Merge branch 'hotfix/3679'

Close #3679
zendframework · Feb 6, 2013 · 902ed2b · 902ed2b
2 parents e9a25a5 + 3aedda6
commit 902ed2b
Show file tree

Hide file tree

Showing 29 changed files with 40 additions and 40 deletions.
diff --git a/library/Zend/Feed/Writer/FeedFactory.php b/library/Zend/Feed/Writer/FeedFactory.php
@@ -16,7 +16,7 @@ abstract class FeedFactory
     /**
      * Create and return a Feed based on data provided.
      *
-     * @param  array|\Traversable $data
+     * @param  array|Traversable $data
      * @throws Exception\InvalidArgumentException
      * @return Feed
      */

diff --git a/library/Zend/Filter/Encrypt/BlockCipher.php b/library/Zend/Filter/Encrypt/BlockCipher.php
@@ -56,7 +56,7 @@ class BlockCipher implements EncryptionAlgorithmInterface
     /**
      * Class constructor
      *
-     * @param  string|array|\Traversable $options Encryption Options
+     * @param  string|array|Traversable $options Encryption Options
      * @throws Exception\RuntimeException
      * @throws Exception\InvalidArgumentException
      */

diff --git a/library/Zend/Form/Element.php b/library/Zend/Form/Element.php
@@ -101,7 +101,7 @@ public function getName()
      * - label: label to associate with the element
      * - label_attributes: attributes to use when the label is rendered
      *
-     * @param  array|\Traversable $options
+     * @param  array|Traversable $options
      * @return Element|ElementInterface
      * @throws Exception\InvalidArgumentException
      */

diff --git a/library/Zend/Form/Element/Captcha.php b/library/Zend/Form/Element/Captcha.php
@@ -26,7 +26,7 @@ class Captcha extends Element implements InputProviderInterface
      * Accepted options for Captcha:
      * - captcha: a valid Zend\Captcha\AdapterInterface
      *
-     * @param array|\Traversable $options
+     * @param array|Traversable $options
      * @return Captcha
      */
     public function setOptions($options)

diff --git a/library/Zend/Form/Element/Checkbox.php b/library/Zend/Form/Element/Checkbox.php
@@ -64,7 +64,7 @@ class Checkbox extends Element implements InputProviderInterface
      * - unchecked_value: value for checkbox when unchecked
      * - checked_value: value for checkbox when checked
      *
-     * @param  array|\Traversable $options
+     * @param  array|Traversable $options
      * @return Checkbox
      */
     public function setOptions($options)

diff --git a/library/Zend/Form/Element/Collection.php b/library/Zend/Form/Element/Collection.php
@@ -84,7 +84,7 @@ class Collection extends Fieldset implements FieldsetPrepareAwareInterface
      * - should_create_template: if set to true, a template is generated (inside a <span>)
      * - template_placeholder: placeholder used in the data template
      *
-     * @param array|\Traversable $options
+     * @param array|Traversable $options
      * @return Collection
      */
     public function setOptions($options)
@@ -133,7 +133,7 @@ public function allowObjectBinding($object)
      * Set the object used by the hydrator
      * In this case the "object" is a collection of objects
      *
-     * @param  array|\Traversable $object
+     * @param  array|Traversable $object
      * @return Fieldset|FieldsetInterface
      * @throws Exception\InvalidArgumentException
      */
@@ -156,7 +156,7 @@ public function setObject($object)
     /**
      * Populate values
      *
-     * @param array|\Traversable $data
+     * @param array|Traversable $data
      * @throws \Zend\Form\Exception\InvalidArgumentException
      * @throws \Zend\Form\Exception\DomainException
      * @return void

diff --git a/library/Zend/Form/Element/Select.php b/library/Zend/Form/Element/Select.php
@@ -99,7 +99,7 @@ public function setValueOptions(array $options)
      * - value_options: list of values and labels for the select options
      * _ empty_option: should an empty option be prepended to the options ?
      *
-     * @param  array|\Traversable $options
+     * @param  array|Traversable $options
      * @return Select|ElementInterface
      * @throws InvalidArgumentException
      */

diff --git a/library/Zend/Form/Fieldset.php b/library/Zend/Form/Fieldset.php
@@ -81,7 +81,7 @@ public function __construct($name = null, $options = array())
      * Set options for a fieldset. Accepted options are:
      * - use_as_base_fieldset: is this fieldset use as the base fieldset?
      *
-     * @param  array|\Traversable $options
+     * @param  array|Traversable $options
      * @return Element|ElementInterface
      * @throws Exception\InvalidArgumentException
      */

diff --git a/library/Zend/Form/Form.php b/library/Zend/Form/Form.php
@@ -191,7 +191,7 @@ public function prepare()
      *
      * Typically, also passes data on to the composed input filter.
      *
-     * @param  array|\ArrayAccess|\Traversable $data
+     * @param  array|\ArrayAccess|Traversable $data
      * @return Form|FormInterface
      * @throws Exception\InvalidArgumentException
      */

diff --git a/library/Zend/Http/Headers.php b/library/Zend/Http/Headers.php
@@ -126,7 +126,7 @@ public function getPluginClassLoader()
      */
     public function addHeaders($headers)
     {
-        if (!is_array($headers) && !$headers instanceof \Traversable) {
+        if (!is_array($headers) && !$headers instanceof Traversable) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Expected array or Traversable; received "%s"',
                 (is_object($headers) ? get_class($headers) : gettype($headers))

diff --git a/library/Zend/Loader/ModuleAutoloader.php b/library/Zend/Loader/ModuleAutoloader.php
@@ -326,7 +326,7 @@ public function registerPaths($paths)
             throw new Exception\InvalidArgumentException(
                 'Parameter to \\Zend\\Loader\\ModuleAutoloader\'s '
                 . 'registerPaths method must be an array or '
-                . 'implement the \\Traversable interface'
+                . 'implement the Traversable interface'
             );
         }
 

diff --git a/library/Zend/Loader/PluginClassLoader.php b/library/Zend/Loader/PluginClassLoader.php
@@ -64,7 +64,7 @@ public static function addStaticMap($map)
             return;
         }
 
-        if (!is_array($map) && !$map instanceof \Traversable) {
+        if (!is_array($map) && !$map instanceof Traversable) {
             throw new Exception\InvalidArgumentException('Expects an array or Traversable object');
         }
         foreach ($map as $key => $value) {

diff --git a/library/Zend/Log/Logger.php b/library/Zend/Log/Logger.php
@@ -119,7 +119,7 @@ class Logger implements LoggerInterface
      * - exceptionhandler: if true register this logger as exceptionhandler
      * - errorhandler: if true register this logger as errorhandler
      *
-     * @param  array|\Traversable $options
+     * @param  array|Traversable $options
      * @return Logger
      * @throws Exception\InvalidArgumentException
      */

diff --git a/library/Zend/Log/Writer/AbstractWriter.php b/library/Zend/Log/Writer/AbstractWriter.php
@@ -66,7 +66,7 @@ abstract class AbstractWriter implements WriterInterface
      * - filters: array of filters to add to this filter
      * - formatter: formatter for this writer
      *
-     * @param  array|\Traversable $options
+     * @param  array|Traversable $options
      * @return Logger
      * @throws Exception\InvalidArgumentException
      */

diff --git a/library/Zend/ModuleManager/Listener/ConfigListener.php b/library/Zend/ModuleManager/Listener/ConfigListener.php
@@ -277,7 +277,7 @@ protected function addConfigPaths($paths, $type)
         if (!is_array($paths)) {
             throw new Exception\InvalidArgumentException(
                 sprintf('Argument passed to %::%s() must be an array, '
-                . 'implement the \Traversable interface, or be an '
+                . 'implement the Traversable interface, or be an '
                 . 'instance of Zend\Config\Config. %s given.',
                 __CLASS__, __METHOD__, gettype($paths))
             );
@@ -323,7 +323,7 @@ protected function addConfig($key, $config)
         if (!is_array($config)) {
             throw new Exception\InvalidArgumentException(
                 sprintf('Config being merged must be an array, '
-                . 'implement the \Traversable interface, or be an '
+                . 'implement the Traversable interface, or be an '
                 . 'instance of Zend\Config\Config. %s given.', gettype($config))
             );
         }

diff --git a/library/Zend/ModuleManager/Listener/ListenerOptions.php b/library/Zend/ModuleManager/Listener/ListenerOptions.php
@@ -89,7 +89,7 @@ public function setModulePaths($modulePaths)
         if (!is_array($modulePaths) && !$modulePaths instanceof Traversable) {
             throw new Exception\InvalidArgumentException(
                 sprintf('Argument passed to %s::%s() must be an array, '
-                . 'implement the \Traversable interface, or be an '
+                . 'implement the Traversable interface, or be an '
                 . 'instance of Zend\Config\Config. %s given.',
                 __CLASS__, __METHOD__, gettype($modulePaths))
             );
@@ -131,7 +131,7 @@ public function setConfigGlobPaths($configGlobPaths)
         if (!is_array($configGlobPaths) && !$configGlobPaths instanceof Traversable) {
             throw new Exception\InvalidArgumentException(
                 sprintf('Argument passed to %s::%s() must be an array, '
-                . 'implement the \Traversable interface, or be an '
+                . 'implement the Traversable interface, or be an '
                 . 'instance of Zend\Config\Config. %s given.',
                 __CLASS__, __METHOD__, gettype($configGlobPaths))
             );
@@ -153,7 +153,7 @@ public function setConfigStaticPaths($configStaticPaths)
         if (!is_array($configStaticPaths) && !$configStaticPaths instanceof Traversable) {
             throw new Exception\InvalidArgumentException(
                 sprintf('Argument passed to %s::%s() must be an array, '
-                . 'implement the \Traversable interface, or be an '
+                . 'implement the Traversable interface, or be an '
                 . 'instance of Zend\Config\Config. %s given.',
                 __CLASS__, __METHOD__, gettype($configStaticPaths))
             );
@@ -186,7 +186,7 @@ public function setExtraConfig($extraConfig)
         if (!is_array($extraConfig) && !$extraConfig instanceof Traversable) {
             throw new Exception\InvalidArgumentException(
                 sprintf('Argument passed to %s::%s() must be an array, '
-                . 'implement the \Traversable interface, or be an '
+                . 'implement the Traversable interface, or be an '
                 . 'instance of Zend\Config\Config. %s given.',
                 __CLASS__, __METHOD__, gettype($extraConfig))
             );

diff --git a/library/Zend/ModuleManager/ModuleManager.php b/library/Zend/ModuleManager/ModuleManager.php
@@ -203,7 +203,7 @@ public function setModules($modules)
             $this->modules = $modules;
         } else {
             throw new Exception\InvalidArgumentException(sprintf(
-                'Parameter to %s\'s %s method must be an array or implement the \\Traversable interface',
+                'Parameter to %s\'s %s method must be an array or implement the Traversable interface',
                 __CLASS__, __METHOD__
             ));
         }

diff --git a/library/Zend/Mvc/Router/Console/SimpleRouteStack.php b/library/Zend/Mvc/Router/Console/SimpleRouteStack.php
@@ -58,7 +58,7 @@ public function addRoute($name, $route, $priority = null)
      * routeFromArray(): defined by SimpleRouteStack.
      *
      * @see    SimpleRouteStack::routeFromArray()
-     * @param  array|\Traversable $specs
+     * @param  array|Traversable $specs
      * @return RouteInterface
      * @throws Exception\InvalidArgumentException
      * @throws Exception\RuntimeException

diff --git a/library/Zend/Mvc/Router/Http/Hostname.php b/library/Zend/Mvc/Router/Http/Hostname.php
@@ -67,7 +67,7 @@ public function __construct($route, array $constraints = array(), array $default
      * factory(): defined by RouteInterface interface.
      *
      * @see    Route::factory()
-     * @param  array|\Traversable $options
+     * @param  array|Traversable $options
      * @throws \Zend\Mvc\Router\Exception\InvalidArgumentException
      * @return Hostname
      */

diff --git a/library/Zend/Mvc/Router/Http/Regex.php b/library/Zend/Mvc/Router/Http/Regex.php
@@ -69,7 +69,7 @@ public function __construct($regex, $spec, array $defaults = array())
      * factory(): defined by RouteInterface interface.
      *
      * @see    Route::factory()
-     * @param  array|\Traversable $options
+     * @param  array|Traversable $options
      * @throws \Zend\Mvc\Router\Exception\InvalidArgumentException
      * @return Regex
      */

diff --git a/library/Zend/Mvc/Router/Http/TreeRouteStack.php b/library/Zend/Mvc/Router/Http/TreeRouteStack.php
@@ -81,7 +81,7 @@ public function addRoute($name, $route, $priority = null)
      * routeFromArray(): defined by SimpleRouteStack.
      *
      * @see    SimpleRouteStack::routeFromArray()
-     * @param  array|\Traversable $specs
+     * @param  array|Traversable $specs
      * @return RouteInterface
      * @throws Exception\InvalidArgumentException
      * @throws Exception\RuntimeException

diff --git a/library/Zend/Mvc/Router/SimpleRouteStack.php b/library/Zend/Mvc/Router/SimpleRouteStack.php
@@ -61,7 +61,7 @@ public function __construct(RoutePluginManager $routePluginManager = null)
      * factory(): defined by RouteInterface interface.
      *
      * @see    Route::factory()
-     * @param  array|\Traversable $options
+     * @param  array|Traversable $options
      * @return SimpleRouteStack
      * @throws Exception\InvalidArgumentException
      */
@@ -125,7 +125,7 @@ public function getRoutePluginManager()
      * addRoutes(): defined by RouteStackInterface interface.
      *
      * @see    RouteStack::addRoutes()
-     * @param  array|\Traversable $routes
+     * @param  array|Traversable $routes
      * @return SimpleRouteStack
      * @throws Exception\InvalidArgumentException
      */
@@ -182,7 +182,7 @@ public function removeRoute($name)
     /**
      * setRoutes(): defined by RouteStackInterface interface.
      *
-     * @param  array|\Traversable $routes
+     * @param  array|Traversable $routes
      * @return SimpleRouteStack
      */
     public function setRoutes($routes)
@@ -252,7 +252,7 @@ public function setDefaultParam($name, $value)
     /**
      * Create a route from array specifications.
      *
-     * @param  array|\Traversable $specs
+     * @param  array|Traversable $specs
      * @return SimpleRouteStack
      * @throws Exception\InvalidArgumentException
      */

diff --git a/library/Zend/Paginator/Paginator.php b/library/Zend/Paginator/Paginator.php
@@ -155,7 +155,7 @@ class Paginator implements Countable, IteratorAggregate
     /**
      * Set a global config
      *
-     * @param array|\Traversable $config
+     * @param array|Traversable $config
      * @throws Exception\InvalidArgumentException
      */
     public static function setGlobalConfig($config)

diff --git a/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php b/library/Zend/ProgressBar/Upload/AbstractUploadHandler.php
@@ -31,7 +31,7 @@ abstract class AbstractUploadHandler implements UploadHandlerInterface
     protected $progressAdapter;
 
     /**
-     * @param  array|\Traversable $options Optional options
+     * @param  array|Traversable $options Optional options
      * @throws Exception\InvalidArgumentException
      */
     public function __construct($options = array())
@@ -46,7 +46,7 @@ public function __construct($options = array())
      * - session_namespace: session namespace for upload progress
      * - progress_adapter: progressbar adapter to use for updating progress
      *
-     * @param  array|\Traversable $options
+     * @param  array|Traversable $options
      * @return AbstractUploadHandler
      * @throws Exception\InvalidArgumentException
      */

diff --git a/library/Zend/Serializer/Adapter/PythonPickle.php b/library/Zend/Serializer/Adapter/PythonPickle.php
@@ -134,7 +134,7 @@ class PythonPickle extends AbstractAdapter
     /**
      * Constructor.
      *
-     * @param  array|\Traversable|PythonPickleOptions $options Optional
+     * @param  array|Traversable|PythonPickleOptions $options Optional
      */
     public function __construct($options = null)
     {
@@ -151,7 +151,7 @@ public function __construct($options = null)
     /**
      * Set options
      *
-     * @param  array|\Traversable|PythonPickleOptions $options
+     * @param  array|Traversable|PythonPickleOptions $options
      * @return PythonPickle
      */
     public function setOptions($options)

diff --git a/library/Zend/Stdlib/Hydrator/ClassMethods.php b/library/Zend/Stdlib/Hydrator/ClassMethods.php
@@ -45,7 +45,7 @@ public function __construct($underscoreSeparatedKeys = true)
     }
 
     /**
-     * @param  array|\Traversable                 $options
+     * @param  array|Traversable                 $options
      * @return ClassMethods
      * @throws Exception\InvalidArgumentException
      */

diff --git a/library/Zend/Validator/File/Extension.php b/library/Zend/Validator/File/Extension.php
@@ -52,7 +52,7 @@ class Extension extends AbstractValidator
     /**
      * Sets validator options
      *
-     * @param  string|array|\Traversable $options
+     * @param  string|array|Traversable $options
      */
     public function __construct($options = null)
     {

diff --git a/library/Zend/Validator/Uri.php b/library/Zend/Validator/Uri.php
@@ -45,7 +45,7 @@ class Uri extends AbstractValidator
     /**
      * Sets default option values for this instance
      *
-     * @param array|\Traversable $options
+     * @param array|Traversable $options
      */
     public function __construct($options = array())
     {

diff --git a/library/Zend/View/Model/ViewModel.php b/library/Zend/View/Model/ViewModel.php
@@ -170,7 +170,7 @@ public function getOption($name, $default = null)
     /**
      * Set renderer options/hints en masse
      *
-     * @param array|\Traversable $options
+     * @param array|Traversable $options
      * @throws \Zend\View\Exception\InvalidArgumentException
      * @return ViewModel
      */