Commitfbf15a8

committed

[Config] Add conditional types to conditional builders

This allows static analysis tools to understand what type is returned.

1 parent18aea63 commitfbf15a8Copy full SHA for fbf15a8

File tree

+32

-0

lines changed

+32

-0

lines changed

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,10 @@ private function handleArrayNode(ArrayNode $node, ClassBuilder $class, string $n`
`143`	`143`	`);`
`144`	`144`	`$body =$hasNormalizationClosures ?'`
`145`	`145`	`/**`
	`146`	`+ * @template T`
	`147`	`+ * @psalm-param T $value`
	`148`	`+ * @psalm-return (T is array ? CLASS : static)`
	`149`	`+ *`
`146`	`150`	`* @return CLASS\|$this`
`147`	`151`	`*/`
`148`	`152`	`public function NAME($value = [])`
`@@ -262,6 +266,10 @@ public function NAME(string $VAR, $VALUE): self`
`262`	`266`	`if (null ===$key =$node->getKeyAttribute()) {`
`263`	`267`	`$body =$hasNormalizationClosures ?'`
`264`	`268`	`/**`
	`269`	`+ * @template T`
	`270`	`+ * @psalm-param T $value`
	`271`	`+ * @psalm-return (T is array ? CLASS : static)`
	`272`	`+ *`
`265`	`273`	`* @return CLASS\|$this`
`266`	`274`	`*/`
`267`	`275`	`public function NAME($value = [])`
`@@ -285,7 +293,11 @@ public function NAME(array $value = []): CLASS`
`285`	`293`	`}else {`
`286`	`294`	`$body =$hasNormalizationClosures ?'`
`287`	`295`	`/**`
	`296`	`+ * @template T`
	`297`	`+ * @psalm-param T $value`
	`298`	`+ *`
`288`	`299`	`* @return CLASS\|$this`
	`300`	`+ * @psalm-return (T is array ? CLASS : static)`
`289`	`301`	`*/`
`290`	`302`	`public function NAME(string $VAR, $VALUE = [])`
`291`	`303`	`{`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,10 @@ class NestedConfig`
`17`	`17`	`private$_usedProperties = [];`
`18`	`18`
`19`	`19`	`/**`
	`20`	`+ * @template T`
	`21`	`+ * @psalm-param T $value`
	`22`	`+ * @psalm-return (T is array ? \Symfony\Config\ScalarNormalizedTypes\Nested\NestedObjectConfig : static)`
	`23`	`+ *`
`20`	`24`	`* @return \Symfony\Config\ScalarNormalizedTypes\Nested\NestedObjectConfig\|$this`
`21`	`25`	`*/`
`22`	`26`	`publicfunctionnestedObject($value = [])`
`@@ -39,6 +43,10 @@ public function nestedObject($value = [])`
`39`	`43`	`}`
`40`	`44`
`41`	`45`	`/**`
	`46`	`+ * @template T`
	`47`	`+ * @psalm-param T $value`
	`48`	`+ * @psalm-return (T is array ? \Symfony\Config\ScalarNormalizedTypes\Nested\NestedListObjectConfig : static)`
	`49`	`+ *`
`42`	`50`	`* @return \Symfony\Config\ScalarNormalizedTypes\Nested\NestedListObjectConfig\|$this`
`43`	`51`	`*/`
`44`	`52`	`publicfunctionnestedListObject($value = [])`

Lines changed: 12 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,10 @@ public function keyedArray(string $name, $value): self`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
	`51`	`+ * @template T`
	`52`	`+ * @psalm-param T $value`
	`53`	`+ * @psalm-return (T is array ? \Symfony\Config\ScalarNormalizedTypes\ObjectConfig : static)`
	`54`	`+ *`
`51`	`55`	`* @return \Symfony\Config\ScalarNormalizedTypes\ObjectConfig\|$this`
`52`	`56`	`*/`
`53`	`57`	`publicfunctionobject($value = [])`
`@@ -70,6 +74,10 @@ public function object($value = [])`
`70`	`74`	`}`
`71`	`75`
`72`	`76`	`/**`
	`77`	`+ * @template T`
	`78`	`+ * @psalm-param T $value`
	`79`	`+ * @psalm-return (T is array ? \Symfony\Config\ScalarNormalizedTypes\ListObjectConfig : static)`
	`80`	`+ *`
`73`	`81`	`* @return \Symfony\Config\ScalarNormalizedTypes\ListObjectConfig\|$this`
`74`	`82`	`*/`
`75`	`83`	`publicfunctionlistObject($value = [])`
`@@ -85,6 +93,10 @@ public function listObject($value = [])`
`85`	`93`	`}`
`86`	`94`
`87`	`95`	`/**`
	`96`	`+ * @template T`
	`97`	`+ * @psalm-param T $value`
	`98`	`+ * @psalm-return (T is array ? \Symfony\Config\ScalarNormalizedTypes\KeyedListObjectConfig : static)`
	`99`	`+ *`
`88`	`100`	`* @return \Symfony\Config\ScalarNormalizedTypes\KeyedListObjectConfig\|$this`
`89`	`101`	`*/`
`90`	`102`	`publicfunctionkeyedListObject(string$class,$value = [])`

Comments

(0)