Merge branch 'master' into acceptHandling

Conflicts:
	library/Zend/Http/Header/AbstractAccept.php
	library/Zend/Http/Header/AcceptEncoding.php
	library/Zend/Http/Header/AcceptLanguage.php
	tests/Zend/Http/Header/AcceptCharsetTest.php
	tests/Zend/Http/Header/AcceptEncodingTest.php
	tests/Zend/Http/Header/AcceptLanguageTest.php
	tests/Zend/Http/Header/AcceptTest.php

Author: Freeaqingme

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);

src/Server.php

@@ -10,10 +10,10 @@
 
 namespace Zend\XmlRpc;
 
+use ReflectionClass;
 use Zend\Server\AbstractServer;
 use Zend\Server\Definition;
 use Zend\Server\Reflection;
-use Zend\Stdlib\SubClass;
 
 /**
  * An XML-RPC server implementation
@@ -439,7 +439,7 @@ public function getResponse()
      */
     public function setResponseClass($class)
     {
-        if (!class_exists($class) || !SubClass::isSubclassOf($class, 'Zend\XmlRpc\Response')) {
+        if (!class_exists($class) || !self::isSubclassOf($class, 'Zend\XmlRpc\Response')) {
             throw new Server\Exception\InvalidArgumentException('Invalid response class');
 
         }
@@ -588,4 +588,28 @@ protected function registerSystemMethods()
         $this->_system = $system;
         $this->setClass($system, 'system');
     }
+
+    /**
+     * Checks if the object has this class as one of its parents
+     *
+     * @see https://bugs.php.net/bug.php?id=53727
+     * @see https://github.com/zendframework/zf2/pull/1807
+     *
+     * @param string $className
+     * @param string $type
+     */
+    protected static function isSubclassOf($className, $type)
+    {
+        if (is_subclass_of($className, $type)) {
+            return true;
+        }
+        if (version_compare(PHP_VERSION, '5.3.7', '>=')) {
+            return false;
+        }
+        if (!interface_exists($type)) {
+            return false;
+        }
+        $r = new ReflectionClass($className);
+        return $r->implementsInterface($type);
+    }
 }

src/Value/DateTime.php

@@ -9,6 +9,7 @@
  */
 
 namespace Zend\XmlRpc\Value;
+
 use Zend\XmlRpc\Exception;
 
 /**

src/Value/Integer.php

@@ -9,6 +9,7 @@
  */
 
 namespace Zend\XmlRpc\Value;
+
 use Zend\XmlRpc\Exception;
 
 /**

test/BigIntegerValueTest.php

@@ -9,15 +9,14 @@
  */
 
 namespace ZendTest\XmlRpc;
+
 use Zend\XmlRpc\AbstractValue;
 use Zend\XmlRpc\Value\BigInteger;
 use Zend\XmlRpc\Exception;
 use Zend\XmlRpc\Generator\GeneratorInterface as Generator;
 use Zend\Math\BigInteger as MathBigInteger;
 
 /**
- * Test case for Zend_XmlRpc_Value
- *
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage UnitTests

test/ClientTest.php

@@ -20,8 +20,6 @@
 use Zend\XmlRpc;
 
 /**
- * Test case for Zend\XmlRpc\Client
- *
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage UnitTests
@@ -651,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'));
     }
 
@@ -715,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';
         }
@@ -725,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

@@ -14,8 +14,6 @@
 use Zend\XmlRpc;
 
 /**
- * Test case for Zend_XmlRpc_Fault
- *
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage UnitTests
@@ -161,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/GeneratorTest.php

@@ -13,8 +13,6 @@
 use Zend\XmlRpc\Generator\GeneratorInterface as Generator;
 
 /**
- * Test case for Zend_XmlRpc_Generator_*
- *
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage UnitTests

test/Request/HttpTest.php

@@ -14,8 +14,6 @@
 use ZendTest\AllTests\StreamWrapper\PHPInput;
 
 /**
- * Test case for Zend\XmlRpc\Request\Http
- *
  * @category   Zend
  * @package    Zend_XmlRpc
  * @subpackage UnitTests