feature #47367 [DependencyInjection] Handle INI arrays (MatTheCat)

fabpot · fabpot · commit a0e0325ea786 · 2022-08-26T10:55:15.000+02:00
This PR was submitted for the 4.4 branch but it was merged into the 6.2 branch instead. Discussion ---------- [DependencyInjection] Handle INI arrays | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #47357 | License | MIT | Doc PR | N/A Commits ------- f90525c Handle INI arrays
diff --git a/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/IniFileLoader.php
@@ -38,7 +38,11 @@ public function load(mixed $resource, string $type = null): mixed
 
         if (isset($result['parameters']) && \is_array($result['parameters'])) {
             foreach ($result['parameters'] as $key => $value) {
-                $this->container->setParameter($key, $this->phpize($value));
+                if (\is_array($value)) {
+                    $this->container->setParameter($key, array_map([$this, 'phpize'], $value));
+                } else {
+                    $this->container->setParameter($key, $this->phpize($value));
+                }
             }
         }
 
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ini/types.ini b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/ini/types.ini
@@ -26,3 +26,7 @@
   -120.0 = -1.2E2
   -10100.1 = -10100.1
   -10,100.1 = -10,100.1
+  list[] = 1
+  list[] = 2
+  map[one] = 1
+  map[two] = 2
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php b/src/Symfony/Component/DependencyInjection/Tests/Loader/IniFileLoaderTest.php
@@ -88,6 +88,8 @@ public function getTypeConversions()
             ['-120.0', -1.2E2, false], // not supported by INI_SCANNER_TYPED
             ['-10100.1', -10100.1, false], // not supported by INI_SCANNER_TYPED
             ['-10,100.1', '-10,100.1', true],
+            ['list', [1, 2], true],
+            ['map', ['one' => 1, 'two' => 2], true],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,11 @@ public function load(mixed $resource, string $type = null): mixed`
`38`	`38`
`39`	`39`	`if (isset($result['parameters']) && \is_array($result['parameters'])) {`
`40`	`40`	`foreach ($result['parameters'] as $key => $value) {`
`41`		`- $this->container->setParameter($key, $this->phpize($value));`
	`41`	`+ if (\is_array($value)) {`
	`42`	`+ $this->container->setParameter($key, array_map([$this, 'phpize'], $value));`
	`43`	`+ } else {`
	`44`	`+ $this->container->setParameter($key, $this->phpize($value));`
	`45`	`+ }`
`42`	`46`	`}`
`43`	`47`	`}`
`44`	`48`
Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,8 @@ public function getTypeConversions()`
`88`	`88`	`['-120.0', -1.2E2, false], // not supported by INI_SCANNER_TYPED`
`89`	`89`	`['-10100.1', -10100.1, false], // not supported by INI_SCANNER_TYPED`
`90`	`90`	`['-10,100.1', '-10,100.1', true],`
	`91`	`+ ['list', [1, 2], true],`
	`92`	`+ ['map', ['one' => 1, 'two' => 2], true],`
`91`	`93`	`];`
`92`	`94`	`}`
`93`	`95`