Merge pull request #2 from rstgroup/handle-multiuse

Handle multiuse
rstgroup · Jul 18, 2018 · 0757e5f · 0757e5f
2 parents 0d65a52 + 88b345f
commit 0757e5f
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 12 deletions.
diff --git a/src/Builder/Reflection.php b/src/Builder/Reflection.php
@@ -110,8 +110,8 @@ private function buildParameter(ReflectionParameter $parameter, $data, Reflectio
 
                     $parsedFile = $parser->parse(file_get_contents($constructor->getDeclaringClass()->getFileName()));
                     $namespace = $this->getNamespaceStmt($parsedFile);
-                    $use = $this->getUseStmt($namespace);
-                    $namespaces = $this->getUsesNamespaces($use);
+                    $uses = $this->getUseStmts($namespace);
+                    $namespaces = $this->getUsesNamespaces($uses);
 
                     foreach($data as $objectConstructorData) {
                         $list[] = $this->build(
@@ -141,23 +141,28 @@ private function getNamespaceStmt(array $nodes): Stmt\Namespace_
         return new Stmt\Namespace_();
     }
 
-    private function getUseStmt(Stmt\Namespace_ $node): Stmt\Use_
+    /** @return Stmt\Use_[] */
+    private function getUseStmts(Stmt\Namespace_ $node): array
     {
+        $uses = [];
         foreach ($node->stmts as $node) {
             if ($node instanceof Stmt\Use_) {
-                return $node;
+                $uses[]= $node;
             }
         }
 
-        return new Stmt\Use_([]);
+        return $uses;
     }
 
-    /** @return string[] */
-    private function getUsesNamespaces(Stmt\Use_ $node): array
+    /**
+     * @param Stmt\Use_[] $uses
+     * @return string[]
+     */
+    private function getUsesNamespaces(array $uses): array
     {
         $names = [];
-        foreach ($node->uses as $use) {
-            $names[] = $use->name->toString();
+        foreach ($uses as $use) {
+            $names[] = $use->uses[0]->name->toString();
         }
 
         return $names;

diff --git a/test/ListOfObjectsWithUseStmtConstructor.php b/test/ListOfObjectsWithUseStmtConstructor.php
@@ -3,16 +3,19 @@
 namespace RstGroup\ObjectBuilder\Test;
 
 use RstGroup\ObjectBuilder\Test\Object\SomeObject;
+use RstGroup\ObjectBuilder\Test\Object\SomeSecondObject;
 
 class ListOfObjectsWithUseStmtConstructor
 {
     public $list;
+    public $object;
 
     /**
-     * @param SomeObject[] $list
+     * @param SomeSecondObject[] $list
      */
     public function __construct(array $list)
     {
         $this->list = $list;
+        $this->object = new SomeObject();
     }
 }
diff --git a/test/Object/SomeSecondObject.php b/test/Object/SomeSecondObject.php
@@ -0,0 +1,10 @@
+<?php declare(strict_types=1);
+
+namespace RstGroup\ObjectBuilder\Test\Object;
+
+class SomeSecondObject
+{
+    public function __construct()
+    {
+    }
+}
diff --git a/test/unit/Builder/ReflectionTest.php b/test/unit/Builder/ReflectionTest.php
@@ -6,13 +6,14 @@
 use RstGroup\ObjectBuilder\Builder\ParameterNameStrategy\Simple;
 use RstGroup\ObjectBuilder\Builder\Reflection;
 use RstGroup\ObjectBuilder\Test\ListOfObjectsWithoutUseButWithFQNTypedArrayConstructor;
+use RstGroup\ObjectBuilder\Test\ListOfObjectsWithoutUseStmtConstructor;
 use RstGroup\ObjectBuilder\Test\ListOfObjectsWithUseStmtConstructor;
 use RstGroup\ObjectBuilder\Test\Object\SomeObject;
+use RstGroup\ObjectBuilder\Test\Object\SomeSecondObject;
 use RstGroup\ObjectBuilder\Test\SimpleMixedConstructor;
 use RstGroup\ObjectBuilder\Test\SimpleMixedConstructorWithDefaultValue;
 use RstGroup\ObjectBuilder\Test\SimpleScalarConstructor;
 use RstGroup\ObjectBuilder\Test\SomeAggregateRoot;
-use RstGroup\ObjectBuilder\Test\ListOfObjectsWithoutUseStmtConstructor;
 use RstGroup\ObjectBuilder\Test\SomeObjectWithEmptyConstructor;
 
 class ReflectionTest extends TestCase
@@ -122,7 +123,7 @@ public function iCanBuildObjectWithObjectCollectionWithUseInConstructor()
         $this->assertInstanceOf(ListOfObjectsWithUseStmtConstructor::class, $object);
         $this->assertCount(2, $object->list);
         foreach($object->list as $element) {
-            $this->assertInstanceOf(SomeObject::class, $element);
+            $this->assertInstanceOf(SomeSecondObject::class, $element);
         }
     }