Skip to content

Commit 7272251

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 e32b674 + 05c7ce5 commit 7272251

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Resources/config/form.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@
184184
<tag name="form.type_extension" extended-type="Symfony\Component\Form\Extension\Core\Type\SubmitType" />
185185
</service>
186186
<service id="form.type_extension.upload.validator" class="Symfony\Component\Form\Extension\Validator\Type\UploadValidatorExtension">
187-
<tag name="form.type_extension" alias="form" />
187+
<tag name="form.type_extension" extended-type="Symfony\Component\Form\Extension\Core\Type\FormType" />
188188
<argument type="service" id="translator"/>
189189
<argument type="string">%validator.translation_domain%</argument>
190190
</service>

Routing/RedirectableUrlMatcher.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class RedirectableUrlMatcher extends BaseMatcher
2121
/**
2222
* Redirects the user to another URL.
2323
*
24-
* @param string $path The path info to redirect to.
24+
* @param string $path The path info to redirect to
2525
* @param string $route The route that matched
2626
* @param string $scheme The URL scheme (null to keep the current one)
2727
*

Templating/Helper/FormHelper.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@ public function rest(FormView $view, array $variables = array())
202202
/**
203203
* Renders a block of the template.
204204
*
205-
* @param FormView $view The view for determining the used themes.
206-
* @param string $blockName The name of the block to render.
207-
* @param array $variables The variable to pass to the template.
205+
* @param FormView $view The view for determining the used themes
206+
* @param string $blockName The name of the block to render
207+
* @param array $variables The variable to pass to the template
208208
*
209209
* @return string The HTML markup
210210
*/

Tests/Fixtures/Descriptor/alias_1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

2-
// This service is an alias for the service service_1
2+
 // This service is an alias for the service service_1
33

Tests/Fixtures/Descriptor/alias_2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

2-
// This service is an alias for the service service_2
2+
 // This service is an alias for the service service_2
33

0 commit comments

Comments
 (0)