Merge branch '3.1'

nicolas-grekas · nicolas-grekas · commit 3a3801a07c22 · 2016-06-16T07:23:20.000+02:00
* 3.1:
  [TwigBridge] Add missing type hint to TwigRenderer
  [HttpFoundation] Fix UPSERT for PgSql &gt;= 9.5
  [Form] fixed DateTime transformers
  [PropertyAccess][DX] Enhance exception that say that some methods are missing if they don't
  bumped Symfony version to 3.1.2
  updated VERSION for 3.1.1
  updated CHANGELOG for 3.1.1
  [Form] fixed EntityType test with query_builder option

Conflicts:
	src/Symfony/Component/HttpKernel/Kernel.php
	src/Symfony/Component/PropertyAccess/PropertyAccessor.php
diff --git a/CHANGELOG-3.1.md b/CHANGELOG-3.1.md
@@ -7,6 +7,32 @@ in 3.1 minor versions.
 To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
 To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v3.1.0...v3.1.1
 
+* 3.1.1 (2016-06-15)
+
+ * bug #19048 [HttpFoundation] Use UPSERT for sessions stored in PgSql >= 9.5 (nicolas-grekas)
+ * bug #19042 [Cache] Fix double fetch in ProxyAdapter (nicolas-grekas)
+ * bug #19038 Fix feature detection for IE (Alsciende)
+ * bug #18915 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)
+ * bug #19020 [Form] Fixed collapsed choice attributes (HeahDude)
+ * bug #19028 [Yaml] properly count skipped comment lines (xabbuh)
+ * bug #19009 [WebProfilerBundle] Fix invalid CSS style (romainneutron)
+ * bug #17733 [Yaml] Fix wrong line number when comments are inserted in the middle of a block. (paradajozsef)
+ * bug #18909 Fixed singular of committee (peterrehm)
+ * bug #18911 Fixed singular of committee (peterrehm)
+ * bug #18971 Do not inject web debug toolbar on attachments (peterrehm)
+ * bug #18944 [Ldap] Fixed issue with legacy client initialisation (csarrazi)
+ * bug #18974 Added missing APCU CacheProvider of doctrine/cache 1.6.x (Carsten Eilers)
+ * bug #18954 [HttpKernel] Fix RequestDataCollector starting the session (romainneutron)
+ * bug #18949 [Security] Fix DebugAccessDecisionManager when object is not a scalar (romainneutron)
+ * bug #18959 [WebProfilerBundle] Fixed forwarded request data in templates (HeahDude)
+ * bug #18943 [Ldap][Security] The Ldap user provider abstract service now has the correct number of arguments (csarrazi)
+ * bug #18925 [Console] Fix BC break introduced by #18101 (dunglas)
+ * bug #18908 [DependencyInjection] force enabling the external XML entity loaders (xabbuh)
+ * bug #18893 [DependencyInjection] Skip deep reference check for 'service_container' (RobertMe)
+ * bug #18812 Catch \Throwable (fprochazka)
+ * bug #18821 [Form] Removed UTC specification with timestamp (francisbesset)
+ * bug #18861 Fix for #18843 (inso)
+
 * 3.1.0 (2016-05-30)
 
  * bug #18889 [Console] SymfonyStyle: Fix alignment/prefixing of multi-line comments (chalasr)
diff --git a/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php b/src/Symfony/Bridge/Doctrine/HttpFoundation/DbalSessionHandler.php
@@ -243,7 +243,7 @@ private function getMergeSql()
                 return "INSERT OR REPLACE INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time)";
             case 'postgresql' === $platform && version_compare($this->con->getServerVersion(), '9.5', '>='):
                 return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".
-                    "ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->timeCol) = (:data, :time) WHERE $this->idCol = :id";
+                    "ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->timeCol) = (EXCLUDED.$this->dataCol, EXCLUDED.$this->timeCol)";
         }
     }
 }
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php b/src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php
@@ -209,8 +209,13 @@ public function testConfigureQueryBuilderWithClosureReturningNonQueryBuilder()
         $field->submit('2');
     }
 
-    public function testConfigureQueryBuilderWithClosureReturningNull()
+    public function testConfigureQueryBuilderWithClosureReturningNullUseDefault()
     {
+        $entity1 = new SingleIntIdEntity(1, 'Foo');
+        $entity2 = new SingleIntIdEntity(2, 'Bar');
+
+        $this->persist(array($entity1, $entity2));
+
         $field = $this->factory->createNamed('name', 'Symfony\Bridge\Doctrine\Form\Type\EntityType', null, array(
             'em' => 'default',
             'class' => self::SINGLE_IDENT_CLASS,
@@ -219,7 +224,7 @@ public function testConfigureQueryBuilderWithClosureReturningNull()
             },
         ));
 
-        $this->assertEquals(array(), $field->createView()->vars['choices']);
+        $this->assertEquals(array(1 => new ChoiceView($entity1, '1', 'Foo'), 2 => new ChoiceView($entity2, '2', 'Bar')), $field->createView()->vars['choices']);
     }
 
     public function testSetDataSingleNull()
diff --git a/src/Symfony/Bridge/Twig/Form/TwigRenderer.php b/src/Symfony/Bridge/Twig/Form/TwigRenderer.php
@@ -12,6 +12,7 @@
 namespace Symfony\Bridge\Twig\Form;
 
 use Symfony\Component\Form\FormRenderer;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
 
 /**
  * @author Bernhard Schussek <bschussek@gmail.com>
@@ -23,7 +24,7 @@ class TwigRenderer extends FormRenderer implements TwigRendererInterface
      */
     private $engine;
 
-    public function __construct(TwigRendererEngineInterface $engine, $csrfTokenManager = null)
+    public function __construct(TwigRendererEngineInterface $engine, CsrfTokenManagerInterface $csrfTokenManager = null)
     {
         parent::__construct($engine, $csrfTokenManager);
 
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToArrayTransformer.php
@@ -51,13 +51,11 @@ public function __construct($inputTimezone = null, $outputTimezone = null, array
     /**
      * Transforms a normalized date into a localized date.
      *
-     * @param \DateTime|\DateTimeInterface $dateTime A DateTime object
+     * @param \DateTimeInterface $dateTime A DateTimeInterface object
      *
      * @return array Localized date.
      *
-     * @throws TransformationFailedException If the given value is not an
-     *                                       instance of \DateTime or if the
-     *                                       output timezone is not supported.
+     * @throws TransformationFailedException If the given value is not a \DateTimeInterface
      */
     public function transform($dateTime)
     {
@@ -81,11 +79,7 @@ public function transform($dateTime)
                 $dateTime = clone $dateTime;
             }
 
-            try {
-                $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
-            } catch (\Exception $e) {
-                throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
-            }
+            $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
         }
 
         $result = array_intersect_key(array(
@@ -118,8 +112,6 @@ public function transform($dateTime)
      *
      * @throws TransformationFailedException If the given value is not an array,
      *                                       if the value could not be transformed
-     *                                       or if the input timezone is not
-     *                                       supported.
      */
     public function reverseTransform($value)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToLocalizedStringTransformer.php
@@ -70,13 +70,12 @@ public function __construct($inputTimezone = null, $outputTimezone = null, $date
     /**
      * Transforms a normalized date into a localized date string/array.
      *
-     * @param \DateTime|\DateTimeInterface $dateTime A DateTime object
+     * @param \DateTimeInterface $dateTime A DateTimeInterface object
      *
      * @return string|array Localized date string/array.
      *
-     * @throws TransformationFailedException If the given value is not an instance
-     *                                       of \DateTime or if the date could not
-     *                                       be transformed.
+     * @throws TransformationFailedException If the given value is not a \DateTimeInterface
+     *                                       or if the date could not be transformed.
      */
     public function transform($dateTime)
     {
@@ -105,8 +104,7 @@ public function transform($dateTime)
      * @return \DateTime Normalized date
      *
      * @throws TransformationFailedException if the given value is not a string,
-     *                                       if the date could not be parsed or
-     *                                       if the input timezone is not supported
+     *                                       if the date could not be parsed
      */
     public function reverseTransform($value)
     {
@@ -132,11 +130,7 @@ public function reverseTransform($value)
         }
 
         if ('UTC' !== $this->inputTimezone) {
-            try {
-                $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
-            } catch (\Exception $e) {
-                throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
-            }
+            $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
         }
 
         return $dateTime;
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToRfc3339Transformer.php
@@ -19,7 +19,13 @@
 class DateTimeToRfc3339Transformer extends BaseDateTimeTransformer
 {
     /**
-     * {@inheritdoc}
+     * Transforms a normalized date into a localized date.
+     *
+     * @param \DateTimeInterface $dateTime A DateTimeInterface object
+     *
+     * @return string The formatted date.
+     *
+     * @throws TransformationFailedException If the given value is not a \DateTimeInterface
      */
     public function transform($dateTime)
     {
@@ -32,15 +38,25 @@ public function transform($dateTime)
         }
 
         if ($this->inputTimezone !== $this->outputTimezone) {
-            $dateTime = clone $dateTime;
+            if (!$dateTime instanceof \DateTimeImmutable) {
+                $dateTime = clone $dateTime;
+            }
+
             $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
         }
 
         return preg_replace('/\+00:00$/', 'Z', $dateTime->format('c'));
     }
 
     /**
-     * {@inheritdoc}
+     * Transforms a formatted string following RFC 3339 into a normalized date.
+     *
+     * @param string $rfc3339 Formatted string
+     *
+     * @return \DateTime Normalized date
+     *
+     * @throws TransformationFailedException If the given value is not a string,
+     *                                       if the value could not be transformed
      */
     public function reverseTransform($rfc3339)
     {
@@ -58,12 +74,8 @@ public function reverseTransform($rfc3339)
             throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
         }
 
-        if ($this->outputTimezone !== $dateTime->getTimezone()->getName()) {
-            try {
-                $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
-            } catch (\Exception $e) {
-                throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
-            }
+        if ($this->inputTimezone !== $dateTime->getTimezone()->getName()) {
+            $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));
         }
 
         if (preg_match('/(\d{4})-(\d{2})-(\d{2})/', $rfc3339, $matches)) {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToStringTransformer.php
@@ -85,35 +85,29 @@ public function __construct($inputTimezone = null, $outputTimezone = null, $form
      * Transforms a DateTime object into a date string with the configured format
      * and timezone.
      *
-     * @param \DateTime|\DateTimeInterface $value A DateTime object
+     * @param \DateTimeInterface $dateTime A DateTimeInterface object
      *
      * @return string A value as produced by PHP's date() function
      *
-     * @throws TransformationFailedException If the given value is not a \DateTime
-     *                                       instance or if the output timezone
-     *                                       is not supported.
+     * @throws TransformationFailedException If the given value is not a \DateTimeInterface
      */
-    public function transform($value)
+    public function transform($dateTime)
     {
-        if (null === $value) {
+        if (null === $dateTime) {
             return '';
         }
 
-        if (!$value instanceof \DateTimeInterface) {
+        if (!$dateTime instanceof \DateTimeInterface) {
             throw new TransformationFailedException('Expected a \DateTimeInterface.');
         }
 
-        if (!$value instanceof \DateTimeImmutable) {
-            $value = clone $value;
+        if (!$dateTime instanceof \DateTimeImmutable) {
+            $dateTime = clone $dateTime;
         }
 
-        try {
-            $value = $value->setTimezone(new \DateTimeZone($this->outputTimezone));
-        } catch (\Exception $e) {
-            throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);
-        }
+        $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));
 
-        return $value->format($this->generateFormat);
+        return $dateTime->format($this->generateFormat);
     }
 
     /**
@@ -124,8 +118,7 @@ public function transform($value)
      * @return \DateTime An instance of \DateTime
      *
      * @throws TransformationFailedException If the given value is not a string,
-     *                                       if the date could not be parsed or
-     *                                       if the input timezone is not supported.
+     *                                       or could not be transformed
      */
     public function reverseTransform($value)
     {
diff --git a/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToTimestampTransformer.php b/src/Symfony/Component/Form/Extension/Core/DataTransformer/DateTimeToTimestampTransformer.php
@@ -24,25 +24,23 @@ class DateTimeToTimestampTransformer extends BaseDateTimeTransformer
     /**
      * Transforms a DateTime object into a timestamp in the configured timezone.
      *
-     * @param \DateTime|\DateTimeInterface $dateTime A DateTime object
+     * @param \DateTimeInterface $dateTime A DateTimeInterface object
      *
      * @return int A timestamp
      *
-     * @throws TransformationFailedException If the given value is not an instance
-     *                                       of \DateTime or if the output
-     *                                       timezone is not supported.
+     * @throws TransformationFailedException If the given value is not a \DateTimeInterface
      */
-    public function transform($value)
+    public function transform($dateTime)
     {
-        if (null === $value) {
+        if (null === $dateTime) {
             return;
         }
 
-        if (!$value instanceof \DateTimeInterface) {
+        if (!$dateTime instanceof \DateTimeInterface) {
             throw new TransformationFailedException('Expected a \DateTimeInterface.');
         }
 
-        return $value->getTimestamp();
+        return $dateTime->getTimestamp();
     }
 
     /**
@@ -53,7 +51,7 @@ public function transform($value)
      * @return \DateTime A \DateTime object
      *
      * @throws TransformationFailedException If the given value is not a timestamp
-     *                                       or if the given timestamp is invalid.
+     *                                       or if the given timestamp is invalid
      */
     public function reverseTransform($value)
     {
diff --git a/src/Symfony/Component/HttpFoundation/Cookie.php b/src/Symfony/Component/HttpFoundation/Cookie.php
@@ -30,14 +30,14 @@ class Cookie
     /**
      * Constructor.
      *
-     * @param string                                  $name     The name of the cookie
-     * @param string                                  $value    The value of the cookie
-     * @param int|string|\DateTime|\DateTimeInterface $expire   The time the cookie expires
-     * @param string                                  $path     The path on the server in which the cookie will be available on
-     * @param string                                  $domain   The domain that the cookie is available to
-     * @param bool                                    $secure   Whether the cookie should only be transmitted over a secure HTTPS connection from the client
-     * @param bool                                    $httpOnly Whether the cookie will be made accessible only through the HTTP protocol
-     * @param bool                                    $raw      Whether the cookie value should be sent with no url encoding
+     * @param string                        $name     The name of the cookie
+     * @param string                        $value    The value of the cookie
+     * @param int|string|\DateTimeInterface $expire   The time the cookie expires
+     * @param string                        $path     The path on the server in which the cookie will be available on
+     * @param string                        $domain   The domain that the cookie is available to
+     * @param bool                          $secure   Whether the cookie should only be transmitted over a secure HTTPS connection from the client
+     * @param bool                          $httpOnly Whether the cookie will be made accessible only through the HTTP protocol
+     * @param bool                          $raw      Whether the cookie value should be sent with no url encoding
      *
      * @throws \InvalidArgumentException
      */
diff --git a/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php b/src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php
@@ -678,7 +678,7 @@ private function getMergeSql()
                 return "INSERT OR REPLACE INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time)";
             case 'pgsql' === $this->driver && version_compare($this->pdo->getAttribute(\PDO::ATTR_SERVER_VERSION), '9.5', '>='):
                 return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time) ".
-                    "ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->lifetimeCol, $this->timeCol) = (:data, :lifetime, :time) WHERE $this->idCol = :id";
+                    "ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->lifetimeCol, $this->timeCol) = (EXCLUDED.$this->dataCol, EXCLUDED.$this->lifetimeCol, EXCLUDED.$this->timeCol)";
         }
     }
 
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -758,6 +758,17 @@ private function getWriteAccessInfo($class, $property, $value)
                 // we call the getter and hope the __call do the job
                 $access[self::ACCESS_TYPE] = self::ACCESS_TYPE_MAGIC;
                 $access[self::ACCESS_NAME] = $setter;
+            } elseif (null !== $methods = $this->findAdderAndRemover($reflClass, $singulars)) {
+                $access[self::ACCESS_TYPE] = self::ACCESS_TYPE_NOT_FOUND;
+                $access[self::ACCESS_NAME] = sprintf(
+                    'The property "%s" in class "%s" can be defined with the methods "%s()" but '.
+                    'the new value must be an array or an instance of \Traversable, '.
+                    '"%s" given.',
+                    $property,
+                    $reflClass->name,
+                    implode('()", "', $methods),
+                    is_object($value) ? get_class($value) : gettype($value)
+                );
             } else {
                 $access[self::ACCESS_TYPE] = self::ACCESS_TYPE_NOT_FOUND;
                 $access[self::ACCESS_NAME] = sprintf(
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorCollectionTest.php
@@ -194,4 +194,15 @@ public function testIsWritableReturnsFalseIfNoAdderNorRemoverExists()
 
         $this->assertFalse($this->propertyAccessor->isWritable($car, 'axes', $axes));
     }
+
+    /**
+     * @expectedException \Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException
+     * expectedExceptionMessageRegExp /The property "axes" in class "Mock_PropertyAccessorCollectionTest_Car[^"]*" can be defined with the methods "addAxis()", "removeAxis()" but the new value must be an array or an instance of \Traversable, "string" given./
+     */
+    public function testSetValueFailsIfAdderAndRemoverExistButValueIsNotTraversable()
+    {
+        $car = $this->getMock(__CLASS__.'_Car');
+
+        $this->propertyAccessor->setValue($car, 'axes', 'Not an array or Traversable');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ private function getMergeSql()`
`243`	`243`	`return "INSERT OR REPLACE INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time)";`
`244`	`244`	`case 'postgresql' === $platform && version_compare($this->con->getServerVersion(), '9.5', '>='):`
`245`	`245`	`return "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->timeCol) VALUES (:id, :data, :time) ".`
`246`		`- "ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->timeCol) = (:data, :time) WHERE $this->idCol = :id";`
	`246`	`+ "ON CONFLICT ($this->idCol) DO UPDATE SET ($this->dataCol, $this->timeCol) = (EXCLUDED.$this->dataCol, EXCLUDED.$this->timeCol)";`
`247`	`247`	`}`
`248`	`248`	`}`
`249`	`249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,11 @@ public function __construct($inputTimezone = null, $outputTimezone = null, array`
`51`	`51`	`/**`
`52`	`52`	`* Transforms a normalized date into a localized date.`
`53`	`53`	`*`
`54`		`- * @param \DateTime\|\DateTimeInterface $dateTime A DateTime object`
	`54`	`+ * @param \DateTimeInterface $dateTime A DateTimeInterface object`
`55`	`55`	`*`
`56`	`56`	`* @return array Localized date.`
`57`	`57`	`*`
`58`		`- * @throws TransformationFailedException If the given value is not an`
`59`		`- * instance of \DateTime or if the`
`60`		`- * output timezone is not supported.`
	`58`	`+ * @throws TransformationFailedException If the given value is not a \DateTimeInterface`
`61`	`59`	`*/`
`62`	`60`	`public function transform($dateTime)`
`63`	`61`	`{`
`@@ -81,11 +79,7 @@ public function transform($dateTime)`
`81`	`79`	`$dateTime = clone $dateTime;`
`82`	`80`	`}`
`83`	`81`
`84`		`- try {`
`85`		`- $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));`
`86`		`- } catch (\Exception $e) {`
`87`		`- throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);`
`88`		`- }`
	`82`	`+ $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));`
`89`	`83`	`}`
`90`	`84`
`91`	`85`	`$result = array_intersect_key(array(`
`@@ -118,8 +112,6 @@ public function transform($dateTime)`
`118`	`112`	`*`
`119`	`113`	`* @throws TransformationFailedException If the given value is not an array,`
`120`	`114`	`* if the value could not be transformed`
`121`		`- * or if the input timezone is not`
`122`		`- * supported.`
`123`	`115`	`*/`
`124`	`116`	`public function reverseTransform($value)`
`125`	`117`	`{`
Original file line number	Diff line number	Diff line change
`@@ -70,13 +70,12 @@ public function __construct($inputTimezone = null, $outputTimezone = null, $date`
`70`	`70`	`/**`
`71`	`71`	`* Transforms a normalized date into a localized date string/array.`
`72`	`72`	`*`
`73`		`- * @param \DateTime\|\DateTimeInterface $dateTime A DateTime object`
	`73`	`+ * @param \DateTimeInterface $dateTime A DateTimeInterface object`
`74`	`74`	`*`
`75`	`75`	`* @return string\|array Localized date string/array.`
`76`	`76`	`*`
`77`		`- * @throws TransformationFailedException If the given value is not an instance`
`78`		`- * of \DateTime or if the date could not`
`79`		`- * be transformed.`
	`77`	`+ * @throws TransformationFailedException If the given value is not a \DateTimeInterface`
	`78`	`+ * or if the date could not be transformed.`
`80`	`79`	`*/`
`81`	`80`	`public function transform($dateTime)`
`82`	`81`	`{`
`@@ -105,8 +104,7 @@ public function transform($dateTime)`
`105`	`104`	`* @return \DateTime Normalized date`
`106`	`105`	`*`
`107`	`106`	`* @throws TransformationFailedException if the given value is not a string,`
`108`		`- * if the date could not be parsed or`
`109`		`- * if the input timezone is not supported`
	`107`	`+ * if the date could not be parsed`
`110`	`108`	`*/`
`111`	`109`	`public function reverseTransform($value)`
`112`	`110`	`{`
`@@ -132,11 +130,7 @@ public function reverseTransform($value)`
`132`	`130`	`}`
`133`	`131`
`134`	`132`	`if ('UTC' !== $this->inputTimezone) {`
`135`		`- try {`
`136`		`- $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));`
`137`		`- } catch (\Exception $e) {`
`138`		`- throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);`
`139`		`- }`
	`133`	`+ $dateTime->setTimezone(new \DateTimeZone($this->inputTimezone));`
`140`	`134`	`}`
`141`	`135`
`142`	`136`	`return $dateTime;`
Original file line number	Diff line number	Diff line change
`@@ -85,35 +85,29 @@ public function __construct($inputTimezone = null, $outputTimezone = null, $form`
`85`	`85`	`* Transforms a DateTime object into a date string with the configured format`
`86`	`86`	`* and timezone.`
`87`	`87`	`*`
`88`		`- * @param \DateTime\|\DateTimeInterface $value A DateTime object`
	`88`	`+ * @param \DateTimeInterface $dateTime A DateTimeInterface object`
`89`	`89`	`*`
`90`	`90`	`* @return string A value as produced by PHP's date() function`
`91`	`91`	`*`
`92`		`- * @throws TransformationFailedException If the given value is not a \DateTime`
`93`		`- * instance or if the output timezone`
`94`		`- * is not supported.`
	`92`	`+ * @throws TransformationFailedException If the given value is not a \DateTimeInterface`
`95`	`93`	`*/`
`96`		`- public function transform($value)`
	`94`	`+ public function transform($dateTime)`
`97`	`95`	`{`
`98`		`- if (null === $value) {`
	`96`	`+ if (null === $dateTime) {`
`99`	`97`	`return '';`
`100`	`98`	`}`
`101`	`99`
`102`		`- if (!$value instanceof \DateTimeInterface) {`
	`100`	`+ if (!$dateTime instanceof \DateTimeInterface) {`
`103`	`101`	`throw new TransformationFailedException('Expected a \DateTimeInterface.');`
`104`	`102`	`}`
`105`	`103`
`106`		`- if (!$value instanceof \DateTimeImmutable) {`
`107`		`- $value = clone $value;`
	`104`	`+ if (!$dateTime instanceof \DateTimeImmutable) {`
	`105`	`+ $dateTime = clone $dateTime;`
`108`	`106`	`}`
`109`	`107`
`110`		`- try {`
`111`		`- $value = $value->setTimezone(new \DateTimeZone($this->outputTimezone));`
`112`		`- } catch (\Exception $e) {`
`113`		`- throw new TransformationFailedException($e->getMessage(), $e->getCode(), $e);`
`114`		`- }`
	`108`	`+ $dateTime = $dateTime->setTimezone(new \DateTimeZone($this->outputTimezone));`
`115`	`109`
`116`		`- return $value->format($this->generateFormat);`
	`110`	`+ return $dateTime->format($this->generateFormat);`
`117`	`111`	`}`
`118`	`112`
`119`	`113`	`/**`
`@@ -124,8 +118,7 @@ public function transform($value)`
`124`	`118`	`* @return \DateTime An instance of \DateTime`
`125`	`119`	`*`
`126`	`120`	`* @throws TransformationFailedException If the given value is not a string,`
`127`		`- * if the date could not be parsed or`
`128`		`- * if the input timezone is not supported.`
	`121`	`+ * or could not be transformed`
`129`	`122`	`*/`
`130`	`123`	`public function reverseTransform($value)`
`131`	`124`	`{`
Original file line number	Diff line number	Diff line change
`@@ -24,25 +24,23 @@ class DateTimeToTimestampTransformer extends BaseDateTimeTransformer`
`24`	`24`	`/**`
`25`	`25`	`* Transforms a DateTime object into a timestamp in the configured timezone.`
`26`	`26`	`*`
`27`		`- * @param \DateTime\|\DateTimeInterface $dateTime A DateTime object`
	`27`	`+ * @param \DateTimeInterface $dateTime A DateTimeInterface object`
`28`	`28`	`*`
`29`	`29`	`* @return int A timestamp`
`30`	`30`	`*`
`31`		`- * @throws TransformationFailedException If the given value is not an instance`
`32`		`- * of \DateTime or if the output`
`33`		`- * timezone is not supported.`
	`31`	`+ * @throws TransformationFailedException If the given value is not a \DateTimeInterface`
`34`	`32`	`*/`
`35`		`- public function transform($value)`
	`33`	`+ public function transform($dateTime)`
`36`	`34`	`{`
`37`		`- if (null === $value) {`
	`35`	`+ if (null === $dateTime) {`
`38`	`36`	`return;`
`39`	`37`	`}`
`40`	`38`
`41`		`- if (!$value instanceof \DateTimeInterface) {`
	`39`	`+ if (!$dateTime instanceof \DateTimeInterface) {`
`42`	`40`	`throw new TransformationFailedException('Expected a \DateTimeInterface.');`
`43`	`41`	`}`
`44`	`42`
`45`		`- return $value->getTimestamp();`
	`43`	`+ return $dateTime->getTimestamp();`
`46`	`44`	`}`
`47`	`45`
`48`	`46`	`/**`
`@@ -53,7 +51,7 @@ public function transform($value)`
`53`	`51`	`* @return \DateTime A \DateTime object`
`54`	`52`	`*`
`55`	`53`	`* @throws TransformationFailedException If the given value is not a timestamp`
`56`		`- * or if the given timestamp is invalid.`
	`54`	`+ * or if the given timestamp is invalid`
`57`	`55`	`*/`
`58`	`56`	`public function reverseTransform($value)`
`59`	`57`	`{`