diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1949d22..c105a20 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -11,33 +11,38 @@ jobs: strategy: fail-fast: false matrix: - php: - - '8.1' - - '8.2' - coverage: ['none'] - symfony-versions: - - '4.4.*' - - '5.4.*' - - '6.0.*' - - '6.1.*' - - '6.2.*' include: - - php: '7.4' - symfony-versions: '^4.4' + # --- Symfony 6.4 LTS --- + - php: '8.1' + symfony-versions: '^6.4' coverage: 'none' - - php: '7.4' - symfony-versions: '^5.4' + - php: '8.2' + symfony-versions: '^6.4' coverage: 'none' - - php: '8.0' - symfony-versions: '^5.4' + - php: '8.3' + symfony-versions: '^6.4' coverage: 'none' - - php: '8.0' - symfony-versions: '^6.0' + - php: '8.4' + symfony-versions: '^6.4' + coverage: 'none' + - php: '8.5' + symfony-versions: '^6.4' + coverage: 'none' + + # --- Symfony 7.4 LTS --- + - php: '8.2' + symfony-versions: '^7.4' + coverage: 'none' + - php: '8.3' + symfony-versions: '^7.4' + coverage: 'none' + - php: '8.4' + symfony-versions: '^7.4' coverage: 'none' - description: 'Log Code Coverage' - php: '8.2' + php: '8.5' coverage: 'xdebug' - symfony-versions: '^7.0' + symfony-versions: '^7.4' name: PHP ${{ matrix.php }} Symfony ${{ matrix.symfony-versions }} ${{ matrix.description }} steps: diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 9c92088..cc9200c 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -36,7 +36,7 @@ jobs: run: composer install --no-progress --no-interaction --prefer-dist - name: Run script - run: vendor/bin/phpstan analyse + run: vendor/bin/phpstan analyse --memory-limit=1G composer-validate: name: Composer validate diff --git a/composer.json b/composer.json index 789092a..6db5e24 100644 --- a/composer.json +++ b/composer.json @@ -29,19 +29,17 @@ } ], "require": { - "php": ">=7.4", - "symfony/framework-bundle": "^3.4 || ^4.1.12 || ^5.0 || ^6.0 || ^7.0" + "php": "^8.1", + "symfony/framework-bundle": "^6.4 || ^7.4" }, "require-dev": { - "ext-json": "*", - "phpstan/phpstan": "1.11.*", - "squizlabs/php_codesniffer": "3.7.*", - "symfony/phpunit-bridge": "^3.4 || ^4.1.12 || ^5.0 || ^6.0 || ^7.0", - "phpunit/phpunit": "^8.5 || ^9.0", - "symfony/yaml": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0", - "symfony/browser-kit": "^3.4 || ^4.4 || ^5.0 || ^6.0 || ^7.0", - "symfony/cache": "^3.4 || ^4.4 || ^5.0 || ^6.0 || ^7.0", - "predis/predis": "^2.3" + "phpstan/phpstan": "^2.1", + "squizlabs/php_codesniffer": "^4.0", + "phpunit/phpunit": "^10.5", + "symfony/yaml": "^6.4 || ^7.4", + "symfony/browser-kit": "^6.4 || ^7.4", + "symfony/cache": "^6.4 || ^7.4", + "predis/predis": "^3.3" }, "autoload": { "psr-4": { @@ -64,10 +62,10 @@ "vendor/bin/phpcbf" ], "phpstan": [ - "vendor/bin/phpstan analyse" + "vendor/bin/phpstan analyse --memory-limit=1G" ], "phpunit": [ - "vendor/bin/simple-phpunit" + "vendor/bin/phpunit" ] } } diff --git a/phpcs.xml.dist b/phpcs.xml.dist index d89bc03..38a2185 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -23,7 +23,19 @@ - + + + + + + + + + + + + + diff --git a/phpunit.xml.dist b/phpunit.xml.dist index eb152f2..58061b0 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,37 +1,26 @@ - - - - ./src - - - - - - - - - + tests - - - - + + + ./src + + diff --git a/src/Check/RedisCheck.php b/src/Check/RedisCheck.php index 17fe079..90eefae 100644 --- a/src/Check/RedisCheck.php +++ b/src/Check/RedisCheck.php @@ -89,8 +89,6 @@ private function checkForRedisArrayClient(\RedisArray $client): bool return $response; } - // invalid configuration, RedisClient have different response, than one, provided by RedisArray in fact. - // @phpstan-ignore-next-line foreach ($response as $pingResult) { if (is_bool($pingResult)) { continue; diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php index 5418520..f74087a 100644 --- a/src/DependencyInjection/Configuration.php +++ b/src/DependencyInjection/Configuration.php @@ -15,11 +15,7 @@ public function getConfigTreeBuilder(): TreeBuilder { $treeBuilder = new TreeBuilder('symfony_health_check'); - /** @var ArrayNodeDefinition $root */ - $root = method_exists(TreeBuilder::class, 'getRootNode') - ? $treeBuilder->getRootNode() - // @phpstan-ignore-next-line - BC layer for Symfony <4.2 - : $treeBuilder->root('symfony_health_check'); + $root = $treeBuilder->getRootNode(); $root ->children()