From e30a948c10ee64e7111241efbee5bacb4b852dd3 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Fri, 30 Sep 2022 10:43:26 +0100
Subject: [PATCH] Issue #3226139 by Spokje, longwave: ->willReturn(...) would
make more sense here (ding ding round 2)
---
.../Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php | 8 ++++----
core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php | 4 ++--
.../Entity/KeyValueStore/KeyValueEntityStorageTest.php | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
index f6834c4c8240..062b8a958f75 100644
--- a/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
+++ b/core/modules/forum/tests/src/Unit/Breadcrumb/ForumBreadcrumbBuilderBaseTest.php
@@ -92,16 +92,16 @@ public function testBuild() {
$vocab_storage = $this->createMock('Drupal\Core\Entity\EntityStorageInterface');
$vocab_storage->expects($this->any())
->method('load')
- ->will($this->returnValueMap([
+ ->willReturnMap([
['forums', $prophecy->reveal()],
- ]));
+ ]);
$entity_type_manager = $this->createMock(EntityTypeManagerInterface::class);
$entity_type_manager->expects($this->any())
->method('getStorage')
- ->will($this->returnValueMap([
+ ->willReturnMap([
['taxonomy_vocabulary', $vocab_storage],
- ]));
+ ]);
$config_factory = $this->getConfigFactoryStub(
[
diff --git a/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php b/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
index 9db016cba351..85181be82c13 100644
--- a/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Access/AccessManagerTest.php
@@ -543,9 +543,9 @@ protected function setupAccessArgumentsResolverFactory($constraint = NULL) {
$resolver = $this->createMock('Drupal\Component\Utility\ArgumentsResolverInterface');
$resolver->expects($this->any())
->method('getArguments')
- ->will($this->returnCallback(function ($callable) use ($route_match) {
+ ->willReturnCallback(function ($callable) use ($route_match) {
return [$route_match->getRouteObject()];
- }));
+ });
return $resolver;
});
diff --git a/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
index 27784bce4c87..9eb297066403 100644
--- a/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/KeyValueStore/KeyValueEntityStorageTest.php
@@ -100,11 +100,11 @@ protected function setUp(): void {
protected function setUpKeyValueEntityStorage($uuid_key = 'uuid') {
$this->entityType->expects($this->atLeastOnce())
->method('getKey')
- ->will($this->returnValueMap([
+ ->willReturnMap([
['id', 'id'],
['uuid', $uuid_key],
['langcode', 'langcode'],
- ]));
+ ]);
$this->entityType->expects($this->atLeastOnce())
->method('id')
->will($this->returnValue('test_entity_type'));
--
GitLab