Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Feb 14, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
845a43e
Update PHPStan and PHP-CS-Fixer to their latest version
ste93cry Nov 14, 2021
790815a
Raise the PHPStan level to 9
ste93cry Nov 27, 2021
8a1aa22
Fix failing test due to wrong assertion
ste93cry Dec 2, 2021
7465a39
Fix code style
ste93cry Dec 2, 2021
f6acf3f
Bump minimum required version of `friendsofphp/php-cs-fixer`
ste93cry Dec 13, 2021
836b7f8
Update PHPStan and Psalm baselines
ste93cry Dec 13, 2021
d2e38ec
Raise the minimum required version of PHPStan
ste93cry Dec 29, 2021
dc83822
Bump minimum required version of `PHP-CS-Fixer`
ste93cry Feb 10, 2022
44481af
Update PHPStan and Psalm baselines
ste93cry Feb 10, 2022
56c317f
Widen the version constraint range for PHP-CS-Fixer
ste93cry Feb 10, 2022
ea4619c
Revert breaking change
ste93cry Feb 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/static-analysis.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.*'
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
package.xml
/vendor
.idea
.php_cs.cache
.php-cs-fixer.cache
.phpunit.result.cache
docs/_build
var
Expand Down
8 changes: 4 additions & 4 deletions .php_cs.dist → .php-cs-fixer.dist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<?php

return PhpCsFixer\Config::create()
declare(strict_types=1);

return (new PhpCsFixer\Config())
->setRiskyAllowed(true)
->setRules([
'@PSR2' => true,
'@Symfony' => true,
Expand All @@ -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,
Expand All @@ -27,7 +28,6 @@
'property' => 'multi',
],
])
->setRiskyAllowed(true)
->setFinder(
PhpCsFixer\Finder::create()
->in(__DIR__)
Expand Down
9 changes: 5 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading