minor #21492 [DI] Deduplicate resources while adding them (nicolas-grekas)

fabpot · fabpot · commit 29db096b0ba6 · 2017-02-01T11:11:51.000-08:00
This PR was merged into the 3.3-dev branch. Discussion ---------- [DI] Deduplicate resources while adding them | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Since the string cast of resources is already used to deduplicate them, let's do it earlier. This can only decrease memory usage. Commits ------- 04853fc [DI] Deduplicate resource while adding them
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -202,7 +202,7 @@ public function hasExtension($name)
      */
     public function getResources()
     {
-        return array_unique($this->resources);
+        return array_values($this->resources);
     }
 
     /**
@@ -218,7 +218,7 @@ public function addResource(ResourceInterface $resource)
             return $this;
         }
 
-        $this->resources[] = $resource;
+        $this->resources[(string) $resource] = $resource;
 
         return $this;
     }

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public function hasExtension($name)`
`202`	`202`	`*/`
`203`	`203`	`public function getResources()`
`204`	`204`	`{`
`205`		`- return array_unique($this->resources);`
	`205`	`+ return array_values($this->resources);`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`/**`
`@@ -218,7 +218,7 @@ public function addResource(ResourceInterface $resource)`
`218`	`218`	`return $this;`
`219`	`219`	`}`
`220`	`220`
`221`		`- $this->resources[] = $resource;`
	`221`	`+ $this->resources[(string) $resource] = $resource;`
`222`	`222`
`223`	`223`	`return $this;`
`224`	`224`	`}`