Fix order of filtered queues with wildcard

Author: ElGigi

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.0.0-beta6] - 2025-01-23
+
+### Fixed
+
+- Order of filtered queues with wildcard
+
 ## [1.0.0-beta5] - 2025-01-23
 
 ### Added

src/QueueManager.php

@@ -68,40 +68,32 @@ public function filter(string ...$queue): static
             return $this;
         }
 
-        $queues = iterator_to_array($this->getQueues(), false);
-        $queues = array_filter(
-            $queues,
-            function (QueueInterface $q) use ($queue): bool {
-                foreach ($queue as $item) {
-                    if ($item == $q->getName()) {
-                        return true;
-                    }
-
-                    // No wildcard
-                    if (false === str_contains($item, '*')) {
-                        continue;
-                    }
-
-                    // Wildcard
-                    $regex = '/^' . str_replace('\*', '.*', preg_quote($item, '/')) . '$/';
-                    if (1 === preg_match($regex, $q->getName())) {
-                        return true;
-                    }
+        $finalQueues = [];
+        foreach ($queue as $name) {
+            foreach ($this->getQueues() as $q) {
+                if ($name == $q->getName()) {
+                    $finalQueues[$q->getName()] = $q;
+                    continue;
                 }
 
-                return false;
-            });
+                // No wildcard
+                if (false === str_contains($name, '*')) {
+                    continue;
+                }
 
-        if (empty($queues)) {
-            throw QueueManagerException::queueNotFound(...$queue);
+                // Wildcard
+                $regex = '/^' . str_replace('\*', '.*', preg_quote($name, '/')) . '$/';
+                if (1 === preg_match($regex, $q->getName())) {
+                    $finalQueues[$q->getName()] = $q;
+                }
+            }
         }
 
-        usort(
-            $queues,
-            fn($a, $b) => array_search($a->getName(), $queue) <=> array_search($b->getName(), $queue)
-        );
+        if (empty($finalQueues)) {
+            throw QueueManagerException::queueNotFound(...$queue);
+        }
 
-        return new self(...$queues);
+        return new self(...array_values($finalQueues));
     }
 
     /**

tests/QueueManagerTest.php

@@ -70,6 +70,16 @@ public function testFilterReturnsFilteredQueueManagerWithWildcard()
         $this->assertSame($this->secondaryQueueMock, $filteredQueues[0]);
     }
 
+    public function testFilterReturnsFilteredQueueManagerOrder()
+    {
+        $filteredQueueManager = $this->queueManager->filter('Secondary*', 'Primary*');
+
+        $filteredQueues = iterator_to_array($filteredQueueManager->getQueues(), false);
+        $this->assertCount(2, $filteredQueues);
+        $this->assertSame($this->secondaryQueueMock, $filteredQueues[0]);
+        $this->assertSame($this->primaryQueueMock, $filteredQueues[1]);
+    }
+
     public function testFilterThrowsExceptionIfQueueNotFound()
     {
         $this->expectException(QueueManagerException::class);