Merge branch 'hotfix/59' into develop

Forward port #59

Author: weierophinney

CHANGELOG.md

@@ -36,7 +36,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#59](https://github.com/zendframework/zend-code/pull/59) fixes an issue with
+  detection of multiple trait `use` statements.
 
 ## 3.0.3 - 2016-06-27
 

src/Scanner/ClassScanner.php

@@ -547,6 +547,8 @@ public function getTraits()
      */
     public function getTraitNames()
     {
+        $this->scan();
+
         $return = [];
         foreach ($this->infos as $info) {
             if ($info['type'] !== 'use') {
@@ -562,7 +564,6 @@ public function getTraitNames()
                     $return[] = $traitName;
                 }
             }
-            break;
         }
 
         return $return;
@@ -575,6 +576,8 @@ public function getTraitNames()
      */
     public function getTraitAliases()
     {
+        $this->scan();
+
         $return = [];
         foreach ($this->infos as $info) {
             if ($info['type'] !== 'use') {
@@ -598,7 +601,6 @@ public function getTraitAliases()
                     $return[$alias['alias']] = $trait . '::' . $method;
                 }
             }
-            break;
         }
 
         return $return;
@@ -612,6 +614,8 @@ public function getTraitAliases()
      */
     protected function getVisibilityForAlias($aliasName)
     {
+        $this->scan();
+
         $return = null;
         foreach ($this->infos as $info) {
             if ($info['type'] !== 'use') {
@@ -632,7 +636,6 @@ protected function getVisibilityForAlias($aliasName)
                     }
                 }
             }
-            break;
         }
 
         return $return;
@@ -645,6 +648,8 @@ protected function getVisibilityForAlias($aliasName)
      */
     protected function getBlockedTraitMethods()
     {
+        $this->scan();
+
         $return = [];
         foreach ($this->infos as $info) {
             if ($info['type'] !== 'use') {
@@ -668,7 +673,6 @@ protected function getBlockedTraitMethods()
                     $return[] = $trait . '::' . $method;
                 }
             }
-            break;
         }
 
         return $return;

test/Scanner/ClassScannerTest.php

@@ -202,6 +202,7 @@ public function testClassScannerCanScanClassThatUsesTraits()
         $class->getTraitAliases();
         $this->assertContains('ZendTest\Code\TestAsset\BarTrait', $traitNames);
         $this->assertContains('ZendTest\Code\TestAsset\FooTrait', $traitNames);
+        $this->assertContains('ZendTest\Code\TestAsset\BazTrait', $traitNames);
     }
 
     /**

test/TestAsset/BazTrait.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2016 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ */
+
+namespace ZendTest\Code\TestAsset;
+
+trait BazTrait
+{
+    public function baz()
+    {
+    }
+}

test/TestAsset/TestClassUsesTraitSimple.php

@@ -14,4 +14,5 @@
 class TestClassUsesTraitSimple
 {
     use \ZendTest\Code\TestAsset\BarTrait, FooTrait;
+    use BazTrait;
 }