Merge branch 'cs/various-things' of https://github.com/Maks3w/zf2

Author: weierophinney

src/AbstractValue.php

@@ -290,8 +290,7 @@ protected static function _phpVarToNativeXmlRpc($value)
             }
         }
 
-        switch (self::getXmlRpcTypeByValue($value))
-        {
+        switch (self::getXmlRpcTypeByValue($value)) {
             case self::XMLRPC_TYPE_DATETIME:
                 return new Value\DateTime($value);
 

src/Generator/AbstractGenerator.php

@@ -36,7 +36,7 @@ public function __construct($encoding = 'UTF-8')
 
     /**
      * Initialize internal objects
-     * 
+     *
      * @return void
      */
     abstract protected function _init();
@@ -45,7 +45,7 @@ abstract protected function _init();
      * Start XML element
      *
      * Method opens a new XML element with an element name and an optional value
-     * 
+     *
      * @param string $name XML tag name
      * @param string $value Optional value of the XML tag
      * @return AbstractGenerator Fluent interface
@@ -77,7 +77,7 @@ public function closeElement($name)
 
     /**
      * Return encoding
-     * 
+     *
      * @return string
      */
     public function getEncoding()
@@ -87,8 +87,8 @@ public function getEncoding()
 
     /**
      * Set XML encoding
-     * 
-     * @param  string $encoding 
+     *
+     * @param  string $encoding
      * @return AbstractGenerator
      */
     public function setEncoding($encoding)
@@ -146,7 +146,7 @@ abstract protected function _writeTextData($text);
 
     /**
      * End XML element
-     * 
+     *
      * @param string $name
      */
     abstract protected function _closeElement($name);

test/ClientTest.php

@@ -649,13 +649,13 @@ public function testHandlesLeadingOrTrailingWhitespaceInChunkedResponseProperly(
         $baseUri = "http://foo:80";
         $this->httpAdapter = new Adapter\Test();
         $this->httpClient = new Http\Client(null, array('adapter' => $this->httpAdapter));
-        
+
         $respBody = file_get_contents(dirname(__FILE__) . "/_files/ZF1897-response-chunked.txt");
         $this->httpAdapter->setResponse($respBody);
 
         $this->xmlrpcClient = new Client($baseUri);
         $this->xmlrpcClient->setHttpClient($this->httpClient);
-        
+
         $this->assertEquals('FOO', $this->xmlrpcClient->call('foo'));
     }
 
@@ -713,8 +713,10 @@ public function mockHttpClient()
 }
 
 /** related to ZF-8478 */
-class PythonSimpleXMLRPCServerWithUnsupportedIntrospection extends Client\ServerProxy {
-    public function __call($method, $args) {
+class PythonSimpleXMLRPCServerWithUnsupportedIntrospection extends Client\ServerProxy
+{
+    public function __call($method, $args)
+    {
         if ($method == 'methodSignature') {
             return 'signatures not supported';
         }
@@ -723,8 +725,10 @@ public function __call($method, $args) {
 }
 
 /** related to ZF-8478 */
-class TestClient extends Client {
-    public function getProxy($namespace = '') {
+class TestClient extends Client
+{
+    public function getProxy($namespace = '')
+    {
         if (empty($this->_proxyCache[$namespace])) {
             $this->_proxyCache[$namespace] = new PythonSimpleXMLRPCServerWithUnsupportedIntrospection($this, $namespace);
         }

test/FaultTest.php

@@ -159,19 +159,19 @@ public function testLoadXmlThrowsExceptionOnInvalidInput2()
         $this->setExpectedException('Zend\XmlRpc\Exception\InvalidArgumentException', 'Invalid fault structure');
         $this->assertFalse($this->_fault->loadXml('<methodResponse><fault/></methodResponse>'));
     }
-    
+
     public function testLoadXmlThrowsExceptionOnInvalidInput3()
     {
         $this->setExpectedException('Zend\XmlRpc\Exception\InvalidArgumentException', 'Invalid fault structure');
         $this->_fault->loadXml('<methodResponse><fault/></methodResponse>');
     }
-    
+
     public function testLoadXmlThrowsExceptionOnInvalidInput4()
     {
         $this->setExpectedException('Zend\XmlRpc\Exception\InvalidArgumentException', 'Fault code and string required');
         $this->_fault->loadXml('<methodResponse><fault><value><struct/></value></fault></methodResponse>');
     }
-    
+
     /**
      * Zend_XmlRpc_Fault::isFault() test
      */

test/RequestTest.php

@@ -170,7 +170,7 @@ public function testLoadXml()
 
         $xml = $dom->saveXml();
 
-        
+
         $parsed = $this->_request->loadXml($xml);
         $this->assertTrue($parsed, $xml);
 

test/ResponseTest.php

@@ -212,27 +212,27 @@ public function testSetGetEncoding()
     public function testLoadXmlCreatesFaultWithMissingNodes()
     {
         $sxl = new \SimpleXMLElement('<?xml version="1.0"?><methodResponse><params><param>foo</param></params></methodResponse>');
-        
+
         $this->assertFalse($this->_response->loadXml($sxl->asXML()));
         $this->assertTrue($this->_response->isFault());
         $fault = $this->_response->getFault();
         $this->assertEquals(653, $fault->getCode());
     }
-    
+
     public function testLoadXmlCreatesFaultWithMissingNodes2()
     {
         $sxl = new \SimpleXMLElement('<?xml version="1.0"?><methodResponse><params>foo</params></methodResponse>');
-        
+
         $this->assertFalse($this->_response->loadXml($sxl->asXML()));
         $this->assertTrue($this->_response->isFault());
         $fault = $this->_response->getFault();
         $this->assertEquals(653, $fault->getCode());
     }
-    
+
     public function testLoadXmlThrowsExceptionWithMissingNodes3()
     {
         $sxl = new \SimpleXMLElement('<?xml version="1.0"?><methodResponse><bar>foo</bar></methodResponse>');
-        
+
         $this->assertFalse($this->_response->loadXml($sxl->asXML()));
         $this->assertTrue($this->_response->isFault());
         $fault = $this->_response->getFault();

test/ValueTest.php

@@ -583,7 +583,7 @@ public function testMarshalDateTimeFromNativeStringProducesIsoOutput()
 
     public function testMarshalDateTimeFromInvalidString()
     {
-        $this->setExpectedException('Zend\XmlRpc\Exception\ValueException', 
+        $this->setExpectedException('Zend\XmlRpc\Exception\ValueException',
                                     "The timezone could not be found in the database");
         AbstractValue::getXmlRpcValue('foobarbaz', AbstractValue::XMLRPC_TYPE_DATETIME);
     }