Update PHPStan and PHP-CS-Fixer to their latest version (#578)

* Update PHPStan and PHP-CS-Fixer to their latest version

* Raise the PHPStan level to 9

* Fix failing test due to wrong assertion

* Fix code style

* Bump minimum required version of `friendsofphp/php-cs-fixer`

* Update PHPStan and Psalm baselines

* Raise the minimum required version of PHPStan

* Bump minimum required version of `PHP-CS-Fixer`

* Update PHPStan and Psalm baselines

* Widen the version constraint range for PHP-CS-Fixer

* Revert breaking change

.github/workflows/static-analysis.yaml

@@ -19,7 +19,7 @@ jobs:
  - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
- php-version: '8.0'
+ php-version: '8.1'
 
  - name: Install dependencies
  run: composer update --no-progress --no-interaction --prefer-dist
@@ -36,6 +36,8 @@ jobs:
 
  - name: Setup PHP
  uses: shivammathur/setup-php@v2
+ with:
+ php-version: '8.1'
 
  - name: Install dependencies
  run: composer update --no-progress --no-interaction --prefer-dist
@@ -53,7 +55,7 @@ jobs:
  - name: Setup PHP
  uses: shivammathur/setup-php@v2
  with:
- php-version: '8.0'
+ php-version: '8.1'
 
  - name: Install dependencies
  run: composer update --no-progress --no-interaction --prefer-dist

.github/workflows/tests.yaml

@@ -71,9 +71,6 @@ jobs:
  - name: Setup Problem Matchers for PHPUnit
  run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
- - name: Remove PHP-CS-Fixer
- run: composer remove --dev friendsofphp/php-cs-fixer --no-update
-
  - name: Remove Symfony Messenger
  run: composer remove --dev symfony/messenger --no-update
  if: matrix.symfony-version == '3.4.*'

.gitignore

@@ -2,7 +2,7 @@
 package.xml
 /vendor
 .idea
-.php_cs.cache
+.php-cs-fixer.cache
 .phpunit.result.cache
 docs/_build
 var

.php_cs.dist → .php-cs-fixer.dist.php

@@ -1,6 +1,9 @@
 <?php
 
-return PhpCsFixer\Config::create()
+declare(strict_types=1);
+
+return (new PhpCsFixer\Config())
+ ->setRiskyAllowed(true)
  ->setRules([
  '@PSR2' => true,
  '@Symfony' => true,
@@ -11,8 +14,6 @@
  'imports_order' => ['class', 'function', 'const'],
  ],
  'declare_strict_types' => true,
- 'psr0' => true,
- 'psr4' => true,
  'random_api_migration' => true,
  'yoda_style' => true,
  'self_accessor' => false,
@@ -27,7 +28,6 @@
  'property' => 'multi',
  ],
  ])
- ->setRiskyAllowed(true)
  ->setFinder(
  PhpCsFixer\Finder::create()
  ->in(__DIR__)

composer.json

@@ -40,14 +40,15 @@
  "require-dev": {
  "doctrine/dbal": "^2.13||^3.0",
  "doctrine/doctrine-bundle": "^1.12||^2.5",
- "friendsofphp/php-cs-fixer": "^2.18",
- "jangregor/phpstan-prophecy": "^0.8",
+ "friendsofphp/php-cs-fixer": "^2.19||^3.6",
+ "jangregor/phpstan-prophecy": "^1.0",
  "monolog/monolog": "^1.3||^2.0",
  "phpspec/prophecy": "!=1.11.0",
  "phpspec/prophecy-phpunit": "^1.1||^2.0",
  "phpstan/extension-installer": "^1.0",
- "phpstan/phpstan": "^0.12",
- "phpstan/phpstan-phpunit": "^0.12",
+ "phpstan/phpstan": "^1.3",
+ "phpstan/phpstan-phpunit": "^1.0",
+ "phpstan/phpstan-symfony": "^1.0",
  "phpunit/phpunit": "^8.5.14||^9.3.9",
  "symfony/browser-kit": "^3.4.44||^4.4.20||^5.0.11||^6.0",
  "symfony/cache": "^3.4.44||^4.4.20||^5.0.11||^6.0",