Fixing weird infinite loop issue

thecodingmachine · Aug 30, 2018 · 275fc35 · 275fc35
1 parent b20c237
commit 275fc35
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/src/Definition/FactoryCallDefinition.php b/src/Definition/FactoryCallDefinition.php
@@ -123,4 +123,9 @@ public function toPhpCode(string $containerVariable, array $usedVariables = arra
 
         return new InlineEntry($code, $prependedCode, $usedVariables);
     }
+
+    public function cloneWithoutIdentifier(): self
+    {
+        return new self(null, $this->factory, $this->methodName, $this->methodArguments);
+    }
 }
diff --git a/src/ServiceProvider/CreateServiceFromRegistryDefinition.php b/src/ServiceProvider/CreateServiceFromRegistryDefinition.php
@@ -69,4 +69,9 @@ public function toPhpCode(string $containerVariable, array $usedVariables = arra
 
         return new InlineEntry($code, null, $usedVariables);
     }
+
+    public function cloneWithoutIdentifier(): self
+    {
+        return new self(null, $this->serviceName, $this->serviceProviderKey);
+    }
 }
diff --git a/src/ServiceProvider/ExtendServiceFromRegistryDefinition.php b/src/ServiceProvider/ExtendServiceFromRegistryDefinition.php
@@ -82,4 +82,9 @@ public function toPhpCode(string $containerVariable, array $usedVariables = arra
 
         return new InlineEntry($code, null, $usedVariables);
     }
+
+    public function cloneWithoutIdentifier(): self
+    {
+        return new self(null, $this->serviceName, $this->serviceProviderKey, $this->previousDefinition);
+    }
 }
diff --git a/src/ServiceProvider/ServiceProviderLoader.php b/src/ServiceProvider/ServiceProviderLoader.php
@@ -126,9 +126,11 @@ private function extendService(string $serviceName, int $serviceProviderKey, cal
 
         // TODO: it would be way easier if we could simply rename a definition!!!
         if ($previousDefinition instanceof FactoryCallDefinition) {
-            $innerDefinition = new FactoryCallDefinition(null /*$innerName*/, $previousDefinition->getFactory(), $previousDefinition->getMethodName(), $previousDefinition->getMethodArguments());
-        } elseif ($previousDefinition instanceof CreateServiceFromRegistryDefinition || $previousDefinition instanceof ExtendServiceFromRegistryDefinition) {
-            $innerDefinition = $previousDefinition;
+            $innerDefinition = $previousDefinition->cloneWithoutIdentifier();
+        } elseif ($previousDefinition instanceof CreateServiceFromRegistryDefinition) {
+            $innerDefinition = $previousDefinition->cloneWithoutIdentifier();
+        } elseif ($previousDefinition instanceof ExtendServiceFromRegistryDefinition) {
+            $innerDefinition = $previousDefinition->cloneWithoutIdentifier();
         } else {
             // @codeCoverageIgnoreStart
             throw new CompilerException('Unable to rename definition from class '.get_class($previousDefinition));
@@ -153,8 +155,6 @@ private function extendService(string $serviceName, int $serviceProviderKey, cal
      */
     private function getCreateServiceDefinitionFromCallable($decoratedServiceName, $serviceName, $serviceProviderKey, callable $callable, ContainerDefinition $containerDefinition): DumpableInterface
     {
-        // FIXME: we must split this method in 2. One for the factories and one for the extensions!
-
         if ($callable instanceof DefinitionInterface) {
             return $this->converter->convert($decoratedServiceName, $callable);
         }
@@ -183,8 +183,6 @@ private function getCreateServiceDefinitionFromCallable($decoratedServiceName, $
      */
     private function getExtendServiceDefinitionFromCallable($decoratedServiceName, $serviceName, $serviceProviderKey, callable $callable, ContainerDefinition $containerDefinition, DumpableInterface $previousDefinition = null): DumpableInterface
     {
-        // FIXME: we must split this method in 2. One for the factories and one for the extensions!
-
         if ($callable instanceof DefinitionInterface) {
             return $this->converter->convert($decoratedServiceName, $callable);
         }