Skip to content

Commit 668fd4f

Browse files
committed
Merge branch '5.1'
* 5.1: Postpone BC layer removal to 6.0. add validator translation 99 for Italian language stop using the deprecated at() PHPUnit matcher Fix typehint phpdoc
2 parents 74b60be + 1d1c0bf commit 668fd4f

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

Tests/Controller/ContainerControllerResolverTest.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Psr\Log\LoggerInterface;
1616
use Symfony\Bridge\PhpUnit\ExpectDeprecationTrait;
1717
use Symfony\Component\DependencyInjection\Container;
18+
use Symfony\Component\DependencyInjection\ContainerBuilder;
1819
use Symfony\Component\HttpFoundation\Request;
1920
use Symfony\Component\HttpKernel\Controller\ContainerControllerResolver;
2021

Tests/HttpKernelTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -305,8 +305,8 @@ public function testVerifyRequestStackPushPopDuringHandle()
305305
$request = new Request();
306306

307307
$stack = $this->getMockBuilder('Symfony\Component\HttpFoundation\RequestStack')->setMethods(['push', 'pop'])->getMock();
308-
$stack->expects($this->at(0))->method('push')->with($this->equalTo($request));
309-
$stack->expects($this->at(1))->method('pop');
308+
$stack->expects($this->once())->method('push')->with($this->equalTo($request));
309+
$stack->expects($this->once())->method('pop');
310310

311311
$dispatcher = new EventDispatcher();
312312
$kernel = $this->getHttpKernel($dispatcher, null, $stack);

Tests/KernelTest.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\Config\Loader\LoaderInterface;
1616
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
1717
use Symfony\Component\DependencyInjection\ContainerBuilder;
18+
use Symfony\Component\DependencyInjection\ContainerInterface;
1819
use Symfony\Component\Filesystem\Filesystem;
1920
use Symfony\Component\HttpFoundation\Request;
2021
use Symfony\Component\HttpFoundation\Response;
@@ -165,9 +166,12 @@ public function testShutdownCallsShutdownOnAllBundles()
165166
public function testShutdownGivesNullContainerToAllBundles()
166167
{
167168
$bundle = $this->getMockBuilder('Symfony\Component\HttpKernel\Bundle\Bundle')->getMock();
168-
$bundle->expects($this->at(3))
169+
$bundle->expects($this->exactly(2))
169170
->method('setContainer')
170-
->with(null);
171+
->withConsecutive(
172+
[$this->isInstanceOf(ContainerInterface::class)],
173+
[null]
174+
);
171175

172176
$kernel = $this->getKernel(['getBundles']);
173177
$kernel->expects($this->any())

0 commit comments

Comments
 (0)