Switch from XML-based to PHP-based service configuration

.github/workflows/dependencies.yml

@@ -7,21 +7,20 @@ on:
     pull_request:
 
 env:
-    PHP_VERSION: 8.1
+    PHP_VERSION: 8.4
 
 jobs:
     composer-require-checker:
         name: Check missing composer requirements
-        runs-on: ubuntu-22.04
+        runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v4
-            -   name: Konfiguriere PHP-Version und -Einstellungen im Worker-Node
+            -   name: Configure PHP version
                 uses: shivammathur/setup-php@v2
                 with:
-                  php-version: ${{ env.PHP_VERSION }}
-                  coverage: none
-                  tools: composer:v2
-                  ini-values: variables_order=EGPCS, date.timezone=Europe/Berlin
+                    php-version: ${{ env.PHP_VERSION }}
+                    coverage: none
+                    tools: composer:v2
+            -   uses: actions/checkout@v4
             -   name: Cache Composer Dependencies
                 uses: actions/cache@v4
                 with:
@@ -31,7 +30,7 @@ jobs:
                         composer-${{ env.PHP_VERSION }}-${{ github.ref }}
                         composer-${{ env.PHP_VERSION }}-
             -   run: |
-                    composer install --no-interaction --no-scripts --no-progress --no-suggest
+                    composer update --no-interaction --no-scripts --no-progress
                     composer show
             -   name: ComposerRequireChecker
-                uses: docker://ghcr.io/webfactory/composer-require-checker:4.8.0
+                uses: docker://ghcr.io/webfactory/composer-require-checker:4.11.0

.php-cs-fixer.dist.php

@@ -19,10 +19,7 @@
     ->setFinder(
         PhpCsFixer\Finder::create()
             ->in(__DIR__)
-            ->notPath('conf/')
-            ->notPath('tmp/')
-            ->notPath('node_modules/')
-            ->notPath('var/cache')
+            ->notPath('src/Resources/config')
             ->notPath('vendor/')
     )
 ;

src/DependencyInjection/WebfactoryHttpCacheExtension.php

@@ -5,14 +5,14 @@
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\Extension;
-use Symfony\Component\DependencyInjection\Loader\XmlFileLoader;
+use Symfony\Component\DependencyInjection\Loader\PhpFileLoader;
 
 class WebfactoryHttpCacheExtension extends Extension
 {
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $locator = new FileLocator(__DIR__.'/../NotModified');
-        $loader = new XmlFileLoader($container, $locator);
-        $loader->load('services.xml');
+        $locator = new FileLocator(__DIR__.'/../Resources/config');
+        $loader = new PhpFileLoader($container, $locator);
+        $loader->load('services.php');
     }
 }

src/Resources/config/services.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use function Symfony\Component\DependencyInjection\Loader\Configurator\service;
+
+return static function(ContainerConfigurator $container) {
+    $services = $container->services();
+    $parameters = $container->parameters();
+
+    $services->set(\Webfactory\HttpCacheBundle\NotModified\EventListener::class, \Webfactory\HttpCacheBundle\NotModified\EventListener::class)
+        ->public()
+        ->args([
+            service('service_container'),
+            '%kernel.debug%',
+        ])
+        ->tag('kernel.event_listener', ['event' => 'kernel.controller', 'priority' => -200])
+        ->tag('kernel.event_listener', ['event' => 'kernel.response']);
+};