Theme System: Split & organised tests, changed module version to string

Author: ssddanbrown

app/Theming/ThemeModule.php

@@ -9,7 +9,7 @@ class ThemeModule
     protected string $name;
     protected string $description;
     protected string $folderName;
-    protected int $version;
+    protected string $version;
 
     /**
      * Create a ThemeModule instance from JSON data.
@@ -26,10 +26,14 @@ public static function fromJson(array $data, string $folderName): static
             throw new ThemeException("Module in folder \"{$folderName}\" is missing a valid 'description' property");
         }
 
-        if (!isset($data['version']) || !is_int($data['version']) || $data['version'] < 1) {
+        if (!isset($data['version']) || !is_string($data['version'])) {
             throw new ThemeException("Module in folder \"{$folderName}\" is missing a valid 'version' property");
         }
 
+        if (!preg_match('/^v?\d+\.\d+\.\d+(-.*)?$/', $data['version'])) {
+            throw new ThemeException("Module in folder \"{$folderName}\" has an invalid 'version' format. Expected semantic version format like '1.0.0' or 'v1.0.0'");
+        }
+
         $module = new static();
         $module->name = $data['name'];
         $module->description = $data['description'];

tests/TestCase.php

@@ -13,6 +13,7 @@
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Env;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Testing\Assert as PHPUnit;
 use Illuminate\Testing\Constraints\HasInDatabase;
@@ -157,6 +158,23 @@ protected function runWithEnv(array $valuesByKey, callable $callback, bool $hand
         }
     }
 
+    protected function usingThemeFolder(callable $callback): void
+    {
+        // Create a folder and configure a theme
+        $themeFolderName = 'testing_theme_' . str_shuffle(rtrim(base64_encode(time()), '='));
+        config()->set('view.theme', $themeFolderName);
+        $themeFolderPath = theme_path('');
+
+        // Create a theme folder and clean it up on application tear-down
+        File::makeDirectory($themeFolderPath);
+        $this->beforeApplicationDestroyed(fn() => File::deleteDirectory($themeFolderPath));
+
+        // Run provided callback with the theme env option set
+        $this->runWithEnv(['APP_THEME' => $themeFolderName], function () use ($callback, $themeFolderName) {
+            call_user_func($callback, $themeFolderName);
+        });
+    }
+
     /**
      * Check the keys and properties in the given map to include
      * exist, albeit not exclusively, within the map to check.