Merge pull request #41 from RobinDvorak/fix/rd-doctrine-orm-2.12

Fix usage with doctrine/orm 2.12.0
Prezent · Jun 22, 2022 · 22c1fdb · 22c1fdb
2 parents 95b80a4 + 16b100b
commit 22c1fdb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -22,11 +22,12 @@
     "require": {
         "php": ">=7.1.0",
         "doctrine/common": "^2.3|^3.0",
+        "doctrine/orm": ">=2.12.0",
         "jms/metadata": "^1.1|^2.0",
-        "symfony/cache": "^5.0|^6.0"
+        "symfony/cache": "^5.0|^6.0",
+        "doctrine/annotations": "^1.13"
     },
     "require-dev": {
-        "doctrine/orm": "^2.3",
         "symfony/yaml": "^5.0|6.0",
         "phpunit/phpunit": "^8.5"
     },

diff --git a/src/Mapping/Driver/DoctrineAdapter.php b/src/Mapping/Driver/DoctrineAdapter.php
@@ -12,7 +12,7 @@
 use Doctrine\ORM\Mapping\Driver\SimplifiedXmlDriver;
 use Doctrine\ORM\Mapping\Driver\SimplifiedYamlDriver;
 use Doctrine\Persistence\ManagerRegistry;
-use Doctrine\Persistence\Mapping\Driver\AnnotationDriver as DoctrineAnnotationDriver;
+use Doctrine\ORM\Mapping\Driver\AnnotationDriver as DoctrineAnnotationDriver;
 use Doctrine\Persistence\Mapping\Driver\FileDriver as DoctrineFileDriver;
 use Doctrine\Persistence\Mapping\Driver\MappingDriver;
 use Doctrine\Persistence\Mapping\Driver\MappingDriverChain;