[DependencyInjection] backport perf optim

Conflicts:
	src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services19.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
	src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php

Author: nicolas-grekas

Dumper/PhpDumper.php

@@ -764,6 +764,8 @@ private function startClass($class, $baseClass)
  */
 class $class extends $baseClass
 {
+    private \$parameters;
+
 EOF;
     }
 
@@ -774,7 +776,7 @@ class $class extends $baseClass
      */
     private function addConstructor()
     {
-        $arguments = $this->container->getParameterBag()->all() ? 'new ParameterBag($this->getDefaultParameters())' : null;
+        $parameters = $this->exportParameters($this->container->getParameterBag()->all());
 
         $code = <<<EOF
 
@@ -783,7 +785,9 @@ private function addConstructor()
      */
     public function __construct()
     {
-        parent::__construct($arguments);
+        \$this->parameters = $parameters;
+
+        parent::__construct(new ParameterBag(\$this->parameters));
 
 EOF;
 
@@ -811,24 +815,19 @@ public function __construct()
      */
     private function addFrozenConstructor()
     {
+        $parameters = $this->exportParameters($this->container->getParameterBag()->all());
+
         $code = <<<EOF
 
     /**
      * Constructor.
      */
     public function __construct()
     {
-EOF;
-
-        if ($this->container->getParameterBag()->all()) {
-            $code .= "\n        \$this->parameters = \$this->getDefaultParameters();\n";
-        }
-
-        $code .= <<<EOF
-
         \$this->services =
         \$this->scopedServices =
         \$this->scopeStacks = array();
+        \$this->parameters = $parameters;
 
         \$this->set('service_container', \$this);
 
@@ -913,8 +912,6 @@ private function addDefaultParametersMethod()
             return '';
         }
 
-        $parameters = $this->exportParameters($this->container->getParameterBag()->all());
-
         $code = '';
         if ($this->container->isFrozen()) {
             $code .= <<<EOF
@@ -962,22 +959,9 @@ public function getParameterBag()
 
         return \$this->parameterBag;
     }
-EOF;
-        }
-
-        $code .= <<<EOF
-
-    /**
-     * Gets the default parameters.
-     *
-     * @return array An array of the default parameters
-     */
-    protected function getDefaultParameters()
-    {
-        return $parameters;
-    }
 
 EOF;
+        }
 
         return $code;
     }

Tests/Dumper/PhpDumperTest.php

@@ -37,21 +37,6 @@ public function testDump()
         new PhpDumper($container);
     }
 
-    public function testDumpFrozenContainerWithNoParameter()
-    {
-        $container = new ContainerBuilder();
-        $container->setResourceTracking(false);
-        $container->register('foo', 'stdClass');
-
-        $container->compile();
-
-        $dumper = new PhpDumper($container);
-
-        $dumpedString = $dumper->dump();
-        $this->assertStringEqualsFile(self::$fixturesPath.'/php/services11.php', $dumpedString, '->dump() does not add getDefaultParameters() method call if container have no parameters.');
-        $this->assertNotRegexp("/function getDefaultParameters\(/", $dumpedString, '->dump() does not add getDefaultParameters() method definition.');
-    }
-
     public function testDumpOptimizationString()
     {
         $definition = new Definition();

Tests/Fixtures/php/services1-1.php

@@ -16,11 +16,17 @@
  */
 class Container extends AbstractContainer
 {
+    private $parameters;
+
     /**
      * Constructor.
      */
     public function __construct()
     {
-        parent::__construct();
+        $this->parameters = array(
+
+        );
+
+        parent::__construct(new ParameterBag($this->parameters));
     }
 }

Tests/Fixtures/php/services1.php

@@ -16,11 +16,17 @@
  */
 class ProjectServiceContainer extends Container
 {
+    private $parameters;
+
     /**
      * Constructor.
      */
     public function __construct()
     {
-        parent::__construct();
+        $this->parameters = array(
+
+        );
+
+        parent::__construct(new ParameterBag($this->parameters));
     }
 }

Tests/Fixtures/php/services10.php

@@ -16,16 +16,20 @@
  */
 class ProjectServiceContainer extends Container
 {
+    private $parameters;
+
     /**
      * Constructor.
      */
     public function __construct()
     {
-        $this->parameters = $this->getDefaultParameters();
-
         $this->services =
         $this->scopedServices =
         $this->scopeStacks = array();
+        $this->parameters = array(
+            'empty_value' => '',
+            'some_string' => '-',
+        );
 
         $this->set('service_container', $this);
 
@@ -94,16 +98,4 @@ public function getParameterBag()
 
         return $this->parameterBag;
     }
-    /**
-     * Gets the default parameters.
-     *
-     * @return array An array of the default parameters
-     */
-    protected function getDefaultParameters()
-    {
-        return array(
-            'empty_value' => '',
-            'some_string' => '-',
-        );
-    }
 }

Tests/Fixtures/php/services11.php

@@ -16,16 +16,21 @@
  */
 class ProjectServiceContainer extends Container
 {
+    private $parameters;
+
     /**
      * Constructor.
      */
     public function __construct()
     {
-        $this->parameters = $this->getDefaultParameters();
-
         $this->services =
         $this->scopedServices =
         $this->scopeStacks = array();
+        $this->parameters = array(
+            'foo' => ('wiz'.dirname(__DIR__)),
+            'bar' => __DIR__,
+            'baz' => (__DIR__.'/PhpDumperTest.php'),
+        );
 
         $this->set('service_container', $this);
 
@@ -94,17 +99,4 @@ public function getParameterBag()
 
         return $this->parameterBag;
     }
-    /**
-     * Gets the default parameters.
-     *
-     * @return array An array of the default parameters
-     */
-    protected function getDefaultParameters()
-    {
-        return array(
-            'foo' => ('wiz'.dirname(__DIR__)),
-            'bar' => __DIR__,
-            'baz' => (__DIR__.'/PhpDumperTest.php'),
-        );
-    }
 }

Tests/Fixtures/php/services12.php

@@ -16,22 +16,14 @@
  */
 class ProjectServiceContainer extends Container
 {
+    private $parameters;
+
     /**
      * Constructor.
      */
     public function __construct()
     {
-        parent::__construct(new ParameterBag($this->getDefaultParameters()));
-    }
-
-    /**
-     * Gets the default parameters.
-     *
-     * @return array An array of the default parameters
-     */
-    protected function getDefaultParameters()
-    {
-        return array(
+        $this->parameters = array(
             'foo' => '%baz%',
             'baz' => 'bar',
             'bar' => 'foo is %%foo bar',
@@ -47,5 +39,7 @@ protected function getDefaultParameters()
                 7 => 'null',
             ),
         );
+
+        parent::__construct(new ParameterBag($this->parameters));
     }
 }

Tests/Fixtures/php/services8.php

@@ -16,12 +16,20 @@
  */
 class ProjectServiceContainer extends Container
 {
+    private $parameters;
+
     /**
      * Constructor.
      */
     public function __construct()
     {
-        parent::__construct(new ParameterBag($this->getDefaultParameters()));
+        $this->parameters = array(
+            'baz_class' => 'BazClass',
+            'foo_class' => 'FooClass',
+            'foo' => 'bar',
+        );
+
+        parent::__construct(new ParameterBag($this->parameters));
         $this->methodMap = array(
             'bar' => 'getBarService',
             'baz' => 'getBazService',
@@ -245,18 +253,4 @@ protected function getInlinedService()
 
         return $instance;
     }
-
-    /**
-     * Gets the default parameters.
-     *
-     * @return array An array of the default parameters
-     */
-    protected function getDefaultParameters()
-    {
-        return array(
-            'baz_class' => 'BazClass',
-            'foo_class' => 'FooClass',
-            'foo' => 'bar',
-        );
-    }
 }