From 7c1b42e81b7e63423607200ae08911ca58bcdcae Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 2 Sep 2010 12:16:20 +0200
Subject: [PATCH] [DependencyInjection] added a way to inject an anonymous
 service in an extension configuration

    <foo:bar>
        <service class="Foo" />
        <service class="Bar" />
    </foo:bar>

In the foo:bar extension method, you can retrieve the services with:

    // always an array of services
    $config['_services']
---
 .../Loader/XmlFileLoader.php                  | 43 +++++++++++++++----
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
index 9bbf0cf435..59a5aabc1b 100644
--- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
+++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php
@@ -179,12 +179,24 @@ class XmlFileLoader extends FileLoader
 
         // find anonymous service definitions
         $xml->registerXPathNamespace('container', 'http://www.symfony-project.org/schema/dic/services');
+
+        // anonymous services as arguments
         $nodes = $xml->xpath('//container:argument[@type="service"][not(@id)]');
         foreach ($nodes as $node) {
-            // give it a unique names
+            // give it a unique name
             $node['id'] = sprintf('_%s_%d', md5($file), ++$count);
 
-            $definitions[(string) $node['id']] = array($node->service, $file);
+            $definitions[(string) $node['id']] = array($node->service, $file, false);
+            $node->service['id'] = (string) $node['id'];
+        }
+
+        // anonymous services "in the wild"
+        $nodes = $xml->xpath('//container:service[not(@id)]');
+        foreach ($nodes as $node) {
+            // give it a unique name
+            $node['id'] = sprintf('_%s_%d', md5($file), ++$count);
+
+            $definitions[(string) $node['id']] = array($node, $file, true);
             $node->service['id'] = (string) $node['id'];
         }
 
@@ -194,7 +206,13 @@ class XmlFileLoader extends FileLoader
             $this->parseDefinition($id, $def[0], $def[1]);
 
             $oNode = dom_import_simplexml($def[0]);
-            $oNode->parentNode->removeChild($oNode);
+            if (true === $def[2]) {
+                $nNode = new \DOMElement('_services');
+                $oNode->parentNode->replaceChild($nNode, $oNode);
+                $nNode->setAttribute('id', $id);
+            } else {
+                $oNode->parentNode->removeChild($oNode);
+            }
         }
 
         return $xml;
@@ -350,13 +368,20 @@ EOF
                     $empty = false;
                 }
             } elseif (!$node instanceof \DOMComment) {
-                if (isset($config[$node->localName])) {
-                    if (!is_array($config[$node->localName]) || !is_int(key($config[$node->localName]))) {
-                        $config[$node->localName] = array($config[$node->localName]);
-                    }
-                    $config[$node->localName][] = static::convertDomElementToArray($node);
+                if ($node instanceof \DOMElement && '_services' === $node->nodeName) {
+                    $value = new Reference($node->getAttribute('id'));
                 } else {
-                    $config[$node->localName] = static::convertDomElementToArray($node);
+                    $value = static::convertDomElementToArray($node);
+                }
+
+                $key = $node->localName;
+                if (isset($config[$key])) {
+                    if (!is_array($config[$key]) || !is_int(key($config[$key]))) {
+                        $config[$key] = array($config[$key]);
+                    }
+                    $config[$key][] = $value;
+                } else {
+                    $config[$key] = $value;
                 }
 
                 $empty = false;