[DependencyInjection] disable the possibility to have a reference in parameters (as it breaks as soon as you want to use the PHP dumper with no solution - performance wise)

fabpot · fabpot · commit c0152e1bbaf5 · 2010-01-18T14:01:29.000+01:00
diff --git a/src/Symfony/Components/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Components/DependencyInjection/Dumper/PhpDumper.php
@@ -347,7 +347,7 @@ protected function exportParameters($parameters, $indent = 6)
       }
       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
@@ -70,7 +70,7 @@ public function templatingLoad($config)
       );
     }
 
-    $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 @@ public function templatingLoad($config)
       );
     }
 
-    $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
@@ -21,9 +21,7 @@
       <argument type="service" id="symfony.templating.helperset" />
     </service>
 
-    <service id="symfony.templating.helperset" class="%symfony.templating.helperset.class%">
-      <argument>%symfony.templating.helpers%</argument>
-    </service>
+    <service id="symfony.templating.helperset" class="%symfony.templating.helperset.class%" />
 
     <service id="symfony.templating.loader.filesystem" class="%symfony.templating.loader.filesystem.class%">
       <argument>%symfony.templating.loader.filesystem.path%</argument>
@@ -34,9 +32,7 @@
       <argument>%symfony.templating.loader.cache.path%</argument>
     </service>
 
-    <service id="symfony.templating.loader.chain" class="%symfony.templating.loader.chain.class%">
-      <argument>%symfony.templating.loader.chain.loaders%</argument>
-    </service>
+    <service id="symfony.templating.loader.chain" class="%symfony.templating.loader.chain.class%" />
 
     <service id="symfony.templating.helper.javascripts" class="%symfony.templating.helper.javascripts.class%" />
     <service id="symfony.templating.helper.stylesheets" class="%symfony.templating.helper.stylesheets.class%" />
diff --git a/tests/fixtures/Symfony/Components/DependencyInjection/containers/container9.php b/tests/fixtures/Symfony/Components/DependencyInjection/containers/container9.php
@@ -34,7 +34,6 @@
   '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
@@ -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
@@ -148,7 +148,6 @@ protected function getDefaultParameters()
       '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
@@ -7,7 +7,6 @@
     <parameter key="baz_class">BazClass</parameter>
     <parameter key="foo_class">FooClass</parameter>
     <parameter key="foo">bar</parameter>
-    <parameter key="foo_bar" type="service" id="foo_bar" />
   </parameters>
   <services>
     <service id="foo" class="FooClass" constructor="getInstance" shared="false">
diff --git 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:

Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ protected function exportParameters($parameters, $indent = 6)`
`347`	`347`	`}`
`348`	`348`	`elseif ($value instanceof Reference)`
`349`	`349`	`{`
`350`		`- $value = sprintf("new Reference('%s')", $value);`
	`350`	`+ throw new \InvalidArgumentException(sprintf('You cannot dump a container with parameters that contain references to other services (reference to service %s found).', $value));`
`351`	`351`	`}`
`352`	`352`	`else`
`353`	`353`	`{`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function templatingLoad($config)`
`70`	`70`	`);`
`71`	`71`	`}`
`72`	`72`
`73`		`- $configuration->setParameter('symfony.templating.loader.chain.loaders', $loaders);`
	`73`	`+ $configuration->getDefinition('symfony.templating.loader.chain')->addArgument($loaders);`
`74`	`74`	`$configuration->setAlias('symfony.templating.loader', 'symfony.templating.loader.chain');`
`75`	`75`
`76`	`76`	`// helpers`
`@@ -91,7 +91,7 @@ public function templatingLoad($config)`
`91`	`91`	`);`
`92`	`92`	`}`
`93`	`93`
`94`		`- $configuration->setParameter('symfony.templating.helpers', $helpers);`
	`94`	`+ $configuration->getDefinition('symfony.templating.helperset')->addArgument($helpers);`
`95`	`95`
`96`	`96`	`// cache?`
`97`	`97`	`if (isset($config['cache']))`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,6 @@ protected function getDefaultParameters()`
`148`	`148`	`'baz_class' => 'BazClass',`
`149`	`149`	`'foo_class' => 'FooClass',`
`150`	`150`	`'foo' => 'bar',`
`151`		`- 'foo_bar' => new Reference('foo_bar'),`
`152`	`151`	`);`
`153`	`152`	`}`
`154`	`153`	`}`