Merge pull request #644 from TomHAnderson/feature/persistence-v2-3.0.x

Author: greg0ire

.gitignore

@@ -1,5 +1,6 @@
 .idea/
 vendor/
+/composer.lock
 phpunit.xml
 .project/
 nbproject/

composer.json

@@ -50,7 +50,7 @@
         "doctrine/dbal":                        "^2.10",
         "doctrine/doctrine-module":             "^4.0",
         "doctrine/orm":                         "^2.6.4",
-        "doctrine/persistence":                 "^1.3",
+        "doctrine/persistence":                 "^1.3 || ^2.0",
         "symfony/console":                      "^5.0"
     },
     "require-dev":       {

phpcs.xml

@@ -42,6 +42,10 @@
         <exclude-pattern>config/module.config.php</exclude-pattern>
     </rule>
 
+    <rule ref="PSR1.Files.SideEffects">
+        <exclude-pattern>src/DoctrineORMModule/Form/Annotation/AnnotationBuilder.php</exclude-pattern>
+    </rule>
+
     <!-- Paths to check -->
     <file>config</file>
     <file>src</file>

src/DoctrineORMModule/Collector/MappingCollector.php

@@ -4,8 +4,8 @@
 
 namespace DoctrineORMModule\Collector;
 
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Persistence\Mapping\ClassMetadataFactory;
+use Doctrine\Persistence\Mapping\ClassMetadata;
+use Doctrine\Persistence\Mapping\ClassMetadataFactory;
 use Laminas\DeveloperTools\Collector\AutoHideInterface;
 use Laminas\DeveloperTools\Collector\CollectorInterface;
 use Laminas\Mvc\MvcEvent;

src/DoctrineORMModule/Form/Annotation/AnnotationBuilder.php

@@ -5,12 +5,13 @@
 namespace DoctrineORMModule\Form\Annotation;
 
 use ArrayObject;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\Mapping\ClassMetadata;
+use Doctrine\Persistence\ObjectManager;
 use DoctrineModule\Form\Element;
 use Laminas\EventManager\EventManagerInterface;
 use Laminas\Form\Annotation\AnnotationBuilder as LaminasAnnotationBuilder;
 
+use function class_exists;
 use function get_class;
 use function in_array;
 use function is_object;
@@ -129,3 +130,5 @@ protected function checkForExcludeElementFromMetadata(ClassMetadata $metadata, s
         return $result;
     }
 }
+
+class_exists(ClassMetadata::class);

src/DoctrineORMModule/Form/Annotation/ElementAnnotationsListener.php

@@ -5,8 +5,8 @@
 namespace DoctrineORMModule\Form\Annotation;
 
 use ArrayObject;
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\Persistence\ObjectManager;
 use DoctrineORMModule\Form\Element\EntitySelect;
 use Laminas\EventManager\AbstractListenerAggregate;
 use Laminas\EventManager\EventInterface;

src/DoctrineORMModule/Yuml/MetadataGrapher.php

@@ -4,7 +4,7 @@
 
 namespace DoctrineORMModule\Yuml;
 
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
+use Doctrine\Persistence\Mapping\ClassMetadata;
 use Exception;
 
 use function class_exists;

test/DoctrineORMModuleTest/Collector/MappingCollectorTest.php

@@ -2,8 +2,8 @@
 
 namespace DoctrineORMModuleTest\Collector;
 
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Persistence\Mapping\ClassMetadataFactory;
+use Doctrine\Persistence\Mapping\ClassMetadata;
+use Doctrine\Persistence\Mapping\ClassMetadataFactory;
 use DoctrineORMModule\Collector\MappingCollector;
 use Laminas\Mvc\MvcEvent;
 use PHPUnit\Framework\TestCase;

test/DoctrineORMModuleTest/Service/ConfigurationFactoryTest.php

@@ -3,13 +3,13 @@
 namespace DoctrineORMModuleTest\Service;
 
 use Doctrine\Common\Cache\ArrayCache;
-use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\ORM\Cache\CacheConfiguration;
 use Doctrine\ORM\Cache\DefaultCacheFactory;
 use Doctrine\ORM\Mapping\ClassMetadataFactory;
 use Doctrine\ORM\Mapping\EntityListenerResolver;
 use Doctrine\ORM\Mapping\NamingStrategy;
 use Doctrine\ORM\Mapping\QuoteStrategy;
+use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use DoctrineORMModule\Service\ConfigurationFactory;
 use DoctrineORMModuleTest\Assets\RepositoryClass;
 use Laminas\ServiceManager\Exception\InvalidArgumentException;

test/DoctrineORMModuleTest/Service/DBALConnectionFactoryTest.php

@@ -4,11 +4,11 @@
 
 use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\Common\EventManager;
-use Doctrine\Common\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\DBAL\Driver\PDOSqlite\Driver as PDOSqliteDriver;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Type;
 use Doctrine\ORM\Configuration;
+use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use DoctrineORMModule\Service\ConfigurationFactory;
 use DoctrineORMModule\Service\DBALConnectionFactory;
 use DoctrineORMModuleTest\Assets\Types\MoneyType;