From d7619ff5c4de3134a75f3a42b93a946e6d2a6c12 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 Aug 2025 03:04:38 +0000
Subject: [PATCH 1/2] Bump actions/checkout from 4 to 5

Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml             | 4 ++--
 .github/workflows/deploy_docs_1x.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 95476ce..7fee41c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
             prefer-lowest: 'prefer-lowest'
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -70,7 +70,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
diff --git a/.github/workflows/deploy_docs_1x.yml b/.github/workflows/deploy_docs_1x.yml
index ef1b849..54166f4 100644
--- a/.github/workflows/deploy_docs_1x.yml
+++ b/.github/workflows/deploy_docs_1x.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Cloning repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

From 1a7c788b551728c15fc20400353ca9db8ca68d02 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Mon, 18 Aug 2025 00:25:22 -0400
Subject: [PATCH 2/2] Fix phpcs

---
 tests/TestCase/Mailer/Transport/QueueTransportTest.php |  4 ++--
 tests/TestCase/QueueManagerTest.php                    | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/tests/TestCase/Mailer/Transport/QueueTransportTest.php b/tests/TestCase/Mailer/Transport/QueueTransportTest.php
index 6539e0b..1b5a62b 100644
--- a/tests/TestCase/Mailer/Transport/QueueTransportTest.php
+++ b/tests/TestCase/Mailer/Transport/QueueTransportTest.php
@@ -93,7 +93,7 @@ public function testSendCustomTransport()
             'queue' => 'default',
             'url' => $this->getFsQueueUrl(),
         ]);
-        $message = (new Message());
+        $message = new Message();
 
         $transport = new QueueTransport([
             'transport' => SmtpTransport::class,
@@ -124,7 +124,7 @@ public function testSendBcTransport()
             'queue' => 'default',
             'url' => $this->getFsQueueUrl(),
         ]);
-        $message = (new Message());
+        $message = new Message();
 
         $transport = new QueueTransport([
             'transport' => SmtpTransport::class,
diff --git a/tests/TestCase/QueueManagerTest.php b/tests/TestCase/QueueManagerTest.php
index b9f9874..cfa9e57 100644
--- a/tests/TestCase/QueueManagerTest.php
+++ b/tests/TestCase/QueueManagerTest.php
@@ -175,14 +175,18 @@ public function testMessageIsPushedToQueuePassedAsOption()
     {
         QueueManager::setConfig('test', [
             'url' => $this->getFsQueueUrl(),
-            'queue' => 'test',
+            'queue' => 'original-name',
         ]);
 
         QueueManager::push(LogToDebugJob::class, [], ['config' => 'test', 'queue' => 'non-default-queue-name']);
 
-        $fsQueueFile = $this->getFsQueueUrl() . DS . 'enqueue.app.test';
+        // File path uses the (topic) not the 'queue' name.
+        $fsQueueFile = $this->getFsQueueUrl() . DS . 'enqueue.app.original-name';
         $this->assertFileExists($fsQueueFile);
-        $this->assertStringContainsString('non-default-queue-name', file_get_contents($fsQueueFile));
+
+        $contents = file_get_contents($fsQueueFile);
+        $this->assertStringContainsString('non-default-queue-name', $contents);
+        $this->assertStringNotContainsString('original-name', $contents);
     }
 
     public function testUniqueMessageIsQueuedOnlyOnce()