Merge branch 'hotfix/2365' into develop

zendframework · Sep 17, 2012 · 8f6782c · 8f6782c
2 parents 7412923 + 3d2f4d7
commit 8f6782c
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 28 deletions.
diff --git a/library/Zend/Cache/Storage/Capabilities.php b/library/Zend/Cache/Storage/Capabilities.php
@@ -245,7 +245,7 @@ public function setSupportedDatatypes(stdClass $marker, array $datatypes)
         // add missing datatypes as not supported
         $missingTypes = array_diff($allTypes, array_keys($datatypes));
         foreach ($missingTypes as $type) {
-            $datatypes[type] = false;
+            $datatypes[$type] = false;
         }
 
         return $this->setCapability($marker, 'supportedDatatypes', $datatypes);

diff --git a/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php b/library/Zend/Db/Adapter/Driver/Sqlsrv/Statement.php
@@ -48,7 +48,7 @@ class Statement implements StatementInterface
     protected $parameterReferences = array();
 
     /**
-     * @var Zend\Db\Adapter\ParameterContainer\ParameterContainer
+     * @var ParameterContainer
      */
     protected $parameterContainer = null;
 

diff --git a/library/Zend/Feed/Reader/AbstractFeed.php b/library/Zend/Feed/Reader/AbstractFeed.php
@@ -209,7 +209,7 @@ public function getType()
     /**
      * Return the current feed key
      *
-     * @return unknown
+     * @return int
      */
     public function key()
     {

diff --git a/library/Zend/Http/Client.php b/library/Zend/Http/Client.php
@@ -319,7 +319,7 @@ public function setUri($uri)
     /**
      * Get uri (from the request)
      *
-     * @return Zend\Uri\Http
+     * @return Http
      */
     public function getUri()
     {

diff --git a/library/Zend/Http/Client/Adapter/Test.php b/library/Zend/Http/Client/Adapter/Test.php
@@ -190,7 +190,7 @@ public function setResponse($response)
     /**
      * Add another response to the response buffer.
      *
-     * @param string \Zend\Http\Response|$response
+     * @param string|Response $response
      */
     public function addResponse($response)
     {

diff --git a/library/Zend/Http/ClientStatic.php b/library/Zend/Http/ClientStatic.php
@@ -26,7 +26,7 @@ class ClientStatic
     /**
      * Get the static HTTP client
      *
-     * @return Zend\Http\Client
+     * @return Client
      */
     protected static function getStaticClient()
     {

diff --git a/library/Zend/Json/Decoder.php b/library/Zend/Json/Decoder.php
@@ -179,7 +179,7 @@ protected function _decodeValue()
      * array.
      *
      * @return array|stdClass
-     * @throws Zend\Json\Exception\RuntimeException
+     * @throws RuntimeException
      */
     protected function _decodeObject()
     {
@@ -239,7 +239,7 @@ protected function _decodeObject()
      *    [element, element2,...,elementN]
      *
      * @return array
-     * @throws Zend\Json\Exception\RuntimeException
+     * @throws RuntimeException
      */
     protected function _decodeArray()
     {
@@ -290,7 +290,7 @@ protected function _eatWhitespace()
      * Retrieves the next token from the source stream
      *
      * @return int Token constant value specified in class definition
-     * @throws Zend\Json\Exception\RuntimeException
+     * @throws RuntimeException
      */
     protected function _getNextToken()
     {

diff --git a/library/Zend/Json/Encoder.php b/library/Zend/Json/Encoder.php
@@ -104,8 +104,8 @@ protected function _encodeValue(&$value)
      *
      * @param $value object
      * @return string
-     * @throws Zend\Json\Exception\RecursionException If recursive checks are enabled
-     *                                                and the object has been serialized previously
+     * @throws RecursionException If recursive checks are enabled and the
+     *                            object has been serialized previously
      */
     protected function _encodeObject(&$value)
     {
@@ -398,7 +398,7 @@ private static function _encodeVariables(ReflectionClass $cls)
      * @param $package string Optional package name appended to JavaScript
      * proxy class name
      * @return string The class2 (JavaScript) encoding of the class
-     * @throws Zend\Json\Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public static function encodeClass($className, $package = '')
     {

diff --git a/library/Zend/Json/Json.php b/library/Zend/Json/Json.php
@@ -52,7 +52,7 @@ class Json
      * @param int $objectDecodeType Optional; flag indicating how to decode
      * objects. See {@link Zend_Json_Decoder::decode()} for details.
      * @return mixed
-     * @throws Zend\Json\Exception\RuntimeException
+     * @throws RuntimeException
      */
     public static function decode($encodedValue, $objectDecodeType = self::TYPE_OBJECT)
     {

diff --git a/library/Zend/Paginator/Paginator.php b/library/Zend/Paginator/Paginator.php
@@ -18,6 +18,7 @@
 use Zend\Cache\Storage\IteratorInterface as CacheIterator;
 use Zend\Cache\Storage\StorageInterface as CacheStorage;
 use Zend\Db\Sql;
+use Zend\Db\ResultSet\AbstractResultSet;
 use Zend\Filter\FilterInterface;
 use Zend\Json\Json;
 use Zend\Paginator\Adapter\AdapterInterface;
@@ -826,7 +827,7 @@ public function toJson()
     {
         $currentItems = $this->getCurrentItems();
 
-        if ($currentItems instanceof DbAbstractRowset) {
+        if ($currentItems instanceof AbstractResultSet) {
             return Json::encode($currentItems->toArray());
         }
         return Json::encode($currentItems);
@@ -891,7 +892,7 @@ protected function _calculatePageCount()
      * Creates the page collection.
      *
      * @param  string $scrollingStyle Scrolling style
-     * @return stdClass
+     * @return \stdClass
      */
     protected function _createPages($scrollingStyle = null)
     {

diff --git a/library/Zend/Session/SaveHandler/DbTableGateway.php b/library/Zend/Session/SaveHandler/DbTableGateway.php
@@ -44,7 +44,7 @@ class DbTableGateway implements SaveHandlerInterface
 
     /**
      * Zend Db Table Gateway
-     * @var Zend\Db\TableGateway\TableGateway
+     * @var TableGateway
      */
     protected $tableGateway;
 
@@ -176,4 +176,4 @@ public function gc($maxlifetime)
             time()
         ));
     }
-}
+}
diff --git a/library/Zend/Soap/AutoDiscover.php b/library/Zend/Soap/AutoDiscover.php
@@ -344,7 +344,7 @@ public function addFunction($function)
     /**
      * Generate the WSDL for a service class.
      *
-     * @return Zend\Soap\Wsdl
+     * @return Wsdl
      */
     protected function _generateClass()
     {
@@ -354,7 +354,7 @@ protected function _generateClass()
     /**
      * Generate the WSDL for a set of functions.
      *
-     * @return Zend\Soap\Wsdl
+     * @return Wsdl
      */
     protected function _generateFunctions()
     {
@@ -370,7 +370,7 @@ protected function _generateFunctions()
      * Generate the WSDL for a set of reflection method instances.
      *
      * @param array $reflectionMethods
-     * @return Zend\Soap\Wsdl
+     * @return Wsdl
      */
     protected function _generateWsdl(array $reflectionMethods)
     {

diff --git a/library/Zend/Soap/Server.php b/library/Zend/Soap/Server.php
@@ -736,7 +736,7 @@ public function getResponse()
      * SoapServer object, and then registers any functions or class with it, as
      * well as persistence.
      *
-     * @return SoapServer
+     * @return \SoapServer
      */
     protected function _getSoap()
     {
@@ -894,9 +894,9 @@ public function getFaultExceptions()
      * {@Link registerFaultException()}.
      *
      * @link   http://www.w3.org/TR/soap12-part1/#faultcodes
-     * @param  string|Exception $fault
+     * @param  string|\Exception $fault
      * @param  string $code SOAP Fault Codes
-     * @return SoapFault
+     * @return \SoapFault
      */
     public function fault($fault = null, $code = "Receiver")
     {
@@ -935,7 +935,7 @@ public function fault($fault = null, $code = "Receiver")
      * @param int $errline
      * @param array $errcontext
      * @return void
-     * @throws SoapFault
+     * @throws \SoapFault
      */
     public function handlePhpErrors($errno, $errstr, $errfile = null, $errline = null, array $errcontext = null)
     {

diff --git a/library/Zend/Validator/Iban.php b/library/Zend/Validator/Iban.php
@@ -222,7 +222,7 @@ public function setAllowNonSepa($allowNonSepa)
     public function isValid($value)
     {
         if (!is_string($value)) {
-            $this->error(self::INVALID);
+            $this->error(self::FALSEFORMAT);
             return false;
         }
 

diff --git a/library/Zend/View/Helper/HeadMeta.php b/library/Zend/View/Helper/HeadMeta.php
@@ -81,7 +81,7 @@ public function __invoke($content = null, $keyValue = null, $keyType = 'name', $
     /**
      * Normalize type attribute of meta
      *
-     * @param $type type in CamelCase
+     * @param string $type type in CamelCase
      * @return string
      * @throws Exception\DomainException
      */

diff --git a/library/Zend/View/Renderer/ConsoleRenderer.php b/library/Zend/View/Renderer/ConsoleRenderer.php
@@ -27,7 +27,7 @@
 class ConsoleRenderer implements RendererInterface, TreeRendererInterface
 {
     /**
-     * @var Zend\Filter\FilterChain
+     * @var FilterChain
      */
     protected $__filterChain;
 

diff --git a/library/Zend/View/Renderer/PhpRenderer.php b/library/Zend/View/Renderer/PhpRenderer.php
@@ -79,7 +79,7 @@ class PhpRenderer implements Renderer, TreeRendererInterface
     private $__helpers;
 
     /**
-     * @var Zend\Filter\FilterChain
+     * @var FilterChain
      */
     private $__filterChain;