8000 fix tests · symfony/symfony@c3d3bd1 · GitHub
[go: up one dir, main page]

Skip to content

Commit c3d3bd1

Browse files
committed
fix tests
1 parent 393c6b3 commit c3d3bd1

File tree

4 files changed

+5
-6
lines changed

4 files changed

+5
-6
lines changed

src/Symfony/Bridge/Twig/Resources/views/Form/bootstrap_3_layout.html.twig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
<div class="form-group{% if (not compound or force_error|default(false)) and not valid %} has-error{% endif %}">
115115
{{- form_label(form) }} {# -#}
116116
{{ form_widget(form, widget_attr) }} {# -#}
117-
{{ form_widget(form) }} {# -#}
118117
{{ form_errors(form) }} {# -#}
119118
</div> {# -#}
120119
{%- endblock form_row %}

src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function testDebugDefaultDirectory()
6868
/**
6969
* @group legacy
7070
* @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.
71-
* @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.
71+
* @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.
7272
*/
7373
public function testDebugLegacyDefaultDirectory()
7474
{

src/Symfony/Component/Form/Tests/Extension/Core/Type/FileTypeTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public function testFailedFileUploadIsTurnedIntoFormErrorUsingHttpFoundationRequ
203203
->createBuilder(static::TESTED_TYPE)
204204
->setRequestHandler(new HttpFoundationRequestHandler())
205205
->getForm();
206-
$form->submit(new UploadedFile(__DIR__.'/../../../Fixtures/foo', 'foo', null, null, $errorCode, true));
206+
$form->submit(new UploadedFile(__DIR__.'/../../../Fixtures/foo', 'foo', null, $errorCode, true));
207207

208208
if (UPLOAD_ERR_OK === $errorCode) {
209209
$this->assertTrue($form->isValid());
@@ -250,8 +250,8 @@ public function testMultipleSubmittedFailedFileUploadsAreTurnedIntoFormErrorUsin
250250
->setRequestHandler(new HttpFoundationRequestHandler())
251251
->getForm();
252252
$form->submit([
253-
new UploadedFile(__DIR__.'/../../../Fixtures/foo', 'foo', null, null, $errorCode, true),
254-
new UploadedFile(__DIR__.'/../../../Fixtures/foo', 'bar', null, null, $errorCode, true),
253+
new UploadedFile(__DIR__.'/../../../Fixtures/foo', 'foo', null, $errorCode, true),
254+
new UploadedFile(__DIR__.'/../../../Fixtures/foo', 'bar', null, $errorCode, true),
255255
]);
256256

257257
if (UPLOAD_ERR_OK === $errorCode) {

src/Symfony/Component/Form/Tests/Extension/HttpFoundation/HttpFoundationRequestHandlerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,6 @@ protected function getInvalidFile()
5959

6060
protected function getFailedUploadedFile($errorCode)
6161
{
62-
return new UploadedFile(__DIR__.'/../../Fixtures/foo', 'foo', null, null, $errorCode, true);
62+
return new UploadedFile(__DIR__.'/../../Fixtures/foo', 'foo', null, $errorCode, true);
6363
}
6464
}

0 commit comments

Comments
 (0)
0