[OptionsResolver] Fix force prepend normalizer

hason · hason · commit 6eb836b6f9b9 · 2020-07-10T11:12:14.000+02:00
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -532,6 +532,7 @@ public function addNormalizer(string $option, \Closure $normalizer, bool $forceP
         }
 
         if ($forcePrepend) {
+            $this->normalizers[$option] = $this->normalizers[$option] ?? [];
             array_unshift($this->normalizers[$option], $normalizer);
         } else {
             $this->normalizers[$option][] = $normalizer;
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -1506,6 +1506,17 @@ public function testForcePrependNormalizerClosure()
         $this->assertEquals(['foo' => '2nd-normalized-1st-normalized-bar'], $this->resolver->resolve());
     }
 
+    public function testForcePrependNormalizerForResolverWithoutPreviousNormalizers()
+    {
+        // defined by superclass
+        $this->resolver->setDefault('foo', 'bar');
+        $this->resolver->addNormalizer('foo', function (Options $options, $value) {
+            return '1st-normalized-'.$value;
+        }, true);
+
+        $this->assertEquals(['foo' => '1st-normalized-bar'], $this->resolver->resolve());
+    }
+
     public function testAddNormalizerFailsIfUnknownOption()
     {
         $this->expectException('Symfony\Component\OptionsResolver\Exception\UndefinedOptionsException');

Original file line number	Diff line number	Diff line change
`@@ -532,6 +532,7 @@ public function addNormalizer(string $option, \Closure $normalizer, bool $forceP`
`532`	`532`	`}`
`533`	`533`
`534`	`534`	`if ($forcePrepend) {`
	`535`	`+ $this->normalizers[$option] = $this->normalizers[$option] ?? [];`
`535`	`536`	`array_unshift($this->normalizers[$option], $normalizer);`
`536`	`537`	`} else {`
`537`	`538`	`$this->normalizers[$option][] = $normalizer;`