diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 08d40b99..bb62d92c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,18 +15,18 @@ jobs: strategy: fail-fast: true matrix: - php: [ 8.1, 8.2, 8.3, 8.4 ] + php: [ 8.2, 8.3, 8.4, 8.5 ] deps: [ highest ] - symfony: [ 6.4.*, 7.2.*, 7.3.* ] + symfony: [ 6.4.*, 7.4.*, 8.0.* ] include: - - php: 8.1 + - php: 8.2 deps: lowest symfony: '*' exclude: - - php: 8.1 - symfony: 7.2.* - - php: 8.1 - symfony: 7.3.* + - php: 8.3 + symfony: 8.0.* + - php: 8.2 + symfony: 8.0.* steps: - name: Checkout code @@ -60,7 +60,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 coverage: xdebug - name: Install dependencies @@ -81,7 +81,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: 8.3 + php-version: 8.4 coverage: none - name: Validate composer.json diff --git a/DependencyInjection/Compiler/MailerCompilerPass.php b/DependencyInjection/Compiler/MailerCompilerPass.php index 0630cf4a..9f2b3a02 100644 --- a/DependencyInjection/Compiler/MailerCompilerPass.php +++ b/DependencyInjection/Compiler/MailerCompilerPass.php @@ -29,7 +29,7 @@ public function process(ContainerBuilder $container): void throw new \InvalidArgumentException('To enable mail reporting you have to install "symfony/mailer".'); } - $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../../Resources/config')); - $loader->load('symfony_mailer.xml'); + $loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__.'/../../Resources/config')); + $loader->load('symfony_mailer.php'); } } diff --git a/DependencyInjection/LiipMonitorExtension.php b/DependencyInjection/LiipMonitorExtension.php index 192eff31..4fb97893 100644 --- a/DependencyInjection/LiipMonitorExtension.php +++ b/DependencyInjection/LiipMonitorExtension.php @@ -32,10 +32,10 @@ public function __construct() */ public function load(array $configs, ContainerBuilder $container): void { - $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); - $loader->load('runner.xml'); - $loader->load('helper.xml'); - $loader->load('commands.xml'); + $loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $loader->load('runner.php'); + $loader->load('helper.php'); + $loader->load('commands.php'); $configuration = $this->getConfiguration($configs, $container); $config = $this->processConfiguration($configuration, $configs); @@ -47,7 +47,7 @@ public function load(array $configs, ContainerBuilder $container): void if ($config['enable_controller']) { $container->setParameter(sprintf('%s.view_template', $this->getAlias()), $config['view_template']); $container->setParameter(sprintf('%s.failure_status_code', $this->getAlias()), $config['failure_status_code']); - $loader->load('controller.xml'); + $loader->load('controller.php'); } $this->configureMailer($container, $config); @@ -74,7 +74,7 @@ public function load(array $configs, ContainerBuilder $container): void $this->setParameters($container, $check, $group, $values); if (!in_array($check, $checksLoaded)) { - $loader->load('checks/'.$check.'.xml'); + $loader->load('checks/'.$check.'.php'); $checksLoaded[] = $check; } } diff --git a/Resources/config/checks/apc_fragmentation.php b/Resources/config/checks/apc_fragmentation.php new file mode 100644 index 00000000..d8be026d --- /dev/null +++ b/Resources/config/checks/apc_fragmentation.php @@ -0,0 +1,16 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.apc_fragmentation', \Laminas\Diagnostics\Check\ApcFragmentation::class) + ->public() + ->args([ + '%%liip_monitor.check.apc_fragmentation.warning%%', + '%%liip_monitor.check.apc_fragmentation.critical%%', + ]) + ->tag('liip_monitor.check', ['alias' => 'apc_fragmentation']); +}; diff --git a/Resources/config/checks/apc_fragmentation.xml b/Resources/config/checks/apc_fragmentation.xml deleted file mode 100644 index db4b60de..00000000 --- a/Resources/config/checks/apc_fragmentation.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - %%liip_monitor.check.apc_fragmentation.warning%% - %%liip_monitor.check.apc_fragmentation.critical%% - - - - diff --git a/Resources/config/checks/apc_memory.php b/Resources/config/checks/apc_memory.php new file mode 100644 index 00000000..f69eff01 --- /dev/null +++ b/Resources/config/checks/apc_memory.php @@ -0,0 +1,16 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.apc_memory', \Laminas\Diagnostics\Check\ApcMemory::class) + ->public() + ->args([ + '%%liip_monitor.check.apc_memory.warning%%', + '%%liip_monitor.check.apc_memory.critical%%', + ]) + ->tag('liip_monitor.check', ['alias' => 'apc_memory']); +}; diff --git a/Resources/config/checks/apc_memory.xml b/Resources/config/checks/apc_memory.xml deleted file mode 100644 index fe9bed56..00000000 --- a/Resources/config/checks/apc_memory.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - %%liip_monitor.check.apc_memory.warning%% - %%liip_monitor.check.apc_memory.critical%% - - - - diff --git a/Resources/config/checks/class_exists.php b/Resources/config/checks/class_exists.php new file mode 100644 index 00000000..70f7233f --- /dev/null +++ b/Resources/config/checks/class_exists.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.class_exists', \Laminas\Diagnostics\Check\ClassExists::class) + ->public() + ->args(['%%liip_monitor.check.class_exists%%']) + ->tag('liip_monitor.check', ['alias' => 'class_exists']); +}; diff --git a/Resources/config/checks/class_exists.xml b/Resources/config/checks/class_exists.xml deleted file mode 100644 index c476ff49..00000000 --- a/Resources/config/checks/class_exists.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.class_exists%% - - - - diff --git a/Resources/config/checks/cpu_performance.php b/Resources/config/checks/cpu_performance.php new file mode 100644 index 00000000..21db7197 --- /dev/null +++ b/Resources/config/checks/cpu_performance.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.cpu_performance', \Laminas\Diagnostics\Check\CpuPerformance::class) + ->public() + ->args(['%%liip_monitor.check.cpu_performance%%']) + ->tag('liip_monitor.check', ['alias' => 'cpu_performance']); +}; diff --git a/Resources/config/checks/cpu_performance.xml b/Resources/config/checks/cpu_performance.xml deleted file mode 100644 index 454c99d3..00000000 --- a/Resources/config/checks/cpu_performance.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.cpu_performance%% - - - - diff --git a/Resources/config/checks/custom_error_pages.php b/Resources/config/checks/custom_error_pages.php new file mode 100644 index 00000000..20965162 --- /dev/null +++ b/Resources/config/checks/custom_error_pages.php @@ -0,0 +1,17 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.custom_error_pages', \Liip\MonitorBundle\Check\CustomErrorPages::class) + ->public() + ->args([ + '%%liip_monitor.check.custom_error_pages.error_codes%%', + '%%liip_monitor.check.custom_error_pages.path%%', + '%kernel.project_dir%', + ]) + ->tag('liip_monitor.check', ['alias' => 'custom_error_pages']); +}; diff --git a/Resources/config/checks/custom_error_pages.xml b/Resources/config/checks/custom_error_pages.xml deleted file mode 100644 index 092430b8..00000000 --- a/Resources/config/checks/custom_error_pages.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - %%liip_monitor.check.custom_error_pages.error_codes%% - %%liip_monitor.check.custom_error_pages.path%% - %kernel.project_dir% - - - - diff --git a/Resources/config/checks/disk_usage.php b/Resources/config/checks/disk_usage.php new file mode 100644 index 00000000..f947a395 --- /dev/null +++ b/Resources/config/checks/disk_usage.php @@ -0,0 +1,17 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.disk_usage', \Laminas\Diagnostics\Check\DiskUsage::class) + ->public() + ->args([ + '%%liip_monitor.check.disk_usage.warning%%', + '%%liip_monitor.check.disk_usage.critical%%', + '%%liip_monitor.check.disk_usage.path%%', + ]) + ->tag('liip_monitor.check', ['alias' => 'disk_usage']); +}; diff --git a/Resources/config/checks/disk_usage.xml b/Resources/config/checks/disk_usage.xml deleted file mode 100644 index 465dc196..00000000 --- a/Resources/config/checks/disk_usage.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - %%liip_monitor.check.disk_usage.warning%% - %%liip_monitor.check.disk_usage.critical%% - %%liip_monitor.check.disk_usage.path%% - - - - diff --git a/Resources/config/checks/doctrine_dbal.php b/Resources/config/checks/doctrine_dbal.php new file mode 100644 index 00000000..69853d9b --- /dev/null +++ b/Resources/config/checks/doctrine_dbal.php @@ -0,0 +1,16 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.doctrine_dbal', \Liip\MonitorBundle\Check\DoctrineDbalCollection::class) + ->public() + ->args([ + service('doctrine'), + '%%liip_monitor.check.doctrine_dbal%%', + ]) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/doctrine_dbal.xml b/Resources/config/checks/doctrine_dbal.xml deleted file mode 100644 index 51dd9eda..00000000 --- a/Resources/config/checks/doctrine_dbal.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - %%liip_monitor.check.doctrine_dbal%% - - - - diff --git a/Resources/config/checks/doctrine_migrations.php b/Resources/config/checks/doctrine_migrations.php new file mode 100644 index 00000000..f0ed57be --- /dev/null +++ b/Resources/config/checks/doctrine_migrations.php @@ -0,0 +1,16 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.doctrine_migrations', \Liip\MonitorBundle\Check\DoctrineMigrationsCollection::class) + ->public() + ->args([ + service('service_container'), + '%%liip_monitor.check.doctrine_migrations%%', + ]) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/doctrine_migrations.xml b/Resources/config/checks/doctrine_migrations.xml deleted file mode 100644 index 7b6ea15f..00000000 --- a/Resources/config/checks/doctrine_migrations.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - %%liip_monitor.check.doctrine_migrations%% - - - - - diff --git a/Resources/config/checks/doctrine_mongodb.php b/Resources/config/checks/doctrine_mongodb.php new file mode 100644 index 00000000..8070d1e4 --- /dev/null +++ b/Resources/config/checks/doctrine_mongodb.php @@ -0,0 +1,16 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.doctrine_mongodb', \Liip\MonitorBundle\Check\DoctrineMongoDbCollection::class) + ->public() + ->args([ + service('doctrine_mongodb'), + '%%liip_monitor.check.doctrine_mongodb%%', + ]) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/doctrine_mongodb.xml b/Resources/config/checks/doctrine_mongodb.xml deleted file mode 100644 index e23953ad..00000000 --- a/Resources/config/checks/doctrine_mongodb.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - %%liip_monitor.check.doctrine_mongodb%% - - - - diff --git a/Resources/config/checks/expressions.php b/Resources/config/checks/expressions.php new file mode 100644 index 00000000..a0db8dff --- /dev/null +++ b/Resources/config/checks/expressions.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.expressions', \Liip\MonitorBundle\Check\ExpressionCollection::class) + ->public() + ->args(['%%liip_monitor.check.expressions%%']) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/expressions.xml b/Resources/config/checks/expressions.xml deleted file mode 100644 index 1c27b351..00000000 --- a/Resources/config/checks/expressions.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.expressions%% - - - - diff --git a/Resources/config/checks/file_ini.php b/Resources/config/checks/file_ini.php new file mode 100644 index 00000000..e4311d4e --- /dev/null +++ b/Resources/config/checks/file_ini.php @@ -0,0 +1,15 @@ +services(); + $parameters = $container->parameters(); + $parameters->set('liip_monitor.check.file_ini.label', 'File (INI)'); + + $services->set('liip_monitor.check.file_ini', \Laminas\Diagnostics\Check\IniFile::class) + ->public() + ->args(['%%liip_monitor.check.file_ini%%']) + ->call('setLabel', ['%liip_monitor.check.file_ini.label%']) + ->tag('liip_monitor.check', ['alias' => 'file_ini']); +}; diff --git a/Resources/config/checks/file_ini.xml b/Resources/config/checks/file_ini.xml deleted file mode 100644 index 0c3621bd..00000000 --- a/Resources/config/checks/file_ini.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - File (INI) - - - - - %%liip_monitor.check.file_ini%% - - %liip_monitor.check.file_ini.label% - - - - - diff --git a/Resources/config/checks/file_json.php b/Resources/config/checks/file_json.php new file mode 100644 index 00000000..49a74155 --- /dev/null +++ b/Resources/config/checks/file_json.php @@ -0,0 +1,15 @@ +services(); + $parameters = $container->parameters(); + $parameters->set('liip_monitor.check.file_json.label', 'File (JSON)'); + + $services->set('liip_monitor.check.file_json', \Laminas\Diagnostics\Check\JsonFile::class) + ->public() + ->args(['%%liip_monitor.check.file_json%%']) + ->call('setLabel', ['%liip_monitor.check.file_json.label%']) + ->tag('liip_monitor.check', ['alias' => 'file_json']); +}; diff --git a/Resources/config/checks/file_json.xml b/Resources/config/checks/file_json.xml deleted file mode 100644 index b8e92435..00000000 --- a/Resources/config/checks/file_json.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - File (JSON) - - - - - %%liip_monitor.check.file_json%% - - %liip_monitor.check.file_json.label% - - - - - diff --git a/Resources/config/checks/file_xml.php b/Resources/config/checks/file_xml.php new file mode 100644 index 00000000..57dc4417 --- /dev/null +++ b/Resources/config/checks/file_xml.php @@ -0,0 +1,15 @@ +services(); + $parameters = $container->parameters(); + $parameters->set('liip_monitor.check.file_xml.label', 'File (XML)'); + + $services->set('liip_monitor.check.file_xml', \Laminas\Diagnostics\Check\XmlFile::class) + ->public() + ->args(['%%liip_monitor.check.file_xml%%']) + ->call('setLabel', ['%liip_monitor.check.file_xml.label%']) + ->tag('liip_monitor.check', ['alias' => 'file_xml']); +}; diff --git a/Resources/config/checks/file_xml.xml b/Resources/config/checks/file_xml.xml deleted file mode 100644 index 87fb3509..00000000 --- a/Resources/config/checks/file_xml.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - File (XML) - - - - - %%liip_monitor.check.file_xml%% - - %liip_monitor.check.file_xml.label% - - - - - diff --git a/Resources/config/checks/file_yaml.php b/Resources/config/checks/file_yaml.php new file mode 100644 index 00000000..950a7e6b --- /dev/null +++ b/Resources/config/checks/file_yaml.php @@ -0,0 +1,15 @@ +services(); + $parameters = $container->parameters(); + $parameters->set('liip_monitor.check.file_yaml.label', 'File (YAML)'); + + $services->set('liip_monitor.check.file_yaml', \Laminas\Diagnostics\Check\YamlFile::class) + ->public() + ->args(['%%liip_monitor.check.file_yaml%%']) + ->call('setLabel', ['%liip_monitor.check.file_yaml.label%']) + ->tag('liip_monitor.check', ['alias' => 'file_yaml']); +}; diff --git a/Resources/config/checks/file_yaml.xml b/Resources/config/checks/file_yaml.xml deleted file mode 100644 index 76b93a12..00000000 --- a/Resources/config/checks/file_yaml.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - File (YAML) - - - - - %%liip_monitor.check.file_yaml%% - - %liip_monitor.check.file_yaml.label% - - - - - diff --git a/Resources/config/checks/guzzle_http_service.php b/Resources/config/checks/guzzle_http_service.php new file mode 100644 index 00000000..f655b16a --- /dev/null +++ b/Resources/config/checks/guzzle_http_service.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.guzzle_http_service', \Liip\MonitorBundle\Check\GuzzleHttpServiceCollection::class) + ->public() + ->args(['%%liip_monitor.check.guzzle_http_service%%']) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/guzzle_http_service.xml b/Resources/config/checks/guzzle_http_service.xml deleted file mode 100644 index f8dbe5ee..00000000 --- a/Resources/config/checks/guzzle_http_service.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.guzzle_http_service%% - - - - diff --git a/Resources/config/checks/http_service.php b/Resources/config/checks/http_service.php new file mode 100644 index 00000000..fa0b9eaf --- /dev/null +++ b/Resources/config/checks/http_service.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.http_service', \Liip\MonitorBundle\Check\HttpServiceCollection::class) + ->public() + ->args(['%%liip_monitor.check.http_service%%']) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/http_service.xml b/Resources/config/checks/http_service.xml deleted file mode 100644 index 7fe6d728..00000000 --- a/Resources/config/checks/http_service.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.http_service%% - - - - diff --git a/Resources/config/checks/memcache.php b/Resources/config/checks/memcache.php new file mode 100644 index 00000000..150c5f5f --- /dev/null +++ b/Resources/config/checks/memcache.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.memcache', \Liip\MonitorBundle\Check\MemcacheCollection::class) + ->public() + ->args(['%%liip_monitor.check.memcache%%']) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/memcache.xml b/Resources/config/checks/memcache.xml deleted file mode 100644 index 0a25a67e..00000000 --- a/Resources/config/checks/memcache.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.memcache%% - - - - diff --git a/Resources/config/checks/memcached.php b/Resources/config/checks/memcached.php new file mode 100644 index 00000000..d9f38ed4 --- /dev/null +++ b/Resources/config/checks/memcached.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.memcached', \Liip\MonitorBundle\Check\MemcachedCollection::class) + ->public() + ->args(['%%liip_monitor.check.memcached%%']) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/memcached.xml b/Resources/config/checks/memcached.xml deleted file mode 100644 index 7d2b1131..00000000 --- a/Resources/config/checks/memcached.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.memcached%% - - - - diff --git a/Resources/config/checks/messenger_transports.php b/Resources/config/checks/messenger_transports.php new file mode 100644 index 00000000..09a42849 --- /dev/null +++ b/Resources/config/checks/messenger_transports.php @@ -0,0 +1,16 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.messenger_transports', \Liip\MonitorBundle\Check\SymfonyMessengerTransportCountCollection::class) + ->public() + ->args([ + service('messenger.receiver_locator'), + '%%liip_monitor.check.messenger_transports%%', + ]) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/messenger_transports.xml b/Resources/config/checks/messenger_transports.xml deleted file mode 100644 index a339344b..00000000 --- a/Resources/config/checks/messenger_transports.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - %%liip_monitor.check.messenger_transports%% - - - - diff --git a/Resources/config/checks/opcache_memory.php b/Resources/config/checks/opcache_memory.php new file mode 100644 index 00000000..e0cab0ae --- /dev/null +++ b/Resources/config/checks/opcache_memory.php @@ -0,0 +1,16 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.opcache_memory', \Laminas\Diagnostics\Check\OpCacheMemory::class) + ->public() + ->args([ + '%%liip_monitor.check.opcache_memory.warning%%', + '%%liip_monitor.check.opcache_memory.critical%%', + ]) + ->tag('liip_monitor.check', ['alias' => 'opcache_memory']); +}; diff --git a/Resources/config/checks/opcache_memory.xml b/Resources/config/checks/opcache_memory.xml deleted file mode 100644 index b6cc9157..00000000 --- a/Resources/config/checks/opcache_memory.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - %%liip_monitor.check.opcache_memory.warning%% - %%liip_monitor.check.opcache_memory.critical%% - - - - diff --git a/Resources/config/checks/pdo_connections.php b/Resources/config/checks/pdo_connections.php new file mode 100644 index 00000000..c933ae37 --- /dev/null +++ b/Resources/config/checks/pdo_connections.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.pdo_connections', \Liip\MonitorBundle\Check\PdoConnectionCollection::class) + ->public() + ->args(['%%liip_monitor.check.pdo_connections%%']) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/pdo_connections.xml b/Resources/config/checks/pdo_connections.xml deleted file mode 100644 index 03aae07c..00000000 --- a/Resources/config/checks/pdo_connections.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.pdo_connections%% - - - - diff --git a/Resources/config/checks/php_extensions.php b/Resources/config/checks/php_extensions.php new file mode 100644 index 00000000..3d56438f --- /dev/null +++ b/Resources/config/checks/php_extensions.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.php_extensions', \Laminas\Diagnostics\Check\ExtensionLoaded::class) + ->public() + ->args(['%%liip_monitor.check.php_extensions%%']) + ->tag('liip_monitor.check', ['alias' => 'php_extensions']); +}; diff --git a/Resources/config/checks/php_extensions.xml b/Resources/config/checks/php_extensions.xml deleted file mode 100644 index b99192a1..00000000 --- a/Resources/config/checks/php_extensions.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.php_extensions%% - - - - diff --git a/Resources/config/checks/php_flags.php b/Resources/config/checks/php_flags.php new file mode 100644 index 00000000..54d0e02d --- /dev/null +++ b/Resources/config/checks/php_flags.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.php_flags', \Liip\MonitorBundle\Check\PhpFlagsCollection::class) + ->public() + ->args(['%%liip_monitor.check.php_flags%%']) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/php_flags.xml b/Resources/config/checks/php_flags.xml deleted file mode 100644 index 73dc239d..00000000 --- a/Resources/config/checks/php_flags.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.php_flags%% - - - - diff --git a/Resources/config/checks/php_version.php b/Resources/config/checks/php_version.php new file mode 100644 index 00000000..1cd5d4a7 --- /dev/null +++ b/Resources/config/checks/php_version.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.php_version', \Liip\MonitorBundle\Check\PhpVersionCollection::class) + ->public() + ->args(['%%liip_monitor.check.php_version%%']) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/php_version.xml b/Resources/config/checks/php_version.xml deleted file mode 100644 index 782022d8..00000000 --- a/Resources/config/checks/php_version.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.php_version%% - - - - diff --git a/Resources/config/checks/process_running.php b/Resources/config/checks/process_running.php new file mode 100644 index 00000000..b8191c55 --- /dev/null +++ b/Resources/config/checks/process_running.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.process_running', \Liip\MonitorBundle\Check\ProcessRunningCollection::class) + ->public() + ->args(['%%liip_monitor.check.process_running%%']) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/process_running.xml b/Resources/config/checks/process_running.xml deleted file mode 100644 index b732e4a2..00000000 --- a/Resources/config/checks/process_running.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.process_running%% - - - - diff --git a/Resources/config/checks/rabbit_mq.php b/Resources/config/checks/rabbit_mq.php new file mode 100644 index 00000000..c7384f07 --- /dev/null +++ b/Resources/config/checks/rabbit_mq.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.rabbit_mq', \Liip\MonitorBundle\Check\RabbitMQCollection::class) + ->public() + ->args(['%%liip_monitor.check.rabbit_mq%%']) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/rabbit_mq.xml b/Resources/config/checks/rabbit_mq.xml deleted file mode 100644 index 24ee28f6..00000000 --- a/Resources/config/checks/rabbit_mq.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.rabbit_mq%% - - - - diff --git a/Resources/config/checks/readable_directory.php b/Resources/config/checks/readable_directory.php new file mode 100644 index 00000000..f4f1675c --- /dev/null +++ b/Resources/config/checks/readable_directory.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.readable_directory', \Laminas\Diagnostics\Check\DirReadable::class) + ->public() + ->args(['%%liip_monitor.check.readable_directory%%']) + ->tag('liip_monitor.check', ['alias' => 'readable_directory']); +}; diff --git a/Resources/config/checks/readable_directory.xml b/Resources/config/checks/readable_directory.xml deleted file mode 100644 index 42eae022..00000000 --- a/Resources/config/checks/readable_directory.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.readable_directory%% - - - - diff --git a/Resources/config/checks/redis.php b/Resources/config/checks/redis.php new file mode 100644 index 00000000..51503276 --- /dev/null +++ b/Resources/config/checks/redis.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.redis', \Liip\MonitorBundle\Check\RedisCollection::class) + ->public() + ->args(['%%liip_monitor.check.redis%%']) + ->tag('liip_monitor.check_collection'); +}; diff --git a/Resources/config/checks/redis.xml b/Resources/config/checks/redis.xml deleted file mode 100644 index 3a00676b..00000000 --- a/Resources/config/checks/redis.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.redis%% - - - - diff --git a/Resources/config/checks/security_advisory.php b/Resources/config/checks/security_advisory.php new file mode 100644 index 00000000..4840fb9e --- /dev/null +++ b/Resources/config/checks/security_advisory.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.security_advisory', \Laminas\Diagnostics\Check\SecurityAdvisory::class) + ->public() + ->args(['%%liip_monitor.check.security_advisory.lock_file%%']) + ->tag('liip_monitor.check', ['alias' => 'security_advisory']); +}; diff --git a/Resources/config/checks/security_advisory.xml b/Resources/config/checks/security_advisory.xml deleted file mode 100644 index 4660dd43..00000000 --- a/Resources/config/checks/security_advisory.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.security_advisory.lock_file%% - - - - diff --git a/Resources/config/checks/stream_wrapper_exists.php b/Resources/config/checks/stream_wrapper_exists.php new file mode 100644 index 00000000..82f02f14 --- /dev/null +++ b/Resources/config/checks/stream_wrapper_exists.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.stream_wrapper_exists', \Laminas\Diagnostics\Check\StreamWrapperExists::class) + ->public() + ->args(['%%liip_monitor.check.stream_wrapper_exists%%']) + ->tag('liip_monitor.check', ['alias' => 'stream_wrapper_exists']); +}; diff --git a/Resources/config/checks/stream_wrapper_exists.xml b/Resources/config/checks/stream_wrapper_exists.xml deleted file mode 100644 index 2ffbec9c..00000000 --- a/Resources/config/checks/stream_wrapper_exists.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.stream_wrapper_exists%% - - - - diff --git a/Resources/config/checks/symfony_requirements.php b/Resources/config/checks/symfony_requirements.php new file mode 100644 index 00000000..56221553 --- /dev/null +++ b/Resources/config/checks/symfony_requirements.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.symfony_requirements', \Liip\MonitorBundle\Check\SymfonyRequirements::class) + ->public() + ->args(['%%liip_monitor.check.symfony_requirements.file%%']) + ->tag('liip_monitor.check', ['alias' => 'symfony_requirements']); +}; diff --git a/Resources/config/checks/symfony_requirements.xml b/Resources/config/checks/symfony_requirements.xml deleted file mode 100644 index e8a91091..00000000 --- a/Resources/config/checks/symfony_requirements.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.symfony_requirements.file%% - - - - diff --git a/Resources/config/checks/symfony_version.php b/Resources/config/checks/symfony_version.php new file mode 100644 index 00000000..102d8c38 --- /dev/null +++ b/Resources/config/checks/symfony_version.php @@ -0,0 +1,12 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.symfony_version', \Liip\MonitorBundle\Check\SymfonyVersion::class) + ->public() + ->tag('liip_monitor.check', ['alias' => 'symfony_version']); +}; diff --git a/Resources/config/checks/symfony_version.xml b/Resources/config/checks/symfony_version.xml deleted file mode 100644 index 7c7f3b43..00000000 --- a/Resources/config/checks/symfony_version.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - diff --git a/Resources/config/checks/writable_directory.php b/Resources/config/checks/writable_directory.php new file mode 100644 index 00000000..7eea3493 --- /dev/null +++ b/Resources/config/checks/writable_directory.php @@ -0,0 +1,13 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.check.writable_directory', \Laminas\Diagnostics\Check\DirWritable::class) + ->public() + ->args(['%%liip_monitor.check.writable_directory%%']) + ->tag('liip_monitor.check', ['alias' => 'writable_directory']); +}; diff --git a/Resources/config/checks/writable_directory.xml b/Resources/config/checks/writable_directory.xml deleted file mode 100644 index f99758f8..00000000 --- a/Resources/config/checks/writable_directory.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - %%liip_monitor.check.writable_directory%% - - - - diff --git a/Resources/config/commands.php b/Resources/config/commands.php new file mode 100644 index 00000000..d3771804 --- /dev/null +++ b/Resources/config/commands.php @@ -0,0 +1,25 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.health_check.command', \Liip\MonitorBundle\Command\HealthCheckCommand::class) + ->public() + ->args([ + service('liip_monitor.helper.console_reporter'), + service('liip_monitor.helper.raw_console_reporter'), + service('liip_monitor.helper.runner_manager'), + ]) + ->tag('console.command', ['command' => 'monitor:health']); + + $services->set('liip_monitor.list_checks.command', \Liip\MonitorBundle\Command\ListChecksCommand::class) + ->public() + ->args([ + service('liip_monitor.helper.runner_manager'), + service('liip_monitor.runner'), + ]) + ->tag('console.command', ['command' => 'monitor:list']); +}; diff --git a/Resources/config/commands.xml b/Resources/config/commands.xml deleted file mode 100644 index 871a1ea8..00000000 --- a/Resources/config/commands.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Resources/config/controller.php b/Resources/config/controller.php new file mode 100644 index 00000000..3b71c1e4 --- /dev/null +++ b/Resources/config/controller.php @@ -0,0 +1,27 @@ +services(); + $parameters = $container->parameters(); + + $services->alias(\Liip\MonitorBundle\Controller\HealthCheckController::class, 'liip_monitor.health_controller') + ->public(); + + $services->set('liip_monitor.helper', \Liip\MonitorBundle\Helper\PathHelper::class) + ->public() + ->args([ + service('assets.packages'), + service('router'), + ]); + + $services->set('liip_monitor.health_controller', \Liip\MonitorBundle\Controller\HealthCheckController::class) + ->public() + ->args([ + service('liip_monitor.helper.runner_manager'), + service('liip_monitor.helper'), + '%liip_monitor.view_template%', + '%liip_monitor.failure_status_code%', + ]); +}; diff --git a/Resources/config/controller.xml b/Resources/config/controller.xml deleted file mode 100644 index 8b46277f..00000000 --- a/Resources/config/controller.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - %liip_monitor.view_template% - %liip_monitor.failure_status_code% - - - diff --git a/Resources/config/helper.php b/Resources/config/helper.php new file mode 100644 index 00000000..b8c3690e --- /dev/null +++ b/Resources/config/helper.php @@ -0,0 +1,18 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.helper.raw_console_reporter', \Liip\MonitorBundle\Helper\RawConsoleReporter::class) + ->public(); + + $services->set('liip_monitor.helper.console_reporter', \Liip\MonitorBundle\Helper\ConsoleReporter::class) + ->public(); + + $services->set('liip_monitor.helper.runner_manager', \Liip\MonitorBundle\Helper\RunnerManager::class) + ->public() + ->args([service('service_container')]); +}; diff --git a/Resources/config/helper.xml b/Resources/config/helper.xml deleted file mode 100644 index f3636662..00000000 --- a/Resources/config/helper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/Resources/config/runner.php b/Resources/config/runner.php new file mode 100644 index 00000000..9871916c --- /dev/null +++ b/Resources/config/runner.php @@ -0,0 +1,12 @@ +services(); + $parameters = $container->parameters(); + $parameters->set('liip_monitor.runner.class', 'r'); + + $services->set('liip_monitor.runner', \Liip\MonitorBundle\Runner::class) + ->public(); +}; diff --git a/Resources/config/runner.xml b/Resources/config/runner.xml deleted file mode 100644 index 07940206..00000000 --- a/Resources/config/runner.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - r - - - - - - diff --git a/Resources/config/symfony_mailer.php b/Resources/config/symfony_mailer.php new file mode 100644 index 00000000..386ca5e2 --- /dev/null +++ b/Resources/config/symfony_mailer.php @@ -0,0 +1,18 @@ +services(); + $parameters = $container->parameters(); + + $services->set('liip_monitor.reporter.symfony_mailer', \Liip\MonitorBundle\Helper\SymfonyMailerReporter::class) + ->args([ + service('mailer'), + '%liip_monitor.mailer.recipient%', + '%liip_monitor.mailer.sender%', + '%liip_monitor.mailer.subject%', + '%liip_monitor.mailer.send_on_warning%', + ]) + ->tag('liip_monitor.additional_reporter', ['alias' => 'symfony_mailer']); +}; diff --git a/Resources/config/symfony_mailer.xml b/Resources/config/symfony_mailer.xml deleted file mode 100644 index 4881fc71..00000000 --- a/Resources/config/symfony_mailer.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - %liip_monitor.mailer.recipient% - %liip_monitor.mailer.sender% - %liip_monitor.mailer.subject% - %liip_monitor.mailer.send_on_warning% - - - diff --git a/Tests/Fixture/AppKernel.php b/Tests/Fixture/AppKernel.php index 655b2f94..b2c2e5e4 100644 --- a/Tests/Fixture/AppKernel.php +++ b/Tests/Fixture/AppKernel.php @@ -24,7 +24,7 @@ public function registerBundles(): array public function registerContainerConfiguration(LoaderInterface $loader): void { - $loader->load(__DIR__.'/config_'.$this->environment.'.yml'); + $loader->load(__DIR__.'/config.yml'); } public function getProjectDir(): string diff --git a/Tests/Fixture/config_symfony7.yml b/Tests/Fixture/config.yml similarity index 100% rename from Tests/Fixture/config_symfony7.yml rename to Tests/Fixture/config.yml diff --git a/Tests/Fixture/config_symfony6.yml b/Tests/Fixture/config_symfony6.yml deleted file mode 100644 index b0929e5e..00000000 --- a/Tests/Fixture/config_symfony6.yml +++ /dev/null @@ -1,12 +0,0 @@ -# symfony 6 config (requires assets defined) -framework: - router: - resource: "%kernel.project_dir%/routing.yml" - secret: test - test: ~ - assets: ~ - profiler: - collect: false - -liip_monitor: - enable_controller: true diff --git a/composer.json b/composer.json index af0c305e..3860e968 100644 --- a/composer.json +++ b/composer.json @@ -31,19 +31,19 @@ "doctrine/doctrine-migrations-bundle": "^2.0 || ^3.0 || ^7.0", "doctrine/migrations": "^2.0 || ^3.0", "doctrine/persistence": "^1.3.3 || ^2.0 || ^3.0", - "enlightn/security-checker": "^1.11", + "enlightn/security-checker": "^1.11|^2.0", "guzzlehttp/guzzle": "^5.3.2 || ^6.3.3 || ^7.0.1", "matthiasnoback/symfony-dependency-injection-test": "^4.3 || ^5.0", "php-cs-fixer/shim": "^3.75", "phpunit/phpunit": "^9.6.23", - "symfony/asset": "^6.4|^7.0", - "symfony/browser-kit": "^6.4|^7.0", - "symfony/expression-language": "^6.4|^7.0", - "symfony/finder": "^6.4|^7.0", - "symfony/mailer": "^6.4|^7.0", - "symfony/messenger": "^6.4|^7.0", - "symfony/phpunit-bridge": "^7.3", - "symfony/twig-bundle": "^6.4|^7.0" + "symfony/asset": "^6.4|^7.0|^8.0", + "symfony/browser-kit": "^6.4|^7.0|^8.0", + "symfony/expression-language": "^6.4|^7.0|^8.0", + "symfony/finder": "^6.4|^7.0|^8.0", + "symfony/mailer": "^6.4|^7.0|^8.0", + "symfony/messenger": "^6.4|^7.0|^8.0", + "symfony/phpunit-bridge": "^7.3|^8.0", + "symfony/twig-bundle": "^6.4|^7.0|^8.0" }, "suggest": { "symfony/expression-language": "To use the Expression check"