diff --git a/.gitattributes b/.gitattributes index 1c8e1637..56842108 100644 --- a/.gitattributes +++ b/.gitattributes @@ -13,5 +13,3 @@ rector.php export-ignore phpstan.neon.dist export-ignore phpstan-baseline.neon export-ignore phpstan-console-application.php export-ignore -psalm.xml export-ignore -psalm-baseline.xml export-ignore diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 5b382a3f..d01176f2 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -29,7 +29,7 @@ jobs: - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: '8.5' coverage: none tools: composer:v2 @@ -53,7 +53,7 @@ jobs: - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: '8.5' coverage: none tools: composer:v2, composer-normalize:2 env: diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml index cdb767a1..de32e20a 100644 --- a/.github/workflows/qa.yaml +++ b/.github/workflows/qa.yaml @@ -29,7 +29,7 @@ jobs: - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: '8.5' coverage: none tools: composer:v2 @@ -41,30 +41,6 @@ jobs: - name: PHPStan run: vendor/bin/phpstan --no-progress --memory-limit=1G analyse --error-format=github - psalm: - name: Psalm - - runs-on: ubuntu-latest - - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Install PHP with extensions - uses: shivammathur/setup-php@v2 - with: - php-version: '8.4' - coverage: none - tools: composer:v2 - - - name: Install Composer dependencies (highest) - uses: ramsey/composer-install@v3 - with: - dependency-versions: highest - - - name: Psalm - run: vendor/bin/psalm --no-progress --show-info=false --stats --output-format=github --threads=$(nproc) --shepherd --php-version=8.4 - rector: name: Rector @@ -77,7 +53,7 @@ jobs: - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: '8.5' coverage: none tools: composer:v2 diff --git a/.github/workflows/symfony-lint.yaml b/.github/workflows/symfony-lint.yaml index fb4dd9d1..8c1ade8c 100644 --- a/.github/workflows/symfony-lint.yaml +++ b/.github/workflows/symfony-lint.yaml @@ -29,7 +29,7 @@ jobs: - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: '8.5' coverage: none tools: composer:v2 @@ -53,7 +53,7 @@ jobs: - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: '8.5' coverage: none tools: composer:v2 @@ -77,7 +77,7 @@ jobs: - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: '8.5' coverage: none tools: composer:v2 @@ -101,7 +101,7 @@ jobs: - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: '8.4' + php-version: '8.5' coverage: none tools: composer:v2 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1755327a..47a8d01e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -28,36 +28,42 @@ jobs: SYMFONY_REQUIRE: ${{matrix.symfony-require}} strategy: + fail-fast: false matrix: php-version: - - '8.1' - '8.2' - '8.3' - '8.4' + - '8.5' dependencies: [highest] allowed-to-fail: [false] symfony-require: [''] variant: [normal] include: - - php-version: '8.1' + - php-version: '8.2' dependencies: lowest allowed-to-fail: false variant: normal - - php-version: '8.4' + - php-version: '8.5' dependencies: highest allowed-to-fail: false symfony-require: 6.4.* variant: symfony/symfony:"6.4.*" - - php-version: '8.4' + - php-version: '8.5' dependencies: highest allowed-to-fail: false - symfony-require: 7.1.* - variant: symfony/symfony:"7.1.*" - - php-version: '8.4' + symfony-require: 7.3.* + variant: symfony/symfony:"7.3.*" + - php-version: '8.5' dependencies: highest allowed-to-fail: false - symfony-require: 7.2.* - variant: symfony/symfony:"7.2.*" + symfony-require: 7.4.* + variant: symfony/symfony:"7.4.*" + - php-version: '8.5' + dependencies: highest + allowed-to-fail: false + symfony-require: 8.0.* + variant: symfony/symfony:"8.0.*" steps: - name: Checkout diff --git a/.gitignore b/.gitignore index 3fc5b4a9..2fa6c0d3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,5 @@ composer.lock phpunit.xml phpstan.neon /.phpunit.result.cache +tests/App/config/reference.php /docs/_build/ diff --git a/Makefile b/Makefile index 1f772ffc..18b8dc0a 100644 --- a/Makefile +++ b/Makefile @@ -116,10 +116,6 @@ phpstan: vendor/bin/phpstan --memory-limit=1G analyse .PHONY: phpstan -psalm: - vendor/bin/psalm --php-version=8.4 -.PHONY: psalm - rector: vendor/bin/rector .PHONY: rector diff --git a/README.md b/README.md index 2af215fc..70088e11 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ Symfony SonataBlockBundle [![Latest Stable Version](https://poser.pugx.org/sonata-project/block-bundle/v/stable)](https://packagist.org/packages/sonata-project/block-bundle) [![Latest Unstable Version](https://poser.pugx.org/sonata-project/block-bundle/v/unstable)](https://packagist.org/packages/sonata-project/block-bundle) -[![Psalm Type Coverage][shepherd_stable_badge]][shepherd_stable_link] [![License](https://poser.pugx.org/sonata-project/block-bundle/license)](https://packagist.org/packages/sonata-project/block-bundle) [![Total Downloads](https://poser.pugx.org/sonata-project/block-bundle/downloads)](https://packagist.org/packages/sonata-project/block-bundle) diff --git a/rector.php b/rector.php index 085115f2..3f21a4ed 100644 --- a/rector.php +++ b/rector.php @@ -33,7 +33,7 @@ ]); $rectorConfig->sets([ - LevelSetList::UP_TO_PHP_81, + LevelSetList::UP_TO_PHP_82, PHPUnitSetList::PHPUNIT_100, PHPUnitSetList::PHPUNIT_CODE_QUALITY, ]); diff --git a/tests/bootstrap.php b/tests/bootstrap.php index c9a01342..ee11adb0 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -31,10 +31,5 @@ } if (file_exists($file = __DIR__.'/custom_bootstrap.php')) { - /** - * @psalm-suppress MissingFile,UnusedPsalmSuppress - * - * @see https://github.com/vimeo/psalm/issues/3886 - */ require_once $file; }