Merge branch 'feature/docblock-simplification' into develop

zendframework · Jan 21, 2013 · a6f8add · a6f8add
commit a6f8add
Show file tree

Hide file tree

Showing 102 changed files with 0 additions and 259 deletions.
diff --git a/src/AbstractMessage.php b/src/AbstractMessage.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http;
@@ -15,8 +14,6 @@
 /**
  * HTTP standard message (Request/Response)
  *
- * @category  Zend
- * @package   Zend_Http
  * @link      http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4
  */
 abstract class AbstractMessage extends Message

diff --git a/src/Client.php b/src/Client.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http;
@@ -19,9 +18,6 @@
 
 /**
  * Http client
- *
- * @category   Zend
- * @package    Zend\Http
  */
 class Client implements Stdlib\DispatchableInterface
 {

diff --git a/src/Client/Adapter/AdapterInterface.php b/src/Client/Adapter/AdapterInterface.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -15,10 +14,6 @@
  *
  * These classes are used as connectors for Zend_Http_Client, performing the
  * tasks of connecting, writing, reading and closing connection to the server.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
  */
 interface AdapterInterface
 {

diff --git a/src/Client/Adapter/Curl.php b/src/Client/Adapter/Curl.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -20,10 +19,6 @@
 /**
  * An adapter class for Zend\Http\Client based on the curl extension.
  * Curl requires libcurl. See for full requirements the PHP manual: http://php.net/curl
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
  */
 class Curl implements HttpAdapter, StreamInterface
 {

diff --git a/src/Client/Adapter/Exception/ExceptionInterface.php b/src/Client/Adapter/Exception/ExceptionInterface.php
@@ -5,17 +5,11 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Adapter\Exception;
 
 use Zend\Http\Client\Exception\ExceptionInterface as HttpClientException;
 
-/**
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
- */
 interface ExceptionInterface extends HttpClientException
 {}
diff --git a/src/Client/Adapter/Exception/InitializationException.php b/src/Client/Adapter/Exception/InitializationException.php
@@ -5,15 +5,11 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Adapter\Exception;
 
 /**
- *
- * @category  Zend
- * @package   Zend_Application
  */
 class InitializationException extends RuntimeException
 {}
diff --git a/src/Client/Adapter/Exception/InvalidArgumentException.php b/src/Client/Adapter/Exception/InvalidArgumentException.php
@@ -5,17 +5,13 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Adapter\Exception;
 
 use Zend\Http\Client\Exception;
 
 /**
- *
- * @category  Zend
- * @package   Zend_Application
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements
     ExceptionInterface

diff --git a/src/Client/Adapter/Exception/OutOfRangeException.php b/src/Client/Adapter/Exception/OutOfRangeException.php
@@ -5,17 +5,13 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Adapter\Exception;
 
 use Zend\Http\Client\Exception;
 
 /**
- *
- * @category  Zend
- * @package   Zend_Application
  */
 class OutOfRangeException extends Exception\OutOfRangeException implements
     ExceptionInterface

diff --git a/src/Client/Adapter/Exception/RuntimeException.php b/src/Client/Adapter/Exception/RuntimeException.php
@@ -5,17 +5,13 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Adapter\Exception;
 
 use Zend\Http\Client\Exception;
 
 /**
- *
- * @category  Zend
- * @package   Zend_Application
  */
 class RuntimeException extends Exception\RuntimeException implements
     ExceptionInterface

diff --git a/src/Client/Adapter/Exception/TimeoutException.php b/src/Client/Adapter/Exception/TimeoutException.php
@@ -5,15 +5,11 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Adapter\Exception;
 
 /**
- *
- * @category  Zend
- * @package   Zend_Application
  */
 class TimeoutException extends RuntimeException implements ExceptionInterface
 {

diff --git a/src/Client/Adapter/Proxy.php b/src/Client/Adapter/Proxy.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -23,10 +22,6 @@
  * fall back to Zend_Http_Client_Adapter_Socket behavior. Just like the
  * default Socket adapter, this adapter does not require any special extensions
  * installed.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
  */
 class Proxy extends Socket
 {

diff --git a/src/Client/Adapter/Socket.php b/src/Client/Adapter/Socket.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -20,10 +19,6 @@
 /**
  * A sockets based (stream\socket\client) adapter class for Zend\Http\Client. Can be used
  * on almost every PHP environment, and does not require any special extensions.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
  */
 class Socket implements HttpAdapter, StreamInterface
 {

diff --git a/src/Client/Adapter/StreamInterface.php b/src/Client/Adapter/StreamInterface.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -14,10 +13,6 @@
  * An interface description for Zend_Http_Client_Adapter_Stream classes.
  *
  * This interface describes Zend_Http_Client_Adapter which supports streaming.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
  */
 interface StreamInterface
 {

diff --git a/src/Client/Adapter/Test.php b/src/Client/Adapter/Test.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Adapter;
@@ -21,10 +20,6 @@
  * without actually performing an HTTP request. You should instantiate this
  * object manually, and then set it as the client's adapter. Then, you can
  * set the expected response using the setResponse() method.
- *
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client_Adapter
  */
 class Test implements AdapterInterface
 {

diff --git a/src/Client/Cookies.php b/src/Client/Cookies.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client;
@@ -34,9 +33,6 @@
  * (by passing Zend\Http\Client\Cookies::COOKIE_STRING_CONCAT).
  *
  * @link       http://wp.netscape.com/newsref/std/cookie_spec.html for some specs.
- *
- * @category   Zend
- * @package    Zend\Http\Client
  */
 class Cookies
 {

diff --git a/src/Client/Exception/ExceptionInterface.php b/src/Client/Exception/ExceptionInterface.php
@@ -5,17 +5,11 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Exception;
 
 use Zend\Http\Exception\ExceptionInterface as HttpException;
 
-/**
- * @category   Zend
- * @package    Zend_Http
- * @subpackage Client
- */
 interface ExceptionInterface extends HttpException
 {}
diff --git a/src/Client/Exception/InvalidArgumentException.php b/src/Client/Exception/InvalidArgumentException.php
@@ -5,17 +5,13 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Exception;
 
 use Zend\Http\Exception;
 
 /**
- *
- * @category  Zend
- * @package   Zend_Application
  */
 class InvalidArgumentException extends Exception\InvalidArgumentException implements
     ExceptionInterface

diff --git a/src/Client/Exception/OutOfRangeException.php b/src/Client/Exception/OutOfRangeException.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Exception;

diff --git a/src/Client/Exception/RuntimeException.php b/src/Client/Exception/RuntimeException.php
@@ -5,17 +5,13 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Client\Exception;
 
 use Zend\Http\Exception;
 
 /**
- *
- * @category  Zend
- * @package   Zend_Application
  */
 class RuntimeException extends Exception\RuntimeException implements
     ExceptionInterface

diff --git a/src/ClientStatic.php b/src/ClientStatic.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http;
@@ -14,9 +13,6 @@
 
 /**
  * Http static client
- *
- * @category   Zend
- * @package    Zend\Http
  */
 class ClientStatic
 {

diff --git a/src/Cookies.php b/src/Cookies.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http;
@@ -33,9 +32,6 @@
  * (by passing Zend\Http\Client\Cookies::COOKIE_STRING_CONCAT).
  *
  * @link       http://wp.netscape.com/newsref/std/cookie_spec.html for some specs.
- *
- * @category   Zend
- * @package    Zend\Http\Client
  */
 class Cookies extends Headers
 {

diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Exception;

diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Exception;

diff --git a/src/Exception/OutOfRangeException.php b/src/Exception/OutOfRangeException.php
@@ -5,7 +5,6 @@
  * @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
- * @package   Zend_Http
  */
 
 namespace Zend\Http\Exception;