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 · c8dba7b · c8dba7b
3 parents 85fcc7b + 5d8866f + 18799a2
commit c8dba7b
Show file tree

Hide file tree

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

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

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

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

diff --git a/src/Client/Adapter/Proxy.php b/src/Client/Adapter/Proxy.php
@@ -15,7 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */

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

diff --git a/src/Client/Adapter/Stream.php b/src/Client/Adapter/Stream.php
@@ -15,7 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */

diff --git a/src/Client/Adapter/Test.php b/src/Client/Adapter/Test.php
@@ -15,7 +15,6 @@
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter
- * @version    $Id$
  * @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */

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

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

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

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

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

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

diff --git a/test/Client/CommonHttpTests.php b/test/Client/CommonHttpTests.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/Client/CurlTest.php b/test/Client/CurlTest.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/Client/ProxyAdapterTest.php b/test/Client/ProxyAdapterTest.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/Client/SocketKeepaliveTest.php b/test/Client/SocketKeepaliveTest.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/Client/SocketPersistentTest.php b/test/Client/SocketPersistentTest.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/Client/SocketTest.php b/test/Client/SocketTest.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/Client/StaticTest.php b/test/Client/StaticTest.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/Client/TestAdapterTest.php b/test/Client/TestAdapterTest.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/Client/_files/testCookies.php b/test/Client/_files/testCookies.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$
  */
 
 echo serialize($_COOKIE);
diff --git a/test/Client/_files/testExceptionOnReadTimeout.php b/test/Client/_files/testExceptionOnReadTimeout.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/Client/_files/testGetData.php b/test/Client/_files/testGetData.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$
  */
 
 echo serialize($_GET);
diff --git a/test/Client/_files/testHttpAuth.php b/test/Client/_files/testHttpAuth.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$
  */
 
 $user = isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : null;

diff --git a/test/Client/_files/testMultibyteChunkedResponseZF6218.php b/test/Client/_files/testMultibyteChunkedResponseZF6218.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$
  */
 
 header("Content-type: text/plain; charset=UTF-8");

diff --git a/test/Client/_files/testPostData.php b/test/Client/_files/testPostData.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$
  */
 
 echo serialize($_POST);
diff --git a/test/Client/_files/testRawPostData.php b/test/Client/_files/testRawPostData.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$
  */
 
 readfile('php://input');
diff --git a/test/Client/_files/testRedirections.php b/test/Client/_files/testRedirections.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$
  */
 
 if (! isset($_GET['redirection'])) $_GET['redirection'] = 0;

diff --git a/test/Client/_files/testRelativeRedirections.php b/test/Client/_files/testRelativeRedirections.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$
  */
 
 if (! isset($_GET['redirect'])) $_GET['redirect'] = null;

diff --git a/test/Client/_files/testResetParameters.php b/test/Client/_files/testResetParameters.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$
  */
 
 echo serialize($_GET) . "\n" . serialize($_POST);
diff --git a/test/Client/_files/testStreamRequest.php b/test/Client/_files/testStreamRequest.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: testRawPostData.php 17573 2009-08-13 18:01:41Z alexander $
  */
 
 readfile('php://input');
diff --git a/test/Client/_files/testUploads.php b/test/Client/_files/testUploads.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$
  */
 
 if (! empty($_FILES)) {

diff --git a/test/CookieJarTest.php b/test/CookieJarTest.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/CookieTest.php b/test/CookieTest.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/ResponseTest.php b/test/ResponseTest.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$
  */
 
 /**