Unwrap RoutingQueue when identifying the queue driver (#4855)

The queue connection is wrapped in a RoutingQueue (#4853) so pushes can be
routed by job class. identifyQueueDriver() derived the driver name from the
connection's class, so it began reporting 'routing' instead of the real
backend (redis/database/sync) in `flarum info` and the admin dashboard.

Unwrap a RoutingQueue via its public getDriver() before reading the class
name, so the reported driver reflects the actual backend again.

Author: imorland

framework/core/src/Foundation/ApplicationInfoProvider.php

@@ -12,6 +12,7 @@
 use Carbon\Carbon;
 use Flarum\Database\DatabaseRequirements;
 use Flarum\Locale\Translator;
+use Flarum\Queue\RoutingQueue;
 use Flarum\User\SessionManager;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Contracts\Cache\Repository as CacheRepository;
@@ -57,8 +58,13 @@ public function getSchedulerStatus(): string
 
     public function identifyQueueDriver(): string
     {
+        // The connection is wrapped in a RoutingQueue so pushes can be routed by
+        // job class; the driver underneath is what identifies the queue backend.
+        $queue = $this->queue instanceof RoutingQueue
+            ? $this->queue->getDriver()
+            : $this->queue;
         // Get class name
-        $queue = $this->queue::class;
+        $queue = $queue::class;
         // Drop the namespace
         $queue = Str::afterLast($queue, '\\');
         // Lowercase the class name

framework/core/tests/unit/Foundation/ApplicationInfoProviderTest.php

@@ -12,12 +12,15 @@
 use Flarum\Foundation\ApplicationInfoProvider;
 use Flarum\Foundation\Config;
 use Flarum\Locale\Translator;
+use Flarum\Queue\RoutingQueue;
 use Flarum\Testing\unit\TestCase;
 use Flarum\User\SessionManager;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Contracts\Cache\Repository as CacheRepository;
 use Illuminate\Contracts\Queue\Queue;
 use Illuminate\Database\ConnectionInterface;
+use Illuminate\Queue\QueueRoutes;
+use Illuminate\Queue\SyncQueue;
 use Mockery as m;
 use PHPUnit\Framework\Attributes\Test;
 use SessionHandlerInterface;
@@ -73,12 +76,34 @@ public function sqlite_driver_is_never_flagged_and_does_not_query_the_server()
         $this->assertNull($provider->identifyDatabaseDriverMismatch());
     }
 
+    #[Test]
+    public function queue_driver_is_derived_from_the_connection_class()
+    {
+        $provider = $this->provider('sqlite', null, new SyncQueue());
+
+        $this->assertSame('sync', $provider->identifyQueueDriver());
+    }
+
+    #[Test]
+    public function queue_driver_reports_the_real_driver_when_wrapped_in_a_routing_queue()
+    {
+        // flarum.queue.connection is wrapped in a RoutingQueue so pushes can be
+        // routed by job class. Reporting "routing" would hide the real backend
+        // from `flarum info` and the admin dashboard; unwrap to the driver.
+        $driver = new SyncQueue();
+        $wrapped = new RoutingQueue($driver, new QueueRoutes());
+
+        $provider = $this->provider('sqlite', null, $wrapped);
+
+        $this->assertSame('sync', $provider->identifyQueueDriver());
+    }
+
     /**
      * Build a provider with a configured driver and the version string the
      * server would report from `select version()`. Pass a null version for
      * drivers that should never trigger a version query (pgsql/sqlite).
      */
-    private function provider(string $configuredDriver, ?string $serverVersion): ApplicationInfoProvider
+    private function provider(string $configuredDriver, ?string $serverVersion, ?Queue $queue = null): ApplicationInfoProvider
     {
         $cache = m::mock(CacheRepository::class);
         // Execute the cached closure inline so the detection logic is exercised.
@@ -108,7 +133,7 @@ private function provider(string $configuredDriver, ?string $serverVersion): App
             $config,
             m::mock(SessionManager::class),
             m::mock(SessionHandlerInterface::class),
-            m::mock(Queue::class),
+            $queue ?? m::mock(Queue::class),
         );
     }
 }