Merge branch 'cs/zendframework/zendframework#6988-zend-server-psr2-co…

…mpliance' into develop

Close zendframework/zendframework#6988
Forward port zendframework/zendframework#6988

src/Cache.php

@@ -36,9 +36,7 @@ class Cache
      */
     public static function save($filename, Server $server)
     {
-        if (!is_string($filename)
-            || (!file_exists($filename) && !is_writable(dirname($filename)))
-        ) {
+        if (!is_string($filename) || (!file_exists($filename) && !is_writable(dirname($filename)))) {
             return false;
         }
 
@@ -98,9 +96,7 @@ public static function save($filename, Server $server)
      */
     public static function get($filename, Server $server)
     {
-        if (!is_string($filename)
-            || !file_exists($filename)
-            || !is_readable($filename)) {
+        if (!is_string($filename) || !file_exists($filename) || !is_readable($filename)) {
             return false;
         }
 

src/Exception/BadMethodCallException.php

@@ -9,8 +9,6 @@
 
 namespace Zend\Server\Exception;
 
-class BadMethodCallException
-    extends \BadMethodCallException
-    implements ExceptionInterface
+class BadMethodCallException extends \BadMethodCallException implements ExceptionInterface
 {
 }

src/Exception/InvalidArgumentException.php

@@ -9,8 +9,6 @@
 
 namespace Zend\Server\Exception;
 
-class InvalidArgumentException
-    extends \InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
 }

src/Exception/RuntimeException.php

@@ -9,8 +9,6 @@
 
 namespace Zend\Server\Exception;
 
-class RuntimeException
-    extends \RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
 }

src/Reflection/AbstractFunction.php

@@ -282,8 +282,9 @@ protected function reflect()
             }
         } elseif ($nParamTypesTmp != $paramCount) {
             throw new Exception\RuntimeException(
-               'Variable number of arguments is not supported for services (except optional parameters). '
-             . 'Number of function arguments must correspond to actual number of arguments described in a docblock.');
+                'Variable number of arguments is not supported for services (except optional parameters). '
+                . 'Number of function arguments must correspond to actual number of arguments described in a docblock.'
+            );
         }
 
         $paramTypes = array();
@@ -297,7 +298,6 @@ protected function reflect()
         $this->buildSignatures($return, $returnDesc, $paramTypes, $paramDesc);
     }
 
-
     /**
      * Proxy reflection calls
      *

src/Reflection/Exception/BadMethodCallException.php

@@ -11,8 +11,6 @@
 
 use Zend\Server\Exception;
 
-class BadMethodCallException
-    extends Exception\BadMethodCallException
-    implements ExceptionInterface
+class BadMethodCallException extends Exception\BadMethodCallException implements ExceptionInterface
 {
 }

src/Reflection/Exception/InvalidArgumentException.php

@@ -11,8 +11,6 @@
 
 use Zend\Server\Exception;
 
-class InvalidArgumentException
-    extends Exception\InvalidArgumentException
-    implements ExceptionInterface
+class InvalidArgumentException extends Exception\InvalidArgumentException implements ExceptionInterface
 {
 }

src/Reflection/Exception/RuntimeException.php

@@ -11,8 +11,6 @@
 
 use Zend\Server\Exception;
 
-class RuntimeException
-    extends Exception\RuntimeException
-    implements ExceptionInterface
+class RuntimeException extends Exception\RuntimeException implements ExceptionInterface
 {
 }

src/Reflection/Node.php

@@ -168,9 +168,7 @@ public function getEndPoints()
 
             if (null === $value) {
                 $endPoints[] = $this;
-            } elseif ((null !== $value)
-                && $child->hasChildren()
-            ) {
+            } elseif ((null !== $value) && $child->hasChildren()) {
                 $childEndPoints = $child->getEndPoints();
                 if (!empty($childEndPoints)) {
                     $endPoints = array_merge($endPoints, $childEndPoints);