From 80e8384c8b8b293733c7f7256ae901f6254de981 Mon Sep 17 00:00:00 2001
From: Francis Besset <francis.besset@gmail.com>
Date: Thu, 1 Dec 2011 11:05:59 +0100
Subject: [PATCH] [Converters] Fixed bug if the date(time) is null

---
 .../SoapCommon/Converter/DateTimeTypeConverter.php  |  7 ++++++-
 .../SoapCommon/Converter/DateTypeConverter.php      |  5 +++++
 .../Converter/DateTimeTypeConverterTest.php         | 13 ++++++++++++-
 .../SoapCommon/Converter/DateTypeConverterTest.php  | 13 ++++++++++++-
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/BeSimple/SoapCommon/Converter/DateTimeTypeConverter.php b/src/BeSimple/SoapCommon/Converter/DateTimeTypeConverter.php
index 6446e35..6b0a729 100644
--- a/src/BeSimple/SoapCommon/Converter/DateTimeTypeConverter.php
+++ b/src/BeSimple/SoapCommon/Converter/DateTimeTypeConverter.php
@@ -32,6 +32,10 @@ class DateTimeTypeConverter implements TypeConverterInterface
         $doc = new \DOMDocument();
         $doc->loadXML($data);
 
+        if ('' === $doc->textContent) {
+            return null;
+        }
+
         return new \DateTime($doc->textContent);
     }
 
@@ -39,4 +43,5 @@ class DateTimeTypeConverter implements TypeConverterInterface
     {
         return sprintf('<%1$s>%2$s</%1$s>', $this->getTypeName(), $data->format('Y-m-d\TH:i:sP'));
     }
-}
\ No newline at end of file
+}
+
diff --git a/src/BeSimple/SoapCommon/Converter/DateTypeConverter.php b/src/BeSimple/SoapCommon/Converter/DateTypeConverter.php
index 4e21425..11d5ad2 100644
--- a/src/BeSimple/SoapCommon/Converter/DateTypeConverter.php
+++ b/src/BeSimple/SoapCommon/Converter/DateTypeConverter.php
@@ -32,6 +32,10 @@ class DateTypeConverter implements TypeConverterInterface
         $doc = new \DOMDocument();
         $doc->loadXML($data);
 
+        if ('' === $doc->textContent) {
+            return null;
+        }
+
         return new \DateTime($doc->textContent);
     }
 
@@ -40,3 +44,4 @@ class DateTypeConverter implements TypeConverterInterface
         return sprintf('<%1$s>%2$s</%1$s>', $this->getTypeName(), $data->format('Y-m-d'));
     }
 }
+
diff --git a/tests/BeSimple/Tests/SoapCommon/Converter/DateTimeTypeConverterTest.php b/tests/BeSimple/Tests/SoapCommon/Converter/DateTimeTypeConverterTest.php
index d7913f5..9546722 100644
--- a/tests/BeSimple/Tests/SoapCommon/Converter/DateTimeTypeConverterTest.php
+++ b/tests/BeSimple/Tests/SoapCommon/Converter/DateTimeTypeConverterTest.php
@@ -40,4 +40,15 @@ class DateTimeTypeConverterTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals('<dateTime>2002-10-10T12:00:00-05:00</dateTime>', $dateXml);
     }
-}
\ No newline at end of file
+
+    public function testConvertNullDateTimeXmlToPhp()
+    {
+        $converter = new DateTimeTypeConverter();
+
+        $dateXml = '<sometag xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:nil="true"/>';
+        $date = $converter->convertXmlToPhp($dateXml);
+
+        $this->assertNull($date);
+    }
+}
+
diff --git a/tests/BeSimple/Tests/SoapCommon/Converter/DateTypeConverterTest.php b/tests/BeSimple/Tests/SoapCommon/Converter/DateTypeConverterTest.php
index 6e164cb..48bddcc 100644
--- a/tests/BeSimple/Tests/SoapCommon/Converter/DateTypeConverterTest.php
+++ b/tests/BeSimple/Tests/SoapCommon/Converter/DateTypeConverterTest.php
@@ -38,4 +38,15 @@ class DateTypeConverterTest extends \PHPUnit_Framework_TestCase
 
         $this->assertEquals('<date>2002-10-10</date>', $dateXml);
     }
-}
\ No newline at end of file
+
+    public function testConvertNullDateTimeXmlToPhp()
+    {
+        $converter = new DateTypeConverter();
+
+        $dateXml = '<sometag xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:nil="true"/>';
+        $date = $converter->convertXmlToPhp($dateXml);
+
+        $this->assertNull($date);
+    }
+}
+