Merge pull request #210 from Slamdunk/annotations_2

Add support for doctrine/annotations v2
laminas · Mar 20, 2023 · 91dd0e8 · 91dd0e8
2 parents f50b1aa + 076daf9
commit 91dd0e8
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 91 deletions.
diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
     },
     "require-dev": {
         "ext-intl": "*",
-        "doctrine/annotations": "^1.14.3",
+        "doctrine/annotations": "^1.14.3 || ^2.0.1",
         "laminas/laminas-captcha": "^2.16",
         "laminas/laminas-coding-standard": "^2.5",
         "laminas/laminas-db": "^2.17",
@@ -43,7 +43,7 @@
         "vimeo/psalm": "^5.8"
     },
     "conflict": {
-        "doctrine/annotations": "<1.12.0",
+        "doctrine/annotations": "<1.14.0",
         "laminas/laminas-captcha": "<2.16.0",
         "laminas/laminas-eventmanager": "<3.10.0",
         "laminas/laminas-i18n": "<2.21.0",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Annotation/AnnotationBuilder.php b/src/Annotation/AnnotationBuilder.php
@@ -6,7 +6,6 @@
 
 use ArrayObject;
 use Doctrine\Common\Annotations\AnnotationReader;
-use Doctrine\Common\Annotations\AnnotationRegistry;
 use ReflectionClass;
 use ReflectionException;
 
@@ -16,15 +15,6 @@
  */
 final class AnnotationBuilder extends AbstractBuilder
 {
-    /**
-     * Initialize the annotation registry
-     */
-    public function __construct()
-    {
-        // doctrine/annotations 1.x does not require autoloading by default
-        AnnotationRegistry::registerLoader('class_exists');
-    }
-
     /**
      * Derive a form specification from doctrine annotations for a given entity
      *