Merge branch '2.7' into 2.8

* 2.7:
  removed dots at the end of @param and @return
  fixed typo

Author: fabpot

Extension/FormExtension.php

@@ -97,9 +97,9 @@ public function getTests()
     /**
      * Renders a CSRF token.
      *
-     * @param string $intention The intention of the protected action.
+     * @param string $intention The intention of the protected action
      *
-     * @return string A CSRF token.
+     * @return string A CSRF token
      */
     public function renderCsrfToken($intention)
     {
@@ -109,9 +109,9 @@ public function renderCsrfToken($intention)
     /**
      * Makes a technical name human readable.
      *
-     * @param string $text The text to humanize.
+     * @param string $text The text to humanize
      *
-     * @return string The humanized text.
+     * @return string The humanized text
      */
     public function humanize($text)
     {
@@ -134,10 +134,10 @@ public function humanize($text)
      * seems to be much more efficient at executing filters than at executing
      * methods of an object.
      *
-     * @param ChoiceView   $choice        The choice to check.
-     * @param string|array $selectedValue The selected value to compare.
+     * @param ChoiceView   $choice        The choice to check
+     * @param string|array $selectedValue The selected value to compare
      *
-     * @return bool Whether the choice is selected.
+     * @return bool Whether the choice is selected
      *
      * @see ChoiceView::isSelected()
      */

Form/TwigRendererEngine.php

@@ -70,11 +70,11 @@ public function renderBlock(FormView $view, $resource, $blockName, array $variab
      *
      * @see getResourceForBlock()
      *
-     * @param string   $cacheKey  The cache key of the form view.
-     * @param FormView $view      The form view for finding the applying themes.
-     * @param string   $blockName The name of the block to load.
+     * @param string   $cacheKey  The cache key of the form view
+     * @param FormView $view      The form view for finding the applying themes
+     * @param string   $blockName The name of the block to load
      *
-     * @return bool True if the resource could be loaded, false otherwise.
+     * @return bool True if the resource could be loaded, false otherwise
      */
     protected function loadResourceForBlockName($cacheKey, FormView $view, $blockName)
     {
@@ -141,7 +141,7 @@ protected function loadResourceForBlockName($cacheKey, FormView $view, $blockNam
     /**
      * Loads the resources for all blocks in a theme.
      *
-     * @param string $cacheKey The cache key for storing the resource.
+     * @param string $cacheKey The cache key for storing the resource
      * @param mixed  $theme    The theme to load the block from. This parameter
      *                         is passed by reference, because it might be necessary
      *                         to initialize the theme first. Any changes made to