Annotations fixed

mikemix · Jun 17, 2015 · cf67ea9 · cf67ea9
1 parent 48210ba
commit cf67ea9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/Service/AnnotationExtractor.php b/src/Service/AnnotationExtractor.php
@@ -3,6 +3,7 @@
 
 use Doctrine\Common\Annotations\AnnotationReader;
 use mxdiModule\Annotation\Annotation;
+use mxdiModule\Annotation\Inject;
 use mxdiModule\Annotation\InjectParams;
 
 class AnnotationExtractor
@@ -17,7 +18,7 @@ public function __construct(AnnotationReader $reader = null)
 
     /**
      * @param string $fqcn
-     * @return \mxdiModule\Annotation\InjectParams|null
+     * @return InjectParams|null
      */
     public function getConstructorInjections($fqcn)
     {
@@ -35,7 +36,7 @@ public function getConstructorInjections($fqcn)
      * Get methods injections (except the constructor).
      *
      * @param string $fqcn
-     * @return \mxdiModule\Annotation\InjectParams[]
+     * @return InjectParams[]
      */
     public function getMethodsInjections($fqcn)
     {
@@ -66,7 +67,7 @@ public function getMethodsInjections($fqcn)
      * Get properties injections (except the constructor).
      *
      * @param string $fqcn
-     * @return \mxdiModule\Annotation\Inject[]
+     * @return Inject[]
      */
     public function getPropertiesInjections($fqcn)
     {

diff --git a/src/Service/ChangeSet.php b/src/Service/ChangeSet.php
@@ -12,10 +12,10 @@ class ChangeSet
     /** @var bool */
     protected $hasSimpleConstructor;
 
-    /** @var InjectParams|null */
+    /** @var InjectParams[] */
     protected $methodsInjections;
 
-    /** @var array|Inject[] */
+    /** @var Inject[] */
     protected $propertiesInjections;
 
     /** @var bool */
@@ -31,7 +31,7 @@ public function __construct(AnnotationExtractor $extractor, $fqcn)
 
         $this->isAnnotated =
             $this->constructorInjections ||
-            $this->methodsInjections ||
+            count($this->methodsInjections) ||
             count($this->propertiesInjections);
     }