[CLEANUP] Make the TYPO3 version switches more consistent

Also reduce the cognitive load as these switches are between V12 and pre-V12.
TYPO3BestPractices · Nov 1, 2023 · 9cca6cb · 9cca6cb
1 parent edbb534
commit 9cca6cb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Tests/Unit/Controller/FrontEndEditorControllerTest.php b/Tests/Unit/Controller/FrontEndEditorControllerTest.php
@@ -52,7 +52,7 @@ protected function setUp(): void
 
         // We need to create an accessible mock in order to be able to set the protected `view`.
         $methodsToMock = ['htmlResponse', 'redirect', 'redirectToUri'];
-        if ((new Typo3Version())->getMajorVersion() <= 11) {
+        if ((new Typo3Version())->getMajorVersion() < 12) {
             $methodsToMock[] = 'forward';
         }
         $this->subject = $this->getAccessibleMock(
@@ -211,7 +211,7 @@ public function updateActionWithOwnTeaPersistsProvidedTea(): void
 
     private function mockRedirect(string $actionName): void
     {
-        if ((new Typo3Version())->getMajorVersion() <= 11) {
+        if ((new Typo3Version())->getMajorVersion() < 12) {
             $this->subject->expects(self::once())->method('redirect')
                 ->with($actionName)
                 // @phpstan-ignore-next-line This class does not exist in V12 anymore, but this branch is V11-only.
@@ -227,7 +227,7 @@ private function mockRedirect(string $actionName): void
 
     private function stubRedirect(string $actionName): void
     {
-        if ((new Typo3Version())->getMajorVersion() <= 11) {
+        if ((new Typo3Version())->getMajorVersion() < 12) {
             $this->subject->method('redirect')
                 // @phpstan-ignore-next-line This class does not exist in V12 anymore, but this branch is V11-only.
                 ->willThrowException(new StopActionException('redirectToUri', 1476045828));

diff --git a/Tests/Unit/Controller/TeaControllerTest.php b/Tests/Unit/Controller/TeaControllerTest.php
@@ -43,7 +43,7 @@ protected function setUp(): void
         $this->teaRepositoryMock = $this->getMockBuilder(TeaRepository::class)->disableOriginalConstructor()->getMock();
         // We need to create an accessible mock in order to be able to set the protected `view`.
         $methodsToMock = ['htmlResponse', 'redirect', 'redirectToUri'];
-        if ((new Typo3Version())->getMajorVersion() <= 11) {
+        if ((new Typo3Version())->getMajorVersion() < 12) {
             $methodsToMock[] = 'forward';
         }
         $this->subject = $this->getAccessibleMock(TeaController::class, $methodsToMock, [$this->teaRepositoryMock]);