8000 Minor tweaks · symfony/symfony@80ed2c5 · GitHub
[go: up one dir, main page]
Skip to content

Commit 80ed2c5

Browse files
nicolas-grekasnicolas-grekas
committed
Minor tweaks
1 parent 783abab commit 80ed2c5

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Compiler/CachePoolPass.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ public function process(ContainerBuilder $container)
3636
}
3737
$seed .= '.'.$container->getParameter('kernel.name').'.'.$container->getParameter('kernel.environment');
3838

39-
$aliases = $container->getAliases();
4039
$attributes = array(
4140
'provider',
4241
'namespace',
@@ -57,9 +56,9 @@ public function process(ContainerBuilder $container)
5756
$tags[0]['namespace'] = $this->getNamespace($seed, $id);
5857
}
5958
if (isset($tags[0]['clearer'])) {
60-
$clearer = strtolower($tags[0]['clearer']);
61-
while (isset($aliases[$clearer])) {
62-
$clearer = (string) $aliases[$clearer];
59+
$clearer = $tags[0]['clearer'];
60+
while ($container->hasAlias($clearer)) {
61+
$clearer = (string) $container->getAlias($clearer);
6362
}
6463
} else {
6564
$clearer = null;

‎src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -317,26 +317,26 @@ public function testAssets()
317317
$packages = $container->getDefinition('assets.packages');
318318

319319
// default package
320-
$defaultPackage = $container->getDefinition($packages->getArgument(0));
320+
$defaultPackage = $container->getDefinition((string) $packages->getArgument(0));
321321
$this->assertUrlPackage($container, $defaultPackage, array('http://cdn.example.com'), 'SomeVersionScheme', '%%s?version=%%s');
322322

323323
// packages
324324
$packages = $packages->getArgument(1);
325325
$this->assertCount(5, $packages);
326326

327-
$package = $container->getDefinition($packages['images_path']);
327+
$package = $container->getDefinition((string) $packages['images_path']);
328328
$this->assertPathPackage($container, $package, '/foo', 'SomeVersionScheme', '%%s?version=%%s');
329329

330-
$package = $container->getDefinition($packages['images']);
330+
$package = $container->getDefinition((string) $packages['images']);
331331
$this->assertUrlPackage($container, $package, array('http://images1.example.com', 'http://images2.example.com'), '1.0.0', '%%s?version=%%s');
332332

333-
$package = $container->getDefinition($packages['foo']);
333+
$package = $container->getDefinition((string) $packages['foo']);
334334
$this->assertPathPackage($container, $package, '', '1.0.0', '%%s-%%s');
335335

336-
$package = $container->getDefinition($packages['bar']);
336+
$package = $container->getDefinition((string) $packages['bar']);
337337
$this->assertUrlPackage($container, $package, array('https://bar2.example.com'), 'SomeVersionScheme', '%%s?version=%%s');
338338

339-
$package = $container->getDefinition($packages['bar_version_strategy']);
339+
$package = $container->getDefinition((string) $packages['bar_version_strategy']);
340340
$this->assertEquals('assets.custom_version_strategy', (string) $package->getArgument(1));
341341
}
342342

@@ -346,7 +346,7 @@ public function testAssetsDefaultVersionStrategyAsService()
346346
$packages = $container->getDefinition('assets.packages');
347347

348348
// default package
349-
$defaultPackage = $container->getDefinition($packages->getArgument(0));
349+
$defaultPackage = $container->getDefinition((string) $packages->getArgument(0));
350350
$this->assertEquals('assets.custom_version_strategy', (string) $defaultPackage->getArgument(1));
351351
}
352352

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ private function createFirewall(ContainerBuilder $container, $id, $firewall, &$a
403403
$config->replaceArgument(8, isset($firewall['access_denied_handler']) ? $firewall['access_denied_handler'] : null);
404404
$config->replaceArgument(9, isset($firewall['access_denied_url']) ? $firewall['access_denied_url'] : null);
405405

406-
$container->setAlias(new Alias('security.user_checker.'.$id, false), $firewall['user_checker']);
406+
$container->setAlias('security.user_checker.'.$id, new Alias($firewall['user_checker'], false));
407407

408408
foreach ($this->factories as $position) {
409409
foreach ($position as $factory) {

‎src/Symfony/Bundle/SecurityBundle/Tests/DependencyInjection/CompleteConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function testFirewalls()
7373
$arguments = $contextDef->getArguments();
7474
$listeners[] = array_map(function ($ref) { return (string) $ref; }, $arguments['index_0']);
7575

76-
$configDef = $container->getDefinition($arguments['index_2']);
76+
$configDef = $container->getDefinition((string) $arguments['index_2']);
7777
$configs[] = array_values($configDef->getArguments());
7878
}
7979

‎src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ public function testDumpAutowireData()
287287
$container = include self::$fixturesPath.'/containers/container24.php';
288288
$dumper = new PhpDumper($container);
289289

290-
$this->assertEquals(file_get_contents(self::$fixturesPath.'/php/services24.php'), $dumper->dump());
290+
$this->assertStringEqualsFile(self::$fixturesPath.'/php/services24.php', $dumper->dump());
291291
}
292292

293293
public function testEnvParameter()

0 commit comments

Comments
 (0)
0