Merge pull request zendframework/zendframework#4352 from neeckeloo/do…

…c-blocks-consistency

Fix doc blocks consistency and coding standards PSR2

Conflicts:
	library/Zend/Barcode/Renderer/Pdf.php
	library/Zend/Mvc/Router/Http/Regex.php
	library/Zend/View/Helper/Navigation/Listener/AclListener.php

src/Expr.php

@@ -19,8 +19,8 @@
  * Example:
  * <code>
  * $foo = array(
- *     'integer'  =>9,
- *     'string'   =>'test string',
+ *     'integer'  => 9,
+ *     'string'   => 'test string',
  *     'function' => Zend\Json\Expr(
  *         'function() { window.alert("javascript function encoded by Zend\Json\Json") }'
  *     ),

src/Json.php

@@ -220,7 +220,7 @@ protected static function _getXmlValue($simpleXmlElementObject)
      *
      * @param SimpleXMLElement $simpleXmlElementObject
      * @param  bool $ignoreXmlAttributes
-     * @param integer $recursionDepth
+     * @param int $recursionDepth
      * @throws Exception\RecursionException if the XML tree is deeper than the allowed limit.
      * @return array
      */

src/Server/Server.php

@@ -507,11 +507,10 @@ protected function _handle()
         }
 
         //Make sure named parameters are passed in correct order
-        if (is_string( key( $params ) )) {
-
+        if (is_string(key($params))) {
             $callback = $invokable->getCallback();
             if ('function' == $callback->getType()) {
-                $reflection = new ReflectionFunction( $callback->getFunction() );
+                $reflection = new ReflectionFunction($callback->getFunction());
             } else {
 
                 $reflection = new ReflectionMethod(
@@ -523,9 +522,9 @@ protected function _handle()
             $orderedParams = array();
             foreach ($reflection->getParameters() as $refParam) {
                 if (array_key_exists($refParam->getName(), $params)) {
-                    $orderedParams[ $refParam->getName() ] = $params[ $refParam->getName() ];
+                    $orderedParams[$refParam->getName()] = $params[$refParam->getName()];
                 } elseif ($refParam->isOptional()) {
-                    $orderedParams[ $refParam->getName() ] = null;
+                    $orderedParams[$refParam->getName()] = null;
                 } else {
                     return $this->fault('Invalid params', Error::ERROR_INVALID_PARAMS);
                 }