Skip to content

Commit b38553e

Browse files
committed
Merge branch '2.4' into 2.5
* 2.4: [Debug] fixed class lookup when using PSR-0 with a target dir fixed standalone tests fixed standalone tests [Validator] fixed component standalone tests fixed standalone component tests depending on Validator and Form fixed some composer.json to make standalone component tests pass [SecurityBundle] fixed tests when used in standalone Conflicts: src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php src/Symfony/Component/Validator/composer.json
2 parents 53a3d19 + d7cb1f0 commit b38553e

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

Tests/Bundle/BundleTest.php

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,4 @@ public function testRegisterCommands()
3232

3333
$this->assertNull($bundle2->registerCommands($app));
3434
}
35-
36-
public function testRegisterCommandsIngoreCommandAsAService()
37-
{
38-
$container = new ContainerBuilder();
39-
$commandClass = 'Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand';
40-
$definition = new Definition($commandClass);
41-
$definition->addTag('console.command');
42-
$container->setDefinition('my-command', $definition);
43-
$container->setAlias('console.command.'.strtolower(str_replace('\\', '_', $commandClass)), 'my-command');
44-
$container->compile();
45-
46-
$application = $this->getMock('Symfony\Component\Console\Application');
47-
// Never called, because it's the
48-
// Symfony\Bundle\FrameworkBundle\Console\Application that register
49-
// commands as a service
50-
$application->expects($this->never())->method('add');
51-
52-
$bundle = new ExtensionPresentBundle();
53-
$bundle->setContainer($container);
54-
$bundle->registerCommands($application);
55-
}
5635
}

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
"symfony/config": "~2.0",
2929
"symfony/console": "~2.2",
3030
"symfony/dependency-injection": "~2.0",
31+
"symfony/expression-language": "~2.4",
3132
"symfony/finder": "~2.0",
3233
"symfony/process": "~2.0",
3334
"symfony/routing": "~2.2",

0 commit comments

Comments
 (0)