Merge branch '2.8' into 3.4

nicolas-grekas · nicolas-grekas · commit 8a660daeb65d · 2018-11-26T11:17:44.000+01:00
* 2.8:
  fixed CS
  Changes for upcoming Travis' infra migration
  Doc fix: clarify isMethodCacheable() returns true only for GET &amp; HEAD
  [DomCrawler] exclude fields inside "template" tags
  Use XLIFF source rather than resname when there's no target
  [DoctrineBridge] catch errors while converting to db values in data collector
  [DoctrineBridge] fix case sensitivity issue in RememberMe\DoctrineTokenProvider
  Indentation error
  [HttpFoundation] Fix trailing space for mime-type with parameters
  Use intersection type when referring to ParentNodeDefinitionInterface
  [BrowserKit] fixed BC Break for HTTP_HOST header; implemented same behaviour for HTTPS server parameter
diff --git a/Definition/Builder/NodeBuilder.php b/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`	`{`