Merge branch 'patch-2' of git://github.com/prolic/zf2 into hotfix/2759

Author: weierophinney

library/Zend/Code/Scanner/TokenArrayScanner.php

@@ -584,10 +584,6 @@ protected function getUsesNoScan($namespace)
             }
         }
 
-        if (!$namespaces) {
-            return array();
-        }
-
         if ($namespace === null) {
             $namespace = array_shift($namespaces);
         } elseif (!is_string($namespace)) {

tests/ZendTest/Code/Scanner/TokenArrayScannerTest.php

@@ -24,6 +24,18 @@ public function testScannerReturnsNamespaces()
         $this->assertContains('ZendTest\Code\TestAsset', $namespaces);
     }
 
+    public function testScannerReturnsNamespacesInNotNamespacedClasses()
+    {
+        $tokenScanner = new TokenArrayScanner(token_get_all(file_get_contents((__DIR__ . '/../TestAsset/FooBarClass.php'))));
+        $uses = $tokenScanner->getUses();
+        $this->assertInternalType('array', $uses);
+        $foundUses = array();
+        foreach ($uses as $use) {
+            $foundUses[] = $use['use'];
+        }
+        $this->assertContains('ArrayObject', $foundUses);
+    }
+
     public function testScannerReturnsClassNames()
     {
         $tokenScanner = new TokenArrayScanner(token_get_all(file_get_contents((__DIR__ . '/../TestAsset/FooClass.php'))));

tests/ZendTest/Code/TestAsset/FooBarClass.php

@@ -0,0 +1,20 @@
+<?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @link      http://github.com/zendframework/zf2 for the canonical source repository
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @license   http://framework.zend.com/license/new-bsd New BSD License
+ * @package   Zend_Code
+ */
+
+use ArrayObject;
+
+/**
+ * This is a test class, declaring no namespace at all.
+ * It is used to test, if the token scanner can find use
+ * statements in classes with no namespace defined.
+ */
+class ZendTest_Code_TestAsset_FooBar extends ArrayObject
+{
+}