Merge pull request #101 from mikeweb85/feature/cakephp-4-revised

markstory · web-flow · commit 05cd2e1c2e50 · 2022-08-09T09:48:47.000-04:00
PSR/log fix and path spec only
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
         "php": ">=7.2.0",
         "cakephp/cakephp": "^4.1",
         "enqueue/simple-client": "^0.10",
-        "psr/log": "^1.1"
+        "psr/log": "^1.1 || ^2.0"
     },
     "require-dev": {
         "cakephp/bake": "^2.1",
diff --git a/tests/TestCase/QueueManagerTest.php b/tests/TestCase/QueueManagerTest.php
@@ -93,7 +93,7 @@ public function testNonDefaultQueueNameArray()
     {
         QueueManager::setConfig('test', [
             'url' => [
-                'transport' => 'file:',
+                'transport' => 'file:' . TMP . 'fs-test.tmp',
                 'client' => [
                     'router_queue' => 'other',
                 ],
diff --git a/tests/TestCase/Task/JobTaskTest.php b/tests/TestCase/Task/JobTaskTest.php
@@ -61,7 +61,7 @@ public function tearDown(): void
 
     public function testMain()
     {
-        $this->generatedFile = APP . 'Job/UploadJob.php';
+        $this->generatedFile = APP . 'Job' . DS . 'UploadJob.php';
 
         $this->exec('bake job upload');
         $this->assertExitCode(Command::CODE_SUCCESS);

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public function testNonDefaultQueueNameArray()`
`93`	`93`	`{`
`94`	`94`	`QueueManager::setConfig('test', [`
`95`	`95`	`'url' => [`
`96`		`- 'transport' => 'file:',`
	`96`	`+ 'transport' => 'file:' . TMP . 'fs-test.tmp',`
`97`	`97`	`'client' => [`
`98`	`98`	`'router_queue' => 'other',`
`99`	`99`	`],`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public function tearDown(): void`
`61`	`61`
`62`	`62`	`public function testMain()`
`63`	`63`	`{`
`64`		`- $this->generatedFile = APP . 'Job/UploadJob.php';`
	`64`	`+ $this->generatedFile = APP . 'Job' . DS . 'UploadJob.php';`
`65`	`65`
`66`	`66`	`$this->exec('bake job upload');`
`67`	`67`	`$this->assertExitCode(Command::CODE_SUCCESS);`