diff --git a/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php b/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php index f6ce4a00b11363187436499663dfc002e6f3ebc8..295ce7b0abafbf122533ad90a8506f0c3fee6cef 100644 --- a/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php +++ b/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php @@ -454,7 +454,7 @@ protected function getMockSource() { ->willReturn([]); $source->expects($this->any()) ->method('valid') - ->will($this->onConsecutiveCalls(TRUE, FALSE)); + ->willReturn(TRUE, FALSE); return $source; } diff --git a/core/modules/system/tests/src/Unit/Batch/BatchControllerTest.php b/core/modules/system/tests/src/Unit/Batch/BatchControllerTest.php index ceae340f1af4bfa657aa2d965c514b74f3c91de4..605b135327b92601b4e984333555152d85393893 100644 --- a/core/modules/system/tests/src/Unit/Batch/BatchControllerTest.php +++ b/core/modules/system/tests/src/Unit/Batch/BatchControllerTest.php @@ -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. diff --git a/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php b/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php index 4546b38a831997d0ef67042431fa64853bd82a74..c36b39fa8cf5a3aba36fa72ed322840afb84899a 100644 --- a/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php @@ -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); diff --git a/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php b/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php index 456cd998b08da1c5894832389858ae237a98c19c..e9d5db1e5db77c30b25594c50b850ceab440fa7e 100644 --- a/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php +++ b/core/tests/Drupal/Tests/Core/Extension/ModuleHandlerTest.php @@ -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([ diff --git a/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php b/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php index 08579807a1e4a76b31d7f46bc7860074ea8f8437..f0d474c534acc057a4cd8aeae2868ab5ba541379 100644 --- a/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php +++ b/core/tests/Drupal/Tests/Core/TempStore/SharedTempStoreTest.php @@ -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'));