Sync upstream (4.2)

daftspunk · daftspunk · commit 6385ef41c2f6 · 2026-03-21T03:13:00.000+11:00
diff --git a/config/queue.php b/config/queue.php
@@ -116,12 +116,12 @@
     | can control how and where failed jobs are stored. Laravel ships with
     | support for storing failed jobs in a simple file or in a database.
     |
-    | Supported drivers: "database-uuids", "dynamodb", "file", "null"
+    | Supported drivers: "database", "database-uuids", "dynamodb", "file", "null"
     |
     */
 
     'failed' => [
-        'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
+        'driver' => env('QUEUE_FAILED_DRIVER', 'database'),
         'database' => env('DB_CONNECTION', 'mysql'),
         'table' => 'failed_jobs',
     ],
diff --git a/modules/backend/assets/css/october.css b/modules/backend/assets/css/october.css
diff --git a/modules/backend/assets/less/layout/fancylayout.less b/modules/backend/assets/less/layout/fancylayout.less
@@ -470,7 +470,7 @@ body.breadcrumb-fancy .control-breadcrumb,
                             padding: 0 7px 6px;
 
                             &:before, &:after {
-                                display: none;
+                                display: none !important;
                             }
 
                             span {
@@ -610,15 +610,9 @@ body.breadcrumb-fancy .control-breadcrumb,
         .loading-indicator-container {
             .loading-indicator {
                 background-color: @color-fancy-form-tabless-fields-bg;
-                padding: 0 0 0 45px;
                 color: @color-fancy-form-label;
-                margin-top: 4px;
-                height: 90%;
-                font-size: 12px;
-                line-height: 100%;
-                > span {
-                    left: 5px;
-                    top: 18px;
+                > span, > div {
+                    margin-left: 15px;
                 }
             }
         }
@@ -722,16 +716,4 @@ body.side-panel-not-fixed {
     }
 }
 
-html.cssanimations {
-    .fancy-layout {
-        .form-tabless-fields {
-            .loading-indicator-container {
-                .loading-indicator > span {
-                    .animation(spin 1s linear infinite);
-                    //background-image: url('../../../system/assets/ui/images/loader-white.svg');
-                    background-size: 20px 20px;
-                }
-            }
-        }
-    }
-}
+
diff --git a/modules/backend/vuecomponents/monacoeditor/assets/css/_decorations.css b/modules/backend/vuecomponents/monacoeditor/assets/css/_decorations.css
@@ -21,5 +21,22 @@
         .monaco-error-line {
             background: rgba(255, 0, 0, 0.4);
         }
+
+        .monaco-warning-glyph {
+            margin-left: 5px;
+
+            &:before {
+                content: '';
+                display: block;
+                width: 11px;
+                height: 11px;
+                background-color: #f0ad4e;
+                border-radius: 100%;
+            }
+        }
+
+        .monaco-warning-line {
+            background: rgba(240, 173, 78, 0.25);
+        }
     }
 }
diff --git a/modules/cms/classes/Page.php b/modules/cms/classes/Page.php
@@ -192,7 +192,7 @@ public static function resolveMenuItem($item, string $url, Theme $theme)
 
         $page = self::loadCached($theme, $item->reference);
 
-        $params = PageLookupItem::extractUrlParams($item->attributes);
+        $params = PageLookupItem::extractUrlParams($item->attributes ?? []);
 
         $pageUrl = Cms::pageUrl($item->reference, $params);
 
diff --git a/modules/system/assets/js/pages/market.installprocess.js b/modules/system/assets/js/pages/market.installprocess.js
diff --git a/modules/system/classes/PluginBase.php b/modules/system/classes/PluginBase.php
@@ -1,6 +1,7 @@
 <?php namespace System\Classes;
 
 use Backend;
+use Illuminate\Console\Application as Artisan;
 use October\Contracts\Support\OctoberPackage;
 use October\Rain\Support\ServiceProvider as ServiceProviderBase;
 use ReflectionClass;
@@ -231,11 +232,7 @@ public function registerMailPartials()
      */
     public function discoverConsoleCommands(): void
     {
-        if (!$this->app->runningInConsole()) {
-            return;
-        }
-
-        $reflection = new \ReflectionClass(get_class($this));
+        $reflection = new ReflectionClass(get_class($this));
         $pluginPath = dirname($reflection->getFileName());
         $consolePath = $pluginPath . '/console';
 
@@ -246,22 +243,28 @@ public function discoverConsoleCommands(): void
         $pluginClass = get_class($this);
         $namespace = substr($pluginClass, 0, strrpos($pluginClass, '\\')) . '\\Console\\';
 
-        foreach (glob($consolePath . '/*.php') as $file) {
-            $className = $namespace . basename($file, '.php');
+        Artisan::starting(function ($artisan) use ($consolePath, $namespace) {
+            $commands = [];
 
-            if (!class_exists($className)) {
-                continue;
-            }
+            foreach (glob($consolePath . '/*.php') as $file) {
+                $className = $namespace . basename($file, '.php');
 
-            $ref = new \ReflectionClass($className);
+                if (!class_exists($className)) {
+                    continue;
+                }
 
-            if (
-                $ref->isSubclassOf(\Illuminate\Console\Command::class) &&
-                !$ref->isAbstract()
-            ) {
-                $this->commands($className);
+                $ref = new ReflectionClass($className);
+
+                if (
+                    $ref->isSubclassOf(\Illuminate\Console\Command::class) &&
+                    !$ref->isAbstract()
+                ) {
+                    $commands[] = $className;
+                }
             }
-        }
+
+            $artisan->resolveCommands($commands);
+        });
     }
 
     /**
diff --git a/modules/system/classes/updatemanager/ManagesThemes.php b/modules/system/classes/updatemanager/ManagesThemes.php
@@ -143,13 +143,6 @@ public function seedTheme(string $name)
         $theme = CmsTheme::load($themeName);
         $model = new ThemeSeed;
 
-        // Seed everything
-        $allFolders = [
-            'blueprints' => true,
-            'data' => true,
-            'lang' => true,
-        ];
-
-        $model->seed($theme, ['folders' => $allFolders]);
+        $model->seed($theme);
     }
 }
diff --git a/modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php b/modules/system/database/migrations/2015_10_01_000018_Db_FailedJobs.php
@@ -9,6 +9,7 @@ public function up()
     {
         Schema::create($this->getTableName(), function (Blueprint $table) {
             $table->increments('id');
+            $table->string('uuid')->unique()->nullable();
             $table->text('connection');
             $table->text('queue');
             $table->text('payload');
diff --git a/modules/system/widgets/updater/assets/js/updater.js b/modules/system/widgets/updater/assets/js/updater.js
@@ -91,7 +91,7 @@
                 }
 
                 var template = $('#executeFailed').html(),
-                    html = Mustache.to_html(template, reason);
+                    html = Mustache.render(template, reason);
 
                 $('#executeActivity').hide();
                 $('#executeStatus').html(html);
diff --git a/modules/tailor/classes/Blueprint.php b/modules/tailor/classes/Blueprint.php
@@ -128,12 +128,15 @@ public static function getMtimeByName(string $fileName): ?int
     }
 
     /**
-     * listInProject lists all blueprints in a project (app and plugins)
+     * listInProject lists all blueprints in a project, loaded in priority order:
+     * app, plugins, active theme, then other themes.
      */
     public static function listInProject(array $options = []): BlueprintCollection
     {
+        // 1. App blueprints (highest priority)
         $results = (new static)->get($options);
 
+        // 2. Plugin blueprints
         $plugins = array_pull($options, 'plugins', self::getDefaultPlugins());
 
         foreach ($plugins as $path) {
@@ -143,6 +146,17 @@ public static function listInProject(array $options = []): BlueprintCollection
             );
         }
 
+        // 3. Active theme blueprints
+        $activeTheme = array_pull($options, 'activeTheme', self::getDefaultActiveTheme());
+
+        foreach ($activeTheme as $dirName => $path) {
+            $results = array_merge(
+                static::inDatasource($path, $dirName)->get($options),
+                $results,
+            );
+        }
+
+        // 4. Other theme blueprints (lowest priority)
         $themes = array_pull($options, 'themes', self::getDefaultThemes());
 
         foreach ($themes as $dirName => $path) {
diff --git a/modules/tailor/classes/BlueprintIndexer.php b/modules/tailor/classes/BlueprintIndexer.php
@@ -107,6 +107,12 @@ public function migrate()
             }
         }
 
+        // Output any duplicate handle/UUID warnings
+        $warnings = BlueprintVerifier::instance()->getWarnings();
+        foreach ($warnings as $warning) {
+            $this->note('- <comment>Warning</comment>: ' . $warning['message']);
+        }
+
         // Migrate blueprints
         foreach ($allBlueprints as $blueprint) {
             if ($blueprint instanceof EntryBlueprint) {
diff --git a/modules/tailor/classes/BlueprintVerifier.php b/modules/tailor/classes/BlueprintVerifier.php
@@ -19,6 +19,11 @@ class BlueprintVerifier
      */
     protected $registeredBlueprints = [];
 
+    /**
+     * @var array warnings collects non-fatal validation warnings
+     */
+    protected $warnings = [];
+
     /**
      * @var array|null knownSources stores known blueprint handles and UUIDs for source validation
      */
@@ -77,12 +82,21 @@ public function verifyBlueprint(Blueprint $blueprint)
         $this->validateFieldset($blueprint);
     }
 
+    /**
+     * getWarnings returns collected validation warnings
+     */
+    public function getWarnings(): array
+    {
+        return $this->warnings;
+    }
+
     /**
      * clearCache resets all validation caches
      */
     public function clearCache(): void
     {
         $this->registeredBlueprints = [];
+        $this->warnings = [];
         $this->knownSources = null;
     }
 
@@ -169,31 +183,25 @@ protected function validateUniqueBlueprint(Blueprint $blueprint)
 
     /**
      * validateUniqueProperty checks a property value is unique across blueprints.
-     * Blueprints from different themes are allowed to share handles and UUIDs
-     * since only one theme is active at a time.
+     * Duplicates are collected as warnings instead of throwing exceptions since
+     * the first registered blueprint (by priority order) takes precedence.
      */
     protected function validateUniqueProperty(Blueprint $blueprint, string $property, string $key, string $filePath, ?string $theme = null)
     {
         $cacheKey = $property . ':' . $key;
 
         if (isset($this->registeredBlueprints[$cacheKey])) {
             $existing = $this->registeredBlueprints[$cacheKey];
-
-            // Allow duplicates across different themes since only one theme
-            // is active at a time
-            if ($theme !== null && $existing['theme'] !== null && $theme !== $existing['theme']) {
-                return;
-            }
-
             $existingPath = File::nicePath($existing['path']);
             $value = $blueprint->$property;
             $lineNo = $this->findLineFromKeyValPair($blueprint->content, $property, $value);
 
-            throw new BlueprintException(
-                $blueprint,
-                "Duplicate {$property} '{$value}'. Already defined in: {$existingPath}",
-                $lineNo
-            );
+            $this->warnings[] = [
+                'message' => "Duplicate {$property} '{$value}'. Already defined in: {$existingPath}",
+                'line' => $lineNo,
+                'file' => $filePath,
+            ];
+            return;
         }
 
         $this->registeredBlueprints[$cacheKey] = ['path' => $filePath, 'theme' => $theme];
diff --git a/modules/tailor/classes/blueprint/HasDatasources.php b/modules/tailor/classes/blueprint/HasDatasources.php
@@ -1,6 +1,7 @@
 <?php namespace Tailor\Classes\Blueprint;
 
 use System;
+use Cms\Classes\Theme as CmsTheme;
 use Cms\Classes\ThemeManager;
 use System\Classes\PluginManager;
 use Exception;
@@ -28,6 +29,11 @@ trait HasDatasources
      */
     protected static $resolvedPlugins = null;
 
+    /**
+     * @var array|null resolvedActiveTheme
+     */
+    protected static $resolvedActiveTheme = null;
+
     /**
      * @var array|null resolvedThemes
      */
@@ -83,7 +89,38 @@ protected static function getDefaultPlugins()
     }
 
     /**
-     * getDefaultThemes
+     * getDefaultActiveTheme returns the active theme as a datasource
+     */
+    protected static function getDefaultActiveTheme()
+    {
+        if (self::$resolvedActiveTheme !== null) {
+            return self::$resolvedActiveTheme;
+        }
+
+        $result = [];
+
+        try {
+            if (System::hasModule('Cms')) {
+                $activeCode = CmsTheme::getActiveThemeCode();
+                if ($activeCode) {
+                    $themes = ThemeManager::instance()->getThemePaths();
+                    if (isset($themes[$activeCode])) {
+                        $path = $themes[$activeCode];
+                        if (file_exists($bpPath = $path . '/blueprints')) {
+                            $result[$activeCode] = $bpPath;
+                        }
+                    }
+                }
+            }
+        }
+        catch (Exception $ex) {
+        }
+
+        return self::$resolvedActiveTheme = $result;
+    }
+
+    /**
+     * getDefaultThemes returns all non-active themes as datasources
      */
     protected static function getDefaultThemes()
     {
@@ -94,8 +131,12 @@ protected static function getDefaultThemes()
         $result = [];
 
         try {
+            $activeCode = System::hasModule('Cms') ? CmsTheme::getActiveThemeCode() : null;
             $themes = System::hasModule('Cms') ? ThemeManager::instance()->getThemePaths() : [];
             foreach ($themes as $code => $path) {
+                if ($code === $activeCode) {
+                    continue;
+                }
                 if (file_exists($bpPath = $path . '/blueprints')) {
                     $result[$code] = $bpPath;
                 }
diff --git a/modules/tailor/classes/editorextension/HasExtensionCrud.php b/modules/tailor/classes/editorextension/HasExtensionCrud.php
diff --git a/modules/tailor/vuecomponents/blueprinteditor/assets/js/blueprinteditor.js b/modules/tailor/vuecomponents/blueprinteditor/assets/js/blueprinteditor.js

Original file line number	Diff line number	Diff line change
`@@ -116,12 +116,12 @@`
`116`	`116`	`\| can control how and where failed jobs are stored. Laravel ships with`
`117`	`117`	`\| support for storing failed jobs in a simple file or in a database.`
`118`	`118`	`\|`
`119`		`- \| Supported drivers: "database-uuids", "dynamodb", "file", "null"`
	`119`	`+ \| Supported drivers: "database", "database-uuids", "dynamodb", "file", "null"`
`120`	`120`	`\|`
`121`	`121`	`*/`
`122`	`122`
`123`	`123`	`'failed' => [`
`124`		`- 'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),`
	`124`	`+ 'driver' => env('QUEUE_FAILED_DRIVER', 'database'),`
`125`	`125`	`'database' => env('DB_CONNECTION', 'mysql'),`
`126`	`126`	`'table' => 'failed_jobs',`
`127`	`127`	`],`
Original file line number	Diff line number	Diff line change
`@@ -143,13 +143,6 @@ public function seedTheme(string $name)`
`143`	`143`	`$theme = CmsTheme::load($themeName);`
`144`	`144`	`$model = new ThemeSeed;`
`145`	`145`
`146`		`- // Seed everything`
`147`		`- $allFolders = [`
`148`		`- 'blueprints' => true,`
`149`		`- 'data' => true,`
`150`		`- 'lang' => true,`
`151`		`- ];`
`152`		`-`
`153`		`- $model->seed($theme, ['folders' => $allFolders]);`
	`146`	`+ $model->seed($theme);`
`154`	`147`	`}`
`155`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ public function up()`
`9`	`9`	`{`
`10`	`10`	`Schema::create($this->getTableName(), function (Blueprint $table) {`
`11`	`11`	`$table->increments('id');`
	`12`	`+ $table->string('uuid')->unique()->nullable();`
`12`	`13`	`$table->text('connection');`
`13`	`14`	`$table->text('queue');`
`14`	`15`	`$table->text('payload');`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@`
`91`	`91`	`}`
`92`	`92`
`93`	`93`	`var template = $('#executeFailed').html(),`
`94`		`- html = Mustache.to_html(template, reason);`
	`94`	`+ html = Mustache.render(template, reason);`
`95`	`95`
`96`	`96`	`$('#executeActivity').hide();`
`97`	`97`	`$('#executeStatus').html(html);`