Skip to content

Commit

Permalink
Merge branch '7.0' into 7.1
Browse files Browse the repository at this point in the history
* 7.0:
  [Serializer] Improve exception message in UnwrappingDenormalizer
  [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
  Return false in isTtySupported() when open_basedir restrictions prevent access to /dev/tty.
  Remove calls to `TestCase::iniSet()` and calls to deprecated methods of `MockBuilder`
  [PhpUnitBridge] Fix `DeprecationErrorHandler` with PhpUnit 10
  • Loading branch information
fabpot committed May 17, 2024
2 parents 0ed71dd + ebf082d commit e8637cd
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Tests/EventListener/PasswordMigratingListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public static function provideUnsupportedEvents()

public function testUpgradeWithUpgrader()
{
$passwordUpgrader = $this->getMockForAbstractClass(TestMigratingUserProvider::class);
$passwordUpgrader = $this->createMock(TestMigratingUserProvider::class);
$passwordUpgrader->expects($this->once())
->method('upgradePassword')
->with($this->user, 'new-hash')
Expand All @@ -81,7 +81,7 @@ public function testUpgradeWithUpgrader()

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

$userLoader->expects($this->exactly(2))
Expand Down
7 changes: 5 additions & 2 deletions Tests/Firewall/ContextListenerTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,11 @@ public function testWithPreviousNotStartedSession()

public function testSessionIsNotReported()
{
$usageReporter = $this->getMockBuilder(\stdClass::class)->addMethods(['__invoke'])->getMock();
$usageReporter->expects($this->never())->method('__invoke');
$this->expectNotToPerformAssertions();

$usageReporter = static function (): void {
throw new \LogicException('This should not be called');
};

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

Expand Down

0 comments on commit e8637cd

Please sign in to comment.