Merge pull request #799 from Bouwdie/handle-xsd-nil-as-one

Evaluate XML xsi:nil="1" to null
schmittjoh · Jul 24, 2017 · fe455ee · fe455ee
2 parents 57ca3c4 + d6991f0
commit fe455ee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/JMS/Serializer/XmlDeserializationVisitor.php b/src/JMS/Serializer/XmlDeserializationVisitor.php
@@ -399,7 +399,9 @@ public function isNull($value)
             $xsiAttributes = $value->attributes('http://www.w3.org/2001/XMLSchema-instance');
 
             //We have to keep the isset quiet, some tests give error: `Node no longer exists`; even though it evaluates to false
-            if (@isset($xsiAttributes['nil']) && (string) $xsiAttributes['nil'] === 'true') {
+            if (@isset($xsiAttributes['nil'])
+                && ((string) $xsiAttributes['nil'] === 'true' || (string) $xsiAttributes['nil'] === '1')
+            ) {
                 return true;
             }
         }

diff --git a/tests/Serializer/XmlSerializationTest.php b/tests/Serializer/XmlSerializationTest.php
@@ -494,9 +494,11 @@ public function testEvaluatesToNull()
     {
         $namingStrategy = $this->getMockBuilder(PropertyNamingStrategyInterface::class)->getMock();
         $visitor = new XmlDeserializationVisitor($namingStrategy);
-        $element = simplexml_load_string('<empty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:nil="true"/>');
+        $xsdNilAsTrueElement = simplexml_load_string('<empty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:nil="true"/>');
+        $xsdNilAsOneElement = simplexml_load_string('<empty xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:nil="1"/>');
 
-        $this->assertTrue($visitor->isNull($element));
+        $this->assertTrue($visitor->isNull($xsdNilAsTrueElement));
+        $this->assertTrue($visitor->isNull($xsdNilAsOneElement));
         $this->assertTrue($visitor->isNull(null));
     }