Merge pull request #1837 from ste93cry/issue-1820

Add support for Doctrine immutable date types
doctrine-extensions · Oct 12, 2017 · 79cd1d4 · 79cd1d4
2 parents 5351c26 + 305e330
commit 79cd1d4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 0 deletions.
diff --git a/lib/Gedmo/Timestampable/Mapping/Driver/Annotation.php b/lib/Gedmo/Timestampable/Mapping/Driver/Annotation.php
@@ -28,9 +28,13 @@ class Annotation extends AbstractAnnotationDriver
      */
     protected $validTypes = array(
         'date',
+        'date_immutable',
         'time',
+        'time_immutable',
         'datetime',
+        'datetime_immutable',
         'datetimetz',
+        'datetimetz_immutable',
         'timestamp',
         'zenddate',
         'vardatetime',

diff --git a/lib/Gedmo/Timestampable/Mapping/Driver/Xml.php b/lib/Gedmo/Timestampable/Mapping/Driver/Xml.php
@@ -24,9 +24,13 @@ class Xml extends BaseXml
      */
     private $validTypes = array(
         'date',
+        'date_immutable',
         'time',
+        'time_immutable',
         'datetime',
+        'datetime_immutable',
         'datetimetz',
+        'datetimetz_immutable',
         'timestamp',
         'zenddate',
         'vardatetime',

diff --git a/lib/Gedmo/Timestampable/Mapping/Driver/Yaml.php b/lib/Gedmo/Timestampable/Mapping/Driver/Yaml.php
@@ -30,9 +30,13 @@ class Yaml extends File implements Driver
      */
     private $validTypes = array(
         'date',
+        'date_immutable',
         'time',
+        'time_immutable',
         'datetime',
+        'datetime_immutable',
         'datetimetz',
+        'datetimetz_immutable',
         'timestamp',
         'zenddate',
         'vardatetime',

diff --git a/lib/Gedmo/Timestampable/Mapping/Event/Adapter/ODM.php b/lib/Gedmo/Timestampable/Mapping/Event/Adapter/ODM.php
@@ -26,6 +26,9 @@ public function getDateValue($meta, $field)
         if (isset($mapping['type']) && $mapping['type'] == 'zenddate') {
             return new \Zend_Date();
         }
+        if (isset($mapping['type']) && in_array($mapping['type'], array('date_immutable', 'time_immutable', 'datetime_immutable', 'datetimetz_immutable'), true)) {
+            return new \DateTimeImmutable();
+        }
 
         return \DateTime::createFromFormat('U.u', number_format(microtime(true), 6, '.', ''))
             ->setTimeZone(new \DateTimeZone(date_default_timezone_get()));

diff --git a/lib/Gedmo/Timestampable/Mapping/Event/Adapter/ORM.php b/lib/Gedmo/Timestampable/Mapping/Event/Adapter/ORM.php
@@ -26,6 +26,9 @@ public function getDateValue($meta, $field)
         if (isset($mapping['type']) && $mapping['type'] == 'zenddate') {
             return new \Zend_Date();
         }
+        if (isset($mapping['type']) && in_array($mapping['type'], array('date_immutable', 'time_immutable', 'datetime_immutable', 'datetimetz_immutable'), true)) {
+            return new \DateTimeImmutable();
+        }
 
         return \DateTime::createFromFormat('U.u', number_format(microtime(true), 6, '.', ''))
             ->setTimeZone(new \DateTimeZone(date_default_timezone_get()));