[TASK] Adjust tests and add PHP 8.3 build

FluidTYPO3 · Jan 15, 2024 · 9bb2fbe · 9bb2fbe
1 parent a2444d5
commit 9bb2fbe
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 21 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -57,9 +57,11 @@ jobs:
           - php: "8.1"
             typo3: "^11.5"
           - php: "8.1"
-            typo3: "^12.1"
+            typo3: "^12.4"
           - php: "8.2"
-            typo3: "^12.1"
+            typo3: "^12.4"
+          - php: "8.3"
+            typo3: "^12.4"
 
     runs-on: ubuntu-latest
 

diff --git a/Tests/Unit/AbstractTestCase.php b/Tests/Unit/AbstractTestCase.php
@@ -18,6 +18,9 @@
 use TYPO3\CMS\Core\Charset\CharsetConverter;
 use TYPO3\CMS\Core\Core\ApplicationContext;
 use TYPO3\CMS\Core\Core\Environment;
+use TYPO3\CMS\Core\Localization\Locale;
+use TYPO3\CMS\Core\Localization\Locales;
+use TYPO3\CMS\Core\Localization\LocalizationFactory;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManager;
 use TYPO3Fluid\Fluid\Core\Parser\Interceptor\Escape;
@@ -257,4 +260,38 @@ protected function createInstance()
         $instanceClassName = $this->createInstanceClassName();
         return new $instanceClassName();
     }
+
+    protected function mockForLocalizationUtilityCalls(array $returnValeMap): void
+    {
+        $languageService = $this->getMockBuilder(LanguageService::class)->disableOriginalConstructor()->getMock();
+
+        $this->singletonInstances[LocalizationFactory::class] = $this->getMockBuilder(LocalizationFactory::class)
+            ->setMethods(['getParsedData'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->singletonInstances[LocalizationFactory::class]->method('getParsedData')->willReturn([]);
+
+        if (class_exists(LanguageServiceFactory::class)) {
+            $languageServiceFactory = $this->getMockBuilder(LanguageServiceFactory::class)
+                ->onlyMethods(['create'])
+                ->disableOriginalConstructor()
+                ->getMock();
+            $languageServiceFactory->method('create')->willReturn($languageService);
+
+            GeneralUtility::addInstance(LanguageServiceFactory::class, $languageServiceFactory);
+        }
+
+        if (class_exists(Locales::class)) {
+            $locale = new Locale();
+            $locales = $this->getMockBuilder(Locales::class)
+                ->onlyMethods(['createLocaleFromRequest'])
+                ->disableOriginalConstructor()
+                ->getMock();
+            $locales->method('createLocaleFromRequest')->willReturn($locale);
+
+            $this->singletonInstances[Locales::class] = $locales;
+        }
+
+        $GLOBALS['LANG'] = $languageService;
+    }
 }
diff --git a/Tests/Unit/ViewHelpers/LViewHelperTest.php b/Tests/Unit/ViewHelpers/LViewHelperTest.php
@@ -11,10 +11,8 @@
 use TYPO3\CMS\Core\Cache\CacheManager;
 use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
 use TYPO3\CMS\Core\Localization\LanguageService;
-use TYPO3\CMS\Core\Localization\LocalizationFactory;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
-use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
 
 /**
  * Class LViewHelperTest
@@ -30,11 +28,7 @@ protected function setUp(): void
         $cache->method('get')->willReturn($languageService);
 
         $this->singletonInstances[ConfigurationManagerInterface::class] = $this->getMockBuilder(ConfigurationManagerInterface::class)->getMockForAbstractClass();
-        $this->singletonInstances[LocalizationFactory::class] = $this->getMockBuilder(LocalizationFactory::class)
-            ->setMethods(['getParsedData'])
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->singletonInstances[LocalizationFactory::class]->method('getParsedData')->willReturn([]);
+
         $this->singletonInstances[CacheManager::class] = $this->getMockBuilder(CacheManager::class)
             ->setMethods(['getCache'])
             ->disableOriginalConstructor()
@@ -51,10 +45,9 @@ protected function setUp(): void
             );
         }
 
-        parent::setUp();
+        $this->mockForLocalizationUtilityCalls([]);
 
-        $GLOBALS['TSFE'] = $this->getMockBuilder(TypoScriptFrontendController::class)->disableOriginalConstructor()->getMock();
-        $GLOBALS['LANG'] = $this->getMockBuilder(LanguageService::class)->disableOriginalConstructor()->getMock();
+        parent::setUp();
     }
 
     protected function tearDown(): void

diff --git a/Tests/Unit/ViewHelpers/OrViewHelperTest.php b/Tests/Unit/ViewHelpers/OrViewHelperTest.php
@@ -11,7 +11,6 @@
 use TYPO3\CMS\Core\Cache\CacheManager;
 use TYPO3\CMS\Core\Cache\Frontend\FrontendInterface;
 use TYPO3\CMS\Core\Localization\LanguageService;
-use TYPO3\CMS\Core\Localization\LocalizationFactory;
 use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
 use TYPO3\CMS\Extbase\Object\ObjectManager;
 use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
@@ -29,10 +28,6 @@ protected function setUp(): void
         $cache->method('has')->willReturn(true);
         $cache->method('get')->willReturn($languageService);
 
-        $this->singletonInstances[LocalizationFactory::class] = $this->getMockBuilder(LocalizationFactory::class)
-            ->disableOriginalConstructor()
-            ->getMock();
-        $this->singletonInstances[LocalizationFactory::class]->method('getParsedData')->willReturn([]);
         $this->singletonInstances[ConfigurationManagerInterface::class] = $this->getMockBuilder(ConfigurationManagerInterface::class)->getMockForAbstractClass();
         $this->singletonInstances[CacheManager::class] = $this->getMockBuilder(CacheManager::class)
             ->setMethods(['getCache'])
@@ -49,13 +44,11 @@ protected function setUp(): void
             );
         }
 
+        $this->mockForLocalizationUtilityCalls([]);
+
         parent::setUp();
 
         $GLOBALS['TSFE'] = $this->getMockBuilder(TypoScriptFrontendController::class)->disableOriginalConstructor()->getMock();
-        $GLOBALS['LANG'] = $this->getMockBuilder(LanguageService::class)
-            ->setMethods(['dummy'])
-            ->disableOriginalConstructor()
-            ->getMock();
         $GLOBALS['TYPO3_REQUEST'] = null;
     }