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/Client.php

@@ -954,7 +954,7 @@ public function _doRequest(Client\Common $client, $request, $location, $action,
     {
         // Perform request as is
         if ($oneWay === null) {
-            return call_user_func(array($client,'SoapClient::__doRequest'), $request, $location, $action, $version);
+            return call_user_func(array($client, 'SoapClient::__doRequest'), $request, $location, $action, $version);
         }
         return call_user_func(array($client, 'SoapClient::__doRequest'), $request, $location, $action, $version, $oneWay);
     }

src/Client/DotNet.php

@@ -44,8 +44,8 @@ public function __construct($wsdl = null, $options = null)
      * @param  string       $request  The request body.
      * @param  string       $location The SOAP URI.
      * @param  string       $action   The SOAP action to call.
-     * @param  integer      $version  The SOAP version to use.
-     * @param  integer      $one_way  (Optional) The number 1 if a response is not expected.
+     * @param  int      $version  The SOAP version to use.
+     * @param  int      $one_way  (Optional) The number 1 if a response is not expected.
      * @return string The XML SOAP response.
      */
     public function _doRequest(CommonClient $client, $request, $location, $action, $version, $one_way = null)

src/Wsdl/ComplexTypeStrategy/ArrayOfTypeComplex.php

@@ -107,7 +107,7 @@ protected function _getSingularPhpType($type)
      * Return the array nesting level based on the type name
      *
      * @param  string $type
-     * @return integer
+     * @return int
      */
     protected function _getNestedCount($type)
     {

src/Wsdl/ComplexTypeStrategy/ArrayOfTypeSequence.php

@@ -77,7 +77,7 @@ protected function _getSingularType($type)
      * Return the array nesting level based on the type name
      *
      * @param  string $type
-     * @return integer
+     * @return int
      */
     protected function _getNestedCount($type)
     {

src/Wsdl/ComplexTypeStrategy/Composite.php

@@ -82,7 +82,7 @@ public function getDefaultStrategy()
         if (is_string($strategy) && class_exists($strategy)) {
             $strategy = new $strategy;
         }
-        if ( !($strategy instanceof ComplexTypeStrategy) ) {
+        if (!($strategy instanceof ComplexTypeStrategy)) {
             throw new Exception\InvalidArgumentException(
                 'Default Strategy for Complex Types is not a valid strategy object.'
             );
@@ -107,7 +107,7 @@ public function getStrategyOfType($type)
                 $strategy = new $strategy();
             }
 
-            if ( !($strategy instanceof ComplexTypeStrategy) ) {
+            if (!($strategy instanceof ComplexTypeStrategy)) {
                 throw new Exception\InvalidArgumentException(sprintf(
                     'Strategy for Complex Type "%s" is not a valid strategy object.',
                     $type
@@ -141,7 +141,7 @@ public function setContext(Wsdl $context)
      */
     public function addComplexType($type)
     {
-        if (!($this->context instanceof Wsdl) ) {
+        if (!($this->context instanceof Wsdl)) {
             throw new Exception\InvalidArgumentException(sprintf(
                 'Cannot add complex type "%s", no context is set for this composite strategy.',
                 $type