Skip to content

Commit 855a02c

Browse files
Merge branch '3.4' into 4.3
* 3.4: #30432 fix an error message fix paths to detect code owners [Validator] Ensure numeric subpaths do not cause errors on PHP 7.4 Remove unused local variables in tests Make sure to collect child forms created on *_SET_DATA events do not render errors for checkboxes twice
2 parents 902593a + ebc745e commit 855a02c

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

Tests/Annotation/RouteTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class RouteTest extends TestCase
1919
public function testInvalidRouteParameter()
2020
{
2121
$this->expectException('BadMethodCallException');
22-
$route = new Route(['foo' => 'bar']);
22+
new Route(['foo' => 'bar']);
2323
}
2424

2525
public function testTryingToSetLocalesDirectly()

Tests/Fixtures/AnnotatedClasses/FooTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trait FooTrait
66
{
77
public function doBar()
88
{
9-
$baz = self::class;
9+
self::class;
1010
if (true) {
1111
}
1212
}

Tests/Generator/Dumper/PhpGeneratorDumperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ public function testGenerateNonExistingRoute()
211211
include $this->testTmpFilepath;
212212

213213
$projectUrlGenerator = new \NonExistingRoutesUrlGenerator(new RequestContext());
214-
$url = $projectUrlGenerator->generate('NonExisting', []);
214+
$projectUrlGenerator->generate('NonExisting', []);
215215
}
216216

217217
public function testDumpForRouteWithDefaults()

Tests/RouteCompilerTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,31 +247,31 @@ public function testRouteWithSameVariableTwice()
247247
$this->expectException('LogicException');
248248
$route = new Route('/{name}/{name}');
249249

250-
$compiled = $route->compile();
250+
$route->compile();
251251
}
252252

253253
public function testRouteCharsetMismatch()
254254
{
255255
$this->expectException('LogicException');
256256
$route = new Route("/\xE9/{bar}", [], ['bar' => '.'], ['utf8' => true]);
257257

258-
$compiled = $route->compile();
258+
$route->compile();
259259
}
260260

261261
public function testRequirementCharsetMismatch()
262262
{
263263
$this->expectException('LogicException');
264264
$route = new Route('/foo/{bar}', [], ['bar' => "\xE9"], ['utf8' => true]);
265265

266-
$compiled = $route->compile();
266+
$route->compile();
267267
}
268268

269269
public function testRouteWithFragmentAsPathParameter()
270270
{
271271
$this->expectException('InvalidArgumentException');
272272
$route = new Route('/{_fragment}');
273273

274-
$compiled = $route->compile();
274+
$route->compile();
275275
}
276276

277277
/**

0 commit comments

Comments
 (0)