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

…nto hotfix/uses-annotations
zendframework · May 10, 2012 · 46867a3 · 46867a3
2 parents 80a9fd5 + d3a6ffd
commit 46867a3
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 40 deletions.
diff --git a/src/Decoder.php b/src/Decoder.php
@@ -26,10 +26,6 @@
 /**
  * Decode JSON encoded string to PHP variable constructs
  *
- * @uses       stdClass
- * @uses       Zend\Json\Json
- * @uses       Zend\Json\Exception\RuntimeException
- * @uses       Zend\Json\Exception\InvalidArgumentException
  * @category   Zend
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)

diff --git a/src/Encoder.php b/src/Encoder.php
@@ -26,9 +26,6 @@
 /**
  * Encode PHP constructs to JSON
  *
- * @uses       ReflectionClass
- * @uses       Zend\Json\Exception\RecursionException
- * @uses       Zend\Json\Exception\InvalidArgumentException
  * @category   Zend
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)

diff --git a/src/Exception.php b/src/Exception.php
@@ -21,7 +21,6 @@
 namespace Zend\Json;
 
 /**
- * @uses       Zend\Exception
  * @category   Zend
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)

diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -21,12 +21,10 @@
 namespace Zend\Json\Exception;
 
 /**
- * @uses       InvalidArgumentException
- * @uses       Zend\Json\Exception
  * @category   Zend
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements \Zend\Json\Exception
-{}
+{}
diff --git a/src/Exception/RecursionException.php b/src/Exception/RecursionException.php
@@ -21,11 +21,10 @@
 namespace Zend\Json\Exception;
 
 /**
- * @uses       Zend\Json\Exception\RuntimeException
  * @category   Zend
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RecursionException extends RuntimeException
-{}
+{}
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -21,12 +21,10 @@
 namespace Zend\Json\Exception;
 
 /**
- * @uses       RuntimeException
- * @uses       Zend\Json\Exception
  * @category   Zend
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements \Zend\Json\Exception
-{}
+{}
diff --git a/src/Json.php b/src/Json.php
@@ -26,11 +26,6 @@
 /**
  * Class for encoding to and decoding from JSON.
  *
- * @uses       Zend\Json\Decoder
- * @uses       Zend\Json\Encoder
- * @uses       Zend\Json\Exception\RuntimeException
- * @uses       Zend\Json\Exception\RecursionException
- * @uses       Zend\Json\Expr
  * @category   Zend
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)

diff --git a/src/Server/Cache.php b/src/Server/Cache.php
@@ -24,7 +24,6 @@
 /**
  * Zend_Json_Server_Cache: cache Zend_Json_Server server definition and SMD
  *
- * @uses       \Zend\Server\Cache
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server

diff --git a/src/Server/Error.php b/src/Server/Error.php
@@ -21,7 +21,6 @@
 namespace Zend\Json\Server;
 
 /**
- * @uses       \Zend\Json\Json
  * @category   Zend
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)

diff --git a/src/Server/Exception.php b/src/Server/Exception.php
@@ -21,7 +21,6 @@
 namespace Zend\Json\Server;
 
 /**
- * @uses       Zend\Json\Exception
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server

diff --git a/src/Server/Exception/InvalidArgumentException.php b/src/Server/Exception/InvalidArgumentException.php
@@ -21,13 +21,11 @@
 namespace Zend\Json\Server\Exception;
 
 /**
- * @uses       InvalidArgumentException
- * @uses       Zend\Json\Server\Exception
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class InvalidArgumentException extends \InvalidArgumentException implements \Zend\Json\Server\Exception
-{}
+{}
diff --git a/src/Server/Exception/RuntimeException.php b/src/Server/Exception/RuntimeException.php
@@ -21,13 +21,11 @@
 namespace Zend\Json\Server\Exception;
 
 /**
- * @uses       RuntimeException
- * @uses       Zend\Json\Server\Exception
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
  * @license    http://framework.zend.com/license/new-bsd     New BSD License
  */
 class RuntimeException extends \RuntimeException implements \Zend\Json\Server\Exception
-{}
+{}
diff --git a/src/Server/Request.php b/src/Server/Request.php
@@ -24,7 +24,6 @@
 
 /**
  * @todo       Revised method regex to allow NS; however, should SMD be revised to strip PHP NS instead when attaching functions?
- * @uses       Zend\Json\Json
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server

diff --git a/src/Server/Request/Http.php b/src/Server/Request/Http.php
@@ -23,7 +23,6 @@
 use Zend\Json\Server\Request as JsonRequest;
 
 /**
- * @uses       \Zend\Json\Server\Request\Request
  * @category   Zend
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)

diff --git a/src/Server/Response/Http.php b/src/Server/Response/Http.php
@@ -23,7 +23,6 @@
 use Zend\Json\Server\Response as JsonResponse;
 
 /**
- * @uses       \Zend\Json\Server\Response\Response
  * @category   Zend
  * @package    Zend_Json
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)

diff --git a/src/Server/Smd.php b/src/Server/Smd.php
@@ -24,10 +24,6 @@
     Zend\Json\Server\Exception\RuntimeException;
 
 /**
- * @uses       Zend\Json\Json
- * @uses       Zend\Json\Server\Exception\InvalidArgumentException
- * @uses       Zend\Json\Server\Exception\RuntimeException
- * @uses       Zend\Json\Server\Smd\Service
  * @category   Zend
  * @package    Zend_Json
  * @subpackage Server

diff --git a/src/Server/Smd/Service.php b/src/Server/Smd/Service.php
@@ -27,9 +27,6 @@
  * Create Service Mapping Description for a method
  *
  * @todo       Revised method regex to allow NS; however, should SMD be revised to strip PHP NS instead when attaching functions?
- * @uses       Zend\Json\Json
- * @uses       Zend\Json\Server\Exception\InvalidArgumentException
- * @uses       Zend\Json\Server\Smd\Smd
  * @package    Zend_Json
  * @subpackage Server
  * @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)