fix phpunit (8) warnings

ostark · May 4, 2021 · 3443e61 · 3443e61
1 parent f499f0f
commit 3443e61
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/.phpunit.result.cache b/.phpunit.result.cache
@@ -0,0 +1 @@
+C:37:"PHPUnit\Runner\DefaultTestResultCache":563:{a:2:{s:7:"defects";a:2:{s:55:"QueueCommandTest::test_getPreparedCommand_with_defaults";i:6;s:65:"QueueCommandTest::test_getPreparedCommand_alternative_script_args";i:6;}s:5:"times";a:5:{s:65:"BackgroundProcessRunTest::test_start_default_dummy_script_success";d:0.267;s:55:"QueueCommandTest::test_getPreparedCommand_with_defaults";d:0;s:58:"QueueCommandTest::test_getPreparedCommand_wrong_PHP_BINARY";d:0.004;s:64:"QueueCommandTest::test_getPreparedCommand_alternative_decoration";d:0;s:65:"QueueCommandTest::test_getPreparedCommand_alternative_script_args";d:0;}}}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [2.3.0] - 2021-05-04
+### Changed
+- Added dependency `treeware/plant` 
+- Housekeeping `composer.json` 
+
+
 ## [2.2.0] - 2021-02-05
 ### Changed
 - Added support for `symfony/process:^5.0` 

diff --git a/composer.json b/composer.json
@@ -23,7 +23,8 @@
   "require": {
     "php": ">=7.1",
     "craftcms/cms": "^3.0.0",
-    "symfony/process": "^4.2|^5.0"
+    "symfony/process": "^4.2|^5.0",
+    "treeware/plant": "^0.1.0"
   },
   "autoload": {
     "psr-4": {
@@ -39,7 +40,7 @@
     "changelogUrl": "https://raw.githubusercontent.com/ostark/craft-async-queue/master/CHANGELOG.md"
   },
   "require-dev": {
-    "phpunit/phpunit": "^7.0",
+    "phpunit/phpunit": "^7.0|^8.0",
     "vimeo/psalm": "^4.4"
   },
   "scripts": {

diff --git a/tests/BackgroundProcessRunTest.php b/tests/BackgroundProcessRunTest.php
@@ -10,12 +10,12 @@ class BackgroundProcessRunTest extends TestCase
 {
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
     }
 
-    public function tearDown()
+    public function tearDown(): void
     {
         parent::tearDown();
         unlink(TEST_FILE);
@@ -26,9 +26,9 @@ public function tearDown()
      */
     public function test_start_default_dummy_script_success()
     {
-        $command = new \ostark\AsyncQueue\QueueCommand('craft.php', 'queue/run');
+        $command   = new \ostark\AsyncQueue\QueueCommand('craft.php', 'queue/run');
         $bgProcess = new BackgroundProcess($command);
-        $process = $bgProcess->start();
+        $process   = $bgProcess->start();
 
         $this->assertEquals(0, $process->getExitCode());
         $this->assertTrue($process->isSuccessful());

diff --git a/tests/QueueCommandTest.php b/tests/QueueCommandTest.php
@@ -8,7 +8,7 @@
 class QueueCommandTest extends TestCase
 {
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 
@@ -22,12 +22,12 @@ public function setUp()
      */
     public function test_getPreparedCommand_with_defaults()
     {
-        $command = new \ostark\AsyncQueue\QueueCommand();
+        $command  = new \ostark\AsyncQueue\QueueCommand();
         $prepared = $command->getPreparedCommand();
 
-        $this->assertContains('php', $prepared);
-        $this->assertContains(\ostark\AsyncQueue\QueueCommand::DEFAULT_SCRIPT, $prepared);
-        $this->assertContains(\ostark\AsyncQueue\QueueCommand::DEFAULT_ARGS, $prepared);
+        $this->assertStringContainsString('php', $prepared);
+        $this->assertStringContainsString(\ostark\AsyncQueue\QueueCommand::DEFAULT_SCRIPT, $prepared);
+        $this->assertStringContainsString(\ostark\AsyncQueue\QueueCommand::DEFAULT_ARGS, $prepared);
     }
 
     /**
@@ -52,13 +52,13 @@ public function test_getPreparedCommand_alternative_decoration()
         \yii\base\Event::on(
             \ostark\AsyncQueue\QueueCommand::class,
             \ostark\AsyncQueue\QueueCommand::EVENT_PREPARE_COMMAND,
-            function(\ostark\AsyncQueue\Events\QueueCommandEvent $event) {
+            function (\ostark\AsyncQueue\Events\QueueCommandEvent $event) {
                 $event->useDefaultDecoration = false;
-                $event->commandLine = "BEFORE {$event->commandLine} AFTER";
+                $event->commandLine          = "BEFORE {$event->commandLine} AFTER";
             }
         );
 
-        $command = new \ostark\AsyncQueue\QueueCommand();
+        $command  = new \ostark\AsyncQueue\QueueCommand();
         $prepared = $command->getPreparedCommand();
 
         $this->assertStringStartsWith('BEFORE', $prepared);
@@ -78,13 +78,13 @@ function(\ostark\AsyncQueue\Events\QueueCommandEvent $event) {
     public function test_getPreparedCommand_alternative_script_args()
     {
         $script = 'foo.php';
-        $args = '--bar';
+        $args   = '--bar';
 
-        $command = new \ostark\AsyncQueue\QueueCommand($script, $args);
+        $command  = new \ostark\AsyncQueue\QueueCommand($script, $args);
         $prepared = $command->getPreparedCommand();
 
-        $this->assertContains($script, $prepared);
-        $this->assertContains($args, $prepared);
+        $this->assertStringContainsString($script, $prepared);
+        $this->assertStringContainsString($args, $prepared);
     }
 
 }