Merge branch 'fix/#92-#90-fix-class-scanner-get-interfaces' into develop

Forward port #90 Forward port #92
zendframework · Sep 20, 2016 · 85c5e66 · 85c5e66
2 parents 3712b82 + de130a5
commit 85c5e66
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Scanner/ClassScanner.php b/src/Scanner/ClassScanner.php
@@ -985,7 +985,11 @@ protected function scan()
                     case T_STRING:
                         switch ($classContext) {
                             case T_EXTENDS:
-                                $this->shortParentClass .= $tokenContent;
+                                if ($this->isInterface) {
+                                    $this->shortInterfaces[$classInterfaceIndex] .= $tokenContent;
+                                } else {
+                                    $this->shortParentClass .= $tokenContent;
+                                }
                                 break;
                             case T_IMPLEMENTS:
                                 $this->shortInterfaces[$classInterfaceIndex] .= $tokenContent;
@@ -1006,7 +1010,8 @@ protected function scan()
                         // goto no break needed
 
                     case null:
-                        if ($classContext == T_IMPLEMENTS && $tokenContent == ',') {
+                        if (($classContext == T_IMPLEMENTS && $tokenContent == ',')
+                            || ($classContext == T_EXTENDS && $tokenContent == ',' && $this->isInterface)) {
                             $classInterfaceIndex++;
                             $this->shortInterfaces[$classInterfaceIndex] = '';
                         }

diff --git a/test/Scanner/ClassScannerTest.php b/test/Scanner/ClassScannerTest.php
@@ -307,4 +307,13 @@ public function testTraitIsNotInstantiable()
         $this->assertTrue($class->isTrait());
         $this->assertFalse($class->isInstantiable());
     }
+
+    public function testGetInterfacesFromInterface()
+    {
+        $file  = new FileScanner(__DIR__ . '/../TestAsset/FooInterface.php');
+        $class = $file->getClass('ZendTest\Code\TestAsset\FooInterface');
+        $this->assertTrue($class->isInterface());
+        $this->assertEquals(1, count($class->getInterfaces()));
+        $this->assertEquals('ArrayAccess', $class->getInterfaces()[0]);
+    }
 }