added functionality for PhpFileLoader

przemyslaw-bogusz · przemyslaw-bogusz · commit 3bbf849bb3fd · 2019-01-27T02:11:58.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -1525,9 +1525,14 @@ public function getRemovedBindingIds()
      *
      * @internal
      */
-    public function addRemovedBindingId($id)
+    public function addRemovedBindingIds($id)
     {
-        $this->removedBindingIds[(int) $id] = true;
+        if ($this->hasDefinition($id)) {
+            foreach ($this->getDefinition($id)->getBindings() as $key => $binding) {
+                list(, $bindingId) = $binding->getValues();
+                $this->removedBindingIds[(int) $bindingId] = true;
+            }
+        }
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php b/src/Symfony/Component/DependencyInjection/Loader/Configurator/ServiceConfigurator.php
@@ -59,6 +59,8 @@ public function __destruct()
     {
         parent::__destruct();
 
+        $this->container->addRemovedBindingIds($this->id);
+
         if (!$this->definition instanceof ChildDefinition) {
             $this->container->setDefinition($this->id, $this->definition->setInstanceofConditionals($this->instanceof));
         } else {
diff --git a/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/FileLoader.php
@@ -91,12 +91,7 @@ public function registerClasses(Definition $prototype, $namespace, $resource, $e
      */
     protected function setDefinition($id, Definition $definition)
     {
-        if ($this->container->hasDefinition($id)) {
-            foreach ($this->container->getDefinition($id)->getBindings() as $key => $binding) {
-                list(, $bindingId) = $binding->getValues();
-                $this->container->addRemovedBindingId($bindingId);
-            }
-        }
+        $this->container->addRemovedBindingIds($id);
 
         if ($this->isLoadingInstanceof) {
             if (!$definition instanceof ChildDefinition) {

Original file line number	Diff line number	Diff line change
`@@ -1525,9 +1525,14 @@ public function getRemovedBindingIds()`
`1525`	`1525`	`*`
`1526`	`1526`	`* @internal`
`1527`	`1527`	`*/`
`1528`		`- public function addRemovedBindingId($id)`
	`1528`	`+ public function addRemovedBindingIds($id)`
`1529`	`1529`	`{`
`1530`		`- $this->removedBindingIds[(int) $id] = true;`
	`1530`	`+ if ($this->hasDefinition($id)) {`
	`1531`	`+ foreach ($this->getDefinition($id)->getBindings() as $key => $binding) {`
	`1532`	`+ list(, $bindingId) = $binding->getValues();`
	`1533`	`+ $this->removedBindingIds[(int) $bindingId] = true;`
	`1534`	`+ }`
	`1535`	`+ }`
`1531`	`1536`	`}`
`1532`	`1537`
`1533`	`1538`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,8 @@ public function __destruct()`
`59`	`59`	`{`
`60`	`60`	`parent::__destruct();`
`61`	`61`
	`62`	`+ $this->container->addRemovedBindingIds($this->id);`
	`63`	`+`
`62`	`64`	`if (!$this->definition instanceof ChildDefinition) {`
`63`	`65`	`$this->container->setDefinition($this->id, $this->definition->setInstanceofConditionals($this->instanceof));`
`64`	`66`	`} else {`