Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 0fbb1b9

Browse filesBrowse files
fabpotfabpot
committed
cleaned up the DI extension loading mechanism
1 parent d595401 commit 0fbb1b9
Copy full SHA for 0fbb1b9

File tree

Expand file treeCollapse file tree

11 files changed

+5
-31
lines changed
Filter options
Expand file treeCollapse file tree

11 files changed

+5
-31
lines changed

‎src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/DoctrineBundle/DependencyInjection/DoctrineExtension.php
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ public function dbalLoad($config, BuilderConfiguration $configuration)
133133
new Reference(sprintf('doctrine.dbal.%s_connection.event_manager', $name))
134134
));
135135
}
136-
137-
return $configuration;
138136
}
139137

140138
/**
@@ -255,8 +253,6 @@ public function ormLoad($config, BuilderConfiguration $configuration)
255253
$configuration->getParameter('doctrine.orm.cache_driver')
256254
)
257255
);
258-
259-
return $configuration;
260256
}
261257

262258
/**

‎src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/MongoDBExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/DoctrineMongoDBBundle/DependencyInjection/MongoDBExtension.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ public function mongodbLoad($config, BuilderConfiguration $configuration)
6060
$configuration->setAlias('doctrine.odm.mongodb.'.$key, 'doctrine.odm.mongodb.'.$key.'.'.$config[$key]);
6161
}
6262
}
63-
64-
return $configuration;
6563
}
6664

6765
/**

‎src/Symfony/Bundle/FrameworkBundle/DependencyInjection/WebExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/WebExtension.php
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ public function configLoad($config, BuilderConfiguration $configuration)
166166
$configuration->getDefinition('validator')->clearAnnotations();
167167
}
168168
}
169-
170-
return $configuration;
171169
}
172170

173171
/**
@@ -221,8 +219,6 @@ public function templatingLoad($config, BuilderConfiguration $configuration)
221219
$configuration->setDefinition('templating.loader', $configuration->getDefinition('templating.loader.cache'));
222220
$configuration->setParameter('templating.loader.cache.path', $config['cache']);
223221
}
224-
225-
return $configuration;
226222
}
227223

228224
/**

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

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/PropelBundle/DependencyInjection/PropelExtension.php
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ public function configLoad($config, BuilderConfiguration $configuration)
4343
if (isset($config['phing_path'])) {
4444
$configuration->setParameter('propel.phing_path', $config['phing_path']);
4545
}
46-
47-
return $configuration;
4846
}
4947

5048
/**
@@ -118,8 +116,6 @@ public function dbalLoad($config, BuilderConfiguration $configuration)
118116
}
119117

120118
$configuration->getDefinition('propel.configuration')->setArguments(array($c));
121-
122-
return $configuration;
123119
}
124120

125121
/**

‎src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/SwiftmailerBundle/DependencyInjection/SwiftmailerExtension.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ public function mailerLoad($config, BuilderConfiguration $configuration)
106106
if (isset($config['disable_delivery']) && $config['disable_delivery']) {
107107
$configuration->findDefinition('swiftmailer.transport')->addMethodCall('registerPlugin', array(new Reference('swiftmailer.plugin.blackhole')));
108108
}
109-
110-
return $configuration;
111109
}
112110

113111
/**

‎src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/TwigBundle/DependencyInjection/TwigExtension.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ public function configLoad($config, BuilderConfiguration $configuration)
3232
}
3333

3434
$configuration->setParameter('twig.options', array_replace($configuration->getParameter('twig.options'), $config));
35-
36-
return $configuration;
3735
}
3836

3937
/**

‎src/Symfony/Bundle/ZendBundle/DependencyInjection/ZendExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Bundle/ZendBundle/DependencyInjection/ZendExtension.php
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ public function loggerLoad($config, BuilderConfiguration $configuration)
5555
if (isset($config['path'])) {
5656
$configuration->setParameter('zend.logger.path', $config['path']);
5757
}
58-
59-
return $configuration;
6058
}
6159

6260
/**

‎src/Symfony/Components/DependencyInjection/BuilderConfiguration.php

Copy file name to clipboardExpand all lines: src/Symfony/Components/DependencyInjection/BuilderConfiguration.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public function loadFromExtension(LoaderExtensionInterface $extension, $tag, arr
112112
$this->extensions[$namespace]->addResource(new FileResource($r->getFileName()));
113113
}
114114

115-
$this->extensions[$namespace] = $extension->load($tag, $values, $this->extensions[$namespace]);
115+
$extension->load($tag, $values, $this->extensions[$namespace]);
116116

117117
return $this;
118118
}

‎src/Symfony/Components/DependencyInjection/Loader/LoaderExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Components/DependencyInjection/Loader/LoaderExtension.php
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@ public function setConfiguration($name, $resource)
4242
* @param array $config An array of configuration values
4343
* @param BuilderConfiguration $configuration A BuilderConfiguration instance
4444
*
45-
* @return BuilderConfiguration A BuilderConfiguration instance
46-
*
4745
* @throws \InvalidArgumentException When provided tag is not defined in this extension
4846
*/
4947
public function load($tag, array $config, BuilderConfiguration $configuration)
@@ -52,6 +50,6 @@ public function load($tag, array $config, BuilderConfiguration $configuration)
5250
throw new \InvalidArgumentException(sprintf('The tag "%s:%s" is not defined in the "%s" extension.', $this->getAlias(), $tag, $this->getAlias()));
5351
}
5452

55-
return $this->$method($config, $configuration);
53+
$this->$method($config, $configuration);
5654
}
5755
}

‎src/Symfony/Framework/DependencyInjection/KernelExtension.php

Copy file name to clipboardExpand all lines: src/Symfony/Framework/DependencyInjection/KernelExtension.php
+2-6Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,8 @@
2424
*/
2525
class KernelExtension extends LoaderExtension
2626
{
27-
public function testLoad($config)
27+
public function testLoad($config, BuilderConfiguration $configuration)
2828
{
29-
$configuration = new BuilderConfiguration();
30-
3129
$loader = new XmlFileLoader(array(__DIR__.'/../Resources/config', __DIR__.'/Resources/config'));
3230
$configuration->merge($loader->load('test.xml'));
3331
$configuration->setParameter('kernel.include_core_classes', false);
@@ -76,10 +74,8 @@ public function sessionLoad($config, BuilderConfiguration $configuration)
7674
return $configuration;
7775
}
7876

79-
public function configLoad($config)
77+
public function configLoad($config, BuilderConfiguration $configuration)
8078
{
81-
$configuration = new BuilderConfiguration();
82-
8379
if (isset($config['charset'])) {
8480
$configuration->setParameter('kernel.charset', $config['charset']);
8581
}

‎tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderExtensionTest.php

Copy file name to clipboardExpand all lines: tests/Symfony/Tests/Components/DependencyInjection/Loader/LoaderExtensionTest.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public function testLoad()
3131
$this->assertEquals('The tag "project:foo" is not defined in the "project" extension.', $e->getMessage(), '->load() throws an InvalidArgumentException if the tag does not exist');
3232
}
3333

34-
$config = $extension->load('bar', array('foo' => 'bar'), new BuilderConfiguration());
34+
$extension->load('bar', array('foo' => 'bar'), $config = new BuilderConfiguration());
3535
$this->assertEquals(array('project.parameter.bar' => 'bar', 'project.parameter.foo' => 'bar'), $config->getParameterBag()->all(), '->load() calls the method tied to the given tag');
3636
}
3737
}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.