Merge pull request #69 from cakephp/fix-67

Don't set Queue configuration multiple times

Author: markstory

phpunit.xml.dist

@@ -5,22 +5,15 @@
     bootstrap="tests/bootstrap.php"
     xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
   <!-- Only collect coverage for src/ -->
-  <coverage>
-    <include>
-      <directory suffix=".php">src/</directory>
-    </include>
-  </coverage>
+  <filter>
+    <whitelist>
+      <directory suffix=".php">./src/</directory>
+    </whitelist>
+  </filter>
+
   <testsuites>
     <testsuite name="queue">
       <directory>tests/TestCase</directory>
     </testsuite>
   </testsuites>
-  <!-- Setup a listener for fixtures -->
-  <listeners>
-    <listener class="Cake\TestSuite\Fixture\FixtureInjector">
-      <arguments>
-        <object class="Cake\TestSuite\Fixture\FixtureManager"/>
-      </arguments>
-    </listener>
-  </listeners>
 </phpunit>

src/Plugin.php

@@ -49,7 +49,11 @@ class Plugin extends BasePlugin
      */
     public function bootstrap(PluginApplicationInterface $app): void
     {
-        QueueManager::setConfig(Configure::read('Queue'));
+        foreach (Configure::read('Queue') as $key => $data) {
+            if (QueueManager::getConfig($key) === null) {
+                QueueManager::setConfig($key, $data);
+            }
+        }
     }
 
     /**

tests/TestCase/Command/WorkerCommandTest.php

@@ -136,7 +136,7 @@ public function testQueueProcessesWithLogger()
             'Queue' => [
                 'default' => [
                         'queue' => 'default',
-                        'url' => 'null:',
+                        'url' => 'file:///' . TMP . DS . 'queue',
                     ],
                 ],
         ]);
@@ -146,7 +146,7 @@ public function testQueueProcessesWithLogger()
         ]);
 
         $this->exec('worker --max-runtime=1 --logger=debug --verbose');
-        $this->assertDebugLogContains('debug Max Iterations: 0');
+        $this->assertDebugLogContains('Max Iterations: 0');
     }
 
     /**