Merge pull request #28 from koriym/annotation_loader

Add Dii::registerAnnotationLoader()
koriym · Jan 29, 2021 · 6656d94 · 6656d94
2 parents a0202cf + b3e58ee
commit 6656d94
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/demo/public/index.php b/demo/public/index.php
@@ -10,7 +10,7 @@
 use Koriym\Dii\Test;
 
 $loader = require dirname(__DIR__) . '/vendor/autoload.php';
-AnnotationRegistry::registerLoader([SilentAutoload::class, 'autoload']);
+Dii::registerAnnotationLoader();
 
 $config = __DIR__ . '/protected/config/main.php';
 

diff --git a/src/Dii.php b/src/Dii.php
@@ -5,6 +5,7 @@
 namespace Koriym\Dii;
 
 use CException;
+use Doctrine\Common\Annotations\AnnotationRegistry;
 use Koriym\Dii\Module\AppModule;
 use LengthException;
 use LogicException;
@@ -150,4 +151,13 @@ private static function extract($config): array
 
         throw new CException(self::t('yii', 'Object configuration must be an array containing a "class" element.'));
     }
+
+    /**
+     * Register silent annotation loader
+     */
+    public static function registerAnnotationLoader()
+    {
+        AnnotationRegistry::reset();
+        AnnotationRegistry::registerLoader([SilentAutoload::class, 'autoload']);
+    }
 }