Skip to content

Commit aeb38a5

Browse files
committed
Merge branch '2.8' into 3.0
* 2.8: fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 removed dots at the end of @param and @return fixed typo
2 parents b1baeec + b2db018 commit aeb38a5

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Extension/FormExtension.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ public function renderCsrfToken($tokenId)
104104
/**
105105
* Makes a technical name human readable.
106106
*
107-
* @param string $text The text to humanize.
107+
* @param string $text The text to humanize
108108
*
109-
* @return string The humanized text.
109+
* @return string The humanized text
110110
*/
111111
public function humanize($text)
112112
{
@@ -129,10 +129,10 @@ public function humanize($text)
129129
* seems to be much more efficient at executing filters than at executing
130130
* methods of an object.
131131
*
132-
* @param ChoiceView $choice The choice to check.
133-
* @param string|array $selectedValue The selected value to compare.
132+
* @param ChoiceView $choice The choice to check
133+
* @param string|array $selectedValue The selected value to compare
134134
*
135-
* @return bool Whether the choice is selected.
135+
* @return bool Whether the choice is selected
136136
*
137137
* @see ChoiceView::isSelected()
138138
*/

Form/TwigRendererEngine.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ public function renderBlock(FormView $view, $resource, $blockName, array $variab
7070
*
7171
* @see getResourceForBlock()
7272
*
73-
* @param string $cacheKey The cache key of the form view.
74-
* @param FormView $view The form view for finding the applying themes.
75-
* @param string $blockName The name of the block to load.
73+
* @param string $cacheKey The cache key of the form view
74+
* @param FormView $view The form view for finding the applying themes
75+
* @param string $blockName The name of the block to load
7676
*
77-
* @return bool True if the resource could be loaded, false otherwise.
77+
* @return bool True if the resource could be loaded, false otherwise
7878
*/
7979
protected function loadResourceForBlockName($cacheKey, FormView $view, $blockName)
8080
{
@@ -141,7 +141,7 @@ protected function loadResourceForBlockName($cacheKey, FormView $view, $blockNam
141141
/**
142142
* Loads the resources for all blocks in a theme.
143143
*
144-
* @param string $cacheKey The cache key for storing the resource.
144+
* @param string $cacheKey The cache key for storing the resource
145145
* @param mixed $theme The theme to load the block from. This parameter
146146
* is passed by reference, because it might be necessary
147147
* to initialize the theme first. Any changes made to

0 commit comments

Comments
 (0)