Merge branch 'fix/#3093-dateinterval-legacy-format' into 2.7

doctrine · Apr 7, 2018 · f62711a · f62711a
2 parents 2cc12a1 + 46fab66
commit f62711a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/lib/Doctrine/DBAL/Types/DateIntervalType.php b/lib/Doctrine/DBAL/Types/DateIntervalType.php
@@ -56,10 +56,17 @@ public function convertToPHPValue($value, AbstractPlatform $platform)
             return $value;
         }
 
+        $negative = false;
+
+        if (isset($value[0]) && ($value[0] === '+' || $value[0] === '-')) {
+            $negative = $value[0] === '-';
+            $value    = substr($value, 1);
+        }
+
         try {
-            $interval = new \DateInterval(substr($value, 1));
+            $interval = new \DateInterval($value);
 
-            if (substr($value, 0, 1) === '-') {
+            if ($negative) {
                 $interval->invert = 1;
             }
 

diff --git a/tests/Doctrine/Tests/DBAL/Types/DateIntervalTest.php b/tests/Doctrine/Tests/DBAL/Types/DateIntervalTest.php
@@ -67,6 +67,14 @@ public function testNegativeDateIntervalConvertsToPHPValue() : void
         self::assertEquals('-P02Y00M01DT01H02M03S', $interval->format(DateIntervalType::FORMAT));
     }
 
+    public function testDateIntervalFormatWithoutSignConvertsToPHPValue() : void
+    {
+        $interval = $this->type->convertToPHPValue('P02Y00M01DT01H02M03S', $this->platform);
+
+        self::assertInstanceOf(\DateInterval::class, $interval);
+        self::assertEquals('+P02Y00M01DT01H02M03S', $interval->format(DateIntervalType::FORMAT));
+    }
+
     public function testInvalidDateIntervalFormatConversion() : void
     {
         $this->expectException(ConversionException::class);
@@ -79,6 +87,13 @@ public function testDateIntervalNullConversion() : void
         self::assertNull($this->type->convertToPHPValue(null, $this->platform));
     }
 
+    public function testDateIntervalEmptyStringConversion() : void
+    {
+        $this->expectException(ConversionException::class);
+
+        $this->type->convertToPHPValue('', $this->platform);
+    }
+
     /**
      * @group DBAL-1288
      */