Merge branch '2.7' into 2.8

fabpot · fabpot · commit a1a53933386f · 2017-09-11T13:39:16.000-07:00
* 2.7:
  [CS] Apply phpdoc_annotation_without_dot
diff --git a/Templating/Helper/FormHelper.php b/Templating/Helper/FormHelper.php
@@ -257,7 +257,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($intention)
     {

Original file line number	Diff line number	Diff line change
`@@ -257,7 +257,7 @@ public function block(FormView $view, $blockName, array $variables = array())`
`257`	`257`	`*`
`258`	`258`	`* @return string A CSRF token`
`259`	`259`	`*`
`260`		`- * @throws \BadMethodCallException When no CSRF provider was injected in the constructor.`
	`260`	`+ * @throws \BadMethodCallException when no CSRF provider was injected in the constructor`
`261`	`261`	`*/`
`262`	`262`	`public function csrfToken($intention)`
`263`	`263`	`{`