Skip to content

Commit c57cae7

Browse files
fabpotfabpot
committed
fixed test configuration and broken tests
1 parent 93f2d6e commit c57cae7

File tree

9 files changed

+95
-95
lines changed

9 files changed

+95
-95
lines changed

‎phpunit.xml.dist

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@
1414
<testsuites>
1515
<testsuite name="Symfony Test Suite">
1616
<directory>./tests/Symfony/</directory>
17-
<directory>./src/Symfony/Framework/*/Tests/</directory>
17+
<directory>./src/Symfony/Bundle/*/Tests/</directory>
1818
</testsuite>
1919
</testsuites>
2020

2121
<filter>
2222
<whitelist>
2323
<directory>./src/Symfony/</directory>
2424
<exclude>
25-
<directory>./src/Symfony/Framework/*/Resources</directory>
26-
<file>./src/Symfony/Foundation/bootstrap.php</file>
27-
<file>./src/Symfony/Foundation/packager.php</file>
25+
<directory>./src/Symfony/Bundle/*/Resources</directory>
26+
<file>./src/Symfony/Framework/bootstrap.php</file>
27+
<file>./src/Symfony/Framework/packager.php</file>
2828
</exclude>
2929
</whitelist>
3030
</filter>

‎src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/DoctrineExtensionTest.php

+31-31
Original file line numberDiff line numberDiff line change
@@ -13,53 +13,53 @@
1313

1414
use Symfony\Bundle\DoctrineBundle\Tests\TestCase;
1515
use Symfony\Bundle\DoctrineBundle\DependencyInjection\DoctrineExtension;
16-
use Symfony\Components\DependencyInjection\BuilderConfiguration;
16+
use Symfony\Components\DependencyInjection\ContainerBuilder;
1717
use Symfony\Components\DependencyInjection\Loader\XmlFileLoader;
1818

1919
class DoctrineExtensionTest extends TestCase
2020
{
2121
public function testDbalLoad()
2222
{
23-
$configuration = new BuilderConfiguration();
24-
$loader = new DoctrineExtension(array(), array());
23+
$container = new ContainerBuilder();
24+
$loader = new DoctrineExtension(array(), array(), sys_get_temp_dir());
2525

26-
$configuration = $loader->dbalLoad(array(), $configuration);
27-
$this->assertEquals('Symfony\\Bundle\\DoctrineBundle\\DataCollector\\DoctrineDataCollector', $configuration->getParameter('doctrine.data_collector.class'), '->dbalLoad() loads the dbal.xml file if not already loaded');
26+
$loader->dbalLoad(array(), $container);
27+
$this->assertEquals('Symfony\\Bundle\\DoctrineBundle\\DataCollector\\DoctrineDataCollector', $container->getParameter('doctrine.data_collector.class'), '->dbalLoad() loads the dbal.xml file if not already loaded');
2828

2929
// doctrine.dbal.default_connection
30-
$this->assertEquals('default', $configuration->getParameter('doctrine.dbal.default_connection'), '->dbalLoad() overrides existing configuration options');
31-
$configuration = $loader->dbalLoad(array('default_connection' => 'foo'), $configuration);
32-
$this->assertEquals('foo', $configuration->getParameter('doctrine.dbal.default_connection'), '->dbalLoad() overrides existing configuration options');
33-
$configuration = $loader->dbalLoad(array(), $configuration);
34-
$this->assertEquals('foo', $configuration->getParameter('doctrine.dbal.default_connection'), '->dbalLoad() overrides existing configuration options');
30+
$this->assertEquals('default', $container->getParameter('doctrine.dbal.default_connection'), '->dbalLoad() overrides existing configuration options');
31+
$loader->dbalLoad(array('default_connection' => 'foo'), $container);
32+
$this->assertEquals('foo', $container->getParameter('doctrine.dbal.default_connection'), '->dbalLoad() overrides existing configuration options');
33+
$loader->dbalLoad(array(), $container);
34+
$this->assertEquals('foo', $container->getParameter('doctrine.dbal.default_connection'), '->dbalLoad() overrides existing configuration options');
3535

36-
$configuration = new BuilderConfiguration();
37-
$loader = new DoctrineExtension(array(), array());
38-
$configuration = $loader->dbalLoad(array('password' => 'foo'), $configuration);
36+
$container = new ContainerBuilder();
37+
$loader = new DoctrineExtension(array(), array(), sys_get_temp_dir());
38+
$loader->dbalLoad(array('password' => 'foo'), $container);
3939

40-
$arguments = $configuration->getDefinition('doctrine.dbal.default_connection')->getArguments();
40+
$arguments = $container->getDefinition('doctrine.dbal.default_connection')->getArguments();
4141
$config = $arguments[0];
4242

4343
$this->assertEquals('foo', $config['password']);
4444
$this->assertEquals('root', $config['user']);
4545

46-
$configuration = $loader->dbalLoad(array('user' => 'foo'), $configuration);
46+
$loader->dbalLoad(array('user' => 'foo'), $container);
4747
$this->assertEquals('foo', $config['password']);
4848
$this->assertEquals('root', $config['user']);
4949
}
5050

5151
public function testDbalLoadFromXmlMultipleConnections()
5252
{
53-
$configuration = new BuilderConfiguration();
54-
$loader = new DoctrineExtension(array(), array());
55-
XmlFileLoader::registerExtension($loader);
53+
$container = new ContainerBuilder();
54+
$loader = new DoctrineExtension(array(), array(), sys_get_temp_dir());
55+
$container->registerExtension($loader);
5656

57-
$loadXml = new XmlFileLoader(__DIR__.'/Fixtures/xml');
58-
$configuration->merge($loadXml->load('dbal_service_multiple_connections.xml'));
59-
$configuration = $loader->dbalLoad(array(), $configuration);
57+
$loadXml = new XmlFileLoader($container, __DIR__.'/Fixtures/xml');
58+
$loadXml->load('dbal_service_multiple_connections.xml');
59+
$loader->dbalLoad(array(), $container);
6060

6161
// doctrine.dbal.mysql_connection
62-
$arguments = $configuration->getDefinition('doctrine.dbal.mysql_connection')->getArguments();
62+
$arguments = $container->getDefinition('doctrine.dbal.mysql_connection')->getArguments();
6363
$config = $arguments[0];
6464

6565
$this->assertEquals('mysql_s3cr3t', $config['password']);
@@ -68,7 +68,7 @@ public function testDbalLoadFromXmlMultipleConnections()
6868
$this->assertEquals('/path/to/mysqld.sock', $config['unix_socket']);
6969

7070
// doctrine.dbal.sqlite_connection
71-
$arguments = $configuration->getDefinition('doctrine.dbal.sqlite_connection')->getArguments();
71+
$arguments = $container->getDefinition('doctrine.dbal.sqlite_connection')->getArguments();
7272
$config = $arguments[0];
7373

7474
$this->assertEquals('sqlite_s3cr3t', $config['password']);
@@ -77,7 +77,7 @@ public function testDbalLoadFromXmlMultipleConnections()
7777
$this->assertEquals(true, $config['memory']);
7878

7979
// doctrine.dbal.oci_connection
80-
$arguments = $configuration->getDefinition('doctrine.dbal.oci_connection')->getArguments();
80+
$arguments = $container->getDefinition('doctrine.dbal.oci_connection')->getArguments();
8181
$config = $arguments[0];
8282

8383
$this->assertEquals('oracle_s3cr3t', $config['password']);
@@ -89,16 +89,16 @@ public function testDbalLoadFromXmlMultipleConnections()
8989

9090
public function testDbalLoadFromXmlSingleConnection()
9191
{
92-
$configuration = new BuilderConfiguration();
93-
$loader = new DoctrineExtension(array(), array());
94-
XmlFileLoader::registerExtension($loader);
92+
$container = new ContainerBuilder();
93+
$loader = new DoctrineExtension(array(), array(), sys_get_temp_dir());
94+
$container->registerExtension($loader);
9595

96-
$loadXml = new XmlFileLoader(__DIR__.'/Fixtures/xml');
97-
$configuration->merge($loadXml->load('dbal_service_single_connection.xml'));
98-
$configuration = $loader->dbalLoad(array(), $configuration);
96+
$loadXml = new XmlFileLoader($container, __DIR__.'/Fixtures/xml');
97+
$loadXml->load('dbal_service_single_connection.xml');
98+
$loader->dbalLoad(array(), $container);
9999

100100
// doctrine.dbal.mysql_connection
101-
$arguments = $configuration->getDefinition('doctrine.dbal.mysql_connection')->getArguments();
101+
$arguments = $container->getDefinition('doctrine.dbal.mysql_connection')->getArguments();
102102
$config = $arguments[0];
103103

104104
$this->assertEquals('mysql_s3cr3t', $config['password']);

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

+19-19
Original file line numberDiff line numberDiff line change
@@ -13,49 +13,49 @@
1313

1414
use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
1515
use Symfony\Bundle\FrameworkBundle\DependencyInjection\WebExtension;
16-
use Symfony\Components\DependencyInjection\BuilderConfiguration;
16+
use Symfony\Components\DependencyInjection\ContainerBuilder;
1717

1818
class WebExtensionTest extends TestCase
1919
{
2020
public function testConfigLoad()
2121
{
22-
$configuration = new BuilderConfiguration();
22+
$container = new ContainerBuilder();
2323
$loader = $this->getWebExtension();
2424

25-
$configuration = $loader->configLoad(array(), $configuration);
26-
$this->assertEquals('Symfony\\Bundle\\FrameworkBundle\\RequestListener', $configuration->getParameter('request_listener.class'), '->webLoad() loads the web.xml file if not already loaded');
25+
$loader->configLoad(array(), $container);
26+
$this->assertEquals('Symfony\\Bundle\\FrameworkBundle\\RequestListener', $container->getParameter('request_listener.class'), '->webLoad() loads the web.xml file if not already loaded');
2727

28-
$configuration = new BuilderConfiguration();
28+
$container = new ContainerBuilder();
2929
$loader = $this->getWebExtension();
3030

31-
$configuration = $loader->configLoad(array('profiler' => true), $configuration);
32-
$this->assertEquals('Symfony\\Bundle\\FrameworkBundle\\Profiler', $configuration->getParameter('profiler.class'), '->configLoad() loads the collectors.xml file if not already loaded');
33-
$this->assertFalse($configuration->hasParameter('debug.toolbar.class'), '->configLoad() does not load the toolbar.xml file');
31+
$loader->configLoad(array('profiler' => true), $container);
32+
$this->assertEquals('Symfony\\Bundle\\FrameworkBundle\\Profiler', $container->getParameter('profiler.class'), '->configLoad() loads the collectors.xml file if not already loaded');
33+
$this->assertFalse($container->getParameterBag()->has('debug.toolbar.class'), '->configLoad() does not load the toolbar.xml file');
3434

35-
$configuration = $loader->configLoad(array('toolbar' => true), $configuration);
36-
$this->assertEquals('Symfony\\Components\\HttpKernel\\Profiler\\WebDebugToolbarListener', $configuration->getParameter('debug.toolbar.class'), '->configLoad() loads the collectors.xml file if the toolbar option is given');
35+
$loader->configLoad(array('toolbar' => true), $container);
36+
$this->assertEquals('Symfony\\Components\\HttpKernel\\Profiler\\WebDebugToolbarListener', $container->getParameter('debug.toolbar.class'), '->configLoad() loads the collectors.xml file if the toolbar option is given');
3737
}
3838

3939
public function testTemplatingLoad()
4040
{
41-
$configuration = new BuilderConfiguration();
41+
$container = new ContainerBuilder();
4242
$loader = $this->getWebExtension();
4343

44-
$configuration = $loader->templatingLoad(array(), $configuration);
45-
$this->assertEquals('Symfony\\Bundle\\FrameworkBundle\\Templating\\Engine', $configuration->getParameter('templating.engine.class'), '->templatingLoad() loads the templating.xml file if not already loaded');
44+
$loader->templatingLoad(array(), $container);
45+
$this->assertEquals('Symfony\\Bundle\\FrameworkBundle\\Templating\\Engine', $container->getParameter('templating.engine.class'), '->templatingLoad() loads the templating.xml file if not already loaded');
4646
}
4747

4848
public function testValidationLoad()
4949
{
50-
$configuration = new BuilderConfiguration();
50+
$container = new ContainerBuilder();
5151
$loader = $this->getWebExtension();
5252

53-
$configuration = $loader->configLoad(array('validation' => array('enabled' => true)), $configuration);
54-
$this->assertEquals('Symfony\Components\Validator\Validator', $configuration->getParameter('validator.class'), '->validationLoad() loads the validation.xml file if not already loaded');
55-
$this->assertFalse($configuration->hasDefinition('validator.mapping.loader.annotation_loader'), '->validationLoad() doesn\'t load the annotations service unless its needed');
53+
$loader->configLoad(array('validation' => array('enabled' => true)), $container);
54+
$this->assertEquals('Symfony\Components\Validator\Validator', $container->getParameter('validator.class'), '->validationLoad() loads the validation.xml file if not already loaded');
55+
$this->assertFalse($container->hasDefinition('validator.mapping.loader.annotation_loader'), '->validationLoad() doesn\'t load the annotations service unless its needed');
5656

57-
$configuration = $loader->configLoad(array('validation' => array('enabled' => true, 'annotations' => true)), $configuration);
58-
$this->assertTrue($configuration->hasDefinition('validator.mapping.loader.annotation_loader'), '->validationLoad() loads the annotations service');
57+
$loader->configLoad(array('validation' => array('enabled' => true, 'annotations' => true)), $container);
58+
$this->assertTrue($container->hasDefinition('validator.mapping.loader.annotation_loader'), '->validationLoad() loads the annotations service');
5959
}
6060

6161
public function getWebExtension() {

‎src/Symfony/Bundle/PropelBundle/DependencyInjection/PropelExtension.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function configLoad($config, ContainerBuilder $container)
2727
$loader->load($this->resources['propel']);
2828
}
2929

30-
if (!$container->hasParameter('propel.path')) {
30+
if (!$container->getParameterBag()->has('propel.path')) {
3131
if (!isset($config['path'])) {
3232
throw new \InvalidArgumentException('The "path" parameter is mandatory.');
3333
}

‎src/Symfony/Bundle/PropelBundle/Tests/DependencyInjection/PropelExtensionTest.php

+19-19
Original file line numberDiff line numberDiff line change
@@ -13,54 +13,54 @@
1313

1414
use Symfony\Bundle\PropelBundle\Tests\TestCase;
1515
use Symfony\Bundle\PropelBundle\DependencyInjection\PropelExtension;
16-
use Symfony\Components\DependencyInjection\BuilderConfiguration;
16+
use Symfony\Components\DependencyInjection\ContainerBuilder;
1717

1818
class PropelExtensionTest extends TestCase
1919
{
2020
public function testConfigLoad()
2121
{
22-
$configuration = new BuilderConfiguration();
22+
$container = new ContainerBuilder();
2323
$loader = new PropelExtension();
2424

2525
try {
26-
$configuration = $loader->configLoad(array(), $configuration);
26+
$loader->configLoad(array(), $container);
2727
$this->fail();
2828
} catch (\Exception $e) {
2929
$this->assertInstanceOf('InvalidArgumentException', $e, '->configLoad() throws an \InvalidArgumentException if the Propel path is not set.');
3030
}
3131

32-
$configuration = $loader->configLoad(array('path' => '/propel'), $configuration);
33-
$this->assertEquals('/propel', $configuration->getParameter('propel.path'), '->configLoad() sets the Propel path');
32+
$loader->configLoad(array('path' => '/propel'), $container);
33+
$this->assertEquals('/propel', $container->getParameter('propel.path'), '->configLoad() sets the Propel path');
3434

35-
$configuration = $loader->configLoad(array(), $configuration);
36-
$this->assertEquals('/propel', $configuration->getParameter('propel.path'), '->configLoad() sets the Propel path');
35+
$loader->configLoad(array(), $container);
36+
$this->assertEquals('/propel', $container->getParameter('propel.path'), '->configLoad() sets the Propel path');
3737
}
3838

3939
public function testDbalLoad()
4040
{
41-
$configuration = new BuilderConfiguration();
41+
$container = new ContainerBuilder();
4242
$loader = new PropelExtension();
4343

44-
$configuration = $loader->dbalLoad(array(), $configuration);
45-
$this->assertEquals('Propel', $configuration->getParameter('propel.class'), '->dbalLoad() loads the propel.xml file if not already loaded');
44+
$loader->dbalLoad(array(), $container);
45+
$this->assertEquals('Propel', $container->getParameter('propel.class'), '->dbalLoad() loads the propel.xml file if not already loaded');
4646

4747
// propel.dbal.default_connection
48-
$this->assertEquals('default', $configuration->getParameter('propel.dbal.default_connection'), '->dbalLoad() overrides existing configuration options');
49-
$configuration = $loader->dbalLoad(array('default_connection' => 'foo'), $configuration);
50-
$this->assertEquals('foo', $configuration->getParameter('propel.dbal.default_connection'), '->dbalLoad() overrides existing configuration options');
51-
$configuration = $loader->dbalLoad(array(), $configuration);
52-
$this->assertEquals('foo', $configuration->getParameter('propel.dbal.default_connection'), '->dbalLoad() overrides existing configuration options');
48+
$this->assertEquals('default', $container->getParameter('propel.dbal.default_connection'), '->dbalLoad() overrides existing configuration options');
49+
$loader->dbalLoad(array('default_connection' => 'foo'), $container);
50+
$this->assertEquals('foo', $container->getParameter('propel.dbal.default_connection'), '->dbalLoad() overrides existing configuration options');
51+
$loader->dbalLoad(array(), $container);
52+
$this->assertEquals('foo', $container->getParameter('propel.dbal.default_connection'), '->dbalLoad() overrides existing configuration options');
5353

54-
$configuration = new BuilderConfiguration();
54+
$container = new ContainerBuilder();
5555
$loader = new PropelExtension();
56-
$configuration = $loader->dbalLoad(array('password' => 'foo'), $configuration);
56+
$loader->dbalLoad(array('password' => 'foo'), $container);
5757

58-
$arguments = $configuration->getDefinition('propel.configuration')->getArguments();
58+
$arguments = $container->getDefinition('propel.configuration')->getArguments();
5959
$config = $arguments[0];
6060
$this->assertEquals('foo', $config['datasources']['default']['connection']['password']);
6161
$this->assertEquals('root', $config['datasources']['default']['connection']['user']);
6262

63-
$configuration = $loader->dbalLoad(array('user' => 'foo'), $configuration);
63+
$loader->dbalLoad(array('user' => 'foo'), $container);
6464
$this->assertEquals('foo', $config['datasources']['default']['connection']['password']);
6565
$this->assertEquals('root', $config['datasources']['default']['connection']['user']);
6666
}

‎src/Symfony/Bundle/SwiftmailerBundle/Tests/DependencyInjection/SwiftmailerExtensionTest.php

+8-8
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,21 @@
1313

1414
use Symfony\Bundle\SwiftmailerBundle\Tests\TestCase;
1515
use Symfony\Bundle\SwiftmailerBundle\DependencyInjection\SwiftmailerExtension;
16-
use Symfony\Components\DependencyInjection\BuilderConfiguration;
16+
use Symfony\Components\DependencyInjection\ContainerBuilder;
1717

1818
class SwiftmailerExtensionTest extends TestCase
1919
{
2020
public function testMailerLoad()
2121
{
22-
$configuration = new BuilderConfiguration();
22+
$container = new ContainerBuilder();
2323
$loader = new SwiftmailerExtension();
2424

25-
$configuration = $loader->mailerLoad(array(), $configuration);
26-
$this->assertEquals('Swift_Mailer', $configuration->getParameter('swiftmailer.class'), '->mailerLoad() loads the swiftmailer.xml file if not already loaded');
25+
$loader->mailerLoad(array(), $container);
26+
$this->assertEquals('Swift_Mailer', $container->getParameter('swiftmailer.class'), '->mailerLoad() loads the swiftmailer.xml file if not already loaded');
2727

28-
$configuration = $loader->mailerLoad(array('transport' => 'sendmail'), $configuration);
29-
$this->assertEquals('sendmail', $configuration->getParameter('swiftmailer.transport.name'), '->mailerLoad() overrides existing configuration options');
30-
$configuration = $loader->mailerLoad(array(), $configuration);
31-
$this->assertEquals('sendmail', $configuration->getParameter('swiftmailer.transport.name'), '->mailerLoad() overrides existing configuration options');
28+
$loader->mailerLoad(array('transport' => 'sendmail'), $container);
29+
$this->assertEquals('sendmail', $container->getParameter('swiftmailer.transport.name'), '->mailerLoad() overrides existing configuration options');
30+
$loader->mailerLoad(array(), $container);
31+
$this->assertEquals('sendmail', $container->getParameter('swiftmailer.transport.name'), '->mailerLoad() overrides existing configuration options');
3232
}
3333
}

0 commit comments

Comments
 (0)