From c18cede7ab2b3a8288b7a3759f99c641d011785c Mon Sep 17 00:00:00 2001
From: Francis Besset <francis.besset@gmail.com>
Date: Mon, 29 Aug 2011 21:34:49 +0200
Subject: [PATCH] Added xsd:date type and DateTypeConverter

---
 Converter/DateTimeTypeConverter.php       |  2 +-
 Converter/DateTypeConverter.php           | 44 +++++++++++++++++++++++
 Resources/config/converters.xml           |  5 +++
 Resources/config/webservice.xml           |  4 +++
 Tests/Converter/DateTypeConverterTest.php | 41 +++++++++++++++++++++
 5 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 Converter/DateTypeConverter.php
 create mode 100644 Tests/Converter/DateTypeConverterTest.php

diff --git a/Converter/DateTimeTypeConverter.php b/Converter/DateTimeTypeConverter.php
index 47a9ace..9f692fc 100644
--- a/Converter/DateTimeTypeConverter.php
+++ b/Converter/DateTimeTypeConverter.php
@@ -39,6 +39,6 @@ class DateTimeTypeConverter implements TypeConverterInterface
 
     public function convertPhpToXml(SoapResponse $response, $data)
     {
-        return sprintf('<dateTime>%s</dateTime>', $data->format('Y-m-d\TH:i:sP'));
+        return sprintf('<%1$s>%2$s</%1$s>', $this->getTypeName(), $data->format('Y-m-d\TH:i:sP'));
     }
 }
diff --git a/Converter/DateTypeConverter.php b/Converter/DateTypeConverter.php
new file mode 100644
index 0000000..61f7119
--- /dev/null
+++ b/Converter/DateTypeConverter.php
@@ -0,0 +1,44 @@
+<?php
+/*
+ * This file is part of the BeSimpleSoapBundle.
+ *
+ * (c) Christian Kerl <christian-kerl@web.de>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace BeSimple\SoapBundle\Converter;
+
+use BeSimple\SoapBundle\Soap\SoapRequest;
+use BeSimple\SoapBundle\Soap\SoapResponse;
+use BeSimple\SoapBundle\Util\String;
+
+/**
+ * @author Francis Besset <francis.besset@gmail.com>
+ */
+class DateTypeConverter implements TypeConverterInterface
+{
+    public function getTypeNamespace()
+    {
+        return 'http://www.w3.org/2001/XMLSchema';
+    }
+
+    public function getTypeName()
+    {
+        return 'date';
+    }
+
+    public function convertXmlToPhp(SoapRequest $request, $data)
+    {
+        $doc = new \DOMDocument();
+        $doc->loadXML($data);
+
+        return new \DateTime($doc->textContent);
+    }
+
+    public function convertPhpToXml(SoapResponse $response, $data)
+    {
+        return sprintf('<%1$s>%2$s</%1$s>', $this->getTypeName(), $data->format('Y-m-d'));
+    }
+}
diff --git a/Resources/config/converters.xml b/Resources/config/converters.xml
index 25b7cd1..ec6e5c5 100644
--- a/Resources/config/converters.xml
+++ b/Resources/config/converters.xml
@@ -7,6 +7,7 @@
     <parameters>
         <parameter key="besimple.soap.converter.repository.class">BeSimple\SoapBundle\Converter\ConverterRepository</parameter>
         <parameter key="besimple.soap.converter.date_time.class">BeSimple\SoapBundle\Converter\DateTimeTypeConverter</parameter>
+        <parameter key="besimple.soap.converter.date.class">BeSimple\SoapBundle\Converter\DateTypeConverter</parameter>
     </parameters>
 
     <services>
@@ -15,5 +16,9 @@
         <service id="besimple.soap.converter.date_time" class="%besimple.soap.converter.date_time.class%" public="false">
             <tag name="besimple.soap.converter" />
         </service>
+
+        <service id="besimple.soap.converter.date" class="%besimple.soap.converter.date.class%" public="false">
+            <tag name="besimple.soap.converter" />
+        </service>
     </services>
 </container>
diff --git a/Resources/config/webservice.xml b/Resources/config/webservice.xml
index 873148a..5b0f211 100644
--- a/Resources/config/webservice.xml
+++ b/Resources/config/webservice.xml
@@ -81,6 +81,10 @@
                 <argument>dateTime</argument>
                 <argument>xsd:dateTime</argument>
             </call>
+            <call method="addDefaultTypeMapping">
+                <argument>date</argument>
+                <argument>xsd:date</argument>
+            </call>
         </service>
     </services>
 
diff --git a/Tests/Converter/DateTypeConverterTest.php b/Tests/Converter/DateTypeConverterTest.php
new file mode 100644
index 0000000..db53dd1
--- /dev/null
+++ b/Tests/Converter/DateTypeConverterTest.php
@@ -0,0 +1,41 @@
+<?php
+/*
+ * This file is part of the BeSimpleSoapBundle.
+ *
+ * (c) Christian Kerl <christian-kerl@web.de>
+ *
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace BeSimple\SoapBundle\Tests\Converter;
+
+use BeSimple\SoapBundle\Soap\SoapRequest;
+use BeSimple\SoapBundle\Soap\SoapResponse;
+use BeSimple\SoapBundle\Converter\DateTypeConverter;
+
+/**
+ * UnitTest for \BeSimple\SoapBundle\Converter\DateTimeTypeConverter.
+ */
+class DateTypeConverterTest extends \PHPUnit_Framework_TestCase
+{
+    public function testConvertXmlToPhp()
+    {
+        $converter = new DateTypeConverter();
+
+        $dateXml = '<sometag>2002-10-10</sometag>';
+        $date = $converter->convertXmlToPhp(new SoapRequest(), $dateXml);
+
+        $this->assertEquals(new \DateTime('2002-10-10'), $date);
+    }
+
+    public function testConvertPhpToXml()
+    {
+        $converter = new DateTypeConverter();
+
+        $date    = new \DateTime('2002-10-10');
+        $dateXml = $converter->convertPhpToXml(new SoapResponse(), $date);
+
+        $this->assertEquals('<date>2002-10-10</date>', $dateXml);
+    }
+}