bug #22304 Moved $this->setDate() before the deprecation handling. (mpdonadio)

nicolas-grekas · nicolas-grekas · commit 325e61dbbe5a · 2017-04-07T14:28:10.000+02:00
This PR was squashed before being merged into the 3.2 branch (closes #22304). Discussion ---------- Moved $this->setDate() before the deprecation handling. | Q | A | ------------- | --- | Branch? | 3.2  | Bug fix? | yes | New feature? | no  | BC breaks? | no? | Deprecations? | no  | Tests pass? | yes | Fixed tickets | #...  | License | MIT | Doc PR | symfony/symfony-docs#...   #22036 merged the patch into the wrong place; the `$this->setDate()` happens after the deprecation handling, so it does not always get called. See also https://www.drupal.org/node/2712647?page=1#comment-12025349 Commits ------- b6df4e7 Moved ->setDate() before the deprecation handling.
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -226,6 +226,11 @@ public function __construct($content = '', $status = 200, $headers = array())
         $this->setStatusCode($status);
         $this->setProtocolVersion('1.0');
 
+        /* RFC2616 - 14.18 says all Responses need to have a Date */
+        if (!$this->headers->has('Date')) {
+            $this->setDate(\DateTime::createFromFormat('U', time()));
+        }
+
         // Deprecations
         $class = get_class($this);
         if ($this instanceof \PHPUnit_Framework_MockObject_MockObject || $this instanceof \Prophecy\Doubler\DoubleInterface) {
@@ -242,11 +247,6 @@ public function __construct($content = '', $status = 200, $headers = array())
                 @trigger_error(sprintf('Extending %s::%s() in %s is deprecated since version 3.2 and won\'t be supported anymore in 4.0 as it will be final.', __CLASS__, $method, $class), E_USER_DEPRECATED);
             }
         }
-
-        /* RFC2616 - 14.18 says all Responses need to have a Date */
-        if (!$this->headers->has('Date')) {
-            $this->setDate(\DateTime::createFromFormat('U', time()));
-        }
     }
 
     /**
