minor #28912 [Config] Use intersection type when referring to ParentNodeDefinitionInterface (thewilkybarkid)

fabpot · fabpot · commit 316f96ea95e0 · 2018-11-26T10:38:12.000+01:00
This PR was merged into the 2.8 branch. Discussion ---------- [Config] Use intersection type when referring to ParentNodeDefinitionInterface | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Allows PHPStan to understand it correctly (refs libero/content-api-bundle#2 (comment)). PHPStorm 2018.3 will add support for it too, but to help older versions I've reversed the order (so `NodeDefinition` is recognised). Commits ------- e9cdabe Use intersection type when referring to ParentNodeDefinitionInterface
diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/NodeBuilder.php
@@ -133,7 +133,7 @@ public function variableNode($name)
     /**
      * Returns the parent node.
      *
-     * @return ParentNodeDefinitionInterface|NodeDefinition The parent node
+     * @return NodeDefinition&ParentNodeDefinitionInterface The parent node
      */
     public function end()
     {

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public function variableNode($name)`
`133`	`133`	`/**`
`134`	`134`	`* Returns the parent node.`
`135`	`135`	`*`
`136`		`- * @return ParentNodeDefinitionInterface\|NodeDefinition The parent node`
	`136`	`+ * @return NodeDefinition&ParentNodeDefinitionInterface The parent node`
`137`	`137`	`*/`
`138`	`138`	`public function end()`
`139`	`139`	`{`