Merge branch 'master' into ValidatorMessages

zendframework · Nov 4, 2013 · 8e47bbf · 8e47bbf
commit 8e47bbf
Show file tree

Hide file tree

Showing 44 changed files with 1 addition and 156 deletions.
diff --git a/composer.json b/composer.json
@@ -21,9 +21,6 @@
             "dev-develop": "2.3-dev"
         }
     },
-    "suggest": {
-        "zendframework/zend-stdlib": "Zend\\Stdlib component"
-    },
     "autoload-dev": {
         "psr-4": {
             "ZendTest\\Loader\\": "test/"

diff --git a/src/ClassMapAutoloader.php b/src/ClassMapAutoloader.php
@@ -206,7 +206,7 @@ public static function realPharPath($path)
             return ($p !== '' && $p !== '.');
         }));
 
-        array_walk($parts, function ($value, $key) use(&$parts) {
+        array_walk($parts, function ($value, $key) use (&$parts) {
             if ($value === '..') {
                 unset($parts[$key], $parts[$key-1]);
                 $parts = array_values($parts);

diff --git a/test/AutoloadDoesNotHideParseError.php b/test/AutoloadDoesNotHideParseError.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 Zend_Loader::registerAutoload();

diff --git a/test/AutoloadableClass.php b/test/AutoloadableClass.php
@@ -5,14 +5,8 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
-/**
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage UnitTests
- */
 class Zend_Loader_AutoloadableClass
 {
 }
diff --git a/test/AutoloaderFactoryTest.php b/test/AutoloaderFactoryTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\Loader;
@@ -14,9 +13,6 @@
 use Zend\Loader\AutoloaderFactory;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class AutoloaderFactoryTest extends \PHPUnit_Framework_TestCase

diff --git a/test/ClassMapAutoloaderTest.php b/test/ClassMapAutoloaderTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\Loader;
@@ -14,9 +13,6 @@
 use Zend\Loader\Exception\InvalidArgumentException;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class ClassMapAutoloaderTest extends \PHPUnit_Framework_TestCase

diff --git a/test/ModuleAutoloaderTest.php b/test/ModuleAutoloaderTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\Loader\ModuleAutoloaderTest;

diff --git a/test/MyLoader.php b/test/MyLoader.php
@@ -5,15 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 /**
  * Static methods for loading classes and files.
- *
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage UnitTests
  */
 class Zend_Loader_MyLoader extends Zend_Loader
 {

diff --git a/test/MyOverloader.php b/test/MyOverloader.php
@@ -5,15 +5,10 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 /**
  * Static methods for loading classes and files.
- *
- * @category   Zend
- * @package    Zend_Loader
- * @subpackage UnitTests
  */
 class Zend_Loader_MyOverloader extends Zend_Loader
 {

diff --git a/test/PluginClassLoaderTest.php b/test/PluginClassLoaderTest.php
@@ -5,17 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\Loader;
 
 use Zend\Loader\PluginClassLoader;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class PluginClassLoaderTest extends \PHPUnit_Framework_TestCase

diff --git a/test/StandardAutoloaderTest.php b/test/StandardAutoloaderTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\Loader;
@@ -15,9 +14,6 @@
 use ReflectionClass;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class StandardAutoloaderTest extends \PHPUnit_Framework_TestCase

diff --git a/test/TestAsset/ClassMappedClass.php b/test/TestAsset/ClassMappedClass.php
@@ -5,15 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\UnusualNamespace;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class ClassMappedClass

diff --git a/test/TestAsset/CustomClassLoader.php b/test/TestAsset/CustomClassLoader.php
@@ -5,17 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\Loader\TestAsset;
 
 use Zend\Loader\PluginClassLoader;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class CustomClassLoader extends PluginClassLoader

diff --git a/test/TestAsset/ExtendedPluginClassLoader.php b/test/TestAsset/ExtendedPluginClassLoader.php
@@ -5,17 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\Loader\TestAsset;
 
 use Zend\Loader\PluginClassLoader;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class ExtendedPluginClassLoader extends PluginClassLoader

diff --git a/test/TestAsset/Name_Space/Namespaced/Class.php b/test/TestAsset/Name_Space/Namespaced/Class.php
@@ -5,15 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\UnusualNamespace\Name_Space;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class Namespaced_Class

diff --git a/test/TestAsset/NamespacedClass.php b/test/TestAsset/NamespacedClass.php
@@ -5,15 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\UnusualNamespace;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class NamespacedClass

diff --git a/test/TestAsset/PrefixedClass.php b/test/TestAsset/PrefixedClass.php
@@ -5,13 +5,9 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class ZendTest_UnusualPrefix_PrefixedClass

diff --git a/test/TestAsset/SamplePlugin.php b/test/TestAsset/SamplePlugin.php
@@ -5,15 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\Loader\TestAsset;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class SamplePlugin

diff --git a/test/TestAsset/ServiceLocator.php b/test/TestAsset/ServiceLocator.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\Loader\TestAsset;

diff --git a/test/TestAsset/StandardAutoloader.php b/test/TestAsset/StandardAutoloader.php
@@ -5,17 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\Loader\TestAsset;
 
 use Zend\Loader\StandardAutoloader as Psr0Autoloader;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class StandardAutoloader extends Psr0Autoloader

diff --git a/test/TestAsset/TestNamespace/FallbackCase.php b/test/TestAsset/TestNamespace/FallbackCase.php
@@ -5,15 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace TestNamespace;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class FallbackCase

diff --git a/test/TestAsset/TestNamespace/NoDuplicateAutoloadersCase.php b/test/TestAsset/TestNamespace/NoDuplicateAutoloadersCase.php
@@ -5,15 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace TestNamespace;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class NoDuplicateAutoloadersCase

diff --git a/test/TestAsset/TestPluginMap.php b/test/TestAsset/TestPluginMap.php
@@ -5,15 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\Loader\TestAsset;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class TestPluginMap implements \IteratorAggregate

diff --git a/test/TestAsset/TestPlugins/Bar.php b/test/TestAsset/TestPlugins/Bar.php
@@ -5,15 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\Loader\TestAsset\TestPlugins;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class Bar

diff --git a/test/TestAsset/TestPlugins/Baz.php b/test/TestAsset/TestPlugins/Baz.php
@@ -5,15 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\Loader\TestAsset\TestPlugins;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class Baz

diff --git a/test/TestAsset/TestPlugins/Foo.php b/test/TestAsset/TestPlugins/Foo.php
@@ -5,15 +5,11 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_Loader
  */
 
 namespace ZendTest\Loader\TestAsset\TestPlugins;
 
 /**
- * @category   Zend
- * @package    Loader
- * @subpackage UnitTests
  * @group      Loader
  */
 class Foo