Merge pull request #64 from laravel-doctrine/fix-537

Automatic loading of annotations was added in doctrine/annotations
laravel-doctrine · Jan 21, 2023 · 5426f79 · 5426f79
2 parents 4395781 + 20aaee7
commit 5426f79
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 44 deletions.
diff --git a/composer.json b/composer.json
@@ -28,7 +28,8 @@
     "illuminate/config": "^6.0|^7.0|^8.0|^9.0",
     "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0",
     "illuminate/support": "^6.0|^7.0|^8.0|^9.0",
-    "laravel-doctrine/orm": "^1"
+    "laravel-doctrine/orm": "^1",
+    "doctrine/annotations": "^1.10"
   },
   "require-dev": {
     "mockery/mockery": "^1.3.1",

diff --git a/src/AclServiceProvider.php b/src/AclServiceProvider.php
@@ -7,7 +7,6 @@
 use Illuminate\Support\ServiceProvider;
 use Illuminate\Support\Str;
 use LaravelDoctrine\ACL\Contracts\HasPermissions;
-use LaravelDoctrine\ACL\Mappings\AnnotationLoader;
 use LaravelDoctrine\ACL\Permissions\PermissionManager;
 use LaravelDoctrine\ORM\DoctrineManager;
 
@@ -39,7 +38,7 @@ public function boot()
     public function register()
     {
         $this->mergeConfig();
-        $this->registerAnnotations();
+        AnnotationRegistry::registerUniqueLoader('class_exists');
 
         $manager = $this->app->make(DoctrineManager::class);
         $manager->extendAll(RegisterMappedEventSubscribers::class);
@@ -60,17 +59,6 @@ protected function definePermissions(Gate $gate, PermissionManager $manager)
         }
     }
 
-    /**
-     * Register annotations.
-     */
-    protected function registerAnnotations()
-    {
-        AnnotationRegistry::registerLoader([
-            new AnnotationLoader,
-            'loadClass',
-        ]);
-    }
-
     /**
      * Merge config.
      */

diff --git a/src/Mappings/AnnotationLoader.php b/src/Mappings/AnnotationLoader.php