Skip to content

Commit 00d475b

Browse files
Merge branch '3.4' into 4.3
* 3.4: Minor fixes Use namespaced Phpunit classes [Form] remove leftover int child phpdoc Support DateTimeInterface in IntlDateFormatter::format [PhpUnitBridge] fixed PHPUnit 8.3 compatibility: method handleError was renamed to __invoke Use PHPunit assertion
2 parents 29da5e0 + dddd42d commit 00d475b

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

Tests/Compiler/ResolveInstanceofConditionalsPassTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ public function testProcessForAutoconfiguredCalls()
233233
public function testProcessThrowsExceptionForArguments()
234234
{
235235
$this->expectException('Symfony\Component\DependencyInjection\Exception\InvalidArgumentException');
236-
$this->expectExceptionMessage('Autoconfigured instanceof for type "PHPUnit\Framework\TestCase" defines arguments but these are not supported and should be removed.');
236+
$this->expectExceptionMessageRegExp('/Autoconfigured instanceof for type "PHPUnit[\\\\_]Framework[\\\\_]TestCase" defines arguments but these are not supported and should be removed\./');
237237
$container = new ContainerBuilder();
238238
$container->registerForAutoconfiguration(parent::class)
239239
->addArgument('bar');

Tests/Config/ContainerParametersResourceCheckerTest.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
namespace Symfony\Component\DependencyInjection\Tests\Config;
1313

14+
use PHPUnit\Framework\MockObject\MockObject;
1415
use PHPUnit\Framework\TestCase;
1516
use Symfony\Component\Config\ResourceCheckerInterface;
1617
use Symfony\Component\DependencyInjection\Config\ContainerParametersResource;
@@ -52,15 +53,15 @@ public function testIsFresh(callable $mockContainer, $expected)
5253

5354
public function isFreshProvider()
5455
{
55-
yield 'not fresh on missing parameter' => [function (\PHPUnit\Framework\MockObject\MockObject $container) {
56+
yield 'not fresh on missing parameter' => [function (MockObject $container) {
5657
$container->method('hasParameter')->with('locales')->willReturn(false);
5758
}, false];
5859

59-
yield 'not fresh on different value' => [function (\PHPUnit\Framework\MockObject\MockObject $container) {
60+
yield 'not fresh on different value' => [function (MockObject $container) {
6061
$container->method('getParameter')->with('locales')->willReturn(['nl', 'es']);
6162
}, false];
6263

63-
yield 'fresh on every identical parameters' => [function (\PHPUnit\Framework\MockObject\MockObject $container) {
64+
yield 'fresh on every identical parameters' => [function (MockObject $container) {
6465
$container->expects($this->exactly(2))->method('hasParameter')->willReturn(true);
6566
$container->expects($this->exactly(2))->method('getParameter')
6667
->withConsecutive(

0 commit comments

Comments
 (0)