Added type-hints to LazyProxy classes and interfaces.

symfony · fabpot · Jul 8, 2019 · Jun 28, 2019 · Jul 6, 2019 · 211b718e28b63891153c284e3d20058898f37821
commit 211b718e28b63891153c284e3d20058898f37821
diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/Instantiator/RuntimeInstantiator.php
@@ -38,7 +38,7 @@ public function __construct()
    /**
     * {@inheritdoc}
     */
-    public function instantiateProxy(ContainerInterface $container, Definition $definition, $id, $realInstantiator)
+    public function instantiateProxy(ContainerInterface $container, Definition $definition, string $id, callable $realInstantiator)
    {
        return $this->factory->createProxy(
            $this->factory->getGenerator()->getProxifiedClass($definition),

diff --git a/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php b/src/Symfony/Bridge/ProxyManager/LazyProxy/PhpDumper/ProxyDumper.php
@@ -48,18 +48,14 @@ public function isProxyCandidate(Definition $definition): bool
    /**
     * {@inheritdoc}
     */
-    public function getProxyFactoryCode(Definition $definition, $id, $factoryCode = null): string
+    public function getProxyFactoryCode(Definition $definition, string $id, string $factoryCode): string
    {
        $instantiation = 'return';

        if ($definition->isShared()) {
            $instantiation .= sprintf(' $this->%s[%s] =', $definition->isPublic() && !$definition->isPrivate() ? 'services' : 'privates', var_export($id, true));
        }

-        if (null === $factoryCode) {
-            throw new \InvalidArgumentException(sprintf('Missing factory code to construct the service "%s".', $id));
-        }
-
        $proxyClass = $this->getProxyClassName($definition);

        return <<<EOF

diff --git a/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php b/src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/PhpDumper/ProxyDumperTest.php
@@ -109,17 +109,6 @@ public function getPrivatePublicDefinitions()
        ];
    }

-    /**
-     * @expectedException \InvalidArgumentException
-     * @expectedExceptionMessage Missing factory code to construct the service "foo".
-     */
-    public function testGetProxyFactoryCodeWithoutCustomMethod()
-    {
-        $definition = new Definition(__CLASS__);
-        $definition->setLazy(true);
-        $this->dumper->getProxyFactoryCode($definition, 'foo');
-    }
-
    public function testGetProxyFactoryCodeForInterface()
    {
        $class = DummyClass::class;

diff --git a/src/Symfony/Bridge/ProxyManager/composer.json b/src/Symfony/Bridge/ProxyManager/composer.json
@@ -17,7 +17,7 @@
    ],
    "require": {
        "php": "^7.2.9",
-        "symfony/dependency-injection": "^4.4|^5.0",
+        "symfony/dependency-injection": "^5.0",
        "ocramius/proxy-manager": "~2.1"
    },
    "require-dev": {

diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/InstantiatorInterface.php b/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/InstantiatorInterface.php
@@ -32,5 +32,5 @@ interface InstantiatorInterface
     *
     * @return object
     */
-    public function instantiateProxy(ContainerInterface $container, Definition $definition, $id, $realInstantiator);
+    public function instantiateProxy(ContainerInterface $container, Definition $definition, string $id, callable $realInstantiator);
 }
diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/RealServiceInstantiator.php b/src/Symfony/Component/DependencyInjection/LazyProxy/Instantiator/RealServiceInstantiator.php
@@ -26,7 +26,7 @@ class RealServiceInstantiator implements InstantiatorInterface
    /**
     * {@inheritdoc}
     */
-    public function instantiateProxy(ContainerInterface $container, Definition $definition, $id, $realInstantiator)
+    public function instantiateProxy(ContainerInterface $container, Definition $definition, string $id, callable $realInstantiator)
    {
        return $realInstantiator();
    }

diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/DumperInterface.php
@@ -30,13 +30,9 @@ public function isProxyCandidate(Definition $definition);
    /**
     * Generates the code to be used to instantiate a proxy in the dumped factory code.
     *
-     * @param Definition $definition
-     * @param string     $id          Service identifier
-     * @param string     $factoryCode The code to execute to create the service
-     *
     * @return string
     */
-    public function getProxyFactoryCode(Definition $definition, $id, $factoryCode);
+    public function getProxyFactoryCode(Definition $definition, string $id, string $factoryCode);

    /**
     * Generates the code for the lazy proxy.

diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/NullDumper.php b/src/Symfony/Component/DependencyInjection/LazyProxy/PhpDumper/NullDumper.php
@@ -33,7 +33,7 @@ public function isProxyCandidate(Definition $definition): bool
    /**
     * {@inheritdoc}
     */
-    public function getProxyFactoryCode(Definition $definition, $id, $factoryCode = null): string
+    public function getProxyFactoryCode(Definition $definition, string $id, string $factoryCode): string
    {
        return '';
    }

diff --git a/src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php b/src/Symfony/Component/DependencyInjection/LazyProxy/ProxyHelper.php
@@ -21,7 +21,7 @@ class ProxyHelper
    /**
     * @return string|null The FQCN or builtin name of the type hint, or null when the type hint references an invalid self|parent context
     */
-    public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionParameter $p = null, $noBuiltin = false)
+    public static function getTypeHint(\ReflectionFunctionAbstract $r, \ReflectionParameter $p = null, bool $noBuiltin = false)
    {
        if ($p instanceof \ReflectionParameter) {
            $type = $p->getType();

diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/classes.php
@@ -88,7 +88,7 @@ public function isProxyCandidate(Definition $definition)
        return $definition->isLazy();
    }

-    public function getProxyFactoryCode(Definition $definition, $id, $factoryCall = null)
+    public function getProxyFactoryCode(Definition $definition, string $id, string $factoryCode)
    {
        return "        // lazy factory for {$definition->getClass()}\n\n";
    }