Skip to content

Commit 20c31b2

Browse files
Merge branch '4.2'
* 4.2: [HttpFoundation] Check file exists before unlink [Console] Fixed #29835: ConfirmationQuestion with default true for answer '0' [Cache] PDO-based cache pool table autocreation does not work [Translation] Concatenated translation messages [Form] ensure compatibility with older PHPUnit mocks [Serializer] Docblock about throwing exceptions on serializer [Cache] fix used variable name [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 Always pass $key to NullAdapter->createCacheItem
2 parents cf1aa90 + 506bd37 commit 20c31b2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/Controller/ControllerTraitTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
use Symfony\Bundle\FrameworkBundle\Tests\TestCase;
1717
use Symfony\Component\DependencyInjection\Container;
1818
use Symfony\Component\Form\Form;
19+
use Symfony\Component\Form\FormConfigInterface;
1920
use Symfony\Component\HttpFoundation\BinaryFileResponse;
2021
use Symfony\Component\HttpFoundation\File\File;
2122
use Symfony\Component\HttpFoundation\JsonResponse;
@@ -488,8 +489,7 @@ public function testCreateNotFoundException()
488489

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

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

0 commit comments

Comments
 (0)