Merge branch '2.6' into 2.7

* 2.6:
  [Process] Fix outdated Process->start() docblock
  prevent inlining service configurators
  [DomCrawler] Improve namespace discovery performance

Conflicts:
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php

Author: fabpot

Compiler/InlineServiceDefinitionsPass.php

@@ -62,9 +62,6 @@ public function process(ContainerBuilder $container)
             $definition->setProperties(
                 $this->inlineArguments($container, $definition->getProperties())
             );
-
-            $configurator = $this->inlineArguments($container, array($definition->getConfigurator()));
-            $definition->setConfigurator($configurator[0]);
         }
     }
 

Tests/Compiler/InlineServiceDefinitionsPassTest.php

@@ -254,6 +254,23 @@ public function testProcessDoesNotInlineFactories()
         $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $factory[0]);
     }
 
+    public function testProcessDoesNotInlineConfigurators()
+    {
+        $container = new ContainerBuilder();
+        $container
+            ->register('foo.configurator')
+            ->setPublic(false)
+        ;
+        $container
+            ->register('foo')
+            ->setConfigurator(array(new Reference('foo.configurator'), 'getFoo'))
+        ;
+        $this->process($container);
+
+        $configurator = $container->getDefinition('foo')->getConfigurator();
+        $this->assertInstanceOf('Symfony\Component\DependencyInjection\Reference', $configurator[0]);
+    }
+
     protected function process(ContainerBuilder $container)
     {
         $repeatedPass = new RepeatedPass(array(new AnalyzeServiceReferencesPass(), new InlineServiceDefinitionsPass()));

Tests/Dumper/XmlDumperTest.php

@@ -169,6 +169,7 @@ public function provideCompiledContainerData()
     {
         return array(
             array('container8'),
+            array('container9'),
             array('container11'),
             array('container12'),
             array('container14'),

Tests/Fixtures/php/services9_compiled.php

@@ -37,6 +37,7 @@ public function __construct()
         $this->methodMap = array(
             'bar' => 'getBarService',
             'baz' => 'getBazService',
+            'configurator_service' => 'getConfiguratorServiceService',
             'configured_service' => 'getConfiguredServiceService',
             'decorator_service' => 'getDecoratorServiceService',
             'decorator_service_with_name' => 'getDecoratorServiceWithNameService',
@@ -112,12 +113,9 @@ protected function getBazService()
      */
     protected function getConfiguredServiceService()
     {
-        $a = new \ConfClass();
-        $a->setFoo($this->get('baz'));
-
         $this->services['configured_service'] = $instance = new \stdClass();
 
-        $a->configureStdClass($instance);
+        $this->get('configurator_service')->configureStdClass($instance);
 
         return $instance;
     }
@@ -298,6 +296,27 @@ protected function getServiceFromStaticMethodService()
         return $this->services['service_from_static_method'] = \Bar\FooClass::getInstance();
     }
 
+    /**
+     * Gets the 'configurator_service' service.
+     *
+     * This service is shared.
+     * This method always returns the same instance of the service.
+     *
+     * This service is private.
+     * If you want to be able to request this service from the container directly,
+     * make it public, otherwise you might end up with broken code.
+     *
+     * @return \ConfClass A ConfClass instance.
+     */
+    protected function getConfiguratorServiceService()
+    {
+        $this->services['configurator_service'] = $instance = new \ConfClass();
+
+        $instance->setFoo($this->get('baz'));
+
+        return $instance;
+    }
+
     /**
      * Gets the 'new_factory' service.
      *