From 1ab3353588974e1bc3edc4004a1b091aacd8c55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dalibor=20Karlovi=C4=87?= Date: Sat, 17 Dec 2022 17:59:38 +0100 Subject: [PATCH] chore: remove support for PHP 7.4 (#170) --- .github/workflows/build.yaml | 9 +-- 7.4-phpstan.neon.dist | 6 -- 7.4-psalm.xml.dist | 77 ------------------- composer.json | 2 +- src/Bridge/PhpSpreadsheet/composer.json | 2 +- src/Bridge/Spout/composer.json | 2 +- src/Bridge/Symfony/bin/xezilaires | 4 +- src/Bridge/Symfony/composer.json | 2 +- src/Xezilaires/7.4-phpstan.neon.dist | 8 -- src/Xezilaires/7.4-psalm.xml.dist | 60 --------------- src/Xezilaires/Serializer.php | 3 + .../Test/Functional/FunctionalTestCase.php | 4 - src/Xezilaires/composer.json | 2 +- 13 files changed, 12 insertions(+), 169 deletions(-) delete mode 100644 7.4-phpstan.neon.dist delete mode 100644 7.4-psalm.xml.dist delete mode 100644 src/Xezilaires/7.4-phpstan.neon.dist delete mode 100644 src/Xezilaires/7.4-psalm.xml.dist diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cdc33e9..1a1262b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -12,7 +12,7 @@ jobs: PHP_VERSION: ${{ matrix.php }} strategy: matrix: - php: [ "7.4", "8.0", "8.1" ] + php: [ "8.0", "8.1" ] dependencies: [ lowest, highest ] steps: - @@ -20,13 +20,8 @@ jobs: - name: "Composer install: ${{ matrix.dependencies }}" run: make all/composer/install-${{ matrix.dependencies }} - - - name: Tests without mutation - if: "matrix.php == '7.4'" - run: make all/test/phpunit-coverage - name: Tests with mutation - if: "matrix.php != '7.4'" run: make test CodeQualityAnalysis: runs-on: ubuntu-latest @@ -34,7 +29,7 @@ jobs: PHP_VERSION: ${{ matrix.php }} strategy: matrix: - php: [ "7.4", "8.0", "8.1" ] + php: [ "8.0", "8.1" ] dependencies: [ lowest, highest ] steps: - diff --git a/7.4-phpstan.neon.dist b/7.4-phpstan.neon.dist deleted file mode 100644 index ca80615..0000000 --- a/7.4-phpstan.neon.dist +++ /dev/null @@ -1,6 +0,0 @@ -includes: - - phpstan.neon.dist -parameters: - ignoreErrors: - # PHPStan does not process version guards correctly - - '#Call to an undefined method.*getAttributes#' diff --git a/7.4-psalm.xml.dist b/7.4-psalm.xml.dist deleted file mode 100644 index 0ae95dc..0000000 --- a/7.4-psalm.xml.dist +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/composer.json b/composer.json index f47d8c0..59fa69a 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": "^7.4 || ^8.0", + "php": "^8.0", "ext-json": "*", "symfony/options-resolver": "^4.4 || ^5.0 || ^6.0", "symfony/serializer": "^4.4 || ^5.0 || ^6.0" diff --git a/src/Bridge/PhpSpreadsheet/composer.json b/src/Bridge/PhpSpreadsheet/composer.json index 97fe42d..71d4a44 100644 --- a/src/Bridge/PhpSpreadsheet/composer.json +++ b/src/Bridge/PhpSpreadsheet/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": "^7.4 || ^8.0", + "php": "^8.0", "phpoffice/phpspreadsheet": "^1.18", "sigwin/xezilaires": "^0.5 || ^0.6" }, diff --git a/src/Bridge/Spout/composer.json b/src/Bridge/Spout/composer.json index 6b5d56b..f23aabc 100644 --- a/src/Bridge/Spout/composer.json +++ b/src/Bridge/Spout/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": "^7.4 || ^8.0", + "php": "^8.0", "openspout/openspout": "^3.0", "sigwin/xezilaires": "^0.5 || ^0.6" }, diff --git a/src/Bridge/Symfony/bin/xezilaires b/src/Bridge/Symfony/bin/xezilaires index 81c7a7e..4dd229b 100755 --- a/src/Bridge/Symfony/bin/xezilaires +++ b/src/Bridge/Symfony/bin/xezilaires @@ -6,8 +6,8 @@ use Symfony\Component\HttpKernel\Bundle\BundleInterface; use Xezilaires\Bridge\Symfony\AppKernel; use Xezilaires\Bridge\Symfony\Console\Application; -if (version_compare('7.4.0', PHP_VERSION, '>')) { - fwrite(STDERR, 'Xezilaires requires PHP 7.4+'.PHP_EOL); +if (version_compare('8.0.0', PHP_VERSION, '>')) { + fwrite(STDERR, 'Xezilaires requires PHP 8.0+'.PHP_EOL); exit(1); } diff --git a/src/Bridge/Symfony/composer.json b/src/Bridge/Symfony/composer.json index b6e513c..f9615f4 100644 --- a/src/Bridge/Symfony/composer.json +++ b/src/Bridge/Symfony/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": "^7.4 || ^8.0", + "php": "^8.0", "sigwin/xezilaires": "^0.5 || ^0.6", "symfony/console": "^4.4 || ^5.0 || ^6.0", "symfony/framework-bundle": "^4.4 || ^5.0 || ^6.0", diff --git a/src/Xezilaires/7.4-phpstan.neon.dist b/src/Xezilaires/7.4-phpstan.neon.dist deleted file mode 100644 index d817a7d..0000000 --- a/src/Xezilaires/7.4-phpstan.neon.dist +++ /dev/null @@ -1,8 +0,0 @@ -includes: - - phpstan.neon.dist -parameters: - ignoreErrors: - # PHPStan does not process version guards correctly - - '#Call to an undefined method.*getAttributes#' - excludePaths: - - Test/Model/ProductWithAttributes.php diff --git a/src/Xezilaires/7.4-psalm.xml.dist b/src/Xezilaires/7.4-psalm.xml.dist deleted file mode 100644 index 4dc9fc8..0000000 --- a/src/Xezilaires/7.4-psalm.xml.dist +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Xezilaires/Serializer.php b/src/Xezilaires/Serializer.php index 19d3a4f..4730c26 100644 --- a/src/Xezilaires/Serializer.php +++ b/src/Xezilaires/Serializer.php @@ -15,5 +15,8 @@ interface Serializer { + /** + * @param array $context + */ public function serialize(object $data, string $format, array $context = []): string; } diff --git a/src/Xezilaires/Test/Functional/FunctionalTestCase.php b/src/Xezilaires/Test/Functional/FunctionalTestCase.php index b133c7d..b67af56 100644 --- a/src/Xezilaires/Test/Functional/FunctionalTestCase.php +++ b/src/Xezilaires/Test/Functional/FunctionalTestCase.php @@ -178,10 +178,6 @@ public function testCanLoadSparseFixtureWithAnnotations(): void */ public function testCanLoadSparseFixtureWithNativeAttributes(): void { - if (\PHP_VERSION_ID < 80000) { - static::markTestSkipped('Native PHP attributes available since PHP 8.0.0'); - } - $driver = new AnnotationDriver(); $mapping = $driver->getMetadataMapping(ProductWithAttributes::class); diff --git a/src/Xezilaires/composer.json b/src/Xezilaires/composer.json index 3fa42d6..652dc0a 100644 --- a/src/Xezilaires/composer.json +++ b/src/Xezilaires/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": "^7.4 || ^8.0", + "php": "^8.0", "symfony/options-resolver": "^4.4 || ^5.0 || ^6.0", "symfony/serializer": "^4.4 || ^5.0 || ^6.0" },