Merge branch '6.x' into feature/create-object

Author: riasvdv

AGENTS.md

@@ -133,7 +133,7 @@ Element queries (`src/Database/Queries/`) are the primary way to query content:
 - Uses `RefreshDatabase` trait - tables are migrated fresh via the `Install` migration
 - **Classes marked `final` have this keyword stripped during testing** - you can create custom test classes that extend production classes (e.g., extending `User` element) to override methods like `getFieldLayout()` for easier testing without complex mocks
 
-**Important**: When creating or adjusting tests, take a look at @docs/TESTING.md for patterns and best practices.
+**Important**: When creating or adjusting tests, use the `testing-guidelines` skill for patterns and best practices.
 
 ### Service Providers Pattern
 

src/Database/Commands/MigrateCommand.php

@@ -7,6 +7,7 @@
 use CraftCms\Cms\Console\CraftCommand;
 use CraftCms\Cms\Database\Commands\Concerns\BackupTrait;
 use CraftCms\Cms\Database\Events\RegisterMigrators;
+use CraftCms\Cms\Database\LaravelMigrations;
 use CraftCms\Cms\Database\Migrator;
 use CraftCms\Cms\Plugin\Plugins;
 use CraftCms\Cms\Support\Str;
@@ -53,19 +54,22 @@ class MigrateCommand extends Command implements Isolatable
 
     private Plugins $plugins;
 
+    private LaravelMigrations $laravelMigrations;
+
     /**
      * @var array<string, Migrator>
      */
     private array $migrators = [];
 
-    public function handle(Updates $updates, Plugins $plugins): int
+    public function handle(Updates $updates, Plugins $plugins, LaravelMigrations $laravelMigrations): int
     {
         if (! $this->confirmToProceed()) {
             return self::SUCCESS;
         }
 
         $this->updates = $updates;
         $this->plugins = $plugins;
+        $this->laravelMigrations = $laravelMigrations;
 
         try {
             $this->runMigrations();
@@ -197,6 +201,7 @@ private function gatherMigrationsByTrack(array &$migrationsByTrack, array &$plug
 
         $noContent = $this->option('no-content') ?? $this->option('noContent');
         if (! $noContent && (! $this->option('track') || $this->option('track') === 'content')) {
+            $this->laravelMigrations->reconcile($this->getMigrator('content'));
             $contentMigrations = $this->getMigrator('content')->getPendingMigrations();
             if (! empty($contentMigrations)) {
                 $migrationsByTrack['content'] = $contentMigrations;

src/Database/LaravelMigrations.php

@@ -15,39 +15,42 @@
 class LaravelMigrations
 {
     public function install(Migrator $migrator): void
+    {
+        $pendingMigrations = $this->reconcile($migrator);
+
+        if (empty($pendingMigrations)) {
+            return;
+        }
+
+        $migrator->run($pendingMigrations);
+    }
+
+    /**
+     * Reconciles already-existing optional Laravel tables with the content
+     * migration track and returns any optional Laravel migrations that still
+     * need to run.
+     *
+     * @return string[]
+     */
+    public function reconcile(Migrator $migrator): array
     {
         $this->publishMigrationFiles();
 
         $migrationPaths = $this->migrationPaths();
 
         if (empty($migrationPaths)) {
-            return;
+            return [];
         }
 
         $originalTrack = $migrator->getTrack();
 
         try {
             $migrator->track('content');
 
-            $pendingMigrations = $migrator->getPendingMigrations($migrationPaths);
-            $batch = $migrator->getRepository()->getNextBatchNumber();
-
-            foreach ($pendingMigrations as $key => $path) {
-                if (! $this->migrationTableExists($path)) {
-                    continue;
-                }
-
-                $migrator->getRepository()->log($migrator->getMigrationName($path), $batch);
-                unset($pendingMigrations[$key]);
-            }
-
-            $pendingMigrations = array_values($pendingMigrations);
-
-            if (empty($pendingMigrations)) {
-                return;
-            }
-
-            $migrator->run($pendingMigrations);
+            return $this->reconcilePendingMigrations(
+                $migrator,
+                $migrator->getPendingMigrations($migrationPaths),
+            );
         } finally {
             $migrator->track($originalTrack ?? 'content');
         }
@@ -135,6 +138,26 @@ private function migrationFiles(string $pattern): array
         return File::glob(app()->databasePath("migrations/$pattern")) ?: [];
     }
 
+    /**
+     * @param  string[]  $pendingMigrations
+     * @return string[]
+     */
+    private function reconcilePendingMigrations(Migrator $migrator, array $pendingMigrations): array
+    {
+        $batch = $migrator->getRepository()->getNextBatchNumber();
+
+        foreach ($pendingMigrations as $key => $path) {
+            if (! $this->migrationTableExists($path)) {
+                continue;
+            }
+
+            $migrator->getRepository()->log($migrator->getMigrationName($path), $batch);
+            unset($pendingMigrations[$key]);
+        }
+
+        return array_values($pendingMigrations);
+    }
+
     private function migrationTableExists(string $path): bool
     {
         $migrationName = pathinfo($path, PATHINFO_FILENAME);

src/Http/Controllers/MigrateController.php

@@ -6,6 +6,8 @@
 
 use CraftCms\Cms\Config\GeneralConfig;
 use CraftCms\Cms\Database\Backups;
+use CraftCms\Cms\Database\LaravelMigrations;
+use CraftCms\Cms\Database\Migrator;
 use CraftCms\Cms\ProjectConfig\Exceptions\BusyResourceException;
 use CraftCms\Cms\ProjectConfig\Exceptions\StaleResourceException;
 use CraftCms\Cms\ProjectConfig\ProjectConfig;
@@ -28,8 +30,10 @@ class MigrateController
      * services (like [DeployBot](https://deploybot.com/) or [DeployPlace](https://deployplace.com/)) to minimize site
      * downtime after a deployment.
      */
-    public function __invoke(Request $request, GeneralConfig $generalConfig, Updates $updates, ProjectConfig $projectConfig, MaintenanceModeManager $maintenance, Backups $backups)
+    public function __invoke(Request $request, GeneralConfig $generalConfig, Updates $updates, ProjectConfig $projectConfig, MaintenanceModeManager $maintenance, Backups $backups, Migrator $migrator, LaravelMigrations $laravelMigrations)
     {
+        $laravelMigrations->reconcile($migrator);
+
         $handles = $updates->pendingMigrationHandles(true);
         $runMigrations = ! empty($handles);
 

src/Plugin/Testing/PluginTestCase.php

@@ -6,6 +6,7 @@
 
 use CraftCms\Cms\Database\LaravelMigrations;
 use CraftCms\Cms\Database\Migrations\Install;
+use CraftCms\Cms\Database\Migrator;
 use CraftCms\Cms\Providers\CraftServiceProvider;
 use CraftCms\Cms\Site\Data\Site;
 use CraftCms\Yii2Adapter\Yii2ServiceProvider;
@@ -40,10 +41,17 @@ protected function migrateDatabases(): void
             password: 'craftcms2018!!',
             email: 'support@craftcms.com',
             site: $site,
-        );
+        )->silent();
 
-        $migration->up();
-        app(LaravelMigrations::class)->ensureSessionsTable();
+        $migrator = app(Migrator::class)->track('craft');
+        $migrator->runMigration($migration, 'up');
+        $migrator->getRepository()->log('Install', 1);
+
+        foreach ($migrator->getPendingMigrations() as $file) {
+            $migrator->getRepository()->log($migrator->getMigrationName($file), 1);
+        }
+
+        app(LaravelMigrations::class)->install($migrator);
     }
 
     #[Override]

src/Queue/JobProgress.php

@@ -89,8 +89,8 @@ public function jobsQuery(): Builder
             ->orderByRaw('CASE WHEN status = ? THEN 1 ELSE 0 END DESC', [JobStatus::Reserved->value])
             // Pending jobs go second
             ->orderByRaw('CASE WHEN status = ? THEN 1 ELSE 0 END DESC', [JobStatus::Pending->value])
-            // Then by now or dateCreated + delay
-            ->orderByRaw($delay, [now()->getTimestamp()])
+            // Then by now or dateCreated + delay, with furthest delayed jobs first
+            ->orderByRaw("$delay DESC", [now()->getTimestamp()])
             // Lastly by dateCreated
             ->orderBy('dateCreated');
     }

tests/Feature/Utility/UtilitiesTest.php

@@ -65,12 +65,6 @@
     expect($this->utilities->getAuthorizedUtilityTypes())->not()->toContain(SystemReport::class);
 });
 
-it('can get badge count for all utilities', function () {
-    actingAs(User::find()->one());
-
-    expect($this->utilities->getUtilitiesBadgeCount())->toBe(0);
-});
-
 class DummyUtility extends Utility
 {
     #[Override]

tests/TestCase.php

@@ -202,15 +202,17 @@ protected function refreshTestDatabase(): void
 
             Cache::lock(ProjectConfig::MUTEX_NAME)->forceRelease();
 
-            $migration->up();
-            app(LaravelMigrations::class)->ensureSessionsTable();
-
-            // Mark all existing migrations as applied
             $migrator = app(Migrator::class)->track('craft');
+            $migrator->runMigration($migration, 'up');
+            $migrator->getRepository()->log('Install', 1);
+
+            // Mark all existing Craft migrations as applied
             foreach ($migrator->getPendingMigrations() as $file) {
                 $migrator->getRepository()->log($migrator->getMigrationName($file), 1);
             }
 
+            app(LaravelMigrations::class)->install($migrator);
+
             RefreshDatabaseState::$migrated = true;
         }
 

tests/UnitTestCase.php

@@ -9,6 +9,8 @@
 use CraftCms\Cms\Site\Data\Site;
 use CraftCms\Cms\Support\Facades\Sites;
 use CraftCms\Cms\View\TemplateMode;
+use Illuminate\Contracts\Config\Repository as ConfigRepository;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\File;
 use Orchestra\Testbench\Concerns\WithWorkbench;
 use Orchestra\Testbench\TestCase as Orchestra;
@@ -29,6 +31,21 @@ protected function setUp(): void
     {
         parent::setUp();
 
+        tap(app(ConfigRepository::class), function (ConfigRepository $config) {
+            $config->set('database.default', 'sqlite');
+            $config->set('database.connections.sqlite', array_merge(
+                $config->get('database.connections.sqlite', []),
+                [
+                    'driver' => 'sqlite',
+                    'database' => ':memory:',
+                    'prefix' => '',
+                ],
+            ));
+        });
+
+        DB::purge('sqlite');
+        DB::setDefaultConnection('sqlite');
+
         Edition::set(Edition::Pro);
         TemplateMode::set(TemplateMode::Cp);