Merge branch '3.3' into 3.4

fabpot · fabpot · commit 0fe8670ccc8a · 2017-09-11T13:45:17.000-07:00
* 3.3:
  [CS] Apply phpdoc_annotation_without_dot
  bumped Symfony version to 3.3.10
  updated VERSION for 3.3.9
  updated CHANGELOG for 3.3.9
  [DomCrawler] Fix conversion to int on GetPhpFiles
  Remove `protected_to_private` rule.
  Filtering empty uuids in ORMQueryBuilderLoader.
diff --git a/Templating/Helper/FormHelper.php b/Templating/Helper/FormHelper.php
@@ -236,7 +236,7 @@ public function block(FormView $view, $blockName, array $variables = array())
      *
      * @return string A CSRF token
      *
-     * @throws \BadMethodCallException When no CSRF provider was injected in the constructor.
+     * @throws \BadMethodCallException when no CSRF provider was injected in the constructor
      */
     public function csrfToken($tokenId)
     {

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ public function block(FormView $view, $blockName, array $variables = array())`
`236`	`236`	`*`
`237`	`237`	`* @return string A CSRF token`
`238`	`238`	`*`
`239`		`- * @throws \BadMethodCallException When no CSRF provider was injected in the constructor.`
	`239`	`+ * @throws \BadMethodCallException when no CSRF provider was injected in the constructor`
`240`	`240`	`*/`
`241`	`241`	`public function csrfToken($tokenId)`
`242`	`242`	`{`