Fix bug with sub-components

Arachne · Sep 21, 2016 · 0892d45 · 0892d45
1 parent 50709ff
commit 0892d45
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/src/Application/ParameterFinder.php b/src/Application/ParameterFinder.php
@@ -201,7 +201,7 @@ private function createReflection(PresenterComponentReflection $reflection, $com
             }
 
             return isset($subComponent)
-                ? $this->createReflection(new ClassType($class), $subComponent)
+                ? $this->createReflection(new PresenterComponentReflection($class), $subComponent)
                 : new PresenterComponentReflection($class);
         }
     }

diff --git a/tests/unit/src/Classes/TestComponent.php b/tests/unit/src/Classes/TestComponent.php
@@ -25,4 +25,11 @@ final public function __construct()
     public function handleTestHandle(Class6 $handleEntity)
     {
     }
+
+    /**
+     * @return TestComponent
+     */
+    public function createComponentSub()
+    {
+    }
 }
diff --git a/tests/unit/src/ParameterFinderTest.php b/tests/unit/src/ParameterFinderTest.php
@@ -99,6 +99,22 @@ public function testComponent()
         ], $this->finder->getMapping($request));
     }
 
+    public function testSubComponent()
+    {
+        $request = new Request('', 'GET', [
+            'action' => 'testAction',
+            'do' => 'component-sub-testHandle',
+            'component-sub-persistent' => 1,
+        ]);
+        $this->assertEquals([
+            'persistent1' => $this->createInfoObject('Tests\Unit\Classes\Class1', true),
+            'actionEntity' => $this->createInfoObject('Tests\Unit\Classes\Class2', false),
+            'component-sub-persistent' => $this->createInfoObject('Tests\Unit\Classes\Class5', true),
+            'component-sub-handleEntity' => $this->createInfoObject('Tests\Unit\Classes\Class6', false),
+            'persistent2' => $this->createInfoObject('string', true),
+        ], $this->finder->getMapping($request));
+    }
+
     public function testNamelessComponent()
     {
         $request = new Request('', 'GET', [