Merge branch 'zf2/master' into milestones/autoloading

- Bring milestones/autoloading branch up-to-date with current master Conflicts: library/Zend/Loader/Autoloader.php library/Zend/Loader/PluginLoader.php library/Zend/Serializer/Serializer.php library/Zend/View/AbstractView.php library/Zend/View/View.php library/Zend/View/ViewEngine.php tests/Zend/Loader/AutoloaderTest.php tests/Zend/View/ViewTest.php
zendframework · Oct 28, 2010 · 76de94f · 76de94f
2 parents 2e82e26 + b36e3e8
commit 76de94f
Show file tree

Hide file tree

Showing 44 changed files with 0 additions and 44 deletions.
diff --git a/src/DbAdapter.php b/src/DbAdapter.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/DbStatement.php b/src/DbStatement.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Constraint/DomQuery.php b/src/PHPUnit/Constraint/DomQuery.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Constraint/Exception.php b/src/PHPUnit/Constraint/Exception.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Constraint/Redirect.php b/src/PHPUnit/Constraint/Redirect.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Constraint/ResponseHeader.php b/src/PHPUnit/Constraint/ResponseHeader.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/ControllerTestCase.php b/src/PHPUnit/ControllerTestCase.php
@@ -16,7 +16,6 @@
  * @package    Zend_Test
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/DatabaseTestCase.php b/src/PHPUnit/DatabaseTestCase.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Db/Connection.php b/src/PHPUnit/Db/Connection.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Db/DataSet/DbRowset.php b/src/PHPUnit/Db/DataSet/DbRowset.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Db/DataSet/DbTable.php b/src/PHPUnit/Db/DataSet/DbTable.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Db/DataSet/DbTableDataSet.php b/src/PHPUnit/Db/DataSet/DbTableDataSet.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Db/DataSet/QueryDataSet.php b/src/PHPUnit/Db/DataSet/QueryDataSet.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Db/DataSet/QueryTable.php b/src/PHPUnit/Db/DataSet/QueryTable.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Db/Exception.php b/src/PHPUnit/Db/Exception.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Db/Metadata/Generic.php b/src/PHPUnit/Db/Metadata/Generic.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Db/Operation/DeleteAll.php b/src/PHPUnit/Db/Operation/DeleteAll.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Db/Operation/Insert.php b/src/PHPUnit/Db/Operation/Insert.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Db/Operation/Truncate.php b/src/PHPUnit/Db/Operation/Truncate.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/src/PHPUnit/Db/SimpleTester.php b/src/PHPUnit/Db/SimpleTester.php
@@ -17,7 +17,6 @@
  * @subpackage PHPUnit
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/DbAdapterTest.php b/test/DbAdapterTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/DbStatementTest.php b/test/DbStatementTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Constraint/DomQueryTest.php b/test/PHPUnit/Constraint/DomQueryTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/ControllerTestCaseTest.php b/test/PHPUnit/ControllerTestCaseTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/ConnectionTest.php b/test/PHPUnit/Db/ConnectionTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/DataSet/DataSetTestCase.php b/test/PHPUnit/Db/DataSet/DataSetTestCase.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/DataSet/DbRowsetTest.php b/test/PHPUnit/Db/DataSet/DbRowsetTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/DataSet/DbTableDataSetTest.php b/test/PHPUnit/Db/DataSet/DbTableDataSetTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/DataSet/DbTableTest.php b/test/PHPUnit/Db/DataSet/DbTableTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/DataSet/QueryDataSetTest.php b/test/PHPUnit/Db/DataSet/QueryDataSetTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/DataSet/QueryTableTest.php b/test/PHPUnit/Db/DataSet/QueryTableTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/Integration/AbstractTestCase.php b/test/PHPUnit/Db/Integration/AbstractTestCase.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/Integration/MysqlIntegrationTest.php b/test/PHPUnit/Db/Integration/MysqlIntegrationTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/Integration/SqLiteIntegrationTest.php b/test/PHPUnit/Db/Integration/SqLiteIntegrationTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/Metadata/GenericTest.php b/test/PHPUnit/Db/Metadata/GenericTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/Operation/DeleteAllTest.php b/test/PHPUnit/Db/Operation/DeleteAllTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/Operation/InsertTest.php b/test/PHPUnit/Db/Operation/InsertTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/Operation/TruncateTest.php b/test/PHPUnit/Db/Operation/TruncateTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/SimpleTesterTest.php b/test/PHPUnit/Db/SimpleTesterTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/Db/TestCaseTest.php b/test/PHPUnit/Db/TestCaseTest.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/_files/application/controllers/ErrorController.php b/test/PHPUnit/_files/application/controllers/ErrorController.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 

diff --git a/test/PHPUnit/_files/application/controllers/IndexController.php b/test/PHPUnit/_files/application/controllers/IndexController.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/_files/application/controllers/ZendTestPhpUnitFooController.php b/test/PHPUnit/_files/application/controllers/ZendTestPhpUnitFooController.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**

diff --git a/test/PHPUnit/_files/bootstrap.php b/test/PHPUnit/_files/bootstrap.php
@@ -17,7 +17,6 @@
  * @subpackage UnitTests
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
- * @version    $Id$
  */
 
 /**