fixbug - excludedPsr4Prefixes

swoft-cloud · Jan 9, 2020 · 5934088 · 5934088
1 parent b57fc12
commit 5934088
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/annotation/src/Resource/AnnotationResource.php b/src/annotation/src/Resource/AnnotationResource.php
@@ -83,7 +83,7 @@ class AnnotationResource extends AbstractResource
      * @var array
      * eg. ['Psr\\', 'PHPUnit\\', 'Symfony\\']
      */
-    private $excludedPsr4Prefixes;
+    private $excludedPsr4Prefixes = [];
 
     /**
      * Can disable AutoLoader class before load component classes.
@@ -119,12 +119,12 @@ class AnnotationResource extends AbstractResource
      */
     public function __construct(array $config = [])
     {
-        // Init $excludedPsr4Prefixes
-        $this->excludedPsr4Prefixes = self::DEFAULT_EXCLUDED_PSR4_PREFIXES;
-
         // Can set property by array
         ObjectHelper::init($this, $config);
 
+        // Init $excludedPsr4Prefixes
+        array_push($this->excludedPsr4Prefixes, ...self::DEFAULT_EXCLUDED_PSR4_PREFIXES);
+
         $this->registerLoader();
 
         $this->classLoader   = ComposerHelper::getClassLoader();

diff --git a/src/framework/src/Processor/AnnotationProcessor.php b/src/framework/src/Processor/AnnotationProcessor.php
@@ -35,7 +35,7 @@ public function handle(): bool
             'notifyHandler'        => [$this, 'notifyHandle'],
             // TODO force load framework components: bean, error, event, aop
             'disabledAutoLoaders'  => $app->getDisabledAutoLoaders(),
-            'disabledPsr4Prefixes' => $app->getDisabledPsr4Prefixes(),
+            'excludedPsr4Prefixes' => $app->getDisabledPsr4Prefixes(),
         ]);
 
         $stats = AnnotationRegister::getClassStats();