Skip to content

Commit b87b2cc

Browse files
committed
minor #1174 Removed friendsofphp/php-cs-fixer from dev dependencies (javiereguiluz)
This PR was squashed before being merged into the main branch. Discussion ---------- Removed friendsofphp/php-cs-fixer from dev dependencies We can remove this because we're now using PHP-CS-Fixer via a Docker image created by @OskarStark and run via GitHub Actions (see #1171) Commits ------- d36d83b Removed friendsofphp/php-cs-fixer from dev dependencies
2 parents c6009c3 + d36d83b commit b87b2cc

File tree

5 files changed

+278
-655
lines changed

5 files changed

+278
-655
lines changed

.github/workflows/ci.yaml

+15-3
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,17 @@ env:
1111
PHPUNIT_FLAGS: "-v"
1212
SYMFONY_PHPUNIT_DIR: "$HOME/symfony-bridge/.phpunit"
1313
SYMFONY_REQUIRE: ">=4.4"
14+
# 40x: Since symfony/monolog-bridge 5.2:
15+
# Passing an actionLevel (int|string) as constructor's 3rd argument of
16+
# "Symfony\Bridge\Monolog\Handler\FingersCrossed\HttpCodeActivationStrategy"
17+
# is deprecated, "Monolog\Handler\FingersCrossed\ActivationStrategyInterface" expected.
18+
SYMFONY_DEPRECATIONS_HELPER: 40
1419

1520
jobs:
1621
test:
1722
name: "${{ matrix.operating-system }} / PHP ${{ matrix.php-version }}"
1823
runs-on: ${{ matrix.operating-system }}
19-
continue-on-error: ${{ matrix.allow-failures }}
24+
continue-on-error: false
2025

2126
strategy:
2227
matrix:
@@ -56,11 +61,18 @@ jobs:
5661
run: composer update
5762

5863
- if: matrix.php-version == '8.0'
59-
run: composer update --ignore-platform-reqs=php
64+
run: composer update --ignore-platform-req=php
6065

61-
- name: "Install PHPUnit"
66+
- if: matrix.php-version != '8.0'
67+
name: "Install PHPUnit"
6268
run: vendor/bin/simple-phpunit install
6369

70+
- if: matrix.php-version == '8.0'
71+
name: "Install PHPUnit for PHP 8"
72+
run: |
73+
echo 'SYMFONY_PHPUNIT_VERSION=9.4' >> $GITHUB_ENV
74+
vendor/bin/simple-phpunit install
75+
6476
- name: "PHPUnit version"
6577
run: vendor/bin/simple-phpunit --version
6678

.gitignore

-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@
1616
.phpunit.result.cache
1717
/phpunit.xml
1818
###< symfony/phpunit-bridge ###
19-
###> friendsofphp/php-cs-fixer ###
20-
/.php_cs
21-
/.php_cs.cache
22-
###< friendsofphp/php-cs-fixer ###
23-
2419
###> symfony/webpack-encore-bundle ###
2520
/node_modules/
2621
/public/build/

composer.json

-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"require-dev": {
4545
"dama/doctrine-test-bundle": "^6.2",
4646
"doctrine/doctrine-fixtures-bundle": "^3.0",
47-
"friendsofphp/php-cs-fixer": "3.0.x-dev",
4847
"symfony/browser-kit": "^5.2",
4948
"symfony/css-selector": "^5.2",
5049
"symfony/debug-bundle": "^5.2",

0 commit comments

Comments
 (0)