Verified Commit 71b8f1cf authored by Alex Pott's avatar Alex Pott
Browse files

Issue #3433089 by mondrake: Method onConsecutiveCalls() of class... 

Issue #3433089 by mondrake: Method onConsecutiveCalls() of class PHPUnit\Framework\TestCase is deprecated in PHPUnit 10

(cherry picked from commit a1699fe0)
parent a65d1f9d

core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php

+1 −1
Original line number Diff line number Diff line
@@ -455,7 +455,7 @@ protected function getMockSource() { 
      ->willReturn([]);

    $source->expects($this->any())

      ->method('valid')

      ->will($this->onConsecutiveCalls(TRUE, FALSE));

      ->willReturn(TRUE, FALSE);



    return $source;

  }

core/modules/system/tests/src/Unit/Batch/BatchControllerTest.php

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ public function testBatchPageTitle() { 
    $this->assertSame('', $controller->batchPageTitle(new Request()));

    // Test no batch loaded from storage and batch loaded from storage cases.

    $batch = ['sets' => [['title' => 'foobar']], 'current_set' => 0];

    $batch_storage->method('load')->will($this->onConsecutiveCalls(FALSE, $batch));

    $batch_storage->method('load')->willReturn(FALSE, $batch);

    $this->assertSame('', $controller->batchPageTitle(new Request(['id' => 1234])));

    $this->assertSame('foobar', $controller->batchPageTitle(new Request(['id' => 1234])));

    // Test batch returned by &batch_get() call.

core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ protected function setUp(): void { 
    $this->languageManager = $this->createMock('\Drupal\Core\Language\LanguageManagerInterface');

    $this->languageManager->expects($this->any())

      ->method('getCurrentLanguage')

      ->will($this->onConsecutiveCalls($english, $english, $japanese, $japanese));

      ->willReturn($english, $english, $japanese, $japanese);

    $this->cache = new TestMemoryBackend(new Time());



    $this->assetResolver = new AssetResolver($this->libraryDiscovery, $this->libraryDependencyResolver, $this->moduleHandler, $this->themeManager, $this->languageManager, $this->cache);

core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php

+5 −7
Original line number Diff line number Diff line
@@ -361,9 +361,7 @@ public function testHasImplementations() { 
  public function testCachedGetImplementations() {

    $this->cacheBackend->expects($this->exactly(1))

      ->method('get')

      ->will($this->onConsecutiveCalls(

        (object) ['data' => ['hook' => ['module_handler_test' => 'test']]]

      ));

      ->willReturn((object) ['data' => ['hook' => ['module_handler_test' => 'test']]]);



    // Ensure buildImplementationInfo doesn't get called and that we work off cached results.

    $module_handler = $this->getMockBuilder(ModuleHandler::class)
@@ -400,14 +398,14 @@ function (callable $hook, string $module) use (&$implementors) { 
  public function testCachedGetImplementationsMissingMethod() {

    $this->cacheBackend->expects($this->exactly(1))

      ->method('get')

      ->will($this->onConsecutiveCalls((object) [

      ->willReturn((object) [

        'data' => [

          'hook' => [

            'module_handler_test' => [],

            'module_handler_test_missing' => [],

          ],

        ],

      ]));

      ]);



    // Ensure buildImplementationInfo doesn't get called and that we work off cached results.

    $module_handler = $this->getMockBuilder(ModuleHandler::class)
@@ -478,10 +476,10 @@ public function testGetHookInfo() { 
    $this->cacheBackend

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

      ->method('get')

      ->will($this->onConsecutiveCalls(

      ->willReturn(

        NULL,

        (object) ['data' => ['hook_foo' => ['group' => 'hook']]]

      ));

      );



    // Results from building from mocked environment.

    $this->assertEquals([

core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ public function testSetIfOwner() { 
    $this->keyValue->expects($this->exactly(2))

      ->method('get')

      ->with('test')

      ->will($this->onConsecutiveCalls($this->ownObject, $this->otherObject));

      ->willReturn($this->ownObject, $this->otherObject);



    $this->assertTrue($this->tempStore->setIfOwner('test', 'test_data'));

    $this->assertFalse($this->tempStore->setIfOwner('test', 'test_data'));