Add PHP 8.5 and Symfony 8 support

.github/workflows/ci.yml

@@ -15,9 +15,9 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [ 8.1, 8.2, 8.3, 8.4 ]
+        php: [ 8.1, 8.2, 8.3, 8.4, 8.5 ]
         deps: [ highest ]
-        symfony: [ 6.4.*, 7.2.*, 7.3.* ]
+        symfony: [ 6.4.*, 7.2.*, 7.3.*, 8.0.* ]
         include:
           - php: 8.1
             deps: lowest
@@ -27,28 +27,71 @@ jobs:
             symfony: 7.2.*
           - php: 8.1
             symfony: 7.3.*
+          - php: 8.1
+            symfony: 8.0.*
+          - php: 8.2
+            symfony: 8.0.*
+          - php: 8.3
+            symfony: 8.0.*
+          # PHP 8.5: laminas-diagnostics 1.28+ conflicts with symfony/process < 7.4 (Symfony 6.4)
+          - php: 8.5
+            symfony: 6.4.*
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
+      - name: Validate composer.json constraints (CI requirement)
+        run: |
+          RAW=$(cat composer.json | tr -d '\n')
+          if echo "$RAW" | grep -qE 'laminas-diagnostics[^"]*"\^1\.28"'; then
+            echo "::error::composer.json must use laminas/laminas-diagnostics ^1.27 (not ^1.28) for PHP 8.1 and Symfony 6.4 compatibility."
+            exit 1
+          fi
+          if echo "$RAW" | grep -q '"require-dev"[^}]*"enlightn/security-checker"'; then
+            echo "::error::enlightn/security-checker must be in suggest only, not in require-dev. Remove it from require-dev."
+            exit 1
+          fi
+          echo "composer.json constraints OK"
+
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           coverage: none
           tools: flex
 
+      - name: Remove matthiasnoback for Symfony 8 (dev dep not compatible yet)
+        if: matrix.symfony == '8.0.*'
+        run: |
+          php -r "
+          \$j = json_decode(file_get_contents('composer.json'), true);
+          unset(\$j['require-dev']['matthiasnoback/symfony-dependency-injection-test']);
+          file_put_contents('composer.json', json_encode(\$j, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+          "
+
       - name: Install dependencies
+        if: matrix.symfony != '8.0.*'
         uses: ramsey/composer-install@v2
         with:
-          dependency-versions: ${{ inputs.deps }}
+          dependency-versions: ${{ matrix.deps }}
           composer-options: --prefer-dist
         env:
           SYMFONY_REQUIRE: ${{ matrix.symfony }}
 
+      - name: Install dependencies (Symfony 8)
+        if: matrix.symfony == '8.0.*'
+        run: composer update --prefer-dist
+        env:
+          SYMFONY_REQUIRE: ${{ matrix.symfony }}
+
       - name: Run tests
-        run: vendor/bin/phpunit -v
+        run: |
+          if [ "${{ matrix.symfony }}" = "8.0.*" ]; then
+            vendor/bin/phpunit -c phpunit-symfony8.xml.dist -v
+          else
+            vendor/bin/phpunit -v
+          fi
 
   code-coverage:
     name: Code Coverage

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');
     }
 }

DependencyInjection/DoctrineMigrations/DoctrineMigrationsLoader.php

@@ -30,7 +30,7 @@ public function __construct()
 
     public function process(ContainerBuilder $container): void
     {
-        if (!($this->loader instanceof CompilerPassInterface)) {
+        if (!$this->loader instanceof CompilerPassInterface) {
             return;
         }
 

DependencyInjection/LiipMonitorExtension.php

@@ -32,10 +32,11 @@ 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');
+        $locator = new FileLocator(__DIR__.'/../Resources/config');
+        $loader = new Loader\PhpFileLoader($container, $locator);
+        $loader->load('runner.php');
+        $loader->load('helper.php');
+        $loader->load('commands.php');
 
         $configuration = $this->getConfiguration($configs, $container);
         $config = $this->processConfiguration($configuration, $configs);
@@ -47,7 +48,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 +75,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;
                 }
             }

Dockerfile

@@ -0,0 +1,16 @@
+FROM php:8.3-cli
+
+RUN apt-get update && apt-get install -y \
+    git \
+    unzip \
+    libzip-dev \
+    && docker-php-ext-install zip \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
+
+# Allow git operations when /app is mounted from host (different ownership)
+RUN git config --global --add safe.directory /app
+
+WORKDIR /app

Helper/ArrayReporter.php

@@ -75,7 +75,6 @@ public function onAfterRun(CheckInterface $check, ResultInterface $result, $chec
      */
     public function onStart(\ArrayObject $checks, $runnerConfig)
     {
-        return;
     }
 
     /**
@@ -91,14 +90,12 @@ public function onBeforeRun(CheckInterface $check, $checkAlias = null)
      */
     public function onStop(ResultsCollection $results)
     {
-        return;
     }
 
     /**
      * @return void
      */
     public function onFinish(ResultsCollection $results)
     {
-        return;
     }
 }

Helper/ConsoleReporter.php

@@ -71,30 +71,26 @@ public function onAfterRun(CheckInterface $check, ResultInterface $result, $chec
      */
     public function onStart(\ArrayObject $checks, $runnerConfig)
     {
-        return;
     }
 
     /**
      * @return bool|void
      */
     public function onBeforeRun(CheckInterface $check, $checkAlias = null)
     {
-        return;
     }
 
     /**
      * @return void
      */
     public function onStop(ResultsCollection $results)
     {
-        return;
     }
 
     /**
      * @return void
      */
     public function onFinish(ResultsCollection $results)
     {
-        return;
     }
 }

Helper/RawConsoleReporter.php

@@ -72,30 +72,26 @@ protected function getNagiosPerformanceData(): string
      */
     public function onStart(\ArrayObject $checks, $runnerConfig)
     {
-        return;
     }
 
     /**
      * @return bool|void
      */
     public function onBeforeRun(CheckInterface $check, $checkAlias = null)
     {
-        return;
     }
 
     /**
      * @return void
      */
     public function onStop(ResultsCollection $results)
     {
-        return;
     }
 
     /**
      * @return void
      */
     public function onFinish(ResultsCollection $results)
     {
-        return;
     }
 }

README.md

@@ -59,7 +59,7 @@ If you want to enable the REST API provided by the bundle then add the following
 
 ```yml
 _monitor:
-    resource: "@LiipMonitorBundle/Resources/config/routing.xml"
+    resource: "@LiipMonitorBundle/Resources/config/routing.yaml"
     prefix: /monitor/health
 ```
 
@@ -488,7 +488,7 @@ liip_monitor:
 ## REST API DOCS ##
 
 For documentation on the REST API see: [http://myproject.org/monitor/health/](http://myproject.org/monitor/health/).
-Don't forget to add the bundle routes in your `routing.xml` file.
+Don't forget to add the bundle routes in your `routing.yaml` file.
 
 
 ## Nagios integration ##

Resources/config/checks/apc_fragmentation.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return function (ContainerConfigurator $container): void {
+    $container->services()
+        ->set('liip_monitor.check.apc_fragmentation', \Laminas\Diagnostics\Check\ApcFragmentation::class)
+        ->args([
+            '%%liip_monitor.check.apc_fragmentation.warning%%',
+            '%%liip_monitor.check.apc_fragmentation.critical%%',
+        ])
+        ->tag('liip_monitor.check', ['alias' => 'apc_fragmentation'])
+        ->public();
+};

Resources/config/checks/apc_memory.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return function (ContainerConfigurator $container): void {
+    $container->services()
+        ->set('liip_monitor.check.apc_memory', \Laminas\Diagnostics\Check\ApcMemory::class)
+        ->args([
+            '%%liip_monitor.check.apc_memory.warning%%',
+            '%%liip_monitor.check.apc_memory.critical%%',
+        ])
+        ->tag('liip_monitor.check', ['alias' => 'apc_memory'])
+        ->public();
+};

Resources/config/checks/class_exists.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return function (ContainerConfigurator $container): void {
+    $container->services()
+        ->set('liip_monitor.check.class_exists', \Laminas\Diagnostics\Check\ClassExists::class)
+        ->args(['%%liip_monitor.check.class_exists%%'])
+        ->tag('liip_monitor.check', ['alias' => 'class_exists'])
+        ->public();
+};

Resources/config/checks/cpu_performance.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return function (ContainerConfigurator $container): void {
+    $container->services()
+        ->set('liip_monitor.check.cpu_performance', \Laminas\Diagnostics\Check\CpuPerformance::class)
+        ->args(['%%liip_monitor.check.cpu_performance%%'])
+        ->tag('liip_monitor.check', ['alias' => 'cpu_performance'])
+        ->public();
+};

Resources/config/checks/custom_error_pages.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+return function (ContainerConfigurator $container): void {
+    $container->services()
+        ->set('liip_monitor.check.custom_error_pages', \Liip\MonitorBundle\Check\CustomErrorPages::class)
+        ->args([
+            '%%liip_monitor.check.custom_error_pages.error_codes%%',
+            '%%liip_monitor.check.custom_error_pages.path%%',
+            param('kernel.project_dir'),
+        ])
+        ->tag('liip_monitor.check', ['alias' => 'custom_error_pages'])
+        ->public();
+};