From 4994fbf350155cb8cbb56969b7858fa434192cca Mon Sep 17 00:00:00 2001 From: Jakub Caban Date: Mon, 18 Dec 2023 13:53:41 +0100 Subject: [PATCH 01/11] Allow Symfony 7 --- .github/workflows/qa.yaml | 2 +- .github/workflows/test.yaml | 7 +++++-- composer.json | 12 ++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml index 0b4b81f..0455409 100644 --- a/.github/workflows/qa.yaml +++ b/.github/workflows/qa.yaml @@ -17,7 +17,7 @@ jobs: - name: Install PHP with extensions uses: shivammathur/setup-php@v2 with: - php-version: 7.4 + php-version: 8.1 coverage: none tools: composer:v2, cs2pr, php-cs-fixer diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 41e7c27..7af7800 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -58,8 +58,11 @@ jobs: - php: '8.0' symfony: '5.2.*' phpstan: .phpstan/symfony_5.neon - - php: '8.0' - symfony: '6.0.*' + - php: '8.1' + symfony: '6.4.*' + phpstan: .phpstan/symfony_6.neon + - php: '8.2' + symfony: '7.0.*' phpstan: .phpstan/symfony_6.neon steps: - name: Checkout diff --git a/composer.json b/composer.json index 4e9d4a4..dfb7272 100644 --- a/composer.json +++ b/composer.json @@ -19,12 +19,12 @@ "ext-zlib": "*", "php": ">=7.1.0", "geoip2/geoip2": "~2.0", - "symfony/http-kernel": "~2.8|~3.0|~4.0|~5.0|~6.0", - "symfony/dependency-injection": "~2.8|~3.0|~4.0|~5.0|~6.0", - "symfony/expression-language": "~2.8|~3.0|~4.0|~5.0|~6.0", - "symfony/config": "~2.8|~3.0|~4.0|~5.0|~6.0", - "symfony/console": "~2.8|~3.0|~4.0|~5.0|~6.0", - "symfony/filesystem": "~2.8|~3.0|~4.0|~5.0|~6.0" + "symfony/http-kernel": "~2.8|~3.0|~4.0|~5.0|~6.0|~7.0", + "symfony/dependency-injection": "~2.8|~3.0|~4.0|~5.0|~6.0|~7.0", + "symfony/expression-language": "~2.8|~3.0|~4.0|~5.0|~6.0|~7.0", + "symfony/config": "~2.8|~3.0|~4.0|~5.0|~6.0|~7.0", + "symfony/console": "~2.8|~3.0|~4.0|~5.0|~6.0|~7.0", + "symfony/filesystem": "~2.8|~3.0|~4.0|~5.0|~6.0|~7.0" }, "require-dev": { "phpunit/phpunit": "~7.0|~8.0|~9.0", From f3fc378afa394aaa8d05afc3c8ada92f1097e4a5 Mon Sep 17 00:00:00 2001 From: Jakub Caban Date: Thu, 21 Dec 2023 12:26:21 +0100 Subject: [PATCH 02/11] Fix code style --- src/Command/UpdateDatabaseCommand.php | 10 +++--- src/DependencyInjection/Configuration.php | 40 +++++++++++------------ src/Reader/ReaderFactory.php | 2 +- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/Command/UpdateDatabaseCommand.php b/src/Command/UpdateDatabaseCommand.php index af41481..e3ad51f 100644 --- a/src/Command/UpdateDatabaseCommand.php +++ b/src/Command/UpdateDatabaseCommand.php @@ -57,7 +57,7 @@ protected function configure(): void $databases_help .= sprintf(' * %s'.PHP_EOL, $name); } - [$first, $second, ] = array_keys($this->databases); + [$first, $second] = array_keys($this->databases); $help .= <<databases[$database]) || - !array_key_exists('path', $this->databases[$database]) || - !is_string($this->databases[$database]['url']) || - !is_string($this->databases[$database]['path']) + if (!array_key_exists('url', $this->databases[$database]) + || !array_key_exists('path', $this->databases[$database]) + || !is_string($this->databases[$database]['url']) + || !is_string($this->databases[$database]['path']) ) { throw new \InvalidArgumentException(sprintf('Invalid "%s" database config.', $database)); } diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 36e145d..80cd13e 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -192,10 +192,10 @@ private function normalizeDefaultDatabase(NodeDefinition $root_node): void ->beforeNormalization() ->ifTrue(static function ($v): bool { return - is_array($v) && - !array_key_exists('default_database', $v) && - !empty($v['databases']) && - is_array($v['databases']); + is_array($v) + && !array_key_exists('default_database', $v) + && !empty($v['databases']) + && is_array($v['databases']); }) ->then(static function (array $v): array { $keys = array_keys($v['databases']); @@ -268,10 +268,10 @@ private function validateAvailableDefaultDatabase(NodeDefinition $root_node): vo ->validate() ->ifTrue(static function ($v): bool { return - is_array($v) && - array_key_exists('default_database', $v) && - !empty($v['databases']) && - !array_key_exists($v['default_database'], $v['databases']); + is_array($v) + && array_key_exists('default_database', $v) + && !empty($v['databases']) + && !array_key_exists($v['default_database'], $v['databases']); }) ->then(static function (array $v): array { $databases = implode('", "', array_keys($v['databases'])); @@ -292,10 +292,10 @@ private function allowGlobalLicense(NodeDefinition $root_node): void ->beforeNormalization() ->ifTrue(static function ($v): bool { return - is_array($v) && - array_key_exists('license', $v) && - array_key_exists('databases', $v) && - is_array($v['databases']); + is_array($v) + && array_key_exists('license', $v) + && array_key_exists('databases', $v) + && is_array($v['databases']); }) ->then(static function (array $v): array { foreach ($v['databases'] as $name => $database) { @@ -320,10 +320,10 @@ private function allowGlobalLocales(NodeDefinition $root_node): void ->beforeNormalization() ->ifTrue(static function ($v): bool { return - is_array($v) && - array_key_exists('locales', $v) && - array_key_exists('databases', $v) && - is_array($v['databases']); + is_array($v) + && array_key_exists('locales', $v) + && array_key_exists('databases', $v) + && is_array($v['databases']); }) ->then(static function (array $v): array { foreach ($v['databases'] as $name => $database) { @@ -386,10 +386,10 @@ private function normalizeUrl(NodeDefinition $database_node): void ->beforeNormalization() ->ifTrue(static function ($v): bool { return - is_array($v) && - !array_key_exists('url', $v) && - array_key_exists('license', $v) && - array_key_exists('edition', $v); + is_array($v) + && !array_key_exists('url', $v) + && array_key_exists('license', $v) + && array_key_exists('edition', $v); }) ->then(static function (array $v): array { $v['url'] = sprintf(self::URL, urlencode($v['edition']), urlencode($v['license'])); diff --git a/src/Reader/ReaderFactory.php b/src/Reader/ReaderFactory.php index 107d29c..067bdbc 100644 --- a/src/Reader/ReaderFactory.php +++ b/src/Reader/ReaderFactory.php @@ -41,7 +41,7 @@ public function __construct(array $databases, string $reader_class = Reader::cla * * @return Reader */ - public function create(string $database, ?array $locales = null): Reader + public function create(string $database, array $locales = null): Reader { if (!array_key_exists($database, $this->databases)) { $databases = implode('", "', array_keys($this->databases)); From 3cb16c1901ccfea21335b04054e6a6556deb6b55 Mon Sep 17 00:00:00 2001 From: Jakub Caban Date: Thu, 21 Dec 2023 12:29:29 +0100 Subject: [PATCH 03/11] Don't try to send coverage for PHP 8.1 and 8.2 too --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7af7800..4dfbcda 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -91,7 +91,7 @@ jobs: run: vendor/bin/phpunit --coverage-clover build/coverage-clover.xml - name: Send coverage results to Scrutinizer CI - if: matrix.php != '8.0' + if: matrix.php != '8.0' && matrix.php != '8.1' && matrix.php != '8.2' run: | wget https://scrutinizer-ci.com/ocular.phar php ocular.phar code-coverage:upload --format=php-clover build/coverage-clover.xml @@ -101,7 +101,7 @@ jobs: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} COVERALLS_PARALLEL: true COVERALLS_FLAG_NAME: 'PHP ${{ matrix.php }} + ${{ matrix.symfony }}' - if: matrix.php != '8.0' + if: matrix.php != '8.0' && matrix.php != '8.1' && matrix.php != '8.2' run: | composer global require php-coveralls/php-coveralls php-coveralls -x build/coverage-clover.xml -o build/coveralls-upload.json -v From 845e2baeb43cd7e861e4bc481670fe88dc0b23f8 Mon Sep 17 00:00:00 2001 From: Jakub Caban Date: Thu, 21 Dec 2023 12:37:32 +0100 Subject: [PATCH 04/11] Bump phpstan and minimal PHP version --- .github/workflows/test.yaml | 24 ++++++++++++------------ composer.json | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4dfbcda..9937110 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -13,37 +13,37 @@ jobs: fail-fast: false matrix: include: - - php: '7.1' + - php: '7.2' symfony: '2.8.*' phpstan: .phpstan/default.neon - - php: '7.1' + - php: '7.2' symfony: '3.0.*' phpstan: .phpstan/default.neon - - php: '7.1' + - php: '7.2' symfony: '3.1.*' phpstan: .phpstan/default.neon - - php: '7.1' + - php: '7.2' symfony: '3.2.*' phpstan: .phpstan/default.neon - - php: '7.1' + - php: '7.2' symfony: '3.3.*' phpstan: .phpstan/default.neon - - php: '7.1' + - php: '7.2' symfony: '3.4.*' phpstan: .phpstan/default.neon - - php: '7.1' + - php: '7.2' symfony: '4.0.*' phpstan: .phpstan/default.neon - - php: '7.1' + - php: '7.2' symfony: '4.1.*' phpstan: .phpstan/default.neon - - php: '7.1' + - php: '7.2' symfony: '4.2.*' phpstan: .phpstan/default.neon - - php: '7.1' + - php: '7.2' symfony: '4.3.*' phpstan: .phpstan/default.neon - - php: '7.1' + - php: '7.2' symfony: '4.4.*' phpstan: .phpstan/default.neon - php: '7.2' @@ -70,7 +70,7 @@ jobs: - name: Configure coverage driver id: coverage - run: echo ::set-output name=driver::$([ "${{ matrix.php }}" = "7.1" ] && echo "xdebug" || echo "pcov") + run: echo ::set-output name=driver::pcov - name: Install PHP with extensions uses: shivammathur/setup-php@v2 diff --git a/composer.json b/composer.json index dfb7272..26875ad 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "require": { "ext-phar": "*", "ext-zlib": "*", - "php": ">=7.1.0", + "php": ">=7.2.0", "geoip2/geoip2": "~2.0", "symfony/http-kernel": "~2.8|~3.0|~4.0|~5.0|~6.0|~7.0", "symfony/dependency-injection": "~2.8|~3.0|~4.0|~5.0|~6.0|~7.0", @@ -28,8 +28,8 @@ }, "require-dev": { "phpunit/phpunit": "~7.0|~8.0|~9.0", - "phpstan/phpstan": "^0.12", - "phpstan/phpstan-phpunit": "^0.12" + "phpstan/phpstan": "^1.10", + "phpstan/phpstan-phpunit": "^1.3" }, "suggest": { "splitbrain/php-archive": "Greatly reduces memory usage for the geoip2:update command" From 733a882028c7a632a605638441f1cafcac98b908 Mon Sep 17 00:00:00 2001 From: Jakub Caban Date: Thu, 21 Dec 2023 12:41:31 +0100 Subject: [PATCH 05/11] Bump phpstan version --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 9937110..7468a6f 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -108,8 +108,8 @@ jobs: - name: Install PHPStan run: | - composer global require phpstan/phpstan:"0.12.*" - composer global require phpstan/phpstan-phpunit:"0.12.*" + composer global require phpstan/phpstan:"1.10.*" + composer global require phpstan/phpstan-phpunit:"1.3.*" - name: Run PHPStan run: phpstan --memory-limit=1G analyse -c ${{ matrix.phpstan }} From 238c569b4f8bbae68d7ff26339c01399c4193567 Mon Sep 17 00:00:00 2001 From: Jakub Caban Date: Thu, 21 Dec 2023 13:04:19 +0100 Subject: [PATCH 06/11] Fix docblocks to satisfy phpstan requirements --- src/Command/UpdateDatabaseCommand.php | 6 +++--- src/DependencyInjection/GpsLabGeoIP2Extension.php | 10 ++++++---- src/Reader/ReaderFactory.php | 8 ++++---- tests/DependencyInjection/ConfigurationTest.php | 12 ++++++------ tests/Reader/ReaderFactoryTest.php | 2 +- 5 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/Command/UpdateDatabaseCommand.php b/src/Command/UpdateDatabaseCommand.php index e3ad51f..0471de8 100644 --- a/src/Command/UpdateDatabaseCommand.php +++ b/src/Command/UpdateDatabaseCommand.php @@ -26,13 +26,13 @@ class UpdateDatabaseCommand extends Command private $downloader; /** - * @var array[] + * @var array */ private $databases; /** - * @param Downloader $downloader - * @param array[] $databases + * @param Downloader $downloader + * @param array $databases */ public function __construct(Downloader $downloader, array $databases) { diff --git a/src/DependencyInjection/GpsLabGeoIP2Extension.php b/src/DependencyInjection/GpsLabGeoIP2Extension.php index e09fe1a..5ef3396 100644 --- a/src/DependencyInjection/GpsLabGeoIP2Extension.php +++ b/src/DependencyInjection/GpsLabGeoIP2Extension.php @@ -30,8 +30,10 @@ class GpsLabGeoIP2Extension extends Extension private const SERVICE_NAME = 'geoip2.database.%s_reader'; /** - * @param array[] $configs - * @param ContainerBuilder $container + * @param array> $config + * @param ContainerBuilder $container + * + * @return void */ public function load(array $configs, ContainerBuilder $container): void { @@ -102,8 +104,8 @@ public function load(array $configs, ContainerBuilder $container): void } /** - * @param array[] $config - * @param ContainerBuilder $container + * @param array> $config + * @param ContainerBuilder $container * * @return Configuration */ diff --git a/src/Reader/ReaderFactory.php b/src/Reader/ReaderFactory.php index 067bdbc..a8847d6 100644 --- a/src/Reader/ReaderFactory.php +++ b/src/Reader/ReaderFactory.php @@ -16,18 +16,18 @@ class ReaderFactory { /** - * @var array[] + * @var array */ private $databases; /** - * @var string + * @var class-string */ private $reader_class; /** - * @param array[] $databases - * @param string $reader_class + * @param array $databases + * @param class-string $reader_class */ public function __construct(array $databases, string $reader_class = Reader::class) { diff --git a/tests/DependencyInjection/ConfigurationTest.php b/tests/DependencyInjection/ConfigurationTest.php index 004066e..0f6c584 100644 --- a/tests/DependencyInjection/ConfigurationTest.php +++ b/tests/DependencyInjection/ConfigurationTest.php @@ -162,8 +162,8 @@ public function getBadConfigs(): iterable /** * @dataProvider getBadConfigs * - * @param string|null $cache_dir - * @param array[] $configs + * @param string|null $cache_dir + * @param array> $configs */ public function testBadConfigs(?string $cache_dir, array $configs): void { @@ -177,7 +177,7 @@ public function testBadConfigs(?string $cache_dir, array $configs): void } /** - * @return mixed[] + * @return array> */ public function getConfigs(): iterable { @@ -430,9 +430,9 @@ public function getConfigs(): iterable /** * @dataProvider getConfigs * - * @param string|null $cache_dir - * @param array[] $configs - * @param array[] $expected + * @param string|null $cache_dir + * @param array> $configs + * @param array> $expected */ public function testConfigs(?string $cache_dir, array $configs, array $expected): void { diff --git a/tests/Reader/ReaderFactoryTest.php b/tests/Reader/ReaderFactoryTest.php index 7988b9c..2614b8b 100644 --- a/tests/Reader/ReaderFactoryTest.php +++ b/tests/Reader/ReaderFactoryTest.php @@ -18,7 +18,7 @@ class ReaderFactoryTest extends TestCase { /** - * @return array[] + * @return list>> */ public function getLocales(): array { From 95b7319f045ad8e8ca70d27a2e8cd4d53ac3db32 Mon Sep 17 00:00:00 2001 From: Jakub Caban Date: Thu, 21 Dec 2023 13:08:42 +0100 Subject: [PATCH 07/11] Disable code coverage for now --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7468a6f..ea4d9a8 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -91,7 +91,7 @@ jobs: run: vendor/bin/phpunit --coverage-clover build/coverage-clover.xml - name: Send coverage results to Scrutinizer CI - if: matrix.php != '8.0' && matrix.php != '8.1' && matrix.php != '8.2' + if: false && matrix.php != '8.0' && matrix.php != '8.1' && matrix.php != '8.2' run: | wget https://scrutinizer-ci.com/ocular.phar php ocular.phar code-coverage:upload --format=php-clover build/coverage-clover.xml @@ -101,7 +101,7 @@ jobs: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} COVERALLS_PARALLEL: true COVERALLS_FLAG_NAME: 'PHP ${{ matrix.php }} + ${{ matrix.symfony }}' - if: matrix.php != '8.0' && matrix.php != '8.1' && matrix.php != '8.2' + if: false && matrix.php != '8.0' && matrix.php != '8.1' && matrix.php != '8.2' run: | composer global require php-coveralls/php-coveralls php-coveralls -x build/coverage-clover.xml -o build/coveralls-upload.json -v From 9f88e5b488f90f42aea9f34ef7401004c10aeba2 Mon Sep 17 00:00:00 2001 From: Jakub Caban Date: Thu, 21 Dec 2023 13:10:52 +0100 Subject: [PATCH 08/11] TYPO in docblock --- src/DependencyInjection/GpsLabGeoIP2Extension.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DependencyInjection/GpsLabGeoIP2Extension.php b/src/DependencyInjection/GpsLabGeoIP2Extension.php index 5ef3396..791c1cf 100644 --- a/src/DependencyInjection/GpsLabGeoIP2Extension.php +++ b/src/DependencyInjection/GpsLabGeoIP2Extension.php @@ -30,7 +30,7 @@ class GpsLabGeoIP2Extension extends Extension private const SERVICE_NAME = 'geoip2.database.%s_reader'; /** - * @param array> $config + * @param array> $configs * @param ContainerBuilder $container * * @return void From 768f328dd4aad4a3b3bd97e3caf46b00087579b0 Mon Sep 17 00:00:00 2001 From: Jakub Caban Date: Thu, 21 Dec 2023 13:14:16 +0100 Subject: [PATCH 09/11] Ignore line that is conditional to "new" Symfony versions --- src/DependencyInjection/Configuration.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 80cd13e..3398f37 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -125,7 +125,7 @@ private function createTreeBuilder(string $name): TreeBuilder { // Symfony 4.2 + if (method_exists(TreeBuilder::class, '__construct')) { - return new TreeBuilder($name); + return new TreeBuilder($name); /** @phpstan-ignore-line */ } // Symfony 4.1 and below From ef963b1d3df17770d42094ceff6972e036d12254 Mon Sep 17 00:00:00 2001 From: Jakub Caban Date: Thu, 21 Dec 2023 13:23:25 +0100 Subject: [PATCH 10/11] Properly ignore error --- .github/workflows/test.yaml | 16 ++++++++-------- .phpstan/symfony_4.neon | 8 ++++++++ src/DependencyInjection/Configuration.php | 2 +- 3 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 .phpstan/symfony_4.neon diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index ea4d9a8..1dc2876 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -15,28 +15,28 @@ jobs: include: - php: '7.2' symfony: '2.8.*' - phpstan: .phpstan/default.neon + phpstan: .phpstan/symfony_4.neon - php: '7.2' symfony: '3.0.*' - phpstan: .phpstan/default.neon + phpstan: .phpstan/symfony_4.neon - php: '7.2' symfony: '3.1.*' - phpstan: .phpstan/default.neon + phpstan: .phpstan/symfony_4.neon - php: '7.2' symfony: '3.2.*' - phpstan: .phpstan/default.neon + phpstan: .phpstan/symfony_4.neon - php: '7.2' symfony: '3.3.*' - phpstan: .phpstan/default.neon + phpstan: .phpstan/symfony_4.neon - php: '7.2' symfony: '3.4.*' - phpstan: .phpstan/default.neon + phpstan: .phpstan/symfony_4.neon - php: '7.2' symfony: '4.0.*' - phpstan: .phpstan/default.neon + phpstan: .phpstan/symfony_4.neon - php: '7.2' symfony: '4.1.*' - phpstan: .phpstan/default.neon + phpstan: .phpstan/symfony_4.neon - php: '7.2' symfony: '4.2.*' phpstan: .phpstan/default.neon diff --git a/.phpstan/symfony_4.neon b/.phpstan/symfony_4.neon new file mode 100644 index 0000000..04134cd --- /dev/null +++ b/.phpstan/symfony_4.neon @@ -0,0 +1,8 @@ +# config for Symfony 2.8-4.1 + +includes: + - default.neon + +parameters: + ignoreErrors: + - '#Class Symfony\\Component\\Config\\Definition\\Builder\\TreeBuilder does not have a constructor and must be instantiated without any parameters.#' \ No newline at end of file diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 3398f37..80cd13e 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -125,7 +125,7 @@ private function createTreeBuilder(string $name): TreeBuilder { // Symfony 4.2 + if (method_exists(TreeBuilder::class, '__construct')) { - return new TreeBuilder($name); /** @phpstan-ignore-line */ + return new TreeBuilder($name); } // Symfony 4.1 and below From 9b7b6c8826a05579dfb8fd016b642ce4f1304c63 Mon Sep 17 00:00:00 2001 From: Jakub Caban Date: Thu, 21 Dec 2023 13:36:21 +0100 Subject: [PATCH 11/11] Reenable code coverage upload --- .github/workflows/test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 1dc2876..7b23fd6 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -91,7 +91,7 @@ jobs: run: vendor/bin/phpunit --coverage-clover build/coverage-clover.xml - name: Send coverage results to Scrutinizer CI - if: false && matrix.php != '8.0' && matrix.php != '8.1' && matrix.php != '8.2' + if: matrix.php != '8.0' && matrix.php != '8.1' && matrix.php != '8.2' run: | wget https://scrutinizer-ci.com/ocular.phar php ocular.phar code-coverage:upload --format=php-clover build/coverage-clover.xml @@ -101,7 +101,7 @@ jobs: COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} COVERALLS_PARALLEL: true COVERALLS_FLAG_NAME: 'PHP ${{ matrix.php }} + ${{ matrix.symfony }}' - if: false && matrix.php != '8.0' && matrix.php != '8.1' && matrix.php != '8.2' + if: matrix.php != '8.0' && matrix.php != '8.1' && matrix.php != '8.2' run: | composer global require php-coveralls/php-coveralls php-coveralls -x build/coverage-clover.xml -o build/coveralls-upload.json -v