fix: compatibility with symfony/dependency-injection 7.1.4 (#95)

* fix: compatibility with `symfony/dependency-injection` 7.1.4 * satisfy phpstan * dep
rekalogika · Sep 1, 2024 · 79d4d31 · 79d4d31
1 parent 444dc07
commit 79d4d31
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.5.6
+
+* fix: compatibility with `symfony/dependency-injection` 7.1.4
+
 ## 1.5.5
 
 * build: add rector

diff --git a/composer.json b/composer.json
@@ -32,7 +32,7 @@
         "symfony/clock": "^6.4 || ^7.0",
         "symfony/config": "^6.4 || ^7.0",
         "symfony/console": "^6.4 || ^7.0",
-        "symfony/dependency-injection": "^6.4 || ^7.0",
+        "symfony/dependency-injection": "^6.4.11 || ^6.5 || ^7.1.4 || ^7.2",
         "symfony/property-access": "^6.4 || ^7.0",
         "symfony/property-info": "6.4.0 - 6.4.8 || 7.0.0 - 7.0.8 || 7.1.0 - 7.1.1 || ^7.2",
         "symfony/serializer": "^6.4 || ^7.0",

diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -16,6 +16,9 @@ parameters:
     #     constants: true
     ignoreErrors:
         - '#ContainerBuilder::registerAttributeForAutoconfiguration#'
+        -
+            message: '#Property .* is never assigned .+ so it can be removed from the property type.#'
+            reportUnmatched: false
     banned_code:
         non_ignorable: false
 includes:

diff --git a/src/DependencyInjection/CompilerPass/DebugPass.php b/src/DependencyInjection/CompilerPass/DebugPass.php
@@ -36,39 +36,31 @@ public function process(ContainerBuilder $container): void
         foreach (array_keys($taggedServices) as $serviceId) {
             $decoratedServiceId = 'debug.' . $serviceId;
 
-            $service = $container->getDefinition($serviceId);
-            /** @var array<string,mixed> */
-            $tagAttributes = $service->getTag('rekalogika.mapper.transformer')[0] ?? [];
-            $service->clearTag('rekalogika.mapper.transformer');
-
             $container->register($decoratedServiceId, TraceableTransformer::class)
                 ->setDecoratedService($serviceId)
-                ->addTag('rekalogika.mapper.transformer', $tagAttributes)
                 ->setArguments([
-                    $service,
+                    new Reference($decoratedServiceId . '.inner'),
                     $dataCollector,
                 ]);
         }
 
         // decorates ObjectToObjectMetadataFactory
 
         $serviceId = 'rekalogika.mapper.object_to_object_metadata_factory.cache';
-        $decoratedService = $container->getDefinition($serviceId);
         $container->register('debug.' . $serviceId, TraceableObjectToObjectMetadataFactory::class)
             ->setDecoratedService($serviceId)
             ->setArguments([
-                $decoratedService,
+                new Reference('debug.' . $serviceId . '.inner'),
                 $dataCollector,
             ]);
 
         // decorates mapping factory
 
         $serviceId = 'rekalogika.mapper.mapping_factory';
-        $decoratedService = $container->getDefinition($serviceId);
         $container->register('debug.' . $serviceId, TraceableMappingFactory::class)
             ->setDecoratedService($serviceId, null, 50)
             ->setArguments([
-                $decoratedService,
+                new Reference('debug.' . $serviceId . '.inner'),
                 $dataCollector,
             ])
             ->addTag('kernel.reset', ['method' => 'reset']);