Merge branch 'master' into ValidatorMessages

zendframework · Nov 4, 2013 · f7d2a49 · f7d2a49
commit f7d2a49
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 54 deletions.
diff --git a/src/AbstractValue.php b/src/AbstractValue.php
@@ -19,7 +19,7 @@
  * function acts likes a factory for the Zend\XmlRpc\Value objects
  *
  * Using this function, users/Zend\XmlRpc\Client object can create the Zend\XmlRpc\Value objects
- * from PHP variables, XML string or by specifying the exact XML-RPC natvie type
+ * from PHP variables, XML string or by specifying the exact XML-RPC native type
  */
 abstract class AbstractValue
 {
@@ -445,6 +445,9 @@ protected static function _extractTypeAndValue(\SimpleXMLElement $xml, &$type, &
         // If no type was specified, the default is string
         if (!$type) {
             $type = self::XMLRPC_TYPE_STRING;
+            if (empty($value) and preg_match('#^<value>.*</value>$#', $xml->asXML())) {
+                $value = str_replace(array('<value>', '</value>'), '', $xml->asXML());
+            }
         }
     }
 

diff --git a/src/Request/Stdin.php b/src/Request/Stdin.php
@@ -10,7 +10,7 @@
 namespace Zend\XmlRpc\Request;
 
 use Zend\XmlRpc\Request as XmlRpcRequest;
-use Zend\XmlRpc\Server\Exception as ServerException;
+use Zend\XmlRpc\Fault;
 
 /**
  * XmlRpc Request object -- Request via STDIN
@@ -39,7 +39,7 @@ public function __construct()
     {
         $fh = fopen('php://stdin', 'r');
         if (!$fh) {
-            $this->fault = new ServerException(630);
+            $this->fault = new Fault(630);
             return;
         }
 

diff --git a/src/Value/AbstractCollection.php b/src/Value/AbstractCollection.php
@@ -21,7 +21,7 @@ abstract class AbstractCollection extends AbstractValue
      */
     public function __construct($value)
     {
-        $values = (array)$value;   // Make sure that the value is an array
+        $values = (array) $value;   // Make sure that the value is an array
         foreach ($values as $key => $value) {
             // If the elements of the given array are not Zend\XmlRpc\Value objects,
             // we need to convert them as such (using auto-detection from PHP value)
@@ -40,7 +40,7 @@ public function __construct($value)
      */
     public function getValue()
     {
-        $values = (array)$this->value;
+        $values = (array) $this->value;
         foreach ($values as $key => $value) {
             $values[$key] = $value->getValue();
         }

diff --git a/test/BigIntegerValueTest.php b/test/BigIntegerValueTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -16,9 +15,6 @@
 use Zend\XmlRpc\Generator\GeneratorInterface as Generator;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class BigIntegerValueTest extends \PHPUnit_Framework_TestCase

diff --git a/test/ClientTest.php b/test/ClientTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -19,9 +18,6 @@
 use Zend\XmlRpc;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class ClientTest extends \PHPUnit_Framework_TestCase

diff --git a/test/FaultTest.php b/test/FaultTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -14,9 +13,6 @@
 use Zend\XmlRpc;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class FaultTest extends \PHPUnit_Framework_TestCase

diff --git a/test/GeneratorTest.php b/test/GeneratorTest.php
@@ -5,17 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
 
 use Zend\XmlRpc\Generator\GeneratorInterface as Generator;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class GeneratorTest extends \PHPUnit_Framework_TestCase
@@ -65,7 +61,7 @@ public function testFlushingGeneratorFlushesEverything(Generator $generator)
         $generator->openElement('test')->closeElement('test');
         $this->assertXml('<test/>', $generator);
         $this->assertContains('<test/>', $generator->flush());
-        $this->assertSame('', (string)$generator);
+        $this->assertSame('', (string) $generator);
     }
 
     /**

diff --git a/test/Request/HttpTest.php b/test/Request/HttpTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace ZendTest\XmlRpc\Request;
@@ -14,9 +13,6 @@
 use ZendTest\AllTests\StreamWrapper\PHPInput;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class HTTPTest extends \PHPUnit_Framework_TestCase

diff --git a/test/RequestTest.php b/test/RequestTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -15,9 +14,6 @@
 use Zend\XmlRpc\Value;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class RequestTest extends \PHPUnit_Framework_TestCase

diff --git a/test/ResponseTest.php b/test/ResponseTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -14,9 +13,6 @@
 use Zend\XmlRpc\AbstractValue;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class ResponseTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Server/CacheTest.php b/test/Server/CacheTest.php
@@ -5,17 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace ZendTest\XmlRpc\Server;
 
 use Zend\XmlRpc\Server;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class CacheTest extends \PHPUnit_Framework_TestCase

diff --git a/test/Server/FaultTest.php b/test/Server/FaultTest.php
@@ -5,17 +5,13 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace ZendTest\XmlRpc\Server;
 
 use Zend\XmlRpc\Server;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class FaultTest extends \PHPUnit_Framework_TestCase
@@ -229,11 +225,11 @@ private function __construct()
 
     public static function getInstance()
     {
-        if (!self::$_instance) {
-            self::$_instance = new self();
+        if (!static::$_instance) {
+            static::$_instance = new self();
         }
 
-        return self::$_instance;
+        return static::$_instance;
     }
 
     public static function observe(Server\Fault $fault)

diff --git a/test/ServerTest.php b/test/ServerTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -19,9 +18,6 @@
 use Zend\XmlRpc;
 
 /**
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class ServerTest extends \PHPUnit_Framework_TestCase

diff --git a/test/TestProvider.php b/test/TestProvider.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;

diff --git a/test/ValueTest.php b/test/ValueTest.php
@@ -5,7 +5,6 @@
  * @link      http://github.com/zendframework/zf2 for the canonical source repository
  * @copyright Copyright (c) 2005-2013 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   http://framework.zend.com/license/new-bsd New BSD License
- * @package   Zend_XmlRpc
  */
 
 namespace ZendTest\XmlRpc;
@@ -19,9 +18,6 @@
 /**
  * Test case for Value
  *
- * @category   Zend
- * @package    Zend_XmlRpc
- * @subpackage UnitTests
  * @group      Zend_XmlRpc
  */
 class ValueTest extends \PHPUnit_Framework_TestCase
@@ -214,6 +210,21 @@ public function testMarshalStringFromNative()
         $this->assertSame($native, $val->getValue());
     }
 
+    public function testFactoryAutodetectsStringAndSetsValueInArray()
+    {
+        $val = AbstractValue::getXmlRpcValue('<value><array><data>'.
+            '<value><i4>8</i4></value>'.
+            '<value>a</value>'.
+            '<value>false</value>'.
+            '</data></array></value>', AbstractValue::XML_STRING
+        );
+        $this->assertXmlRpcType('array', $val);
+        $a = $val->getValue();
+        $this->assertSame(8, $a[0]);
+        $this->assertSame('a', $a[1]);
+        $this->assertSame('false', $a[2]);
+    }
+
     /**
      * @dataProvider ZendTest\XmlRpc\TestProvider::provideGenerators
      */