Skip to content

Commit 5ce2d35

Browse files
Merge branch '2.7' into 2.8
* 2.7: do not depend on a fixed date in layout tests [Console] Escape default value when dumping help [Console] OS X Can't call cli_set_process_title php without superuser Polish translation improvement in Validator component [Console] Descriptors should use Helper::strlen [Config] Improve PHPdoc / IDE autocomplete [Debug] Wrap call to ->log in a try catch block [Debug] UndefinedMethodFatalErrorHandler - Handle anonymous classes [SecurityBundle] Made collection of user provider unique when injecting them to the RemberMeService
2 parents 0d2407b + 96992db commit 5ce2d35

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Definition/Builder/ExprBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public function thenUnset()
198198
/**
199199
* Returns the related node.
200200
*
201-
* @return NodeDefinition
201+
* @return NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition
202202
*
203203
* @throws \RuntimeException
204204
*/

Definition/Builder/MergeBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public function denyOverwrite($deny = true)
6363
/**
6464
* Returns the related node.
6565
*
66-
* @return NodeDefinition
66+
* @return NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition
6767
*/
6868
public function end()
6969
{

Definition/Builder/NodeDefinition.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public function attribute($key, $value)
107107
/**
108108
* Returns the parent node.
109109
*
110-
* @return NodeParentInterface|NodeBuilder|NodeDefinition|null The builder of the parent node
110+
* @return NodeParentInterface|NodeBuilder|NodeDefinition|ArrayNodeDefinition|VariableNodeDefinition|null The builder of the parent node
111111
*/
112112
public function end()
113113
{

Definition/Builder/ValidationBuilder.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct(NodeDefinition $node)
3636
*
3737
* @param \Closure $closure
3838
*
39-
* @return ExprBuilder|ValidationBuilder
39+
* @return ExprBuilder|$this
4040
*/
4141
public function rule(\Closure $closure = null)
4242
{

0 commit comments

Comments
 (0)