Merge branch '3.2'

nicolas-grekas · nicolas-grekas · commit 15a70c897d6d · 2017-01-08T14:47:57.000+01:00
* 3.2:
  [TwigBundle] Disable form in tests
diff --git a/ContainerBuilder.php b/ContainerBuilder.php
@@ -862,6 +862,8 @@ public function findDefinition($id)
      * @param string $id
      *
      * @return string
+     *
+     * @internal
      */
     public function getCaseSensitiveId($id)
     {

Original file line number	Diff line number	Diff line change
`@@ -862,6 +862,8 @@ public function findDefinition($id)`
`862`	`862`	`* @param string $id`
`863`	`863`	`*`
`864`	`864`	`* @return string`
	`865`	`+ *`
	`866`	`+ * @internal`
`865`	`867`	`*/`
`866`	`868`	`public function getCaseSensitiveId($id)`
`867`	`869`	`{`