You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
minor #22179 [HttpFoundation] Fix bad merge (nicolas-grekas)
This PR was merged into the 3.3-dev branch.
Discussion
----------
[HttpFoundation] Fix bad merge
| Q | A
| ------------- | ---
| Branch? | master
| Bug fix? | no
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | -
| License | MIT
| Doc PR | -
Bad merge, code had been removed in #21465
Commits
-------
af1eed9 [HttpFoundation] Fix bad merge
@@ -225,23 +202,6 @@ public function __construct($content = '', $status = 200, $headers = array())
225
202
$this->setStatusCode($status);
226
203
$this->setProtocolVersion('1.0');
227
204
228
-
// Deprecations
229
-
$class = get_class($this);
230
-
if ($thisinstanceof \PHPUnit_Framework_MockObject_MockObject || $thisinstanceof \Prophecy\Doubler\DoubleInterface) {
231
-
$class = get_parent_class($class);
232
-
}
233
-
if (isset(self::$deprecationsTriggered[$class])) {
234
-
return;
235
-
}
236
-
237
-
self::$deprecationsTriggered[$class] = true;
238
-
foreach (self::$deprecatedMethodsas$method) {
239
-
$r = new \ReflectionMethod($class, $method);
240
-
if (__CLASS__ !== $r->getDeclaringClass()->getName()) {
241
-
@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);
242
-
}
243
-
}
244
-
245
205
/* RFC2616 - 14.18 says all Responses need to have a Date */
246
206
if (!$this->headers->has('Date')) {
247
207
$this->setDate(new \DateTime(null, new \DateTimeZone('UTC')));
0 commit comments