Merge branch 'hotfix/5375'

Close zendframework/zendframework#5375
zendframework · Nov 1, 2013 · 4cfed7b · 4cfed7b
commit 4cfed7b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/AbstractValue.php b/src/AbstractValue.php
@@ -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/test/ValueTest.php b/test/ValueTest.php
@@ -210,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
      */