Merge branch 'cs/zendframework/zendframework#6981-zend-xmlrpc-psr2-compliance'

Ocramius · Ocramius · commit e1d4cdf19047 · 2014-12-08T22:46:22.000+01:00
Close zendframework/zendframework#6981
diff --git a/src/AbstractValue.php b/src/AbstractValue.php
@@ -371,7 +371,11 @@ protected static function _xmlStringToNativeXmlRpc($xml)
                 }
 
                 if (null === $data) {
-                    throw new Exception\ValueException('Invalid XML for XML-RPC native '. self::XMLRPC_TYPE_ARRAY .' type: ARRAY tag must contain DATA tag');
+                    throw new Exception\ValueException(
+                        'Invalid XML for XML-RPC native '
+                        . self::XMLRPC_TYPE_ARRAY
+                        . ' type: ARRAY tag must contain DATA tag'
+                    );
                 }
                 $values = array();
                 // Parse all the elements of the array from the XML string
@@ -397,7 +401,9 @@ protected static function _xmlStringToNativeXmlRpc($xml)
                 $xmlrpcValue = new Value\Struct($values);
                 break;
             default:
-                throw new Exception\ValueException('Value type \''. $type .'\' parsed from the XML string is not a known XML-RPC native type');
+                throw new Exception\ValueException(
+                    'Value type \'' . $type . '\' parsed from the XML string is not a known XML-RPC native type'
+                );
                 break;
         }
         $xmlrpcValue->_setXML($xml->asXML());
@@ -415,7 +421,11 @@ protected static function _createSimpleXMLElement(&$xml)
             $xml = new \SimpleXMLElement($xml);
         } catch (\Exception $e) {
             // The given string is not a valid XML
-            throw new Exception\ValueException('Failed to create XML-RPC value from XML string: ' . $e->getMessage(), $e->getCode(), $e);
+            throw new Exception\ValueException(
+                'Failed to create XML-RPC value from XML string: ' . $e->getMessage(),
+                $e->getCode(),
+                $e
+            );
         }
     }
 
diff --git a/src/Client.php b/src/Client.php
@@ -126,7 +126,7 @@ public function getIntrospector()
     }
 
 
-   /**
+    /**
      * The request of the last method call
      *
      * @return \Zend\XmlRpc\Request
@@ -251,7 +251,7 @@ public function doRequest($request, $response = null)
      * @return mixed
      * @throws \Zend\XmlRpc\Client\Exception\FaultException
      */
-    public function call($method, $params=array())
+    public function call($method, $params = array())
     {
         if (!$this->skipSystemLookup() && ('system.' != substr($method, 0, 7))) {
             // Ensure empty array/struct params are cast correctly
@@ -323,7 +323,7 @@ public function call($method, $params=array())
             throw new Client\Exception\FaultException(
                 $fault->getMessage(),
                 $fault->getCode()
-                );
+            );
         }
 
         return $this->lastResponse->getReturnValue();
diff --git a/src/Server.php b/src/Server.php
@@ -330,7 +330,10 @@ public function loadFunctions($definition)
             } else {
                 $type = gettype($definition);
             }
-            throw new Server\Exception\InvalidArgumentException('Unable to load server definition; must be an array or Zend\Server\Definition, received ' . $type, 612);
+            throw new Server\Exception\InvalidArgumentException(
+                'Unable to load server definition; must be an array or Zend\Server\Definition, received ' . $type,
+                612
+            );
         }
 
         $this->table->clearMethods();

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public function getIntrospector()`
`126`	`126`	`}`
`127`	`127`
`128`	`128`
`129`		`- /**`
	`129`	`+ /**`
`130`	`130`	`* The request of the last method call`
`131`	`131`	`*`
`132`	`132`	`* @return \Zend\XmlRpc\Request`
`@@ -251,7 +251,7 @@ public function doRequest($request, $response = null)`
`251`	`251`	`* @return mixed`
`252`	`252`	`* @throws \Zend\XmlRpc\Client\Exception\FaultException`
`253`	`253`	`*/`
`254`		`- public function call($method, $params=array())`
	`254`	`+ public function call($method, $params = array())`
`255`	`255`	`{`
`256`	`256`	`if (!$this->skipSystemLookup() && ('system.' != substr($method, 0, 7))) {`
`257`	`257`	`// Ensure empty array/struct params are cast correctly`
`@@ -323,7 +323,7 @@ public function call($method, $params=array())`
`323`	`323`	`throw new Client\Exception\FaultException(`
`324`	`324`	`$fault->getMessage(),`
`325`	`325`	`$fault->getCode()`
`326`		`- );`
	`326`	`+ );`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`return $this->lastResponse->getReturnValue();`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,10 @@ public function loadFunctions($definition)`
`330`	`330`	`} else {`
`331`	`331`	`$type = gettype($definition);`
`332`	`332`	`}`
`333`		`- throw new Server\Exception\InvalidArgumentException('Unable to load server definition; must be an array or Zend\Server\Definition, received ' . $type, 612);`
	`333`	`+ throw new Server\Exception\InvalidArgumentException(`
	`334`	`+ 'Unable to load server definition; must be an array or Zend\Server\Definition, received ' . $type,`
	`335`	`+ 612`
	`336`	`+ );`
`334`	`337`	`}`
`335`	`338`
`336`	`339`	`$this->table->clearMethods();`