minor #10241 [DependencyInjection] made some perf improvements (fabpot)

This PR was merged into the 2.6-dev branch. Discussion ---------- [DependencyInjection] made some perf improvements | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | Fixed tickets | n/a | License | MIT | Doc PR | n/a This PR optimizes the creation of dumped containers drastically (thanks @jpauli for the hint). The Container class generated by the PHP dumper does not include the `getDefaultParameters()` method anymore. It does not seem like a big deal to me as I fail to see a use case where someone would override this method. Commits ------- e1a3ef8 [DependencyInjection] made some perf improvements
2014-09-26 07:01:55 +02:00 · 2014-09-26 07:01:55 +02:00 · 181e460984
commit 181e460984
parent ff17493029 e1a3ef8b3f
8 changed files with 57 additions and 104 deletions
--- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
+++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@ -800,16 +800,18 @@ EOF;
     */
    private function addConstructor()
    {
-        $arguments = $this->container->getParameterBag()->all() ? 'new ParameterBag($this->getDefaultParameters())' : null;
+        $parameters = $this->exportParameters($this->container->getParameterBag()->all());

        $code = <<<EOF

+    private static \$parameters = $parameters;
+
    /**
     * Constructor.
     */
    public function __construct()
    {
-        parent::__construct($arguments);
+        parent::__construct(new ParameterBag(self::\$parameters));

 EOF;

@ -837,23 +839,17 @@ EOF;
     */
    private function addFrozenConstructor()
    {
+        $parameters = $this->exportParameters($this->container->getParameterBag()->all());
+
        $code = <<<EOF

-    private \$parameters;
+    private static \$parameters = $parameters;

    /**
     * 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();
@ -961,8 +957,6 @@ EOF;
            return '';
        }

-        $parameters = $this->exportParameters($this->container->getParameterBag()->all());
-
        $code = '';
        if ($this->container->isFrozen()) {
            $code .= <<<EOF
@ -974,11 +968,11 @@ EOF;
    {
        \$name = strtolower(\$name);

-        if (!(isset(\$this->parameters[\$name]) || array_key_exists(\$name, \$this->parameters))) {
+        if (!(isset(self::\$parameters[\$name]) || array_key_exists(\$name, self::\$parameters))) {
            throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', \$name));
        }

-        return \$this->parameters[\$name];
+        return self::\$parameters[\$name];
    }

    /**
@ -988,7 +982,7 @@ EOF;
    {
        \$name = strtolower(\$name);

-        return isset(\$this->parameters[\$name]) || array_key_exists(\$name, \$this->parameters);
+        return isset(self::\$parameters[\$name]) || array_key_exists(\$name, self::\$parameters);
    }

    /**
@ -1005,28 +999,15 @@ EOF;
    public function getParameterBag()
    {
        if (null === \$this->parameterBag) {
-            \$this->parameterBag = new FrozenParameterBag(\$this->parameters);
+            \$this->parameterBag = new FrozenParameterBag(self::\$parameters);
        }

        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;
    }

--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1-1.php
@ -17,11 +17,15 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 */
 class Container extends AbstractContainer
 {
+    private static $parameters = array(
+
+        );
+
    /**
     * Constructor.
     */
    public function __construct()
    {
-        parent::__construct();
+        parent::__construct(new ParameterBag(self::$parameters));
    }
 }
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services1.php
@ -16,11 +16,15 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 */
 class ProjectServiceContainer extends Container
 {
+    private static $parameters = array(
+
+        );
+
    /**
     * Constructor.
     */
    public function __construct()
    {
-        parent::__construct();
+        parent::__construct(new ParameterBag(self::$parameters));
    }
 }
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@ -16,15 +16,16 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private static $parameters = array(
+            'empty_value' => '',
+            'some_string' => '-',
+        );

    /**
     * Constructor.
     */
    public function __construct()
    {
-        $this->parameters = $this->getDefaultParameters();
-
        $this->services =
        $this->scopedServices =
        $this->scopeStacks = array();
@ -68,11 +69,11 @@ class ProjectServiceContainer extends Container
    {
        $name = strtolower($name);

-        if (!(isset($this->parameters[$name]) || array_key_exists($name, $this->parameters))) {
+        if (!(isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters))) {
            throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
        }

-        return $this->parameters[$name];
+        return self::$parameters[$name];
    }

    /**
@ -82,7 +83,7 @@ class ProjectServiceContainer extends Container
    {
        $name = strtolower($name);

-        return isset($this->parameters[$name]) || array_key_exists($name, $this->parameters);
+        return isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters);
    }

    /**
@ -99,21 +100,9 @@ class ProjectServiceContainer extends Container
    public function getParameterBag()
    {
        if (null === $this->parameterBag) {
-            $this->parameterBag = new FrozenParameterBag($this->parameters);
+            $this->parameterBag = new FrozenParameterBag(self::$parameters);
        }

        return $this->parameterBag;
    }
-    /**
-     * Gets the default parameters.
-     *
-     * @return array An array of the default parameters
-     */
-    protected function getDefaultParameters()
-    {
-        return array(
-            'empty_value' => '',
-            'some_string' => '-',
-        );
-    }
 }
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
@ -16,7 +16,9 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private static $parameters = array(
+
+        );

    /**
     * Constructor.
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services8.php
@ -16,22 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 */
 class ProjectServiceContainer extends Container
 {
-    /**
-     * 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(
+    private static $parameters = array(
            'foo' => '%baz%',
            'baz' => 'bar',
            'bar' => 'foo is %%foo bar',
@ -47,5 +32,12 @@ class ProjectServiceContainer extends Container
                7 => 'null',
            ),
        );
+
+    /**
+     * Constructor.
+     */
+    public function __construct()
+    {
+        parent::__construct(new ParameterBag(self::$parameters));
    }
 }
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php
@ -16,12 +16,18 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 */
 class ProjectServiceContainer extends Container
 {
+    private static $parameters = array(
+            'baz_class' => 'BazClass',
+            'foo_class' => 'Bar\\FooClass',
+            'foo' => 'bar',
+        );
+
    /**
     * Constructor.
     */
    public function __construct()
    {
-        parent::__construct(new ParameterBag($this->getDefaultParameters()));
+        parent::__construct(new ParameterBag(self::$parameters));
        $this->methodMap = array(
            'bar' => 'getBarService',
            'baz' => 'getBazService',
@ -370,18 +376,4 @@ class ProjectServiceContainer extends Container

        return $instance;
    }
-
-    /**
-     * Gets the default parameters.
-     *
-     * @return array An array of the default parameters
-     */
-    protected function getDefaultParameters()
-    {
-        return array(
-            'baz_class' => 'BazClass',
-            'foo_class' => 'Bar\\FooClass',
-            'foo' => 'bar',
-        );
-    }
 }
--- a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
+++ b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@ -16,15 +16,17 @@ use Symfony\Component\DependencyInjection\ParameterBag\FrozenParameterBag;
 */
 class ProjectServiceContainer extends Container
 {
-    private $parameters;
+    private static $parameters = array(
+            'baz_class' => 'BazClass',
+            'foo_class' => 'Bar\\FooClass',
+            'foo' => 'bar',
+        );

    /**
     * Constructor.
     */
    public function __construct()
    {
-        $this->parameters = $this->getDefaultParameters();
-
        $this->services =
        $this->scopedServices =
        $this->scopeStacks = array();
@ -320,11 +322,11 @@ class ProjectServiceContainer extends Container
    {
        $name = strtolower($name);

-        if (!(isset($this->parameters[$name]) || array_key_exists($name, $this->parameters))) {
+        if (!(isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters))) {
            throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
        }

-        return $this->parameters[$name];
+        return self::$parameters[$name];
    }

    /**
@ -334,7 +336,7 @@ class ProjectServiceContainer extends Container
    {
        $name = strtolower($name);

-        return isset($this->parameters[$name]) || array_key_exists($name, $this->parameters);
+        return isset(self::$parameters[$name]) || array_key_exists($name, self::$parameters);
    }

    /**
@ -351,22 +353,9 @@ class ProjectServiceContainer extends Container
    public function getParameterBag()
    {
        if (null === $this->parameterBag) {
-            $this->parameterBag = new FrozenParameterBag($this->parameters);
+            $this->parameterBag = new FrozenParameterBag(self::$parameters);
        }

        return $this->parameterBag;
    }
-    /**
-     * Gets the default parameters.
-     *
-     * @return array An array of the default parameters
-     */
-    protected function getDefaultParameters()
-    {
-        return array(
-            'baz_class' => 'BazClass',
-            'foo_class' => 'Bar\\FooClass',
-            'foo' => 'bar',
-        );
-    }
 }