Merge branch 'hotfix/code-cleanup' of https://github.com/Maks3w/zf2 i…

…nto hotfix/uses-annotations
zendframework · May 10, 2012 · 293054e · 293054e
commit 293054e
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 14 deletions.
diff --git a/src/Client/Adapter/Exception.php b/src/Client/Adapter/Exception.php
@@ -22,7 +22,6 @@
 namespace Zend\Http\Client\Adapter;
 
 /**
- * @uses       \Zend\Http\Client\Exception
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client_Adapter

diff --git a/src/Client/Adapter/Exception/InitializationException.php b/src/Client/Adapter/Exception/InitializationException.php
@@ -25,7 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Application
- * @uses      \Zend\Http\Client\Adapter\Exception
  * @copyright  Copyright (c) 2005-2012 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/InvalidArgumentException.php b/src/Client/Adapter/Exception/InvalidArgumentException.php
@@ -25,7 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Application
- * @uses      \Zend\Http\Client\Adapter\Exception
  * @copyright  Copyright (c) 2005-2012 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/OutOfRangeException.php b/src/Client/Adapter/Exception/OutOfRangeException.php
@@ -25,7 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Application
- * @uses      \Zend\Http\Client\Adapter\Exception
  * @copyright  Copyright (c) 2005-2012 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/RuntimeException.php b/src/Client/Adapter/Exception/RuntimeException.php
@@ -25,7 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Application
- * @uses      \Zend\Http\Client\Adapter\Exception
  * @copyright  Copyright (c) 2005-2012 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/TimeoutException.php b/src/Client/Adapter/Exception/TimeoutException.php
@@ -25,7 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Application
- * @uses      \Zend\Http\Client\Adapter\Exception
  * @copyright  Copyright (c) 2005-2012 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
@@ -22,7 +22,6 @@
 namespace Zend\Http\Client;
 
 /**
- * @uses       \Zend\Http\Exception
  * @category   Zend
  * @package    Zend_Http
  * @subpackage Client

diff --git a/src/Client/Exception/InvalidArgumentException.php b/src/Client/Exception/InvalidArgumentException.php
@@ -25,7 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Application
- * @uses      \Zend\Http\Client\Exception
  * @copyright  Copyright (c) 2005-2012 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/RuntimeException.php b/src/Client/Exception/RuntimeException.php
@@ -25,7 +25,6 @@
  *
  * @category  Zend
  * @package   Zend_Application
- * @uses      \Zend\Http\Client\Exception
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd     New BSD License
  */

diff --git a/src/ClientStatic.php b/src/ClientStatic.php
@@ -118,4 +118,4 @@ public static function post($url, $params, $headers=array(), $body=null)
 
         return self::getStaticClient()->send($request);
     }
-}
+}
diff --git a/src/Header/MultipleHeaderDescription.php b/src/Header/MultipleHeaderDescription.php
@@ -5,4 +5,4 @@
 interface MultipleHeaderDescription extends HeaderDescription
 {
     public function toStringMultipleHeaders(array $headers);
-}
+}
diff --git a/src/Response/Stream.php b/src/Response/Stream.php
@@ -28,7 +28,6 @@
  * includes easy access to all the response's different elemts, as well as some
  * convenience methods for parsing and validating HTTP responses.
  *
- * @uses       \Zend\Http\Response
  * @package    Zend_Http
  * @subpackage Response
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)

diff --git a/test/Client/_files/ZF9404-doubleContentLength.php b/test/Client/_files/ZF9404-doubleContentLength.php
@@ -5,4 +5,4 @@
 header("Content-length: $clength");
 header("Content-length: $clength", false);
 
-readfile(__FILE__);
+readfile(__FILE__);
diff --git a/test/Client/_files/testSimpleRequests.php b/test/Client/_files/testSimpleRequests.php
@@ -1 +1 @@
-Success
+Success