Merge pull request #7489 from ASvi/phpDoc-fixes

Updated phpDoc and removed duplicates
zendframework · May 7, 2015 · 97d0046 · 97d0046
2 parents ecf9b1d + 74341c5
commit 97d0046
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 5 deletions.
diff --git a/library/Zend/Session/Validator/RemoteAddr.php b/library/Zend/Session/Validator/RemoteAddr.php
@@ -50,6 +50,8 @@ class RemoteAddr implements SessionValidator
     /**
      * Constructor
      * get the current user IP and store it in the session as 'valid data'
+     *
+     * @param null|string $data
      */
     public function __construct($data = null)
     {

diff --git a/library/Zend/Soap/Server.php b/library/Zend/Soap/Server.php
@@ -960,7 +960,9 @@ protected function _initializeSoapErrorContext()
     /**
      * Set the debug mode.
      * In debug mode, all exceptions are send to the client.
-     * @param bool $debug
+     *
+     * @param  bool $debug
+     * @return self
      */
     public function setDebugMode($debug)
     {

diff --git a/library/Zend/Soap/Wsdl.php b/library/Zend/Soap/Wsdl.php
@@ -165,9 +165,10 @@ public function getClassMap()
     /**
      * Set the class map of php to wsdl mappings..
      *
+     * @param  array $classMap
      * @return self
      */
-    public function setClassMap($classMap)
+    public function setClassMap(array $classMap)
     {
         $this->classMap = $classMap;
         return $this;

diff --git a/library/Zend/Stdlib/Hydrator/Filter/FilterComposite.php b/library/Zend/Stdlib/Hydrator/Filter/FilterComposite.php
@@ -36,6 +36,8 @@ class FilterComposite implements FilterInterface
     /**
      * Define default Filter
      *
+     * @param  array $orFilter
+     * @param  array $andFilter
      * @throws InvalidArgumentException
      */
     public function __construct($orFilter = array(), $andFilter = array())

diff --git a/library/Zend/Tag/Cloud/Decorator/AbstractDecorator.php b/library/Zend/Tag/Cloud/Decorator/AbstractDecorator.php
@@ -160,6 +160,12 @@ protected function validateAttributeName($name)
         }
     }
 
+    /**
+     * Wrap html with tag
+     *
+     * @param  string $html
+     * @return string
+     */
     protected function wrapTag($html)
     {
         $escaper = $this->getEscaper();

diff --git a/library/Zend/Validator/ValidatorPluginManager.php b/library/Zend/Validator/ValidatorPluginManager.php
@@ -105,7 +105,6 @@ class ValidatorPluginManager extends AbstractPluginManager
         'isfloat'                  => 'Zend\I18n\Validator\IsFloat',
         'isinstanceof'             => 'Zend\Validator\IsInstanceOf',
         'isint'                    => 'Zend\I18n\Validator\IsInt',
-        'ip'                       => 'Zend\Validator\Ip',
         'lessthan'                 => 'Zend\Validator\LessThan',
         'notempty'                 => 'Zend\Validator\NotEmpty',
         'phonenumber'              => 'Zend\I18n\Validator\PhoneNumber',

diff --git a/library/Zend/View/Helper/FlashMessenger.php b/library/Zend/View/Helper/FlashMessenger.php
@@ -116,8 +116,9 @@ public function render($namespace = PluginFlashMessenger::NAMESPACE_DEFAULT, arr
     /**
      * Render Current Messages
      *
-     * @param  string $namespace
-     * @param  array  $classes
+     * @param  string    $namespace
+     * @param  array     $classes
+     * @param  bool|null $autoEscape
      * @return string
      */
     public function renderCurrent($namespace = PluginFlashMessenger::NAMESPACE_DEFAULT, array $classes = array(), $autoEscape = null)

diff --git a/library/Zend/XmlRpc/Fault.php b/library/Zend/XmlRpc/Fault.php
@@ -83,6 +83,8 @@ class Fault
     /**
      * Constructor
      *
+     * @param int    $code
+     * @param string $message
      */
     public function __construct($code = 404, $message = '')
     {

diff --git a/library/Zend/XmlRpc/Server.php b/library/Zend/XmlRpc/Server.php
@@ -492,6 +492,9 @@ public function getSystem()
      * how to handle arguments. If set to true, all methods including constructor
      * will receive the arguments. If set to false, only constructor will receive the
      * arguments
+     *
+     * @param  bool|null $flag
+     * @return self
      */
     public function sendArgumentsToAllMethods($flag = null)
     {