[TASK] Code cleanup: Move isComposerMode() function to EnvironmentUti…

…lity And add some unit tests for this
in2code-de · Aug 4, 2024 · afc99d9 · afc99d9
1 parent 48682e0
commit afc99d9
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 8 deletions.
diff --git a/Classes/UserFunc/EnableStatus.php b/Classes/UserFunc/EnableStatus.php
@@ -5,8 +5,8 @@
 
 use Doctrine\DBAL\Exception as ExceptionDbal;
 use In2code\Lux\Domain\Model\Visitor;
-use In2code\Lux\Utility\ConfigurationUtility;
 use In2code\Lux\Utility\DatabaseUtility;
+use In2code\Lux\Utility\EnvironmentUtility;
 use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\View\StandaloneView;
@@ -23,8 +23,8 @@ class EnableStatus
     public function showEnableStatus(): string
     {
         $variables = [
-            'status' => ConfigurationUtility::isComposerMode() && ExtensionManagementUtility::isLoaded('lux'),
-            'composerMode' => ConfigurationUtility::isComposerMode(),
+            'status' => EnvironmentUtility::isComposerMode() && ExtensionManagementUtility::isLoaded('lux'),
+            'composerMode' => EnvironmentUtility::isComposerMode(),
             'enabled' => [
                 'lux' => ExtensionManagementUtility::isLoaded('lux'),
                 'luxenterprise' => ExtensionManagementUtility::isLoaded('luxenterprise'),

diff --git a/Classes/Utility/ConfigurationUtility.php b/Classes/Utility/ConfigurationUtility.php
@@ -214,11 +214,6 @@ public static function isWorkflowModuleDisabled(): bool
         return $extensionConfig['disableWorkflowModule'] === '1';
     }
 
-    public static function isComposerMode(): bool
-    {
-        return defined('TYPO3_COMPOSER_MODE');
-    }
-
     /**
      * Get extension configuration from LocalConfiguration.php
      *

diff --git a/Classes/Utility/EnvironmentUtility.php b/Classes/Utility/EnvironmentUtility.php
@@ -38,4 +38,9 @@ public static function isCli(): bool
     {
         return Environment::isCli();
     }
+
+    public static function isComposerMode(): bool
+    {
+        return defined('TYPO3_COMPOSER_MODE');
+    }
 }
diff --git a/Tests/Unit/Utility/EnvironmentUtilityTest.php b/Tests/Unit/Utility/EnvironmentUtilityTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace In2code\Lux\Tests\Unit\Utility;
+
+use In2code\Lux\Utility\EnvironmentUtility;
+use TYPO3\TestingFramework\Core\Unit\UnitTestCase;
+
+/**
+ * @coversDefaultClass \In2code\Lux\Utility\EnvironmentUtility
+ */
+class EnvironmentUtilityTest extends UnitTestCase
+{
+    /**
+     * @return void
+     * @covers ::isFrontend
+     */
+    public function testIsFrontend(): void
+    {
+        self::assertFalse(EnvironmentUtility::isFrontend());
+    }
+
+    /**
+     * @return void
+     * @covers ::isBackend
+     */
+    public function testIsBackend(): void
+    {
+        self::assertFalse(EnvironmentUtility::isBackend());
+    }
+
+    /**
+     * @return void
+     * @covers ::isCli
+     */
+    public function testIsCli(): void
+    {
+        self::assertTrue(EnvironmentUtility::isCli());
+    }
+
+    /**
+     * @return void
+     * @covers ::isComposerMode
+     */
+    public function testIsComposerMode(): void
+    {
+        self::assertTrue(EnvironmentUtility::isComposerMode());
+    }
+}