Skip to content

Commit 35f957c

Browse files
nicolas-grekasnicolas-grekas
committed
[DI] fix param name cast
1 parent 6152822 commit 35f957c

12 files changed

+24
-0
lines changed

‎Dumper/PhpDumper.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,6 +1294,7 @@ private function addDefaultParametersMethod()
12941294
12951295
public function getParameter($name)
12961296
{
1297+
$name = (string) $name;
12971298
if (isset($this->buildParameters[$name])) {
12981299
return $this->buildParameters[$name];
12991300
}
@@ -1313,6 +1314,7 @@ public function getParameter($name)
13131314
13141315
public function hasParameter($name)
13151316
{
1317+
$name = (string) $name;
13161318
if (isset($this->buildParameters[$name])) {
13171319
return true;
13181320
}

‎Tests/Fixtures/php/services10.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ protected function getTestService()
6868

6969
public function getParameter($name)
7070
{
71+
$name = (string) $name;
7172
if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
7273
$name = $this->normalizeParameterName($name);
7374

@@ -84,6 +85,7 @@ public function getParameter($name)
8485

8586
public function hasParameter($name)
8687
{
88+
$name = (string) $name;
8789
$name = $this->normalizeParameterName($name);
8890

8991
return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);

‎Tests/Fixtures/php/services12.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ protected function getTestService()
7272

7373
public function getParameter($name)
7474
{
75+
$name = (string) $name;
7576
if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
7677
$name = $this->normalizeParameterName($name);
7778

@@ -88,6 +89,7 @@ public function getParameter($name)
8889

8990
public function hasParameter($name)
9091
{
92+
$name = (string) $name;
9193
$name = $this->normalizeParameterName($name);
9294

9395
return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);

‎Tests/Fixtures/php/services26.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ protected function getTestService()
8585

8686
public function getParameter($name)
8787
{
88+
$name = (string) $name;
8889
if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
8990
$name = $this->normalizeParameterName($name);
9091

@@ -101,6 +102,7 @@ public function getParameter($name)
101102

102103
public function hasParameter($name)
103104
{
105+
$name = (string) $name;
104106
$name = $this->normalizeParameterName($name);
105107

106108
return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);

‎Tests/Fixtures/php/services8.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public function isFrozen()
5555

5656
public function getParameter($name)
5757
{
58+
$name = (string) $name;
5859
if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
5960
$name = $this->normalizeParameterName($name);
6061

@@ -71,6 +72,7 @@ public function getParameter($name)
7172

7273
public function hasParameter($name)
7374
{
75+
$name = (string) $name;
7476
$name = $this->normalizeParameterName($name);
7577

7678
return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);

‎Tests/Fixtures/php/services9_as_files.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ class ProjectServiceContainer extends Container
384384

385385
public function getParameter($name)
386386
{
387+
$name = (string) $name;
387388
if (isset($this->buildParameters[$name])) {
388389
return $this->buildParameters[$name];
389390
}
@@ -403,6 +404,7 @@ class ProjectServiceContainer extends Container
403404

404405
public function hasParameter($name)
405406
{
407+
$name = (string) $name;
406408
if (isset($this->buildParameters[$name])) {
407409
return true;
408410
}

‎Tests/Fixtures/php/services9_compiled.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ protected function getTaggedIteratorFooService()
386386

387387
public function getParameter($name)
388388
{
389+
$name = (string) $name;
389390
if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
390391
$name = $this->normalizeParameterName($name);
391392

@@ -402,6 +403,7 @@ public function getParameter($name)
402403

403404
public function hasParameter($name)
404405
{
406+
$name = (string) $name;
405407
$name = $this->normalizeParameterName($name);
406408

407409
return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);

‎Tests/Fixtures/php/services_array_params.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ protected function getBarService()
7676

7777
public function getParameter($name)
7878
{
79+
$name = (string) $name;
7980
if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
8081
$name = $this->normalizeParameterName($name);
8182

@@ -92,6 +93,7 @@ public function getParameter($name)
9293

9394
public function hasParameter($name)
9495
{
96+
$name = (string) $name;
9597
$name = $this->normalizeParameterName($name);
9698

9799
return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);

‎Tests/Fixtures/php/services_base64_env.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ public function isFrozen()
5555

5656
public function getParameter($name)
5757
{
58+
$name = (string) $name;
5859
if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
5960
$name = $this->normalizeParameterName($name);
6061

@@ -71,6 +72,7 @@ public function getParameter($name)
7172

7273
public function hasParameter($name)
7374
{
75+
$name = (string) $name;
7476
$name = $this->normalizeParameterName($name);
7577

7678
return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);

‎Tests/Fixtures/php/services_env_in_id.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ protected function getBarenvBARService()
9898

9999
public function getParameter($name)
100100
{
101+
$name = (string) $name;
101102
if (!(isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters))) {
102103
$name = $this->normalizeParameterName($name);
103104

@@ -114,6 +115,7 @@ public function getParameter($name)
114115

115116
public function hasParameter($name)
116117
{
118+
$name = (string) $name;
117119
$name = $this->normalizeParameterName($name);
118120

119121
return isset($this->parameters[$name]) || isset($this->loadedDynamicParameters[$name]) || array_key_exists($name, $this->parameters);

0 commit comments

Comments
 (0)