early return includes null condition. added phpdoc

maldoinc · maldoinc · commit b3a292e8a22f · 2016-08-11T20:23:00.000+02:00
diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php
@@ -190,19 +190,19 @@ public function getBoolean($key, $default = false)
     /**
      * Returns the parameter value converted to a DateTime object.
      *
-     * @param string                    $key      The parameter key
-     * @param string                    $format   The expected date format
-     * @param \DateTimeInterface|string $default  The default value to be converted to a DateTime object if the parameter key does not exist
-     * @param \DateTimeZone|null        $timeZone A DateTimeZone object representing the desired time zone
+     * @param string                          $key      The parameter key
+     * @param string                          $format   The expected date format
+     * @param \DateTimeInterface|string|null  $default  The default value to be converted to a DateTime object if the parameter key does not exist
+     * @param \DateTimeZone|null              $timeZone A DateTimeZone object representing the desired time zone
      *
      * @return \DateTimeInterface|null
      */
     public function getDate($key, $format, $default = null, \DateTimeZone $timeZone = null)
     {
         $time = $this->get($key, $default);
 
-        if ($time instanceof \DateTimeInterface) {
-            return $default;
+        if ((null === $time) || $time instanceof \DateTimeInterface) {
+            return $time;
         }
 
         // if the user has specified a timezone then pass that

Original file line number	Diff line number	Diff line change
`@@ -190,19 +190,19 @@ public function getBoolean($key, $default = false)`
`190`	`190`	`/**`
`191`	`191`	`* Returns the parameter value converted to a DateTime object.`
`192`	`192`	`*`
`193`		`- * @param string $key The parameter key`
`194`		`- * @param string $format The expected date format`
`195`		`- * @param \DateTimeInterface\|string $default The default value to be converted to a DateTime object if the parameter key does not exist`
`196`		`- * @param \DateTimeZone\|null $timeZone A DateTimeZone object representing the desired time zone`
	`193`	`+ * @param string $key The parameter key`
	`194`	`+ * @param string $format The expected date format`
	`195`	`+ * @param \DateTimeInterface\|string\|null $default The default value to be converted to a DateTime object if the parameter key does not exist`
	`196`	`+ * @param \DateTimeZone\|null $timeZone A DateTimeZone object representing the desired time zone`
`197`	`197`	`*`
`198`	`198`	`* @return \DateTimeInterface\|null`
`199`	`199`	`*/`
`200`	`200`	`public function getDate($key, $format, $default = null, \DateTimeZone $timeZone = null)`
`201`	`201`	`{`
`202`	`202`	`$time = $this->get($key, $default);`
`203`	`203`
`204`		`- if ($time instanceof \DateTimeInterface) {`
`205`		`- return $default;`
	`204`	`+ if ((null === $time) \|\| $time instanceof \DateTimeInterface) {`
	`205`	`+ return $time;`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`// if the user has specified a timezone then pass that`