Skip to content

Commit

Permalink
Merge pull request #2870 from bolt/fix/update-composer-and-symplify
Browse files Browse the repository at this point in the history 
Update Composer to 2.1 and Symplify to 9.4
  • Loading branch information
@I-Valchev
I-Valchev authored Oct 22, 2021
2 parents ea7beac + 0f57d3f commit f06fc07
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 125 deletions.
11 changes: 0 additions & 11 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,6 @@ appveyor.yml
###> symfony/web-server-bundle ###
/.web-server-pid
###< symfony/web-server-bundle ###

###> friendsofphp/php-cs-fixer ###
/.php_cs
/.php_cs.cache
###< friendsofphp/php-cs-fixer ###

###> squizlabs/php_codesniffer ###
/.phpcs-cache
/phpcs.xml
###< squizlabs/php_codesniffer ###

###> phpunit/phpunit ###
/phpunit.xml
###< phpunit/phpunit ###
Expand Down
72 changes: 36 additions & 36 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,37 +10,37 @@
"ext-pdo": "*",
"composer-runtime-api": "^2",
"api-platform/core": "^2.6",
"babdev/pagerfanta-bundle": "^2.5",
"babdev/pagerfanta-bundle": "^2.11",
"beberlei/doctrineextensions": "^1.3",
"bobdenotter/yaml-migrations": "^1.1.1",
"bolt/common": "^3.0.5",
"cocur/slugify": "^4.0",
"composer/composer": "^2.0",
"composer/composer": "^2.1.9",
"composer/package-versions-deprecated": "^1.11",
"doctrine/doctrine-bundle": "^2.1",
"doctrine/doctrine-fixtures-bundle": "^3.3",
"doctrine/doctrine-migrations-bundle": "^3.0",
"doctrine/orm": "^2.8",
"doctrine/doctrine-bundle": "^2.4",
"doctrine/doctrine-fixtures-bundle": "^3.4",
"doctrine/doctrine-migrations-bundle": "^3.2",
"doctrine/orm": "^2.10",
"drupol/composer-packages": "^2.0",
"embed/embed": "^3.4",
"erusev/parsedown": "^1.7",
"fakerphp/faker": "^1.10",
"fakerphp/faker": "^1.16",
"jasny/twig-extensions": "^1.3",
"knplabs/doctrine-behaviors": "^2.0.3",
"knplabs/knp-menu-bundle": "^3.0",
"knplabs/doctrine-behaviors": "^2.1",
"knplabs/knp-menu-bundle": "^3.1",
"league/glide-symfony": "^1.0",
"miljar/php-exif": "^0.6.4",
"nelexa/zip": "^3.3 || ^4.0",
"nelmio/cors-bundle": "^2.1",
"nesbot/carbon": "^2.39",
"nesbot/carbon": "^2.53",
"php-translation/symfony-bundle": "^0.12",
"phpdocumentor/reflection-docblock": "^5.2",
"phpdocumentor/reflection-docblock": "^5.3",
"psr/event-dispatcher": "^1.0",
"psr/simple-cache": "^1.0",
"scienta/doctrine-json-functions": "^4.1",
"sensio/framework-extra-bundle": "^6.1",
"scienta/doctrine-json-functions": "^4.4",
"sensio/framework-extra-bundle": "^6.2",
"siriusphp/upload": "^3.0.1",
"squirrelphp/twig-php-syntax": "^1.5",
"squirrelphp/twig-php-syntax": "^1.6",
"symfony/asset": "^5.3",
"symfony/console": "^5.3",
"symfony/debug-bundle": "^5.3",
Expand All @@ -53,8 +53,8 @@
"symfony/http-client": "^5.3",
"symfony/mailer": "^5.3",
"symfony/monolog-bridge": "^5.3",
"symfony/monolog-bundle": "^3.5",
"symfony/polyfill-php72": "^1.13",
"symfony/monolog-bundle": "^3.7",
"symfony/polyfill-php72": "^1.23",
"symfony/security-bundle": "^5.3",
"symfony/serializer": "^5.3",
"symfony/stopwatch": "^5.3",
Expand All @@ -64,18 +64,18 @@
"symfony/var-dumper": "^5.3",
"symfony/web-profiler-bundle": "^5.3",
"symfony/web-server-bundle": "^4.4",
"symfony/webpack-encore-bundle": "^1.7",
"symfony/webpack-encore-bundle": "^1.12",
"symfony/yaml": "^5.3",
"symfonycasts/reset-password-bundle": "^1.1",
"tightenco/collect": "^v8.0",
"symfonycasts/reset-password-bundle": "^1.9",
"tightenco/collect": "^v8.34",
"twig/extra-bundle": "^3.3",
"twig/html-extra": "^3.3",
"twig/intl-extra": "^3.3",
"twig/twig": "^3.0",
"twig/twig": "^3.3",
"ua-parser/uap-php": "^3.9",
"webimpress/safe-writer": "^2.1",
"webmozart/path-util": "^2.3",
"webonyx/graphql-php": "^14.5",
"webonyx/graphql-php": "^14.9",
"xemlock/htmlpurifier-html5": "^0.1.11"
},
"conflict": {
Expand All @@ -87,36 +87,36 @@
"ext-curl": "*",
"ext-pdo_sqlite": "*",
"acmecorp/reference-extension": "^1.2",
"behat/mink-goutte-driver": "^1.2",
"behat/mink-selenium2-driver": "^1.4",
"behat/mink-goutte-driver": "^1.3",
"behat/mink-selenium2-driver": "^1.5",
"behatch/contexts": "^3.3",
"bobdenotter/configuration-notices": "^1.1.10",
"bobdenotter/configuration-notices": "^1.2",
"bobdenotter/weatherwidget": "^1.1",
"bolt/newswidget": "^1.3",
"coduo/php-matcher": "^5.0",
"dama/doctrine-test-bundle": "^6.2.0",
"friends-of-behat/mink": "^1.8",
"friends-of-behat/mink-browserkit-driver": "^1.4",
"dama/doctrine-test-bundle": "^6.6.0",
"friends-of-behat/mink": "^1.9",
"friends-of-behat/mink-browserkit-driver": "^1.5",
"friends-of-behat/symfony-extension": "^2.1",
"lakion/mink-debug-extension": "^2.0",
"laminas/laminas-code": "^3.4",
"nyholm/psr7": "^1.1",
"ondram/ci-detector": "^4.0",
"php-http/curl-client": "^2.0",
"php-http/discovery": "^1.6",
"php-http/httplug-bundle": "^1.7",
"php-http/message": "^1.0",
"nyholm/psr7": "^1.4",
"ondram/ci-detector": "^4.1",
"php-http/curl-client": "^2.2",
"php-http/discovery": "^1.14",
"php-http/httplug-bundle": "^1.19",
"php-http/message": "^1.12",
"php-translation/loco-adapter": "^0.11",
"phpspec/phpspec": "^6.2.1",
"phpspec/prophecy": "^1.10",
"phpspec/phpspec": "^6.3.1",
"phpspec/prophecy": "^1.14",
"phpstan/phpstan": "^0.12",
"phpstan/phpstan-doctrine": "^0.12",
"phpstan/phpstan-symfony": "^0.12",
"phpunit/phpunit": "^8.5",
"se/selenium-server-standalone": "^3.141",
"symfony/browser-kit": "^5.3",
"symfony/css-selector": "^5.3",
"symplify/easy-coding-standard": "^8.2.3"
"symplify/easy-coding-standard": "^9.4"
},
"config": {
"preferred-install": {
Expand Down
2 changes: 1 addition & 1 deletion ecs.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@

$services->set(OrderedImportsFixer::class)
->call('configure', [[
'importsOrder' => ['class', 'const', 'function'],
'imports_order' => ['class', 'const', 'function'],
]]);

$services->set(DeclareEqualNormalizeFixer::class)
Expand Down
17 changes: 9 additions & 8 deletions phpstan.neon
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,12 @@ includes:
- vendor/phpstan/phpstan-doctrine/extension.neon
# - vendor/thecodingmachine/phpstan-safe-rule/phpstan-safe-rule.neon # make ON when thecodingmachine/safe will get stable

services:
-
class: Symplify\CodingStandard\Rules\ForbiddenFuncCallRule
tags: [phpstan.rules.rule]
arguments:
forbiddenFunctions: ['d', 'dd', 'dump', 'var_dump', 'extract']

- Symplify\PackageBuilder\Matcher\ArrayStringAndFnMatcher
# Todo: add these: https://tomasvotruba.com/blog/2020/12/14/new-in-symplify-9-more-than-110-phpstan-rules/
# services:
# -
# class: Symplify\CodingStandard\Rules\ForbiddenFuncCallRule
# tags: [phpstan.rules.rule]
# arguments:
# forbiddenFunctions: ['d', 'dd', 'dump', 'var_dump', 'extract']
#
# - Symplify\PackageBuilder\Matcher\ArrayStringAndFnMatcher
69 changes: 0 additions & 69 deletions symfony.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,6 @@
"config/packages/test/dama_doctrine_test_bundle.yaml"
]
},
"dealerdirect/phpcodesniffer-composer-installer": {
"version": "v0.7.0"
},
"doctrine/annotations": {
"version": "1.0",
"recipe": {
Expand Down Expand Up @@ -275,18 +272,6 @@
"friendsofapi/localise.biz": {
"version": "1.0.1"
},
"friendsofphp/php-cs-fixer": {
"version": "2.2",
"recipe": {
"repo": "github.com/symfony/recipes",
"branch": "master",
"version": "2.2",
"ref": "cc05ab6abf6894bddb9bbd6a252459010ebe040b"
},
"files": [
".php_cs.dist"
]
},
"friendsofphp/proxy-manager-lts": {
"version": "v1.0.3"
},
Expand All @@ -311,9 +296,6 @@
"jdorn/sql-formatter": {
"version": "v1.2.17"
},
"jean85/pretty-package-versions": {
"version": "1.2"
},
"justinrainbow/json-schema": {
"version": "5.2.9"
},
Expand Down Expand Up @@ -389,15 +371,9 @@
"nette/component-model": {
"version": "v3.0.0"
},
"nette/finder": {
"version": "v2.5.2"
},
"nette/http": {
"version": "v3.0.3"
},
"nette/robot-loader": {
"version": "v3.2.2"
},
"nette/routing": {
"version": "v3.0.0"
},
Expand Down Expand Up @@ -446,9 +422,6 @@
"php": {
"version": "7.2"
},
"php-cs-fixer/diff": {
"version": "v1.3.0"
},
"php-http/client-common": {
"version": "2.1.0"
},
Expand Down Expand Up @@ -545,9 +518,6 @@
"phpspec/prophecy": {
"version": "v1.10.2"
},
"phpstan/phpdoc-parser": {
"version": "0.4.9"
},
"phpstan/phpstan": {
"version": "0.12.11"
},
Expand Down Expand Up @@ -691,24 +661,9 @@
"siriusphp/validation": {
"version": "2.3.0"
},
"slevomat/coding-standard": {
"version": "6.4.0"
},
"squirrelphp/twig-php-syntax": {
"version": "v1.5"
},
"squizlabs/php_codesniffer": {
"version": "3.0",
"recipe": {
"repo": "github.com/symfony/recipes-contrib",
"branch": "master",
"version": "3.0",
"ref": "0dc9cceda799fd3a08b96987e176a261028a3709"
},
"files": [
"phpcs.xml.dist"
]
},
"symfony/asset": {
"version": "v4.4.4"
},
Expand Down Expand Up @@ -894,9 +849,6 @@
"symfony/polyfill-mbstring": {
"version": "v1.14.0"
},
"symfony/polyfill-php70": {
"version": "v1.17.0"
},
"symfony/polyfill-php72": {
"version": "v1.14.0"
},
Expand Down Expand Up @@ -1089,30 +1041,9 @@
"symplify/auto-bind-parameter": {
"version": "v7.2.2"
},
"symplify/autowire-array-parameter": {
"version": "v7.2.2"
},
"symplify/coding-standard": {
"version": "v7.2.2"
},
"symplify/console-color-diff": {
"version": "v7.3.18"
},
"symplify/easy-coding-standard": {
"version": "v7.2.2"
},
"symplify/package-builder": {
"version": "v7.2.2"
},
"symplify/set-config-resolver": {
"version": "v7.2.2"
},
"symplify/smart-file-system": {
"version": "v7.2.2"
},
"symplify/symplify-kernel": {
"version": "8.3.28"
},
"theseer/tokenizer": {
"version": "1.1.3"
},
Expand Down

0 comments on commit f06fc07

Please sign in to comment.