fix bugs and formatting

laravel · Nov 7, 2021 · 12e47bb · 12e47bb
1 parent 3282651
commit 12e47bb
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/Illuminate/Queue/SqsQueue.php b/src/Illuminate/Queue/SqsQueue.php
@@ -193,17 +193,21 @@ public function getQueue($queue)
     }
 
     /**
-     * Suffixes a queue
+     * Add the given suffix to the given queue name.
      *
-     * @param string $queue
-     * @param string $suffix
+     * @param  string  $queue
+     * @param  string  $suffix
      * @return string
      */
-    private function suffixQueue($queue, $suffix = '')
+    protected function suffixQueue($queue, $suffix = '')
     {
-        $fifo = Str::endsWith($queue, '.fifo') ? '.fifo' : '';
-        $queue = rtrim($queue, '.fifo');
-        return rtrim($this->prefix, '/') . '/' . Str::finish($queue, $suffix) . $fifo;
+        if (Str::endsWith($queue, '.fifo')) {
+            $queue = Str::beforeLast($queue, '.fifo');
+
+            return rtrim($this->prefix, '/').'/'.Str::finish($queue, $suffix).'.fifo';
+        }
+
+        return rtrim($this->prefix, '/').'/'.Str::finish($queue, $this->suffix);
     }
 
     /**