From 6553fd5531a33fc72fc384661a10fb37f1061adc Mon Sep 17 00:00:00 2001
From: Christian Kuhn <lolli@schwarzbu.ch>
Date: Tue, 27 Feb 2024 10:12:11 +0100
Subject: [PATCH] [TASK] Avoid phpunit onConsecutiveCalls()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
phpunit 11 deprecation:
Use `$double->willReturn()` instead of
`$double->will($this->onConsecutiveCalls())`.
Resolves: #103210
Releases: main
Change-Id: I72f4db5814a1c488e8b1883d6ce79cbdb91a2a33
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/83145
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Stefan Bürk <stefan@buerk.tech>
Reviewed-by: Stefan Bürk <stefan@buerk.tech>
Tested-by: core-ci <typo3@b13.com>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
.../Cache/Backend/FileBackendTest.php | 5 +----
.../Tests/Unit/Resource/MetaDataAspectTest.php | 2 +-
.../Unit/Resource/ResourceCompressorTest.php | 5 +----
.../Persistence/FormPersistenceManagerTest.php | 18 +++++-------------
4 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/typo3/sysext/core/Tests/Functional/Cache/Backend/FileBackendTest.php b/typo3/sysext/core/Tests/Functional/Cache/Backend/FileBackendTest.php
index ab4e41ea3e2c..8b23e1899e49 100644
--- a/typo3/sysext/core/Tests/Functional/Cache/Backend/FileBackendTest.php
+++ b/typo3/sysext/core/Tests/Functional/Cache/Backend/FileBackendTest.php
@@ -283,10 +283,7 @@ final class FileBackendTest extends FunctionalTestCase
public function hasReturnsFalseForExpiredEntries(): void
{
$subject = $this->getMockBuilder(FileBackend::class)->onlyMethods(['isCacheFileExpired'])->disableOriginalConstructor()->getMock();
- $subject->expects(self::exactly(2))->method('isCacheFileExpired')->will(self::onConsecutiveCalls(
- true,
- false
- ));
+ $subject->expects(self::exactly(2))->method('isCacheFileExpired')->willReturn(true, false);
self::assertFalse($subject->has('foo'));
self::assertTrue($subject->has('bar'));
}
diff --git a/typo3/sysext/core/Tests/Unit/Resource/MetaDataAspectTest.php b/typo3/sysext/core/Tests/Unit/Resource/MetaDataAspectTest.php
index 2d5fc1f8d1fb..720aa5e71e9d 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/MetaDataAspectTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/MetaDataAspectTest.php
@@ -190,7 +190,7 @@ final class MetaDataAspectTest extends UnitTestCase
->onlyMethods(['loadFromRepository'])
->getMock();
- $metaDataAspectMock->method('loadFromRepository')->will(self::onConsecutiveCalls([], $metaData, $updatedMetadata));
+ $metaDataAspectMock->method('loadFromRepository')->willReturn([], $metaData, $updatedMetadata);
$metaDataAspectMock->add($metaData)->save();
$metaDataAspectMock->add(['testproperty' => 'testvalue'])->save();
diff --git a/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php b/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
index 60af2eaad556..024c9ea48435 100644
--- a/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
+++ b/typo3/sysext/core/Tests/Unit/Resource/ResourceCompressorTest.php
@@ -174,10 +174,7 @@ final class ResourceCompressorTest extends UnitTestCase
$subject = $this->getAccessibleMock(ResourceCompressor::class, ['compressCssFile', 'compressJsFile', 'createMergedCssFile', 'createMergedJsFile', 'getFilenameFromMainDir', 'checkBaseDirectory']);
$subject->expects(self::exactly(2))
->method('createMergedCssFile')
- ->will(self::onConsecutiveCalls(
- self::returnValue('merged_' . $allFileName),
- self::returnValue('merged_' . $screenFileName1)
- ));
+ ->willReturn(self::returnValue('merged_' . $allFileName), self::returnValue('merged_' . $screenFileName1));
$result = $subject->concatenateCssFiles($testFileFixture);
diff --git a/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php b/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php
index c4ab0ad98ca6..644f70dbdad2 100644
--- a/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php
+++ b/typo3/sysext/form/Tests/Unit/Mvc/Persistence/FormPersistenceManagerTest.php
@@ -395,11 +395,7 @@ final class FormPersistenceManagerTest extends UnitTestCase
$mockFormPersistenceManager
->expects(self::exactly(3))
->method('exists')
- ->will(self::onConsecutiveCalls(
- self::returnValue(true),
- self::returnValue(true),
- self::returnValue(false)
- ));
+ ->willReturn(true, true, false);
$input = 'example';
$expected = '-1:/user_uploads/example_2.form.yaml';
@@ -415,9 +411,7 @@ final class FormPersistenceManagerTest extends UnitTestCase
$mockFormPersistenceManager
->expects(self::exactly(101))
->method('exists')
- ->will(self::onConsecutiveCalls(
- ...$this->returnTrue100Times()
- ));
+ ->willReturn(...$this->returnTrue100Times());
$input = 'example';
$expected = '#^-1:/user_uploads/example_([0-9]{10}).form.yaml$#';
@@ -432,8 +426,8 @@ final class FormPersistenceManagerTest extends UnitTestCase
private function returnTrue100Times(): array
{
$returnValues = [];
- $returnValues = array_pad($returnValues, 100, self::returnValue(true));
- $returnValues[] = self::returnValue(false);
+ $returnValues = array_pad($returnValues, 100, true);
+ $returnValues[] = false;
return $returnValues;
}
@@ -461,9 +455,7 @@ final class FormPersistenceManagerTest extends UnitTestCase
$mockFormPersistenceManager
->expects(self::exactly(101))
->method('checkForDuplicateIdentifier')
- ->will(self::onConsecutiveCalls(
- ...$this->returnTrue100Times()
- ));
+ ->willReturn(...$this->returnTrue100Times());
$input = 'example';
$expected = '#^example_([0-9]{10})$#';
--
GitLab