diff --git a/.github/workflows/coding-standards.yaml b/.github/workflows/coding-standards.yaml index ed97ce0..f6a7a0d 100644 --- a/.github/workflows/coding-standards.yaml +++ b/.github/workflows/coding-standards.yaml @@ -9,16 +9,16 @@ on: jobs: php-cs-fixer: name: PHP CS Fixer (PHP ${{ matrix.php-version }}) - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: php-version: - - '8.2' + - '8.4' steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Install PHP uses: shivammathur/setup-php@v2 @@ -32,5 +32,3 @@ jobs: - name: Run PHP CS Fixer run: 'vendor/bin/php-cs-fixer fix --dry-run --format=checkstyle | cs2pr' - env: - PHP_CS_FIXER_IGNORE_ENV: 1 diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index e5ae7a6..554ea67 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -9,7 +9,7 @@ on: jobs: phpunit: name: PHPUnit (PHP ${{ matrix.php-version }} - Symfony ${{ matrix.symfony-version }}) - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 env: SYMFONY_REQUIRE: ${{ matrix.symfony-version }} @@ -18,13 +18,14 @@ jobs: php-version: - '8.2' - '8.3' + - '8.4' symfony-version: - '6.4.*' - - '7.0.*' + - '7.3.*' steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: fetch-depth: 2 diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 57a83ae..9d2ca39 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -9,16 +9,16 @@ on: jobs: phpstan: name: PHPStan (PHP ${{ matrix.php-version }}) - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 strategy: matrix: php-version: - - '8.2' + - '8.4' steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 - name: Install PHP uses: shivammathur/setup-php@v2 diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php index 4f55d38..5992a48 100644 --- a/.php-cs-fixer.php +++ b/.php-cs-fixer.php @@ -10,6 +10,7 @@ return (new PhpCsFixer\Config()) ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect()) + ->setUnsupportedPhpVersionAllowed(true) ->setRiskyAllowed(true) ->setRules([ '@Symfony' => true, diff --git a/composer.json b/composer.json index 9e90b42..649d8b7 100644 --- a/composer.json +++ b/composer.json @@ -19,9 +19,9 @@ "symfony/translation": "^6.4 || ^7.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.57.2", - "phpstan/phpstan": "^1.11.1", - "phpstan/phpstan-deprecation-rules": "^1.2.0", + "friendsofphp/php-cs-fixer": "^3.86.0", + "phpstan/phpstan": "^2.1.22", + "phpstan/phpstan-deprecation-rules": "^2.0.3", "phpunit/phpunit": "^11.1.3", "symfony/asset-mapper": "^6.4 || ^7.0", "symfony/framework-bundle": "^6.4 || ^7.0", @@ -33,8 +33,8 @@ "@phpstan", "@phpunit" ], - "cs:dry": "PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --diff --dry-run --no-interaction --ansi", - "cs:fix": "PHP_CS_FIXER_IGNORE_ENV=1 php-cs-fixer fix --ansi", + "cs:dry": "vendor/bin/php-cs-fixer fix --diff --dry-run --no-interaction --ansi", + "cs:fix": "vendor/bin/php-cs-fixer fix --ansi", "phpstan": "vendor/bin/phpstan analyse --ansi", "phpunit": "vendor/bin/phpunit --coverage-html=var/html-coverage --colors=auto" }, diff --git a/tests/Form/SlugTypeTest.php b/tests/Form/SlugTypeTest.php index cfe636b..07c12bd 100644 --- a/tests/Form/SlugTypeTest.php +++ b/tests/Form/SlugTypeTest.php @@ -47,7 +47,7 @@ public function testRenderForm(): void self::assertSame( '