diff --git a/src/Symfony/Components/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Components/DependencyInjection/Dumper/PhpDumper.php
index 72382f3a15..b3f98b6b49 100644
--- a/src/Symfony/Components/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Components/DependencyInjection/Dumper/PhpDumper.php
@@ -347,7 +347,7 @@ EOF;
}
elseif ($value instanceof Reference)
{
- $value = sprintf("new Reference('%s')", $value);
+ throw new \InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain references to other services (reference to service %s found).', $value));
}
else
{
diff --git a/src/Symfony/Components/DependencyInjection/Loader/Extension/SymfonyTemplatingExtension.php b/src/Symfony/Components/DependencyInjection/Loader/Extension/SymfonyTemplatingExtension.php
index a98ad8a7f4..719c13d504 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/Extension/SymfonyTemplatingExtension.php
+++ b/src/Symfony/Components/DependencyInjection/Loader/Extension/SymfonyTemplatingExtension.php
@@ -70,7 +70,7 @@ class SymfonyTemplatingExtension extends LoaderExtension
);
}
- $configuration->setParameter('symfony.templating.loader.chain.loaders', $loaders);
+ $configuration->getDefinition('symfony.templating.loader.chain')->addArgument($loaders);
$configuration->setAlias('symfony.templating.loader', 'symfony.templating.loader.chain');
// helpers
@@ -91,7 +91,7 @@ class SymfonyTemplatingExtension extends LoaderExtension
);
}
- $configuration->setParameter('symfony.templating.helpers', $helpers);
+ $configuration->getDefinition('symfony.templating.helperset')->addArgument($helpers);
// cache?
if (isset($config['cache']))
diff --git a/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/symfony/templating-1.0.xml b/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/symfony/templating-1.0.xml
index 01c5bbc1b9..457335319b 100644
--- a/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/symfony/templating-1.0.xml
+++ b/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/symfony/templating-1.0.xml
@@ -21,9 +21,7 @@
-
- %symfony.templating.helpers%
-
+
%symfony.templating.loader.filesystem.path%
@@ -34,9 +32,7 @@
%symfony.templating.loader.cache.path%
-
- %symfony.templating.loader.chain.loaders%
-
+
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/containers/container9.php b/tests/fixtures/Symfony/Components/DependencyInjection/containers/container9.php
index aaced5a4b4..0afbe3ef27 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/containers/container9.php
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/containers/container9.php
@@ -34,7 +34,6 @@ $container->setParameters(array(
'baz_class' => 'BazClass',
'foo_class' => 'FooClass',
'foo' => 'bar',
- 'foo_bar' => new Reference('foo_bar'),
));
$container->setAlias('alias_for_foo', 'foo');
$container->
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services9.dot b/tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services9.dot
index 84cce5fb37..9ddf1b4aa6 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services9.dot
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services9.dot
@@ -13,7 +13,6 @@ digraph sc {
node_foo -> node_foo_baz [label="" style="filled"];
node_foo -> node_service_container [label="" style="filled"];
node_bar -> node_foo_baz [label="" style="filled"];
- node_bar -> node_foo_bar [label="" style="filled"];
node_method_call1 -> node_foo [label="setBar()" style="dashed"];
node_method_call1 -> node_foo [label="setBar()" style="dashed"];
node_method_call1 -> node_foo [label="setBar()" style="dashed"];
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/php/services9.php b/tests/fixtures/Symfony/Components/DependencyInjection/php/services9.php
index 60a41686ed..b9a42245ce 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/php/services9.php
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/php/services9.php
@@ -148,7 +148,6 @@ class ProjectServiceContainer extends Container
'baz_class' => 'BazClass',
'foo_class' => 'FooClass',
'foo' => 'bar',
- 'foo_bar' => new Reference('foo_bar'),
);
}
}
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services9.xml b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services9.xml
index fd1df2987b..15ec9120d9 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/xml/services9.xml
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/xml/services9.xml
@@ -7,7 +7,6 @@
BazClass
FooClass
bar
-
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services9.yml b/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services9.yml
index c3a5ba0c30..aafde657fb 100644
--- a/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services9.yml
+++ b/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services9.yml
@@ -2,7 +2,6 @@ parameters:
baz_class: BazClass
foo_class: FooClass
foo: bar
- foo_bar: '@foo_bar'
services:
foo: