Merge branch '2.7' into 2.8

fabpot · fabpot · commit 005bf10c1563 · 2016-08-16T07:56:08.000-07:00
* 2.7:
  [Routing] Add missing options in docblock
  [VarDumper] Fix dumping continuations
  [HttpFoundation] fixed Request::getContent() reusage bug
  [Form] Skip CSRF validation on form when POST max size is exceeded
  Enhance the phpDoc return types so IDEs can handle the configuration tree.
  fixes
  Remove 3.0 from branch suggestions for fixes in PR template
  [Process] Strengthen Windows pipe files opening (again...)
  Fix #19531 [Form] DateType fails parsing when midnight is not a valid time
diff --git a/Definition/Builder/NodeBuilder.php b/Definition/Builder/NodeBuilder.php
@@ -138,7 +138,7 @@ public function variableNode($name)
     /**
      * Returns the parent node.
      *
-     * @return ParentNodeDefinitionInterface The parent node
+     * @return ParentNodeDefinitionInterface|NodeDefinition The parent node
      */
     public function end()
     {
diff --git a/Definition/Builder/NodeDefinition.php b/Definition/Builder/NodeDefinition.php
@@ -107,7 +107,7 @@ public function attribute($key, $value)
     /**
      * Returns the parent node.
      *
-     * @return NodeParentInterface|null The builder of the parent node
+     * @return NodeParentInterface|NodeBuilder|NodeDefinition|null The builder of the parent node
      */
     public function end()
     {

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function variableNode($name)`
`138`	`138`	`/**`
`139`	`139`	`* Returns the parent node.`
`140`	`140`	`*`
`141`		`- * @return ParentNodeDefinitionInterface The parent node`
	`141`	`+ * @return ParentNodeDefinitionInterface\|NodeDefinition The parent node`
`142`	`142`	`*/`
`143`	`143`	`public function end()`
`144`	`144`	`{`
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\|null The builder of the parent node`
	`110`	`+ * @return NodeParentInterface\|NodeBuilder\|NodeDefinition\|null The builder of the parent node`
`111`	`111`	`*/`
`112`	`112`	`public function end()`
`113`	`113`	`{`