zendframework · micheh · Apr 7, 2014 · Apr 7, 2014 · Apr 7, 2014 · samsonasik
diff --git a/library/Zend/Barcode/Object/Identcode.php b/library/Zend/Barcode/Object/Identcode.php
@@ -40,7 +40,7 @@ public function getTextToDisplay()
      * Check allowed characters
      * @param  string $value
      * @return string
-     * @throws  Exception
+     * @throws Exception\BarcodeValidationException
      */
     public function validateText($value)
     {

diff --git a/library/Zend/Cache/Storage/Adapter/Filesystem.php b/library/Zend/Cache/Storage/Adapter/Filesystem.php
@@ -1599,7 +1599,7 @@ protected function putFileContent($file, $data, $nonBlocking = false, & $wouldbl
      *
      * @param string $file
      * @return void
-     * @throws RuntimeException
+     * @throws Exception\RuntimeException
      */
     protected function unlink($file)
     {

diff --git a/library/Zend/Cache/Storage/Adapter/MemcacheOptions.php b/library/Zend/Cache/Storage/Adapter/MemcacheOptions.php
@@ -197,7 +197,7 @@ public function getServers()
     /**
      * Set compress threshold
      *
-     * @param  int|string|array|ArrayAccess|null $threshold
+     * @param  int|string|array|\ArrayAccess|null $threshold
      * @return MemcacheOptions
      */
     public function setAutoCompressThreshold($threshold)

diff --git a/library/Zend/Cache/Storage/Adapter/MemcacheResourceManager.php b/library/Zend/Cache/Storage/Adapter/MemcacheResourceManager.php
@@ -9,6 +9,7 @@
 
 namespace Zend\Cache\Storage\Adapter;
 
+use ArrayAccess;
 use Memcache as MemcacheResource;
 use Traversable;
 use Zend\Cache\Exception;

diff --git a/library/Zend/Cache/Storage/Adapter/Redis.php b/library/Zend/Cache/Storage/Adapter/Redis.php
@@ -12,6 +12,7 @@
 use Redis as RedisResource;
 use RedisException as RedisResourceException;
 use stdClass;
+use Traversable;
 use Zend\Cache\Exception;
 use Zend\Cache\Storage\Capabilities;
 use Zend\Cache\Storage\FlushableInterface;

diff --git a/library/Zend/Code/Reflection/FileReflection.php b/library/Zend/Code/Reflection/FileReflection.php
@@ -49,7 +49,7 @@ class FileReflection implements ReflectionInterface
     protected $requiredFiles = array();
 
     /**
-     * @var ReflectionClass[]
+     * @var ClassReflection[]
      */
     protected $classes = array();
 

diff --git a/library/Zend/Db/Adapter/Driver/Pdo/Feature/OracleRowCounter.php b/library/Zend/Db/Adapter/Driver/Pdo/Feature/OracleRowCounter.php
@@ -64,7 +64,7 @@ public function getCountForSql($sql)
 
     /**
      * @param $context
-     * @return closure
+     * @return \Closure
      */
     public function getRowCountClosure($context)
     {

diff --git a/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php b/library/Zend/Db/Adapter/Driver/Pdo/Feature/SqliteRowCounter.php
@@ -64,7 +64,7 @@ public function getCountForSql($sql)
 
     /**
      * @param $context
-     * @return closure
+     * @return \Closure
      */
     public function getRowCountClosure($context)
     {

diff --git a/library/Zend/Db/TableGateway/AbstractTableGateway.php b/library/Zend/Db/TableGateway/AbstractTableGateway.php
@@ -301,7 +301,7 @@ protected function executeInsert(Insert $insert)
      * Update
      *
      * @param  array $set
-     * @param  string|array|closure $where
+     * @param  string|array|\Closure $where
      * @return int
      */
     public function update($set, $where = null)

diff --git a/library/Zend/Di/Definition/Builder/InjectionMethod.php b/library/Zend/Di/Definition/Builder/InjectionMethod.php
@@ -106,7 +106,7 @@ public static function detectMethodRequirement($requirement)
                     return Di::METHOD_IS_OPTIONAL;
                     break;
                 case "constructor":
-                    return Di::MEHTOD_IS_CONSTRUCTOR;
+                    return Di::METHOD_IS_CONSTRUCTOR;
                     break;
                 case "instantiator":
                     return Di::METHOD_IS_INSTANTIATOR;

diff --git a/library/Zend/Di/Di.php b/library/Zend/Di/Di.php
@@ -551,7 +551,7 @@ protected function resolveAndCallInjectionMethodForInstance($instance, $method,
      * @param  string                                $method
      * @param  array                                 $callTimeUserParams
      * @param  string                                $alias
-     * @param  int|bolean                            $methodRequirementType
+     * @param  int|boolean                           $methodRequirementType
      * @param  bool                                  $isInstantiator
      * @throws Exception\MissingPropertyException
      * @throws Exception\CircularDependencyException

diff --git a/library/Zend/Dom/DOMXPath.php b/library/Zend/Dom/DOMXPath.php
@@ -27,7 +27,7 @@ class DOMXPath extends \DOMXPath
      * raising an error
      *
      * @param string $expression The XPath expression to evaluate.
-     * @return DOMNodeList
+     * @return \DOMNodeList
      * @throws ErrorException
      */
     public function queryWithErrorException($expression)

diff --git a/library/Zend/Dom/Query.php b/library/Zend/Dom/Query.php
@@ -298,7 +298,7 @@ public function registerXpathPhpFunctions($xpathPhpFunctions = true)
      * @param  DOMDocument $document
      * @param  string|array $xpathQuery
      * @return array
-     * @throws ErrorException If query cannot be executed
+     * @throws \ErrorException If query cannot be executed
      */
     protected function getNodeList($document, $xpathQuery)
     {

diff --git a/library/Zend/Feed/Reader/Reader.php b/library/Zend/Feed/Reader/Reader.php
@@ -266,7 +266,7 @@ public static function import($uri, $etag = null, $lastModified = null)
      * HTTP client implementations.
      *
      * @param  string $uri
-     * @param  Http\Client $client
+     * @param  Http\ClientInterface $client
      * @return self
      * @throws Exception\RuntimeException if response is not an Http\ResponseInterface
      */

diff --git a/library/Zend/Feed/Writer/ExtensionManager.php b/library/Zend/Feed/Writer/ExtensionManager.php
@@ -60,7 +60,7 @@ public function __call($method, $args)
      * Get the named extension
      *
      * @param  string $name
-     * @return Extension\AbstractEntry|Extension\AbstractFeed
+     * @return Extension\AbstractRenderer
      */
     public function get($name)
     {

diff --git a/library/Zend/Filter/DateTimeFormatter.php b/library/Zend/Filter/DateTimeFormatter.php
@@ -23,7 +23,7 @@ class DateTimeFormatter extends AbstractFilter
     /**
      * Sets filter options
      *
-     * @param array|Traversable $options
+     * @param array|\Traversable $options
      */
     public function __construct($options = null)
     {

diff --git a/library/Zend/Filter/FilterChain.php b/library/Zend/Filter/FilterChain.php
@@ -10,6 +10,7 @@
 namespace Zend\Filter;
 
 use Countable;
+use Traversable;
 use Zend\Stdlib\PriorityQueue;
 
 class FilterChain extends AbstractFilter implements Countable
@@ -52,7 +53,7 @@ public function __construct($options = null)
      */
     public function setOptions($options)
     {
-        if (!is_array($options) && !$options instanceof \Traversable) {
+        if (!is_array($options) && !$options instanceof Traversable) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Expected array or Traversable; received "%s"',
                 (is_object($options) ? get_class($options) : gettype($options))

diff --git a/library/Zend/Filter/Inflector.php b/library/Zend/Filter/Inflector.php
@@ -217,7 +217,7 @@ public function getTarget()
     /**
      * Set Target Reference
      *
-     * @param  reference $target
+     * @param  string $target
      * @return self
      */
     public function setTargetReference(&$target)

diff --git a/library/Zend/Form/FormElementManager.php b/library/Zend/Form/FormElementManager.php
@@ -11,6 +11,7 @@
 
 use Zend\ServiceManager\AbstractPluginManager;
 use Zend\ServiceManager\ConfigInterface;
+use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\ServiceLocatorInterface;
 use Zend\Stdlib\InitializableInterface;
 
@@ -153,7 +154,7 @@ public function get($name, $options = array(), $usePeeringServiceManagers = true
      * @param  string $canonicalName
      * @param  string $requestedName
      * @return null|\stdClass
-     * @throws Exception\ServiceNotCreatedException If resolved class does not exist
+     * @throws ServiceNotCreatedException If resolved class does not exist
      */
     protected function createFromInvokable($canonicalName, $requestedName)
     {

diff --git a/library/Zend/Form/InputFilterProviderFieldset.php b/library/Zend/Form/InputFilterProviderFieldset.php
@@ -9,6 +9,7 @@
 
 namespace Zend\Form;
 
+use Traversable;
 use Zend\InputFilter\InputFilterProviderInterface;
 
 class InputFilterProviderFieldset extends Fieldset implements InputFilterProviderInterface

diff --git a/library/Zend/Form/LabelAwareInterface.php b/library/Zend/Form/LabelAwareInterface.php
@@ -46,7 +46,7 @@ public function getLabelAttributes();
      *
      * Implementation will decide if this will overwrite or merge.
      *
-     * @param  array|Traversable $arrayOrTraversable
+     * @param  array|\Traversable $arrayOrTraversable
      * @return self
      */
     public function setLabelOptions($arrayOrTraversable);

diff --git a/library/Zend/Http/Headers.php b/library/Zend/Http/Headers.php
@@ -24,7 +24,7 @@
 class Headers implements Countable, Iterator
 {
     /**
-     * @var PluginClassLoader
+     * @var PluginClassLocator
      */
     protected $pluginClassLoader = null;
 

diff --git a/library/Zend/Ldap/Attribute.php b/library/Zend/Ldap/Attribute.php
@@ -37,13 +37,13 @@ public static function setAttribute(array &$data, $attribName, $value, $append =
         $valArray   = array();
         if (is_array($value) || ($value instanceof \Traversable)) {
             foreach ($value as $v) {
-                $v = static::valueToLdap($v);
+                $v = self::valueToLdap($v);
                 if ($v !== null) {
                     $valArray[] = $v;
                 }
             }
         } elseif ($value !== null) {
-            $value = static::valueToLdap($value);
+            $value = self::valueToLdap($value);
             if ($value !== null) {
                 $valArray[] = $value;
             }
@@ -76,14 +76,14 @@ public static function getAttribute(array $data, $attribName, $index = null)
             }
             $retArray = array();
             foreach ($data[$attribName] as $v) {
-                $retArray[] = static::valueFromLdap($v);
+                $retArray[] = self::valueFromLdap($v);
             }
             return $retArray;
         } elseif (is_int($index)) {
             if (!isset($data[$attribName])) {
                 return null;
             } elseif ($index >= 0 && $index < count($data[$attribName])) {
-                return static::valueFromLdap($data[$attribName][$index]);
+                return self::valueFromLdap($data[$attribName][$index]);
             } else {
                 return null;
             }
@@ -295,13 +295,13 @@ public static function setDateTimeAttribute(
         $convertedValues = array();
         if (is_array($value) || ($value instanceof \Traversable)) {
             foreach ($value as $v) {
-                $v = static::valueToLdapDateTime($v, $utc);
+                $v = self::valueToLdapDateTime($v, $utc);
                 if ($v !== null) {
                     $convertedValues[] = $v;
                 }
             }
         } elseif ($value !== null) {
-            $value = static::valueToLdapDateTime($value, $utc);
+            $value = self::valueToLdapDateTime($value, $utc);
             if ($value !== null) {
                 $convertedValues[] = $value;
             }
@@ -336,13 +336,13 @@ public static function getDateTimeAttribute(array $data, $attribName, $index = n
         $values = static::getAttribute($data, $attribName, $index);
         if (is_array($values)) {
             for ($i = 0, $count = count($values); $i < $count; $i++) {
-                $newVal = static::valueFromLdapDateTime($values[$i]);
+                $newVal = self::valueFromLdapDateTime($values[$i]);
                 if ($newVal !== null) {
                     $values[$i] = $newVal;
                 }
             }
         } else {
-            $newVal = static::valueFromLdapDateTime($values);
+            $newVal = self::valueFromLdapDateTime($values);
             if ($newVal !== null) {
                 $values = $newVal;
             }

diff --git a/library/Zend/Log/Writer/AbstractWriter.php b/library/Zend/Log/Writer/AbstractWriter.php
@@ -67,7 +67,6 @@ abstract class AbstractWriter implements WriterInterface
      * - formatter: formatter for this writer
      *
      * @param  array|Traversable $options
-     * @return Logger
      * @throws Exception\InvalidArgumentException
      */
     public function __construct($options = null)

diff --git a/library/Zend/Mail/Storage/Writable/Maildir.php b/library/Zend/Mail/Storage/Writable/Maildir.php
@@ -426,7 +426,7 @@ protected function _getInfoString(&$flags)
     /**
      * append a new message to mail storage
      *
-     * @param   string|stream                              $message message as string or stream resource
+     * @param   string|resource                            $message message as string or stream resource
      * @param   null|string|\Zend\Mail\Storage\Folder      $folder  folder for new message, else current folder is taken
      * @param   null|array                                 $flags   set flags for new message, else a default set is used
      * @param   bool                                       $recent  handle this mail as if recent flag has been set,

diff --git a/library/Zend/Mime/Part.php b/library/Zend/Mime/Part.php
@@ -68,7 +68,7 @@ public function isStream()
      * reading the content. very useful for large file attachments.
      *
      * @param string $EOL
-     * @return stream
+     * @return resource
      * @throws Exception\RuntimeException if not a stream or unable to append filter
      */
     public function getEncodedStream($EOL = Mime::LINEEND)

diff --git a/library/Zend/ModuleManager/ModuleManager.php b/library/Zend/ModuleManager/ModuleManager.php
@@ -174,7 +174,7 @@ public function loadModule($module)
 
     /**
      * Load a module with the name
-     * @param  Zend\EventManager\EventInterface $event
+     * @param  \Zend\EventManager\EventInterface $event
      * @return mixed                            module instance
      * @throws Exception\RuntimeException
      */

diff --git a/library/Zend/Mvc/I18n/Translator.php b/library/Zend/Mvc/I18n/Translator.php
@@ -18,12 +18,12 @@ class Translator implements
     ValidatorTranslatorInterface
 {
     /**
-     * @var I18nTranslator
+     * @var I18nTranslatorInterface
      */
     protected $translator;
 
     /**
-     * @param I18nTranslator $translator
+     * @param I18nTranslatorInterface $translator
      */
     public function __construct(I18nTranslatorInterface $translator)
     {

diff --git a/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php b/library/Zend/Mvc/Router/Http/TranslatorAwareTreeRouteStack.php
@@ -11,6 +11,7 @@
 
 use Zend\I18n\Translator\TranslatorInterface as Translator;
 use Zend\I18n\Translator\TranslatorAwareInterface;
+use Zend\Mvc\Router\Exception;
 use Zend\Stdlib\RequestInterface as Request;
 
 /**

diff --git a/library/Zend/Navigation/Page/AbstractPage.php b/library/Zend/Navigation/Page/AbstractPage.php
@@ -260,7 +260,7 @@ public static function factory($options)
     /**
      * Add static factory for self::factory function
      *
-     * @param type $callback Any callable variable
+     * @param callable $callback Any callable variable
      */
     public static function addFactory($callback)
     {

diff --git a/library/Zend/Navigation/Page/Uri.php b/library/Zend/Navigation/Page/Uri.php
@@ -123,7 +123,7 @@ public function getRequest()
      * Sets request for assembling URLs
      *
      * @param Request $request
-     * @return Fluent interface, returns self
+     * @return self Fluent interface, returns self
      */
     public function setRequest(Request $request = null)
     {

diff --git a/library/Zend/Permissions/Acl/Assertion/AssertionAggregate.php b/library/Zend/Permissions/Acl/Assertion/AssertionAggregate.php
@@ -95,7 +95,7 @@ public function getAssertionManager()
      *
      * @param string $mode
      *            indicates how assertion chain result should interpreted (either 'all' or 'at_least_one')
-     * @throws Exception
+     * @throws InvalidArgumentException
      *
      * @return self
      */

diff --git a/library/Zend/Serializer/Serializer.php b/library/Zend/Serializer/Serializer.php
@@ -18,7 +18,7 @@ abstract class Serializer
      *
      * @var null|AdapterPluginManager
      */
-    private static $adapters = null;
+    protected static $adapters = null;
 
     /**
      * The default adapter.

diff --git a/library/Zend/Session/SaveHandler/MongoDB.php b/library/Zend/Session/SaveHandler/MongoDB.php
@@ -51,7 +51,7 @@ class MongoDB implements SaveHandlerInterface
      *
      * @param Mongo|MongoClient $mongo
      * @param MongoDBOptions $options
-     * @throws Zend\Session\Exception\InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function __construct($mongo, MongoDBOptions $options)
     {

diff --git a/library/Zend/Session/Service/StorageFactory.php b/library/Zend/Session/Service/StorageFactory.php
@@ -12,7 +12,7 @@
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\FactoryInterface;
 use Zend\ServiceManager\ServiceLocatorInterface;
-use Zend\Session\Storage\Exception as SessionException;
+use Zend\Session\Exception\ExceptionInterface as SessionException;
 use Zend\Session\Storage\Factory;
 use Zend\Session\Storage\StorageInterface;