bug symfony#32563 Container*::getServiceIds() should return strings (mathroc)

fabpot · fabpot · commit 04b9ce39ad05 · 2019-07-17T09:04:46.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- Container*::getServiceIds() should return strings | Q | A | ------------- | --- | Branch? | 4.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | o | Tests pass? | yes | Fixed tickets | symfony#32549 | License | MIT Cast services ids to string in `Container*::getServiceIds()` Commits ------- 9c88caa Container*::getServiceIds() should return an array of string
diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php
@@ -386,7 +386,7 @@ public function reset()
     /**
      * Gets all service ids.
      *
-     * @return array An array of all defined service ids
+     * @return string[] An array of all defined service ids
      */
     public function getServiceIds()
     {
@@ -405,7 +405,7 @@ public function getServiceIds()
         }
         $ids[] = 'service_container';
 
-        return array_unique(array_merge($ids, array_keys($this->methodMap), array_keys($this->fileMap), array_keys($this->services)));
+        return array_map('strval', array_unique(array_merge($ids, array_keys($this->methodMap), array_keys($this->fileMap), array_keys($this->services))));
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/ContainerBuilder.php b/src/Symfony/Component/DependencyInjection/ContainerBuilder.php
@@ -815,13 +815,11 @@ public function compile(/*$resolveEnvPlaceholders = false*/)
     }
 
     /**
-     * Gets all service ids.
-     *
-     * @return array An array of all defined service ids
+     * {@inheritdoc}
      */
     public function getServiceIds()
     {
-        return array_unique(array_merge(array_keys($this->getDefinitions()), array_keys($this->aliasDefinitions), parent::getServiceIds()));
+        return array_map('strval', array_unique(array_merge(array_keys($this->getDefinitions()), array_keys($this->aliasDefinitions), parent::getServiceIds())));
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ public function reset()`
`386`	`386`	`/**`
`387`	`387`	`* Gets all service ids.`
`388`	`388`	`*`
`389`		`- * @return array An array of all defined service ids`
	`389`	`+ * @return string[] An array of all defined service ids`
`390`	`390`	`*/`
`391`	`391`	`public function getServiceIds()`
`392`	`392`	`{`
`@@ -405,7 +405,7 @@ public function getServiceIds()`
`405`	`405`	`}`
`406`	`406`	`$ids[] = 'service_container';`
`407`	`407`
`408`		`- return array_unique(array_merge($ids, array_keys($this->methodMap), array_keys($this->fileMap), array_keys($this->services)));`
	`408`	`+ return array_map('strval', array_unique(array_merge($ids, array_keys($this->methodMap), array_keys($this->fileMap), array_keys($this->services))));`
`409`	`409`	`}`
`410`	`410`
`411`	`411`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -815,13 +815,11 @@ public function compile(/$resolveEnvPlaceholders = false/)`
`815`	`815`	`}`
`816`	`816`
`817`	`817`	`/**`
`818`		`- * Gets all service ids.`
`819`		`- *`
`820`		`- * @return array An array of all defined service ids`
	`818`	`+ * {@inheritdoc}`
`821`	`819`	`*/`
`822`	`820`	`public function getServiceIds()`
`823`	`821`	`{`
`824`		`- return array_unique(array_merge(array_keys($this->getDefinitions()), array_keys($this->aliasDefinitions), parent::getServiceIds()));`
	`822`	`+ return array_map('strval', array_unique(array_merge(array_keys($this->getDefinitions()), array_keys($this->aliasDefinitions), parent::getServiceIds())));`
`825`	`823`	`}`
`826`	`824`
`827`	`825`	`/**`