Skip to content

Commit

Permalink
Merge branch '3.0' into 3.1
Browse files Browse the repository at this point in the history
* 3.0:
  fixed CS
  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
  • Loading branch information
fabpot committed Jun 29, 2016
2 parents de5e789 + 7272251 commit 85f1c63
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Resources/config/form.xml
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
<tag name="form.type_extension" extended-type="Symfony\Component\Form\Extension\Core\Type\SubmitType" />
</service>
<service id="form.type_extension.upload.validator" class="Symfony\Component\Form\Extension\Validator\Type\UploadValidatorExtension">
<tag name="form.type_extension" alias="form" />
<tag name="form.type_extension" extended-type="Symfony\Component\Form\Extension\Core\Type\FormType" />
<argument type="service" id="translator"/>
<argument type="string">%validator.translation_domain%</argument>
</service>
Expand Down
2 changes: 1 addition & 1 deletion Routing/RedirectableUrlMatcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class RedirectableUrlMatcher extends BaseMatcher
/**
* Redirects the user to another URL.
*
* @param string $path The path info to redirect to.
* @param string $path The path info to redirect to
* @param string $route The route that matched
* @param string $scheme The URL scheme (null to keep the current one)
*
Expand Down
6 changes: 3 additions & 3 deletions Templating/Helper/FormHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,9 @@ public function rest(FormView $view, array $variables = array())
/**
* Renders a block of the template.
*
* @param FormView $view The view for determining the used themes.
* @param string $blockName The name of the block to render.
* @param array $variables The variable to pass to the template.
* @param FormView $view The view for determining the used themes
* @param string $blockName The name of the block to render
* @param array $variables The variable to pass to the template
*
* @return string The HTML markup
*/
Expand Down
2 changes: 1 addition & 1 deletion Tests/Fixtures/Descriptor/alias_1.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

// This service is an alias for the service service_1
 // This service is an alias for the service service_1

2 changes: 1 addition & 1 deletion Tests/Fixtures/Descriptor/alias_2.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@

// This service is an alias for the service service_2
 // This service is an alias for the service service_2

0 comments on commit 85f1c63

Please sign in to comment.