Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'hotfix/4313' into develop

Forward port #4313
  • Loading branch information...
commit 7e3ab9b41793275d5dde9fa1049a35818ea2c33e 2 parents 765693d + e8ee9e9
@weierophinney weierophinney authored
Showing with 232 additions and 0 deletions.
  1. +8 −0 tests/ZendTest/Code/Generator/TestAsset/ClassWithNamespace.php
  2. +8 −0 tests/ZendTest/Db/Adapter/Driver/Oci8/ConnectionIntegrationTest.php
  3. +8 −0 tests/ZendTest/Db/Adapter/Driver/Oci8/ConnectionTest.php
  4. +8 −0 tests/ZendTest/Db/Adapter/Driver/Oci8/Oci8IntegrationTest.php
  5. +8 −0 tests/ZendTest/Db/Adapter/Driver/Oci8/Oci8Test.php
  6. +8 −0 tests/ZendTest/Db/Adapter/Driver/Oci8/ResultIntegrationTest.php
  7. +8 −0 tests/ZendTest/Db/Adapter/Driver/Oci8/StatementIntegrationTest.php
  8. +8 −0 tests/ZendTest/Db/Adapter/Driver/Oci8/StatementTest.php
  9. +8 −0 tests/ZendTest/Db/Adapter/Driver/Pdo/ConnectionTest.php
  10. +8 −0 tests/ZendTest/Db/Adapter/Driver/Pgsql/ConnectionTest.php
  11. +8 −0 tests/ZendTest/Db/Adapter/Driver/Pgsql/PgsqlTest.php
  12. +8 −0 tests/ZendTest/Db/Adapter/Driver/Sqlsrv/ConnectionIntegrationTest.php
  13. +8 −0 tests/ZendTest/Db/Adapter/Driver/Sqlsrv/ConnectionTest.php
  14. +8 −0 tests/ZendTest/Db/Adapter/Driver/Sqlsrv/ResultIntegrationTest.php
  15. +8 −0 tests/ZendTest/Db/Adapter/Driver/Sqlsrv/SqlSrvIntegrationTest.php
  16. +8 −0 tests/ZendTest/Db/Adapter/Driver/Sqlsrv/SqlsrvTest.php
  17. +8 −0 tests/ZendTest/Db/Adapter/Driver/Sqlsrv/StatementIntegrationTest.php
  18. +8 −0 tests/ZendTest/Db/Adapter/Driver/Sqlsrv/StatementTest.php
  19. +8 −0 tests/ZendTest/Db/Adapter/Profiler/ProfilerTest.php
  20. +8 −0 tests/ZendTest/Db/ResultSet/AbstractResultSetTest.php
  21. +8 −0 tests/ZendTest/Db/ResultSet/HydratingResultSetIntegrationTest.php
  22. +8 −0 tests/ZendTest/Db/ResultSet/HydratingResultSetTest.php
  23. +8 −0 tests/ZendTest/Di/ServiceLocator/DependencyInjectorProxyTest.php
  24. +8 −0 tests/ZendTest/Log/TestAsset/MockChromePhp.php
  25. +8 −0 tests/ZendTest/Log/TestAsset/MockFirePhp.php
  26. +8 −0 tests/ZendTest/Mvc/Router/Console/SimpleTest.php
  27. +8 −0 tests/ZendTest/Mvc/Service/TestAsset/ControllerWithDependencies.php
  28. +8 −0 tests/ZendTest/Mvc/Service/TestAsset/Dispatchable.php
  29. +8 −0 tests/ZendTest/Mvc/Service/TestAsset/InvalidDispatchableClass.php
View
8 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
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
View
8 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;
Please sign in to comment.
Something went wrong with that request. Please try again.