Merge branch 'hotfix/4313' into develop

Forward port #4313
zendframework · Apr 25, 2013 · 7e3ab9b · 7e3ab9b
2 parents 765693d + e8ee9e9
commit 7e3ab9b
Show file tree

Hide file tree

Showing 29 changed files with 232 additions and 0 deletions.
diff --git a/tests/ZendTest/Code/Generator/TestAsset/ClassWithNamespace.php b/tests/ZendTest/Code/Generator/TestAsset/ClassWithNamespace.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Code\Generator\TestAsset;
 
 class ClassWithNamespace

diff --git a/tests/ZendTest/Db/Adapter/Driver/Oci8/ConnectionIntegrationTest.php b/tests/ZendTest/Db/Adapter/Driver/Oci8/ConnectionIntegrationTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Oci8;
 
 use Zend\Db\Adapter\Driver\Oci8\Oci8;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Oci8/ConnectionTest.php b/tests/ZendTest/Db/Adapter/Driver/Oci8/ConnectionTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Oci8;
 
 use Zend\Db\Adapter\Driver\Oci8\Oci8;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Oci8/Oci8IntegrationTest.php b/tests/ZendTest/Db/Adapter/Driver/Oci8/Oci8IntegrationTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Oci8;
 
 use Zend\Db\Adapter\Driver\Oci8\Oci8;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Oci8/Oci8Test.php b/tests/ZendTest/Db/Adapter/Driver/Oci8/Oci8Test.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Oci8;
 
 use Zend\Db\Adapter\Driver\Oci8\Oci8;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Oci8/ResultIntegrationTest.php b/tests/ZendTest/Db/Adapter/Driver/Oci8/ResultIntegrationTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Oci8;
 
 use Zend\Db\Adapter\Driver\Oci8\Result;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Oci8/StatementIntegrationTest.php b/tests/ZendTest/Db/Adapter/Driver/Oci8/StatementIntegrationTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Oci8;
 
 use Zend\Db\Adapter\Driver\Oci8\Oci8;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Oci8/StatementTest.php b/tests/ZendTest/Db/Adapter/Driver/Oci8/StatementTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Oci8;
 
 use Zend\Db\Adapter\Driver\Oci8\Statement;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Pdo/ConnectionTest.php b/tests/ZendTest/Db/Adapter/Driver/Pdo/ConnectionTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Pdo;
 
 use Zend\Db\Adapter\Driver\Pdo\Connection;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Pgsql/ConnectionTest.php b/tests/ZendTest/Db/Adapter/Driver/Pgsql/ConnectionTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Pgsql;
 
 use Zend\Db\Adapter\Driver\Pgsql\Connection;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Pgsql/PgsqlTest.php b/tests/ZendTest/Db/Adapter/Driver/Pgsql/PgsqlTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Pgsql;
 
 use Zend\Db\Adapter\Driver\Pgsql\Pgsql;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Sqlsrv/ConnectionIntegrationTest.php b/tests/ZendTest/Db/Adapter/Driver/Sqlsrv/ConnectionIntegrationTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Sqlsrv;
 
 use Zend\Db\Adapter\Driver\Sqlsrv\Sqlsrv;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Sqlsrv/ConnectionTest.php b/tests/ZendTest/Db/Adapter/Driver/Sqlsrv/ConnectionTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Sqlsrv;
 
 use Zend\Db\Adapter\Driver\Sqlsrv\Sqlsrv;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Sqlsrv/ResultIntegrationTest.php b/tests/ZendTest/Db/Adapter/Driver/Sqlsrv/ResultIntegrationTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Sqlsrv;
 
 use Zend\Db\Adapter\Driver\Sqlsrv\Result;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Sqlsrv/SqlSrvIntegrationTest.php b/tests/ZendTest/Db/Adapter/Driver/Sqlsrv/SqlSrvIntegrationTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Sqlsrv;
 
 use Zend\Db\Adapter\Driver\Sqlsrv\Sqlsrv;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Sqlsrv/SqlsrvTest.php b/tests/ZendTest/Db/Adapter/Driver/Sqlsrv/SqlsrvTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Sqlsrv;
 
 use Zend\Db\Adapter\Driver\Sqlsrv\Sqlsrv;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Sqlsrv/StatementIntegrationTest.php b/tests/ZendTest/Db/Adapter/Driver/Sqlsrv/StatementIntegrationTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Sqlsrv;
 
 use Zend\Db\Adapter\Driver\Sqlsrv\Sqlsrv;

diff --git a/tests/ZendTest/Db/Adapter/Driver/Sqlsrv/StatementTest.php b/tests/ZendTest/Db/Adapter/Driver/Sqlsrv/StatementTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Driver\Sqlsrv;
 
 use Zend\Db\Adapter\Driver\Sqlsrv\Statement;

diff --git a/tests/ZendTest/Db/Adapter/Profiler/ProfilerTest.php b/tests/ZendTest/Db/Adapter/Profiler/ProfilerTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\Adapter\Profiler;
 
 use Zend\Db\Adapter\Profiler\Profiler;

diff --git a/tests/ZendTest/Db/ResultSet/AbstractResultSetTest.php b/tests/ZendTest/Db/ResultSet/AbstractResultSetTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\ResultSet;
 
 class AbstractResultSetTest extends \PHPUnit_Framework_TestCase

diff --git a/tests/ZendTest/Db/ResultSet/HydratingResultSetIntegrationTest.php b/tests/ZendTest/Db/ResultSet/HydratingResultSetIntegrationTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\ResultSet;
 
 use Zend\Db\ResultSet\HydratingResultSet;

diff --git a/tests/ZendTest/Db/ResultSet/HydratingResultSetTest.php b/tests/ZendTest/Db/ResultSet/HydratingResultSetTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Db\ResultSet;
 
 use Zend\Db\ResultSet\HydratingResultSet;

diff --git a/tests/ZendTest/Di/ServiceLocator/DependencyInjectorProxyTest.php b/tests/ZendTest/Di/ServiceLocator/DependencyInjectorProxyTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Di\ServiceLocator;
 
 use Zend\Di\Di;

diff --git a/tests/ZendTest/Log/TestAsset/MockChromePhp.php b/tests/ZendTest/Log/TestAsset/MockChromePhp.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Log\TestAsset;
 
 use Zend\Log\Writer\ChromePhp\ChromePhpInterface;

diff --git a/tests/ZendTest/Log/TestAsset/MockFirePhp.php b/tests/ZendTest/Log/TestAsset/MockFirePhp.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Log\TestAsset;
 
 use Zend\Log\Writer\FirePhp\FirePhpInterface;

diff --git a/tests/ZendTest/Mvc/Router/Console/SimpleTest.php b/tests/ZendTest/Mvc/Router/Console/SimpleTest.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Mvc\Router\Console;
 
 use PHPUnit_Framework_TestCase as TestCase;

diff --git a/tests/ZendTest/Mvc/Service/TestAsset/ControllerWithDependencies.php b/tests/ZendTest/Mvc/Service/TestAsset/ControllerWithDependencies.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Mvc\Service\TestAsset;
 
 use Zend\Stdlib\DispatchableInterface;

diff --git a/tests/ZendTest/Mvc/Service/TestAsset/Dispatchable.php b/tests/ZendTest/Mvc/Service/TestAsset/Dispatchable.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Mvc\Service\TestAsset;
 
 use Zend\Mvc\Controller\AbstractActionController;

diff --git a/tests/ZendTest/Mvc/Service/TestAsset/InvalidDispatchableClass.php b/tests/ZendTest/Mvc/Service/TestAsset/InvalidDispatchableClass.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Zend Framework (http://framework.zend.com/)
+ *
+ * @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
+ */
+
 namespace ZendTest\Mvc\Service\TestAsset;
 
 use DomainException;