Skip to content

Commit aae96d3

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: [PropertyInfo] Update DoctrineExtractor for new DBAL 4 BIGINT type Update security.nl.xlf [Validator] IBAN Check digits should always between 2 and 98 [Security] Populate translations for trans-unit 20 add missing plural translation messages filter out empty HTTP header parts [String] Fix folded in compat mode Remove calls to `getMockForAbstractClass()` [ErrorHandler] Do not call xdebug_get_function_stack() with xdebug >= 3.0 when not in develop mode [Serializer] Fix type for missing property add test for JSON response with null as content [Filesystem] Fix dumpFile `stat failed` error hitting custom handler Remove calls to `TestCase::iniSet()` and calls to deprecated methods of `MockBuilder` [PhpUnitBridge] Fix `DeprecationErrorHandler` with PhpUnit 10
2 parents 01643fd + 1957999 commit aae96d3

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Tests/EventListener/PasswordMigratingListenerTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public static function provideUnsupportedEvents()
6969

7070
public function testUpgradeWithUpgrader()
7171
{
72-
$passwordUpgrader = $this->getMockForAbstractClass(TestMigratingUserProvider::class);
72+
$passwordUpgrader = $this->createMock(TestMigratingUserProvider::class);
7373
$passwordUpgrader->expects($this->once())
7474
->method('upgradePassword')
7575
->with($this->user, 'new-hash')
@@ -81,7 +81,7 @@ public function testUpgradeWithUpgrader()
8181

8282
public function testUpgradeWithoutUpgrader()
8383
{
84-
$userLoader = $this->getMockForAbstractClass(TestMigratingUserProvider::class);
84+
$userLoader = $this->createMock(TestMigratingUserProvider::class);
8585
$userLoader->expects($this->any())->method('loadUserByIdentifier')->willReturn($this->user);
8686

8787
$userLoader->expects($this->exactly(2))

Tests/Firewall/ContextListenerTest.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,11 @@ public function testWithPreviousNotStartedSession()
307307

308308
public function testSessionIsNotReported()
309309
{
310-
$usageReporter = $this->getMockBuilder(\stdClass::class)->addMethods(['__invoke'])->getMock();
311-
$usageReporter->expects($this->never())->method('__invoke');
310+
$this->expectNotToPerformAssertions();
311+
312+
$usageReporter = static function (): void {
313+
throw new \LogicException('This should not be called');
314+
};
312315

313316
$session = new Session(new MockArraySessionStorage(), null, null, $usageReporter);
314317

0 commit comments

Comments
 (0)