Skip to content

Commit 1afa727

Browse files
Merge branch '3.4' into 4.1
* 3.4: [HttpFoundation] Check file exists before unlink [Console] Fixed #29835: ConfirmationQuestion with default true for answer '0' [Translation] Concatenated translation messages [Form] ensure compatibility with older PHPUnit mocks [Serializer] Docblock about throwing exceptions on serializer [Debug][ErrorHandler] Preserve our error handler when a logger set another one [Form] Changed UrlType input type to text when default_protocol is not null [Bugfix] MemcachedSessionHandler::close() must close connection
2 parents cbb2978 + c4fc0f1 commit 1afa727

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Tests/Controller/ControllerTraitTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
1616
use Symfony\Component\DependencyInjection\Container;
1717
use Symfony\Component\Form\Form;
18+
use Symfony\Component\Form\FormConfigInterface;
1819
use Symfony\Component\HttpFoundation\BinaryFileResponse;
1920
use Symfony\Component\HttpFoundation\File\File;
2021
use Symfony\Component\HttpFoundation\JsonResponse;
@@ -487,8 +488,7 @@ public function testCreateNotFoundException()
487488

488489
public function testCreateForm()
489490
{
490-
$config = $this->getMockBuilder('Symfony\Component\Form\FormConfigInterface')->getMock();
491-
$form = new Form($config);
491+
$form = new Form($this->getMockBuilder(FormConfigInterface::class)->getMock());
492492

493493
$formFactory = $this->getMockBuilder('Symfony\Component\Form\FormFactoryInterface')->getMock();
494494
$formFactory->expects($this->once())->method('create')->willReturn($form);

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"symfony/dom-crawler": "~3.4|~4.0",
4040
"symfony/polyfill-intl-icu": "~1.0",
4141
"symfony/security": "~3.4|~4.0",
42-
"symfony/form": "^4.1",
42+
"symfony/form": "^4.1.11|^4.2.3",
4343
"symfony/expression-language": "~3.4|~4.0",
4444
"symfony/messenger": "^4.1",
4545
"symfony/process": "~3.4|~4.0",

0 commit comments

Comments
 (0)