Merge pull request #31 from phpro/sf80-config

Drop XML config

Author: veewee

composer.json

@@ -17,12 +17,12 @@
         "symfony/http-kernel": "^6.4 || ^7.4 || ^8.0"
     },
     "require-dev": {
-        "matthiasnoback/symfony-dependency-injection-test": "^4.3",
-        "php-cs-fixer/shim": "^3.88",
-        "phpro/grumphp-shim": "^2.17",
-        "phpspec/prophecy": "^1.17",
-        "phpspec/prophecy-phpunit": "^2.0",
-        "phpunit/phpunit": "^12.4",
+        "matthiasnoback/symfony-dependency-injection-test": "^6.2",
+        "php-cs-fixer/shim": "^3.94",
+        "phpro/grumphp-shim": "^2.19",
+        "phpspec/prophecy": "^1.25",
+        "phpspec/prophecy-phpunit": "^2.5",
+        "phpunit/phpunit": "^12.5",
         "symfony/security-core": "^6.4 || ^7.4 || ^8.0"
     },
     "config": {

config/services.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Symfony\Component\DependencyInjection\Loader\Configurator;
+
+use Phpro\ApiProblemBundle\EventListener\JsonApiProblemExceptionListener;
+use Phpro\ApiProblemBundle\Transformer\ApiProblemExceptionTransformer;
+use Phpro\ApiProblemBundle\Transformer\Chain;
+use Phpro\ApiProblemBundle\Transformer\HttpExceptionTransformer;
+use Phpro\ApiProblemBundle\Transformer\SecurityExceptionTransformer;
+
+return static function (ContainerConfigurator $container): void {
+    $services = $container->services();
+
+    $services->set(JsonApiProblemExceptionListener::class)
+        ->class(JsonApiProblemExceptionListener::class)
+        ->args([
+            '$exceptionTransformer' => service(Chain::class),
+            '$debug' => param('kernel.debug'),
+        ])
+        ->tag('kernel.event_listener', [
+            'event' => 'kernel.exception',
+            'method' => 'onKernelException',
+            'priority' => -5,
+        ]);
+
+    $services->set(Chain::class)
+        ->class(Chain::class)
+        ->args([
+            tagged_iterator('phpro.api_problem.exception_transformer'),
+        ]);
+
+    $services->set(ApiProblemExceptionTransformer::class)
+        ->class(ApiProblemExceptionTransformer::class)
+        ->tag('phpro.api_problem.exception_transformer');
+
+    $services->set(HttpExceptionTransformer::class)
+        ->class(HttpExceptionTransformer::class)
+        ->tag('phpro.api_problem.exception_transformer');
+
+    $services->set(SecurityExceptionTransformer::class)
+        ->class(SecurityExceptionTransformer::class)
+        ->tag('phpro.api_problem.exception_transformer');
+};

config/services.xml

@@ -13,7 +13,7 @@ class ApiProblemExtension extends Extension
 {
     public function load(array $configs, ContainerBuilder $container): void
     {
-        $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../../config'));
-        $loader->load('services.xml');
+        $loader = new Loader\PhpFileLoader($container, new FileLocator(__DIR__.'/../../config'));
+        $loader->load('services.php');
     }
 }

src/DependencyInjection/ApiProblemExtension.php

@@ -11,6 +11,7 @@
 use PHPUnit\Framework\Attributes\CoversClass;
 use PHPUnit\Framework\Attributes\Test;
 use Symfony\Component\DependencyInjection\Argument\TaggedIteratorArgument;
+use Symfony\Component\DependencyInjection\Reference;
 
 #[CoversClass(ApiProblemExtension::class)]
 class ApiProblemExtensionTest extends AbstractExtensionTestCase
@@ -34,7 +35,7 @@ public function it_registers_json_exception_listener(): void
         $this->assertContainerBuilderHasServiceDefinitionWithArgument(
             JsonApiProblemExceptionListener::class,
             '$exceptionTransformer',
-            Transformer\Chain::class
+            new Reference(Transformer\Chain::class),
         );
         $this->assertContainerBuilderHasServiceDefinitionWithArgument(
             JsonApiProblemExceptionListener::class,