symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/ParameterBag.php
Lines changed: 48 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/ParameterBag.php
Lines changed: 48 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
Lines changed: 32 additions & 1 deletion b/‎src/Symfony/Component/HttpFoundation/Tests/ParameterBagTest.php
Lines changed: 32 additions & 1 deletion
@@ -187,6 +187,54 @@ public function getBoolean($key, $default = false)
         return $this->filter($key, $default, FILTER_VALIDATE_BOOLEAN);
     }
 
+    /**
+     * Returns the parameter value converted to a DateTime object.
+     *
+     * @param string             $key      The parameter key
+     * @param string             $format   The expected date format
+     * @param \DateTime|null     $default  The default value if the parameter key does not exist
+     * @param \DateTimeZone|null $timeZone
+     *
+     * @return \DateTime|null
+     */
+    public function getDate($key, $format = 'Y-m-d', $default = null, $timeZone = null)
+    {
+        if (!$this->has($key)) {
+            return $default;
+        }
+
+        $time = $this->get($key);
+
+        // if the user has specified a timezone then pass that
+        // otherwise do not even attempt to put a value but rather let the runtime decide
+        // the default value by itself
+        // this is in order to ensure compatibility with all php versions since
+        // some accept null as a TimeZone parameter and others do not
+        if ($timeZone !== null) {
+            $result = \DateTime::createFromFormat($format, $time, $timeZone);
+        } else {
+            $result = \DateTime::createFromFormat($format, $time);
+        }
+
+        // Failure to parse the date according to the specified format will return null
+        return false === $result ? null : $result;
+    }
+
+    /**
+     * Returns the parameter value converted to a DateTime object while also parsing the time.
+     *
+     * @param string             $key      The parameter key
+     * @param string             $format   The expected date format
+     * @param \DateTime|null     $default  The default value if the parameter key does not exist
+     * @param \DateTimeZone|null $timeZone
+     *
+     * @return \DateTime|null
+     */
+    public function getDateTime($key, $format = 'Y-m-d H:i:s', $default = null, \DateTimeZone $timeZone = null)
+    {
+        return $this->getDate($key, $format, $default, $timeZone);
+    }
+
     /**
      * Filter key.
      *
 
@@ -124,6 +124,37 @@ public function testGetInt()
         $this->assertEquals(0, $bag->getInt('unknown'), '->getInt() returns zero if a parameter is not defined');
     }
 
+    public function testGetDateTime()
+    {
+        $format = 'Y-m-d H:i:s';
+        $bag = new ParameterBag(array('d1' => '2016-01-01 00:00:00'));
+        $date = \DateTime::createFromFormat($format, '2016-01-01 00:00:00');
+
+        $this->assertEquals($date, $bag->getDateTime('d1', $format), '->getDateTime() returns a date from the specified format');
+    }
+
+    public function testGetDate()
+    {
+        $isoDate = '2016-07-05T15:30:00UTC';
+        $bag = new ParameterBag(array(
+            'd1' => '2016-01-01',
+            'iso' => $isoDate,
+        ));
+
+        $date = \DateTime::createFromFormat('Y-m-d', '2016-01-01');
+        $diff = $date->diff($bag->getDate('d1'));
+
+        $this->assertEquals(0, $diff->days, '->getDate() returns a date via the format specified');
+        $this->assertNull($bag->getDate('d1', 'd/m/Y'), '->getDate() returns false if the format is not valid');
+        $this->assertNull($bag->getDate('d2', 'd/m/Y'), '->getDate() returns null if the parameter is not found');
+
+        $date = $bag->getDate('iso', \DateTime::ISO8601);
+        $this->assertEquals(new \DateTime($isoDate), $date);
+        $this->assertEquals('UTC', $date->getTimezone()->getName());
+
+        $this->assertEquals($date, $bag->getDate('nokey', 'Y-m-d', $date));
+    }
+
     public function testFilter()
     {
         $bag = new ParameterBag(array(
@@ -133,7 +164,7 @@ public function testFilter()
             'dec' => '256',
             'hex' => '0x100',
             'array' => array('bang'),
-            ));
+        ));
 
         $this->assertEmpty($bag->filter('nokey'), '->filter() should return empty by default if no key is found');