Remove deprecations

Author: nikophil

src/Doctrine/DoctrineHelper.php

@@ -11,16 +11,20 @@
 
 namespace Symfony\Bundle\MakerBundle\Doctrine;
 
-use Doctrine\Common\Persistence\ManagerRegistry;
-use Doctrine\Common\Persistence\Mapping\AbstractClassMetadataFactory;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Persistence\Mapping\Driver\AnnotationDriver;
-use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
-use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
-use Doctrine\Common\Persistence\Mapping\MappingException as PersistenceMappingException;
+use Doctrine\Common\Persistence\ManagerRegistry as LegacyManagerRegistry;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata as LegacyClassMetadata;
+use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver as LegacyMappingDriver;
+use Doctrine\Common\Persistence\Mapping\MappingException as LegacyPersistenceMappingException;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\MappingException as ORMMappingException;
 use Doctrine\ORM\Tools\DisconnectedClassMetadataFactory;
+use Doctrine\Persistence\ManagerRegistry;
+use Doctrine\Persistence\Mapping\AbstractClassMetadataFactory;
+use Doctrine\Persistence\Mapping\ClassMetadata;
+use Doctrine\Persistence\Mapping\Driver\AnnotationDriver;
+use Doctrine\Persistence\Mapping\Driver\MappingDriver;
+use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;
+use Doctrine\Persistence\Mapping\MappingException as PersistenceMappingException;
 use Symfony\Bundle\MakerBundle\Util\ClassNameDetails;
 
 /**
@@ -42,13 +46,19 @@ final class DoctrineHelper
      */
     private $registry;
 
-    public function __construct(string $entityNamespace, ManagerRegistry $registry = null)
+    /**
+     * @var ManagerRegistry|LegacyManagerRegistry
+     */
+    public function __construct(string $entityNamespace, $registry = null)
     {
         $this->entityNamespace = trim($entityNamespace, '\\');
         $this->registry = $registry;
     }
 
-    public function getRegistry(): ManagerRegistry
+    /**
+     * @return LegacyManagerRegistry|ManagerRegistry
+     */
+    public function getRegistry()
     {
         // this should never happen: we will have checked for the
         // DoctrineBundle dependency before calling this
@@ -70,7 +80,7 @@ public function getEntityNamespace(): string
     }
 
     /**
-     * @return MappingDriver|null
+     * @return MappingDriver|LegacyMappingDriver|null
      *
      * @throws \Exception
      */
@@ -85,7 +95,7 @@ public function getMappingDriverForClass(string $className)
 
         $metadataDriver = $em->getConfiguration()->getMetadataDriverImpl();
 
-        if (!$metadataDriver instanceof MappingDriverChain) {
+        if (!$this->isInstanceOf($metadataDriver, MappingDriverChain::class)) {
             return $metadataDriver;
         }
 
@@ -116,7 +126,7 @@ public function getEntitiesForAutocomplete(): array
     }
 
     /**
-     * @return array|ClassMetadata
+     * @return array|ClassMetadata|LegacyClassMetadata
      */
     public function getMetadata(string $classOrNamespace = null, bool $disconnected = false)
     {
@@ -130,9 +140,11 @@ public function getMetadata(string $classOrNamespace = null, bool $disconnected
                 try {
                     $loaded = $cmf->getAllMetadata();
                 } catch (ORMMappingException $e) {
-                    $loaded = $cmf instanceof AbstractClassMetadataFactory ? $cmf->getLoadedMetadata() : [];
+                    $loaded = $this->isInstanceOf($cmf, AbstractClassMetadataFactory::class) ? $cmf->getLoadedMetadata() : [];
+                } catch (LegacyPersistenceMappingException $e) {
+                    $loaded = $this->isInstanceOf($cmf, AbstractClassMetadataFactory::class) ? $cmf->getLoadedMetadata() : [];
                 } catch (PersistenceMappingException $e) {
-                    $loaded = $cmf instanceof AbstractClassMetadataFactory ? $cmf->getLoadedMetadata() : [];
+                    $loaded = $this->isInstanceOf($cmf, AbstractClassMetadataFactory::class) ? $cmf->getLoadedMetadata() : [];
                 }
 
                 $cmf = new DisconnectedClassMetadataFactory();
@@ -144,9 +156,9 @@ public function getMetadata(string $classOrNamespace = null, bool $disconnected
 
                 // Invalidating the cached AnnotationDriver::$classNames to find new Entity classes
                 $metadataDriver = $em->getConfiguration()->getMetadataDriverImpl();
-                if ($metadataDriver instanceof MappingDriverChain) {
+                if ($this->isInstanceOf($metadataDriver, MappingDriverChain::class)) {
                     foreach ($metadataDriver->getDrivers() as $driver) {
-                        if ($driver instanceof AnnotationDriver) {
+                        if ($this->isInstanceOf($driver, AnnotationDriver::class)) {
                             $classNames = (new \ReflectionObject($driver))->getProperty('classNames');
                             $classNames->setAccessible(true);
                             $classNames->setValue($driver, null);
@@ -181,7 +193,7 @@ public function createDoctrineDetails(string $entityClassName)
     {
         $metadata = $this->getMetadata($entityClassName);
 
-        if ($metadata instanceof ClassMetadata) {
+        if ($this->isInstanceOf($metadata, ClassMetadata::class)) {
             return new EntityDetails($metadata);
         }
 
@@ -196,4 +208,15 @@ public function isClassAMappedEntity(string $className): bool
 
         return (bool) $this->getMetadata($className);
     }
+
+    private function isInstanceOf($object, string $class): bool
+    {
+        if (!\is_object($object)) {
+            return false;
+        }
+
+        $legacyClass = str_replace('Doctrine\\Persistence\\', 'Doctrine\\Common\\Persistence\\', $class);
+
+        return $object instanceof $class || $object instanceof $legacyClass;
+    }
 }

src/Doctrine/EntityDetails.php

@@ -11,7 +11,8 @@
 
 namespace Symfony\Bundle\MakerBundle\Doctrine;
 
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
+use Doctrine\Common\Persistence\Mapping\ClassMetadata as LegacyClassMetadata;
+use Doctrine\Persistence\Mapping\ClassMetadata;
 
 /**
  * @author Sadicov Vladimir <[email protected]>
@@ -23,9 +24,9 @@ final class EntityDetails
     private $metadata;
 
     /**
-     * @param ClassMetadata|\Doctrine\ORM\Mapping\ClassMetadata $metadata
+     * @param ClassMetadata|LegacyClassMetadata $metadata
      */
-    public function __construct(ClassMetadata $metadata)
+    public function __construct($metadata)
     {
         $this->metadata = $metadata;
     }