Skip to content

Commit b457610

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: fixed CS [HttpKernel] Remove TestEventDispatcher.
2 parents 01a9861 + fc31f88 commit b457610

File tree

4 files changed

+5
-41
lines changed

4 files changed

+5
-41
lines changed

DataCollector/TimeDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function collect(Request $request, Response $response, \Exception $except
4747
'token' => $response->headers->get('X-Debug-Token'),
4848
'start_time' => $startTime * 1000,
4949
'events' => [],
50-
'stopwatch_installed' => \class_exists(Stopwatch::class, false),
50+
'stopwatch_installed' => class_exists(Stopwatch::class, false),
5151
];
5252
}
5353

HttpCache/ResponseCacheStrategy.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,20 +132,20 @@ public function update(Response $response)
132132
$maxAge = null;
133133
$sMaxage = null;
134134

135-
if (\is_numeric($this->ageDirectives['max-age'])) {
135+
if (is_numeric($this->ageDirectives['max-age'])) {
136136
$maxAge = $this->ageDirectives['max-age'] + $this->age;
137137
$response->headers->addCacheControlDirective('max-age', $maxAge);
138138
}
139139

140-
if (\is_numeric($this->ageDirectives['s-maxage'])) {
140+
if (is_numeric($this->ageDirectives['s-maxage'])) {
141141
$sMaxage = $this->ageDirectives['s-maxage'] + $this->age;
142142

143143
if ($maxAge !== $sMaxage) {
144144
$response->headers->addCacheControlDirective('s-maxage', $sMaxage);
145145
}
146146
}
147147

148-
if (\is_numeric($this->ageDirectives['expires'])) {
148+
if (is_numeric($this->ageDirectives['expires'])) {
149149
$date = clone $response->getDate();
150150
$date->modify('+'.($this->ageDirectives['expires'] + $this->age).' seconds');
151151
$response->setExpires($date);

Tests/DataCollector/TimeDataCollectorTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ public function testCollect()
5252

5353
$c->collect($request, new Response());
5454
$this->assertEquals(123456000, $c->getStartTime());
55-
$this->assertSame(\class_exists(Stopwatch::class, false), $c->isStopwatchInstalled());
55+
$this->assertSame(class_exists(Stopwatch::class, false), $c->isStopwatchInstalled());
5656
}
5757
}

Tests/Fixtures/TestEventDispatcher.php

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)