From a1699fe0de2c490682d82bf1103688d2d37ddff8 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sat, 23 Mar 2024 22:34:31 +0000
Subject: [PATCH] Issue #3433089 by mondrake: Method onConsecutiveCalls() of
class PHPUnit\Framework\TestCase is deprecated in PHPUnit 10
---
.../migrate/tests/src/Unit/MigrateExecutableTest.php | 2 +-
.../tests/src/Unit/Batch/BatchControllerTest.php | 2 +-
.../Drupal/Tests/Core/Asset/AssetResolverTest.php | 2 +-
.../Tests/Core/Extension/ModuleHandlerTest.php | 12 +++++-------
.../Tests/Core/TempStore/SharedTempStoreTest.php | 2 +-
5 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php b/core/modules/migrate/tests/src/Unit/MigrateExecutableTest.php
index f6ce4a00b113..295ce7b0abaf 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 ceae340f1af4..605b135327b9 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 4546b38a8319..c36b39fa8cf5 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 456cd998b08d..e9d5db1e5db7 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 08579807a1e4..f0d474c534ac 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'));
--
GitLab