Author: fabien
Date: 2010-01-18 14:15:04 +0100 (Mon, 18 Jan 2010)
New Revision: 26810
Modified:
branches/2.0/src/Symfony/Components/DependencyInjection/Dumper/PhpDumper.php
branches/2.0/src/Symfony/Components/DependencyInjection/Loader/Extension/SymfonyTemplatingExtension.php
branches/2.0/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/symfony/templating-1.0.xml
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/containers/container9.php
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services9.dot
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/php/services9.php
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/xml/services9.xml
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services9.yml
Log:
Merge branch 'master' of git://github.com/symfony/symfony
Modified:
branches/2.0/src/Symfony/Components/DependencyInjection/Dumper/PhpDumper.php
===================================================================
---
branches/2.0/src/Symfony/Components/DependencyInjection/Dumper/PhpDumper.php
2010-01-18 13:00:08 UTC (rev 26809)
+++
branches/2.0/src/Symfony/Components/DependencyInjection/Dumper/PhpDumper.php
2010-01-18 13:15:04 UTC (rev 26810)
@@ -347,7 +347,7 @@
}
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
{
Modified:
branches/2.0/src/Symfony/Components/DependencyInjection/Loader/Extension/SymfonyTemplatingExtension.php
===================================================================
---
branches/2.0/src/Symfony/Components/DependencyInjection/Loader/Extension/SymfonyTemplatingExtension.php
2010-01-18 13:00:08 UTC (rev 26809)
+++
branches/2.0/src/Symfony/Components/DependencyInjection/Loader/Extension/SymfonyTemplatingExtension.php
2010-01-18 13:15:04 UTC (rev 26810)
@@ -70,7 +70,7 @@
);
}
- $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 @@
);
}
- $configuration->setParameter('symfony.templating.helpers', $helpers);
+
$configuration->getDefinition('symfony.templating.helperset')->addArgument($helpers);
// cache?
if (isset($config['cache']))
Modified:
branches/2.0/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/symfony/templating-1.0.xml
===================================================================
---
branches/2.0/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/symfony/templating-1.0.xml
2010-01-18 13:00:08 UTC (rev 26809)
+++
branches/2.0/src/Symfony/Components/DependencyInjection/Loader/Extension/xml/symfony/templating-1.0.xml
2010-01-18 13:15:04 UTC (rev 26810)
@@ -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%" />
Modified:
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/containers/container9.php
===================================================================
---
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/containers/container9.php
2010-01-18 13:00:08 UTC (rev 26809)
+++
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/containers/container9.php
2010-01-18 13:15:04 UTC (rev 26810)
@@ -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->
Modified:
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services9.dot
===================================================================
---
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services9.dot
2010-01-18 13:00:08 UTC (rev 26809)
+++
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/graphviz/services9.dot
2010-01-18 13:15:04 UTC (rev 26810)
@@ -13,7 +13,6 @@
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"];
Modified:
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/php/services9.php
===================================================================
---
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/php/services9.php
2010-01-18 13:00:08 UTC (rev 26809)
+++
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/php/services9.php
2010-01-18 13:15:04 UTC (rev 26810)
@@ -148,7 +148,6 @@
'baz_class' => 'BazClass',
'foo_class' => 'FooClass',
'foo' => 'bar',
- 'foo_bar' => new Reference('foo_bar'),
);
}
}
Modified:
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/xml/services9.xml
===================================================================
---
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/xml/services9.xml
2010-01-18 13:00:08 UTC (rev 26809)
+++
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/xml/services9.xml
2010-01-18 13:15:04 UTC (rev 26810)
@@ -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">
Modified:
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services9.yml
===================================================================
---
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services9.yml
2010-01-18 13:00:08 UTC (rev 26809)
+++
branches/2.0/tests/fixtures/Symfony/Components/DependencyInjection/yaml/services9.yml
2010-01-18 13:15:04 UTC (rev 26810)
@@ -2,7 +2,6 @@
baz_class: BazClass
foo_class: FooClass
foo: bar
- foo_bar: '@foo_bar'
services:
foo:
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
