feature #22689 [DoctrineBridge] Add support for doctrin/dbal v2.6 types (jvasseur)

nicolas-grekas · nicolas-grekas · commit 3b2f9fb89ad9 · 2017-07-12T14:08:10.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- [DoctrineBridge] Add support for doctrin/dbal v2.6 types | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT Add support for the following doctrine types in the property info extractor: - date_immutable - datetime_immutable - datetimetz_immutable - time_immutable - dateinterval I didn't include the json type since it can be anything that can be stored in a json. And add support for the dateinterval type for the form type guesser (the form component doesn't support using DateTimeImmutable instances). Commits ------- b30fd4f Add support for doctrin/dbal 2.6 types
diff --git a/src/Symfony/Bridge/Doctrine/CHANGELOG.md b/src/Symfony/Bridge/Doctrine/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+3.4.0
+-----
+
+ * added support for doctrine/dbal v2.6 types
+
 3.1.0
 -----
 
diff --git a/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php b/src/Symfony/Bridge/Doctrine/Form/DoctrineOrmTypeGuesser.php
@@ -60,6 +60,8 @@ public function guessType($class, $property)
             case Type::DATETIMETZ:
             case 'vardatetime':
                 return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateTimeType', array(), Guess::HIGH_CONFIDENCE);
+            case 'dateinterval':
+                return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateIntervalType', array(), Guess::HIGH_CONFIDENCE);
             case Type::DATE:
                 return new TypeGuess('Symfony\Component\Form\Extension\Core\Type\DateType', array(), Guess::HIGH_CONFIDENCE);
             case Type::TIME:
diff --git a/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php b/src/Symfony/Bridge/Doctrine/PropertyInfo/DoctrineExtractor.php
@@ -117,6 +117,15 @@ public function getTypes($class, $property, array $context = array())
                 case DBALType::TIME:
                     return array(new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateTime'));
 
+                case 'date_immutable':
+                case 'datetime_immutable':
+                case 'datetimetz_immutable':
+                case 'time_immutable':
+                    return array(new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateTimeImmutable'));
+
+                case 'dateinterval':
+                    return array(new Type(Type::BUILTIN_TYPE_OBJECT, $nullable, 'DateInterval'));
+
                 case DBALType::TARRAY:
                     return array(new Type(Type::BUILTIN_TYPE_ARRAY, $nullable, null, true));
 
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/DoctrineExtractorTest.php
@@ -48,6 +48,8 @@ public function testGetProperties()
                 'id',
                 'guid',
                 'time',
+                'timeImmutable',
+                'dateInterval',
                 'json',
                 'simpleArray',
                 'float',
@@ -78,6 +80,9 @@ public function typesProvider()
             array('id', array(new Type(Type::BUILTIN_TYPE_INT))),
             array('guid', array(new Type(Type::BUILTIN_TYPE_STRING))),
             array('bigint', array(new Type(Type::BUILTIN_TYPE_STRING))),
+            array('time', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTime'))),
+            array('timeImmutable', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateTimeImmutable'))),
+            array('dateInterval', array(new Type(Type::BUILTIN_TYPE_OBJECT, false, 'DateInterval'))),
             array('float', array(new Type(Type::BUILTIN_TYPE_FLOAT))),
             array('decimal', array(new Type(Type::BUILTIN_TYPE_STRING))),
             array('bool', array(new Type(Type::BUILTIN_TYPE_BOOL))),
diff --git a/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php b/src/Symfony/Bridge/Doctrine/Tests/PropertyInfo/Fixtures/DoctrineDummy.php
@@ -55,6 +55,16 @@ class DoctrineDummy
      */
     private $time;
 
+    /**
+     * @Column(type="time_immutable")
+     */
+    private $timeImmutable;
+
+    /**
+     * @Column(type="dateinterval")
+     */
+    private $dateInterval;
+
     /**
      * @Column(type="json_array")
      */
