minor #21047 [Config] Improve PHPdoc / IDE autocomplete (ro0NL)

nicolas-grekas · nicolas-grekas · commit d85febc5f8e0 · 2016-12-28T09:11:03.000+01:00
This PR was merged into the 2.7 branch. Discussion ---------- [Config] Improve PHPdoc / IDE autocomplete | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes-ish | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #...  | License | MIT | Doc PR | symfony/symfony-docs#...  The missing pieces for fixing the autocomplete in IDE's (tested in `PhpStorm 2016.3.2`). Each method seems to be found now for the framework bundle configuration 😱 Actually uses #20923 where needed, but i think we should go with it consistently. Relates to #20290 (comment) Commits ------- 3f3c6e0 [Config] Improve PHPdoc / IDE autocomplete
diff --git a/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ExprBuilder.php
@@ -198,7 +198,7 @@ public function thenUnset()
     /**
      * Returns the related node.
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition
      *
      * @throws \RuntimeException
      */
diff --git a/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php b/src/Symfony/Component/Config/Definition/Builder/MergeBuilder.php
@@ -63,7 +63,7 @@ public function denyOverwrite($deny = true)
     /**
      * Returns the related node.
      *
-     * @return NodeDefinition
+     * @return NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition
      */
     public function end()
     {
diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php
@@ -107,7 +107,7 @@ public function attribute($key, $value)
     /**
      * Returns the parent node.
      *
-     * @return NodeParentInterface|NodeBuilder|NodeDefinition|null The builder of the parent node
+     * @return NodeParentInterface|NodeBuilder|NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition|null The builder of the parent node
      */
     public function end()
     {
diff --git a/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php b/src/Symfony/Component/Config/Definition/Builder/ValidationBuilder.php
@@ -36,7 +36,7 @@ public function __construct(NodeDefinition $node)
      *
      * @param \Closure $closure
      *
-     * @return ExprBuilder|ValidationBuilder
+     * @return ExprBuilder|$this
      */
     public function rule(\Closure $closure = null)
     {

Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ public function thenUnset()`
`198`	`198`	`/**`
`199`	`199`	`* Returns the related node.`
`200`	`200`	`*`
`201`		`- * @return NodeDefinition`
	`201`	`+ * @return NodeDefinition\|ArrayNodeDefinition\|VariableNodeDefinition`
`202`	`202`	`*`
`203`	`203`	`* @throws \RuntimeException`
`204`	`204`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function denyOverwrite($deny = true)`
`63`	`63`	`/**`
`64`	`64`	`* Returns the related node.`
`65`	`65`	`*`
`66`		`- * @return NodeDefinition`
	`66`	`+ * @return NodeDefinition\|ArrayNodeDefinition\|VariableNodeDefinition`
`67`	`67`	`*/`
`68`	`68`	`public function end()`
`69`	`69`	`{`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public function attribute($key, $value)`
`107`	`107`	`/**`
`108`	`108`	`* Returns the parent node.`
`109`	`109`	`*`
`110`		`- * @return NodeParentInterface\|NodeBuilder\|NodeDefinition\|null The builder of the parent node`
	`110`	`+ * @return NodeParentInterface\|NodeBuilder\|NodeDefinition\|ArrayNodeDefinition\|VariableNodeDefiniti 95DF on\|null The builder of the parent node`
`111`	`111`	`*/`
`112`	`112`	`public function end()`
`113`	`113`	`{`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public function __construct(NodeDefinition $node)`
`36`	`36`	`*`
`37`	`37`	`* @param \Closure $closure`
`38`	`38`	`*`
`39`		`- * @return ExprBuilder\|ValidationBuilder`
	`39`	`+ * @return ExprBuilder\|$this`
`40`	`40`	`*/`
`41`	`41`	`public function rule(\Closure $closure = null)`
`42`	`42`	`{`