fix tests #30989
Merged
fix tests #30989
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
xabbuh
commented
Apr 7, 2019
| Q | A |
|---|---|
| Branch? | 4.2 |
| Bug fix? | no |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Tests pass? | yes |
| Fixed tickets | |
| License | MIT |
| Doc PR |
chalasr
approved these changes
Apr 7, 2019
4319324 to
c3d3bd1
Compare
xabbuh
commented
Apr 7, 2019
| @@ -68,7 +68,7 @@ public function testDebugDefaultDirectory() | |||
| /** | |||
| * @group legacy | |||
| * @expectedDeprecation Storing translations in the "%ssf_translation%s/Resources/translations" directory is deprecated since Symfony 4.2, use the "%ssf_translation%s/translations" directory instead. | |||
| * @expectedDeprecation Storing templates in the "%ssf_translation%s/Resources/views" directory is deprecated since Symfony 4.2, use the "%ssf_translation%s/templates" directory instead. | |||
| * @expectedDeprecation Loading Twig templates from the "%ssf_translation%s/Resources/views" directory is deprecated since Symfony 4.2, use the "%ssf_translation%s/templates" directory instead. | |||
There was a problem hiding this comment.
messages were clarified in #30952
xabbuh
commented
Apr 7, 2019
| @@ -114,7 +114,6 @@ | |||
| <div class="form-group{% if (not compound or force_error|default(false)) and not valid %} has-error{% endif %}"> | |||
| {{- form_label(form) }} {# -#} | |||
| {{ form_widget(form, widget_attr) }} {# -#} | |||
| {{ form_widget(form) }} {# -#} | |||
There was a problem hiding this comment.
probably just a mistake when resolving conflicts while merging up
xabbuh
commented
Apr 7, 2019
| @@ -203,7 +203,7 @@ public function testFailedFileUploadIsTurnedIntoFormErrorUsingHttpFoundationRequ | |||
| ->createBuilder(static::TESTED_TYPE) | |||
| ->setRequestHandler(new HttpFoundationRequestHandler()) | |||
| ->getForm(); | |||
| $form->submit(new UploadedFile(__DIR__.'/../../../Fixtures/foo', 'foo', null, null, $errorCode, true)); | |||
| $form->submit(new UploadedFile(__DIR__.'/../../../Fixtures/foo', 'foo', null, $errorCode, true)); | |||
There was a problem hiding this comment.
adjustment was needed after merging #30895 up into the 4.2 branch as the filesize argument was deprecated in the meantime
vudaltsov
approved these changes
Apr 7, 2019
derrabus
approved these changes
Apr 7, 2019
derrabus
reviewed
Apr 7, 2019
src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php
Outdated
Show resolved
Hide resolved
xabbuh
added a commit
that referenced
this pull request
Apr 7, 2019
This PR was merged into the 4.2 branch. Discussion ---------- fix tests | Q | A | ------------- | --- | Branch? | 4.2 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | | License | MIT | Doc PR | Commits ------- 27df966 fix tests
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.