Skip to content

Commit fd4b79b

Browse files
Merge branch '4.3' into 4.4
* 4.3: [4.3] Remove unused local variables
2 parents 8be37e7 + f93b420 commit fd4b79b

File tree

3 files changed

+2
-9
lines changed

3 files changed

+2
-9
lines changed

DependencyInjection/FrameworkExtension.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,8 +1039,6 @@ private function registerAssetsConfiguration(array $config, ContainerBuilder $co
10391039
{
10401040
$loader->load('assets.xml');
10411041

1042-
$defaultVersion = null;
1043-
10441042
if ($config['version_strategy']) {
10451043
$defaultVersion = new Reference($config['version_strategy']);
10461044
} else {

Routing/DelegatingLoader.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,6 @@ public function load($resource, $type = null)
111111
}
112112
}
113113

114-
if (1 === substr_count($controller, ':')) {
115-
$nonDeprecatedNotation = str_replace(':', '::', $controller);
116-
// TODO deprecate this in 5.1
117-
}
118-
119114
$route->setDefault('_controller', $controller);
120115
}
121116

Tests/Functional/ContainerDumpTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ class ContainerDumpTest extends AbstractWebTestCase
1818
{
1919
public function testContainerCompilationInDebug()
2020
{
21-
$client = $this->createClient(['test_case' => 'ContainerDump', 'root_config' => 'config.yml']);
21+
$this->createClient(['test_case' => 'ContainerDump', 'root_config' => 'config.yml']);
2222

2323
$this->assertTrue(static::$container->has('serializer'));
2424
}
2525

2626
public function testContainerCompilation()
2727
{
28-
$client = $this->createClient(['test_case' => 'ContainerDump', 'root_config' => 'config.yml', 'debug' => false]);
28+
$this->createClient(['test_case' => 'ContainerDump', 'root_config' => 'config.yml', 'debug' => false]);
2929

3030
$this->assertTrue(static::$container->has('serializer'));
3131
}

0 commit comments

Comments
 (0)