minor #59441 [OptionResolver] Allow whitespace in types (VincentLanglet)

nicolas-grekas · nicolas-grekas · commit 8f04a56e351d · 2025-01-09T15:24:35.000+01:00
This PR was merged into the 7.3 branch. Discussion ---------- [OptionResolver] Allow whitespace in types | Q | A | ------------- | --- | Branch? | 7.3 | Bug fix? | no | New feature? | yes | Deprecations? | no | Issues | Fix #... | License | MIT Since we're now supporting union of type, people might prefer to use whitespace when writing union of type like `int | string` rather than `int|string`. This might be interesting for complex type, and since the support is easy I think it's a good improvement. Commits ------- 887757e Allow whitespace in types
diff --git a/src/Symfony/Component/OptionsResolver/OptionsResolver.php b/src/Symfony/Component/OptionsResolver/OptionsResolver.php
@@ -1141,6 +1141,7 @@ public function offsetGet(mixed $option, bool $triggerDeprecation = true): mixed
 
     private function verifyTypes(string $type, mixed $value, ?array &$invalidTypes = null, int $level = 0): bool
     {
+        $type = trim($type);
         $allowedTypes = $this->splitOutsideParenthesis($type);
         if (\count($allowedTypes) > 1) {
             foreach ($allowedTypes as $allowedType) {
diff --git a/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php b/src/Symfony/Component/OptionsResolver/Tests/OptionsResolverTest.php
@@ -790,6 +790,18 @@ public function testResolveTypedWithUnion()
         $this->assertSame(['foo' => '1'], $options);
     }
 
+    public function testResolveTypedWithUnionAndWhitespaces()
+    {
+        $this->resolver->setDefined('foo');
+        $this->resolver->setAllowedTypes('foo', 'string | int');
+
+        $options = $this->resolver->resolve(['foo' => 1]);
+        $this->assertSame(['foo' => 1], $options);
+
+        $options = $this->resolver->resolve(['foo' => '1']);
+        $this->assertSame(['foo' => '1'], $options);
+    }
+
     public function testResolveTypedWithUnionOfClasse()
     {
         $this->resolver->setDefined('foo');

Original file line number	Diff line number	Diff line change
`@@ -1141,6 +1141,7 @@ public function offsetGet(mixed $option, bool $triggerDeprecation = true): mixed`
`1141`	`1141`
`1142`	`1142`	`private function verifyTypes(string $type, mixed $value, ?array &$invalidTypes = null, int $level = 0): bool`
`1143`	`1143`	`{`
	`1144`	`+ $type = trim($type);`
`1144`	`1145`	`$allowedTypes = $this->splitOutsideParenthesis($type);`
`1145`	`1146`	`if (\count($allowedTypes) > 1) {`
`1146`	`1147`	`foreach ($allowedTypes as $allowedType) {`