[DI] cleanup

src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

@@ -548,7 +548,7 @@ class PhpDumper extends Dumper
             }
 
             $class = $this->dumpValue($callable[0]);
-            // If the class is a string we can optimize call_user_func away
+            // If the class is a string we can optimize away
             if (0 === strpos($class, "'") && false === strpos($class, '$')) {
                 return sprintf("        %s::%s(\$%s);\n", $this->dumpLiteralClass($class), $callable[1], $variableName);
             }
@@ -557,7 +557,7 @@ class PhpDumper extends Dumper
                 return sprintf("        (%s)->%s(\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
             }
 
-            return sprintf("        call_user_func(array(%s, '%s'), \$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
+            return sprintf("        [%s, '%s'](\$%s);\n", $this->dumpValue($callable[0]), $callable[1], $variableName);
         }
 
         return sprintf("        %s(\$%s);\n", $callable, $variableName);
@@ -731,7 +731,7 @@ EOF;
                 }
 
                 $class = $this->dumpValue($callable[0]);
-                // If the class is a string we can optimize call_user_func away
+                // If the class is a string we can optimize away
                 if (0 === strpos($class, "'") && false === strpos($class, '$')) {
                     if ("''" === $class) {
                         throw new RuntimeException(sprintf('Cannot dump definition: The "%s" service is defined to be created by a factory but is missing the service reference, did you forget to define the factory service id or class?', $id));
@@ -744,7 +744,7 @@ EOF;
                     return sprintf("        $return{$instantiation}(%s)->%s(%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '');
                 }
 
-                return sprintf("        $return{$instantiation}call_user_func(array(%s, '%s')%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? ', '.implode(', ', $arguments) : '');
+                return sprintf("        $return{$instantiation}[%s, '%s'](%s);\n", $this->dumpValue($callable[0]), $callable[1], $arguments ? implode(', ', $arguments) : '');
             }
 
             return sprintf("        $return{$instantiation}%s(%s);\n", $this->dumpLiteralClass($this->dumpValue($callable)), $arguments ? implode(', ', $arguments) : '');
@@ -1411,7 +1411,7 @@ EOF;
                     }
 
                     if ($factory[0] instanceof Definition) {
-                        return sprintf("call_user_func(array(%s, '%s')%s)", $this->dumpValue($factory[0]), $factory[1], count($arguments) > 0 ? ', '.implode(', ', $arguments) : '');
+                        return sprintf("[%s, '%s'](%s)", $this->dumpValue($factory[0]), $factory[1], implode(', ', $arguments));
                     }
 
                     if ($factory[0] instanceof Reference) {

src/Symfony/Component/DependencyInjection/Tests/ContainerTest.php

@@ -230,7 +230,7 @@ class ContainerTest extends TestCase
      */
     public function testGetSyntheticServiceThrows()
     {
-        require_once __DIR__.'/Fixtures/php/services9.php';
+        require_once __DIR__.'/Fixtures/php/services9_compiled.php';
 
         $container = new \ProjectServiceContainer();
         $container->get('request');

src/Symfony/Component/DependencyInjection/Tests/Dumper/PhpDumperTest.php

@@ -272,7 +272,7 @@ class PhpDumperTest extends TestCase
      */
     public function testOverrideServiceWhenUsingADumpedContainer()
     {
-        require_once self::$fixturesPath.'/php/services9.php';
+        require_once self::$fixturesPath.'/php/services9_compiled.php';
         require_once self::$fixturesPath.'/includes/foo.php';
 
         $container = new \ProjectServiceContainer();

src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9.php

@@ -1,547 +0,0 @@
-<?php
-
-use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\DependencyInjection\Container;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Exception\LogicException;
-use Symfony\Component\DependencyInjection\Exception\RuntimeException;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
-
-/**
- * ProjectServiceContainer.
- *
- * This class has been auto-generated
- * by the Symfony Dependency Injection Component.
- *
- * @final since Symfony 3.3
- */
-class ProjectServiceContainer extends Container
-{
-    private $parameters;
-    private $targetDirs = array();
-
-    /**
-     * Constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct(new ParameterBag($this->getDefaultParameters()));
-        $this->methodMap = array(
-            'BAR' => 'getBARService',
-            'BAR2' => 'getBAR2Service',
-            'bar' => 'getBar3Service',
-            'bar2' => 'getBar22Service',
-            'baz' => 'getBazService',
-            'configurator_service' => 'getConfiguratorServiceService',
-            'configurator_service_simple' => 'getConfiguratorServiceSimpleService',
-            'configured_service' => 'getConfiguredServiceService',
-            'configured_service_simple' => 'getConfiguredServiceSimpleService',
-            'decorated' => 'getDecoratedService',
-            'decorator_service' => 'getDecoratorServiceService',
-            'decorator_service_with_name' => 'getDecoratorServiceWithNameService',
-            'deprecated_service' => 'getDeprecatedServiceService',
-            'factory_service' => 'getFactoryServiceService',
-            'factory_service_simple' => 'getFactoryServiceSimpleService',
-            'factory_simple' => 'getFactorySimpleService',
-            'foo' => 'getFooService',
-            'foo.baz' => 'getFoo_BazService',
-            'foo_bar' => 'getFooBarService',
-            'foo_with_inline' => 'getFooWithInlineService',
-            'inlined' => 'getInlinedService',
-            'lazy_context' => 'getLazyContextService',
-            'lazy_context_ignore_invalid_ref' => 'getLazyContextIgnoreInvalidRefService',
-            'method_call1' => 'getMethodCall1Service',
-            'new_factory' => 'getNewFactoryService',
-            'new_factory_service' => 'getNewFactoryServiceService',
-            'service_from_static_method' => 'getServiceFromStaticMethodService',
-        );
-        $this->privates = array(
-            'configurator_service' => true,
-            'configurator_service_simple' => true,
-            'factory_simple' => true,
-            'inlined' => true,
-            'new_factory' => true,
-        );
-        $this->aliases = array(
-            'Psr\\Container\\ContainerInterface' => 'service_container',
-            'Symfony\\Component\\DependencyInjection\\ContainerInterface' => 'service_container',
-            'alias_for_alias' => 'foo',
-            'alias_for_foo' => 'foo',
-        );
-    }
-
-    /**
-     * Gets the 'BAR' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \stdClass A stdClass instance
-     */
-    protected function getBARService()
-    {
-        $this->services['BAR'] = $instance = new \stdClass();
-
-        $instance->bar = ($this->services['bar'] ?? $this->get('bar'));
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'BAR2' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \stdClass A stdClass instance
-     */
-    protected function getBAR2Service()
-    {
-        return $this->services['BAR2'] = new \stdClass();
-    }
-
-    /**
-     * Gets the 'bar' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Bar\FooClass A Bar\FooClass instance
-     */
-    protected function getBar3Service()
-    {
-        $a = ($this->services['foo.baz'] ?? $this->get('foo.baz'));
-
-        $this->services['bar'] = $instance = new \Bar\FooClass('foo', $a, $this->getParameter('foo_bar'));
-
-        $a->configure($instance);
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'bar2' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \stdClass A stdClass instance
-     */
-    protected function getBar22Service()
-    {
-        return $this->services['bar2'] = new \stdClass();
-    }
-
-    /**
-     * Gets the 'baz' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Baz A Baz instance
-     */
-    protected function getBazService()
-    {
-        $this->services['baz'] = $instance = new \Baz();
-
-        $instance->setFoo(($this->services['foo_with_inline'] ?? $this->get('foo_with_inline')));
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'configured_service' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \stdClass A stdClass instance
-     */
-    protected function getConfiguredServiceService()
-    {
-        $this->services['configured_service'] = $instance = new \stdClass();
-
-        ($this->services['configurator_service'] ?? $this->getConfiguratorServiceService())->configureStdClass($instance);
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'configured_service_simple' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \stdClass A stdClass instance
-     */
-    protected function getConfiguredServiceSimpleService()
-    {
-        $this->services['configured_service_simple'] = $instance = new \stdClass();
-
-        ($this->services['configurator_service_simple'] ?? $this->getConfiguratorServiceSimpleService())->configureStdClass($instance);
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'decorated' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \stdClass A stdClass instance
-     */
-    protected function getDecoratedService()
-    {
-        return $this->services['decorated'] = new \stdClass();
-    }
-
-    /**
-     * Gets the 'decorator_service' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \stdClass A stdClass instance
-     */
-    protected function getDecoratorServiceService()
-    {
-        return $this->services['decorator_service'] = new \stdClass();
-    }
-
-    /**
-     * Gets the 'decorator_service_with_name' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \stdClass A stdClass instance
-     */
-    protected function getDecoratorServiceWithNameService()
-    {
-        return $this->services['decorator_service_with_name'] = new \stdClass();
-    }
-
-    /**
-     * Gets the 'deprecated_service' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \stdClass A stdClass instance
-     *
-     * @deprecated The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed.
-     */
-    protected function getDeprecatedServiceService()
-    {
-        @trigger_error('The "deprecated_service" service is deprecated. You should stop using it, as it will soon be removed.', E_USER_DEPRECATED);
-
-        return $this->services['deprecated_service'] = new \stdClass();
-    }
-
-    /**
-     * Gets the 'factory_service' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Bar A Bar instance
-     */
-    protected function getFactoryServiceService()
-    {
-        return $this->services['factory_service'] = ($this->services['foo.baz'] ?? $this->get('foo.baz'))->getInstance();
-    }
-
-    /**
-     * Gets the 'factory_service_simple' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Bar A Bar instance
-     */
-    protected function getFactoryServiceSimpleService()
-    {
-        return $this->services['factory_service_simple'] = ($this->services['factory_simple'] ?? $this->getFactorySimpleService())->getInstance();
-    }
-
-    /**
-     * Gets the 'foo' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Bar\FooClass A Bar\FooClass instance
-     */
-    protected function getFooService()
-    {
-        $a = ($this->services['foo.baz'] ?? $this->get('foo.baz'));
-
-        $this->services['foo'] = $instance = \Bar\FooClass::getInstance('foo', $a, array($this->getParameter('foo') => 'foo is '.$this->getParameter('foo').'', 'foobar' => $this->getParameter('foo')), true, $this);
-
-        $instance->foo = 'bar';
-        $instance->moo = $a;
-        $instance->qux = array($this->getParameter('foo') => 'foo is '.$this->getParameter('foo').'', 'foobar' => $this->getParameter('foo'));
-        $instance->setBar(($this->services['bar'] ?? $this->get('bar')));
-        $instance->initialize();
-        sc_configure($instance);
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'foo.baz' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return object A %baz_class% instance
-     */
-    protected function getFoo_BazService()
-    {
-        $this->services['foo.baz'] = $instance = call_user_func(array($this->getParameter('baz_class'), 'getInstance'));
-
-        call_user_func(array($this->getParameter('baz_class'), 'configureStatic1'), $instance);
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'foo_bar' service.
-     *
-     * @return object A %foo_class% instance
-     */
-    protected function getFooBarService()
-    {
-        $class = $this->getParameter('foo_class');
-
-        return new $class();
-    }
-
-    /**
-     * Gets the 'foo_with_inline' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Foo A Foo instance
-     */
-    protected function getFooWithInlineService()
-    {
-        $this->services['foo_with_inline'] = $instance = new \Foo();
-
-        $instance->setBar(($this->services['inlined'] ?? $this->getInlinedService()));
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'lazy_context' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \LazyContext A LazyContext instance
-     */
-    protected function getLazyContextService()
-    {
-        return $this->services['lazy_context'] = new \LazyContext(new RewindableGenerator(function () {
-            yield 'k1' => ($this->services['foo.baz'] ?? $this->get('foo.baz'));
-            yield 'k2' => $this;
-        }, 2), new RewindableGenerator(function () {
-            return new \EmptyIterator();
-        }, 0));
-    }
-
-    /**
-     * Gets the 'lazy_context_ignore_invalid_ref' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \LazyContext A LazyContext instance
-     */
-    protected function getLazyContextIgnoreInvalidRefService()
-    {
-        return $this->services['lazy_context_ignore_invalid_ref'] = new \LazyContext(new RewindableGenerator(function () {
-            yield 0 => ($this->services['foo.baz'] ?? $this->get('foo.baz'));
-            if ($this->has('invalid')) {
-                yield 1 => $this->get('invalid', ContainerInterface::NULL_ON_INVALID_REFERENCE);
-            }
-        }, function () {
-            return 1 + (int) ($this->has('invalid'));
-        }), new RewindableGenerator(function () {
-            return new \EmptyIterator();
-        }, 0));
-    }
-
-    /**
-     * Gets the 'method_call1' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Bar\FooClass A Bar\FooClass instance
-     */
-    protected function getMethodCall1Service()
-    {
-        require_once '%path%foo.php';
-
-        $this->services['method_call1'] = $instance = new \Bar\FooClass();
-
-        $instance->setBar(($this->services['foo'] ?? $this->get('foo')));
-        $instance->setBar($this->get('foo2', ContainerInterface::NULL_ON_INVALID_REFERENCE));
-        if ($this->has('foo3')) {
-            $instance->setBar($this->get('foo3', ContainerInterface::NULL_ON_INVALID_REFERENCE));
-        }
-        if ($this->has('foobaz')) {
-            $instance->setBar($this->get('foobaz', ContainerInterface::NULL_ON_INVALID_REFERENCE));
-        }
-        $instance->setBar((${($_ = isset($this->services['foo']) ? $this->services['foo'] : $this->get('foo')) && false ?: '_'}->foo() . (($this->hasParameter("foo")) ? ($this->getParameter("foo")) : ("default"))));
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'new_factory_service' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \FooBarBaz A FooBarBaz instance
-     */
-    protected function getNewFactoryServiceService()
-    {
-        $this->services['new_factory_service'] = $instance = ($this->services['new_factory'] ?? $this->getNewFactoryService())->getInstance();
-
-        $instance->foo = 'bar';
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'service_from_static_method' service.
-     *
-     * This service is shared.
-     * This method always returns the same instance of the service.
-     *
-     * @return \Bar\FooClass A Bar\FooClass instance
-     */
-    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->services['baz'] ?? $this->get('baz')));
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'configurator_service_simple' 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 getConfiguratorServiceSimpleService()
-    {
-        return $this->services['configurator_service_simple'] = new \ConfClass('bar');
-    }
-
-    /**
-     * Gets the 'factory_simple' 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 \SimpleFactoryClass A SimpleFactoryClass instance
-     */
-    protected function getFactorySimpleService()
-    {
-        return $this->services['factory_simple'] = new \SimpleFactoryClass('foo');
-    }
-
-    /**
-     * Gets the 'inlined' 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 \Bar A Bar instance
-     */
-    protected function getInlinedService()
-    {
-        $this->services['inlined'] = $instance = new \Bar();
-
-        $instance->pub = 'pub';
-        $instance->setBaz(($this->services['baz'] ?? $this->get('baz')));
-
-        return $instance;
-    }
-
-    /**
-     * Gets the 'new_factory' 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 \FactoryClass A FactoryClass instance
-     */
-    protected function getNewFactoryService()
-    {
-        $this->services['new_factory'] = $instance = new \FactoryClass();
-
-        $instance->foo = 'bar';
-
-        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',
-        );
-    }
-}