diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6b03358..c0c9517 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,7 +12,10 @@ jobs: matrix: operating-system: [ ubuntu-latest ] php: [ '8.1', '8.2' ] - symfony: ['6.3.*'] + symfony: [ '6.3.*', '6.4.*', '7.0.*' ] + exclude: + - php: '8.1' + symfony: '7.0.*' steps: - uses: actions/checkout@master @@ -32,11 +35,12 @@ jobs: uses: php-actions/phpunit@v3 env: XDEBUG_MODE: coverage - ACTION_PHPUNIT_PATH: ./vendor/bin/phpunit + ACTION_PHPUNIT_PATH: ./vendor/bin/simple-phpunit with: configuration: phpunit.xml.dist php_extensions: xdebug args: tests --coverage-clover ./coverage.xml + version: 9 - name: Upload to Codecov uses: codecov/codecov-action@v2 diff --git a/composer.json b/composer.json index 7acd718..11daab8 100644 --- a/composer.json +++ b/composer.json @@ -13,23 +13,23 @@ ], "require": { "php": ">=8.1", - "symfony/framework-bundle": "^6.3", - "symfony/serializer": "^6.3" + "symfony/framework-bundle": "^6.3|^7.0", + "symfony/serializer": "^6.3|^7.0" }, "require-dev": { - "nyholm/symfony-bundle-test": "^2.0", + "nyholm/symfony-bundle-test": "^3.0", "zenstruck/console-test": "^v1.1.0", "whatwedo/php-coding-standard": "^1.0", "phpstan/phpstan": "^1.7", "phpunit/phpunit": "^9.5", - "symfony/browser-kit": "^6.3", - "symfony/css-selector": "^6.3", - "symfony/phpunit-bridge": "^6.3", + "symfony/browser-kit": "^6.3|^7.0", + "symfony/css-selector": "^6.3|^7.0", + "symfony/phpunit-bridge": "^6.3|^7.0", "doctrine/doctrine-bundle": "^2.7", "doctrine/doctrine-migrations-bundle": "^3.2", "doctrine/orm": "^2.14", - "symfony/twig-bundle": "^6.3", - "symfony/messenger": "^6.3", + "symfony/twig-bundle": "^6.3|^7.0", + "symfony/messenger": "^6.3|^7.0", "symfony/mercure-bundle": "^0.3" }, "autoload": { diff --git a/src/DependencyInjection/whatwedoMonitorExtension.php b/src/DependencyInjection/whatwedoMonitorExtension.php index 805d6ee..911c63c 100644 --- a/src/DependencyInjection/whatwedoMonitorExtension.php +++ b/src/DependencyInjection/whatwedoMonitorExtension.php @@ -70,7 +70,7 @@ public function configureMonitoring(ContainerBuilder $container, array $config) $container->findDefinition(QueuedMessages::class) ->setArgument(0, $config['monitoring']['metric']['messenger']['queued_messages']['warning_threshold'] ?? 5) ->setArgument(1, $config['monitoring']['metric']['messenger']['queued_messages']['critical_threshold'] ?? 10); - if (!(isset($config['endpoint']['command']['enabled']) + if (! (isset($config['endpoint']['command']['enabled']) && ! $config['endpoint']['command']['enabled'])) { $container->findDefinition(CheckCommand::class) ->setArgument(0, $config['endpoint']['command']['exit_code']['warning'] ?? 1) diff --git a/src/Manager/MonitoringManager.php b/src/Manager/MonitoringManager.php index f925885..7545a5b 100644 --- a/src/Manager/MonitoringManager.php +++ b/src/Manager/MonitoringManager.php @@ -30,7 +30,7 @@ public function run(): void $attribute->run(); $wasSuccessful = $this->wasSuccessful($attribute); $wasWarning = $this->wasWarning($attribute); - if (!$wasSuccessful && !$wasWarning) { + if (! $wasSuccessful && ! $wasWarning) { $this->isSuccessful = false; } if ($wasWarning) { diff --git a/tests/Monitoring/Metric/Messenger/QueuedMessages.php b/tests/Monitoring/Metric/Messenger/QueuedMessages.php index 00701b9..fb04087 100644 --- a/tests/Monitoring/Metric/Messenger/QueuedMessages.php +++ b/tests/Monitoring/Metric/Messenger/QueuedMessages.php @@ -6,7 +6,6 @@ use Symfony\Component\DependencyInjection\ServiceLocator; use whatwedo\MonitorBundle\Enums\MetricStateEnum; -use whatwedo\MonitorBundle\Monitoring\Metric\Messenger\QueuedMessages; use whatwedo\MonitorBundle\Tests\Monitoring\AbstractMonitoring; use whatwedo\MonitorBundle\Tests\Monitoring\Metric\Messenger\Transport\MockTransport; use whatwedo\MonitorBundle\Tests\UseTestKernelTrait; diff --git a/tests/Monitoring/Sensor/Database/DoctrineDbal.php b/tests/Monitoring/Sensor/Database/DoctrineDbal.php index 47f6194..a26fea5 100644 --- a/tests/Monitoring/Sensor/Database/DoctrineDbal.php +++ b/tests/Monitoring/Sensor/Database/DoctrineDbal.php @@ -6,7 +6,6 @@ use Doctrine\Bundle\DoctrineBundle\DoctrineBundle; use Nyholm\BundleTest\TestKernel; -use whatwedo\MonitorBundle\Monitoring\Sensor\Database\DoctrineDbal; use whatwedo\MonitorBundle\Tests\Monitoring\AbstractMonitoring; use whatwedo\MonitorBundle\Tests\UseTestKernelTrait; diff --git a/tests/Monitoring/Sensor/Database/DoctrineMigrations.php b/tests/Monitoring/Sensor/Database/DoctrineMigrations.php index 0ffb766..3076175 100644 --- a/tests/Monitoring/Sensor/Database/DoctrineMigrations.php +++ b/tests/Monitoring/Sensor/Database/DoctrineMigrations.php @@ -11,7 +11,6 @@ use Symfony\Component\Console\Input\ArrayInput; use Symfony\Component\Console\Output\NullOutput; use whatwedo\MonitorBundle\Manager\MonitoringManager; -use whatwedo\MonitorBundle\Monitoring\Sensor\Database\DoctrineMigrations; use whatwedo\MonitorBundle\Tests\Monitoring\AbstractMonitoring; use whatwedo\MonitorBundle\Tests\Monitoring\Sensor\Database\Migrations\Version1; use whatwedo\MonitorBundle\Tests\UseTestKernelTrait; diff --git a/tests/Monitoring/Sensor/Service/Mercure.php b/tests/Monitoring/Sensor/Service/Mercure.php index 6259db8..c0b37b1 100644 --- a/tests/Monitoring/Sensor/Service/Mercure.php +++ b/tests/Monitoring/Sensor/Service/Mercure.php @@ -10,7 +10,6 @@ use Symfony\Component\Mercure\Exception\RuntimeException; use Symfony\Component\Mercure\HubInterface; use whatwedo\MonitorBundle\Enums\SensorStateEnum; -use whatwedo\MonitorBundle\Monitoring\Sensor\Service\Mercure; use whatwedo\MonitorBundle\Tests\Monitoring\AbstractMonitoring; use whatwedo\MonitorBundle\Tests\UseTestKernelTrait;