chore(deps): upgrade services to make it work with 8.2.*

jolicode · Mar 14, 2024 · 3cb1ad3 · 3cb1ad3
1 parent 37aaeb2
commit 3cb1ad3
Show file tree

Hide file tree

Showing 7 changed files with 80 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -22,8 +22,9 @@
         "phpstan/phpdoc-parser": "^1.25"
     },
     "require-dev": {
+        "nikic/php-parser": "^4.18 || ^5.0",
         "moneyphp/money": "^4.2",
-        "phpunit/phpunit": "^8.0",
+        "phpunit/phpunit": "^9.0",
         "symfony/framework-bundle": "^6.0 || ^7.0",
         "symfony/uid": "^6.3 || ^7.0",
         "symfony/yaml": "^6.3 || ^7.0"

diff --git a/src/DependencyInjection/AutoMapperExtension.php b/src/DependencyInjection/AutoMapperExtension.php
@@ -2,6 +2,7 @@
 
 namespace AutoMapper\Bundle\DependencyInjection;
 
+use AutoMapper\Bundle\AutoMapper;
 use AutoMapper\Bundle\CacheWarmup\CacheWarmerLoaderInterface;
 use AutoMapper\Bundle\CacheWarmup\ConfigurationCacheWarmerLoader;
 use AutoMapper\Bundle\Configuration\MapperConfigurationInterface;
@@ -12,6 +13,7 @@
 use AutoMapper\MapperGeneratorMetadataFactory;
 use AutoMapper\MapperGeneratorMetadataInterface;
 use AutoMapper\Normalizer\AutoMapperNormalizer;
+use AutoMapper\Transformer\CustomTransformer\CustomTransformersRegistry;
 use AutoMapper\Transformer\SymfonyUidTransformerFactory;
 use AutoMapper\Transformer\TransformerFactoryInterface;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
@@ -38,6 +40,17 @@ public function load(array $configs, ContainerBuilder $container): void
         $container->registerForAutoconfiguration(MapperConfigurationInterface::class)->addTag('automapper.mapper_configuration');
 
         $loader = new XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config'));
+
+        if (class_exists(Generator::class)) {
+            $loader->load('generator.xml');
+        } else {
+            $loader->load('mapper_generator.xml');
+        }
+
+        if (class_exists(CustomTransformersRegistry::class)) {
+            $loader->load('custom_transformers.xml');
+        }
+
         $loader->load('services.xml');
 
         $container->getDefinition(MapperGeneratorMetadataFactory::class)
@@ -70,7 +83,16 @@ public function load(array $configs, ContainerBuilder $container): void
                 ->addArgument(new Reference($config['name_converter']));
         }
 
-        if ($config['allow_readonly_target_to_populate']) {
+        if (class_exists(CustomTransformersRegistry::class)) {
+            $autoMapperDefinition = $container->getDefinition(AutoMapper::class);
+
+            $mapperDefinition = $autoMapperDefinition->getArgument(2);
+
+            $autoMapperDefinition->replaceArgument(2, new Reference(CustomTransformersRegistry::class));
+            $autoMapperDefinition->addArgument($mapperDefinition);
+        }
+
+        if (class_exists(Generator::class) && $config['allow_readonly_target_to_populate']) {
             $container
                 ->getDefinition(Generator::class)
                 ->replaceArgument(2, $config['allow_readonly_target_to_populate']);

diff --git a/src/DependencyInjection/Compiler/PropertyInfoPass.php b/src/DependencyInjection/Compiler/PropertyInfoPass.php
@@ -25,6 +25,10 @@ public function process(ContainerBuilder $container): void
             new Definition(
                 ReflectionExtractor::class,
                 [
+                    '$mutatorPrefixes' => null,
+                    '$accessorPrefixes' => null,
+                    '$arrayMutatorPrefixes' => null,
+                    '$enableConstructorExtraction' => true,
                     '$accessFlags' => ReflectionExtractor::ALLOW_PUBLIC | ReflectionExtractor::ALLOW_PROTECTED | ReflectionExtractor::ALLOW_PRIVATE,
                 ]
             )

diff --git a/src/Resources/config/custom_transformers.xml b/src/Resources/config/custom_transformers.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="AutoMapper\Transformer\CustomTransformer\CustomTransformersRegistry" />
+    </services>
+</container>
diff --git a/src/Resources/config/generator.xml b/src/Resources/config/generator.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="AutoMapper\Loader\FileLoader">
+            <argument type="service" id="AutoMapper\Generator\Generator" />
+            <argument type="string">%automapper.cache_dir%</argument>
+            <argument></argument> <!-- Hot reload -->
+        </service>
+
+        <service id="AutoMapper\Generator\Generator">
+            <argument>null</argument>
+            <argument type="service" id="automapper.mapping.class_discriminator_from_class_metadata" />
+            <argument>false</argument>
+        </service>
+    </services>
+</container>
diff --git a/src/Resources/config/mapper_generator.xml b/src/Resources/config/mapper_generator.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<container xmlns="http://symfony.com/schema/dic/services"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+           xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <services>
+        <service id="AutoMapper\Loader\FileLoader">
+            <argument type="service" id="AutoMapper\Generator\MapperGenerator" />
+            <argument type="string">%automapper.cache_dir%</argument>
+            <argument></argument> <!-- Hot reload -->
+        </service>
+
+        <service id="AutoMapper\Generator\MapperGenerator">
+            <argument type="service" id="AutoMapper\Generator\Shared\ClassDiscriminatorResolver" />
+            <argument>false</argument>
+        </service>
+
+        <service id="AutoMapper\Generator\Shared\ClassDiscriminatorResolver">
+            <argument type="service" id="automapper.mapping.class_discriminator_from_class_metadata" />
+        </service>
+    </services>
+</container>
diff --git a/src/Resources/config/services.xml b/src/Resources/config/services.xml
@@ -46,20 +46,9 @@
         </service>
         <service id="AutoMapper\MapperGeneratorMetadataFactoryInterface" alias="AutoMapper\MapperGeneratorMetadataFactory" />
 
-        <service id="AutoMapper\Loader\FileLoader">
-            <argument type="service" id="AutoMapper\Generator\Generator" />
-            <argument type="string">%automapper.cache_dir%</argument>
-            <argument></argument> <!-- Hot reload -->
-        </service>
         <service id="AutoMapper\Loader\ClassLoaderInterface" alias="AutoMapper\Loader\FileLoader" />
 
-        <service id="AutoMapper\Generator\Generator">
-            <argument>null</argument>
-            <argument type="service" id="jane.mapping.class_discriminator_from_class_metadata" />
-            <argument>false</argument>
-        </service>
-
-        <service id="jane.mapping.class_discriminator_from_class_metadata" class="Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata">
+        <service id="automapper.mapping.class_discriminator_from_class_metadata" class="Symfony\Component\Serializer\Mapping\ClassDiscriminatorFromClassMetadata">
             <argument type="service" id="serializer.mapping.class_metadata_factory" />
         </service>