typed properties and remove phpcompat from DoctrineHelper

Author: jrushlow

src/DependencyInjection/CompilerPass/SetDoctrineAnnotatedPrefixesPass.php

@@ -63,7 +63,7 @@ public function process(ContainerBuilder $container): void
         }
 
         if (null !== $annotatedPrefixes) {
-            $container->getDefinition('maker.doctrine_helper')->setArgument(4, $annotatedPrefixes);
+            $container->getDefinition('maker.doctrine_helper')->setArgument(3, $annotatedPrefixes);
         }
     }
 }

src/Doctrine/DoctrineHelper.php

@@ -25,7 +25,6 @@
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
 use Doctrine\Persistence\Mapping\MappingException as PersistenceMappingException;
 use Symfony\Bundle\MakerBundle\Util\ClassNameDetails;
-use Symfony\Bundle\MakerBundle\Util\PhpCompatUtil;
 
 /**
  * @author Fabien Potencier <[email protected]>
@@ -36,24 +35,13 @@
  */
 final class DoctrineHelper
 {
-    /**
-     * @var string
-     */
-    private $entityNamespace;
-    private $phpCompatUtil;
-    private $registry;
-
-    /**
-     * @var array|null
-     */
-    private $mappingDriversByPrefix;
-
-    private $attributeMappingSupport;
+    private ?ManagerRegistry $registry;
+    private ?array $mappingDriversByPrefix;
+    private bool $attributeMappingSupport;
 
-    public function __construct(string $entityNamespace, PhpCompatUtil $phpCompatUtil, ManagerRegistry $registry = null, bool $attributeMappingSupport = false, array $annotatedPrefixes = null)
+    public function __construct(private string $entityNamespace, ManagerRegistry $registry = null, bool $attributeMappingSupport = false, array $annotatedPrefixes = null)
     {
         $this->entityNamespace = trim($entityNamespace, '\\');
-        $this->phpCompatUtil = $phpCompatUtil;
         $this->registry = $registry;
         $this->attributeMappingSupport = $attributeMappingSupport;
         $this->mappingDriversByPrefix = $annotatedPrefixes;

src/Resources/config/services.xml

@@ -37,7 +37,6 @@
 
             <service id="maker.doctrine_helper" class="Symfony\Bundle\MakerBundle\Doctrine\DoctrineHelper">
                 <argument /> <!-- entity namespace -->
-                <argument type="service" id="maker.php_compat_util" />
                 <argument type="service" id="doctrine" on-invalid="ignore" />
                 <argument key="$attributeMappingSupport">%maker.compatible_check.doctrine.supports_attributes%</argument>
             </service>

tests/Doctrine/EntityRegeneratorTest.php

@@ -101,7 +101,7 @@ private function doTestRegeneration(string $sourceDir, Kernel $kernel, string $n
             });
 
         $fileManager = new FileManager($fs, $autoloaderUtil, new MakerFileLinkFormatter(null), $tmpDir);
-        $doctrineHelper = new DoctrineHelper('App\\Entity', new PhpCompatUtil($fileManager), $container->get('doctrine'));
+        $doctrineHelper = new DoctrineHelper('App\\Entity', $container->get('doctrine'));
         $phpCompatUtil = new PhpCompatUtil($fileManager);
         $generator = new Generator($fileManager, 'App\\', $phpCompatUtil);
         $entityClassGenerator = new EntityClassGenerator($generator, $doctrineHelper);