Merge pull request #40 from Sweetchuck/upgrade-dependencies

Upgrade dependencies
Sweetchuck · Aug 9, 2020 · 220bc8c · 220bc8c
2 parents b9d79f0 + 300ae36
commit 220bc8c
Show file tree

Hide file tree

Showing 7 changed files with 988 additions and 348 deletions.
diff --git a/RoboFile.php b/RoboFile.php
@@ -372,15 +372,19 @@ protected function getTaskCodeceptRunSuite(string $suite, array $options = []):
             $cmdPattern .= ' || [[ "${?}" == "1" ]]';
         }
 
-        $command = vsprintf($cmdPattern, $cmdArgs);
+        $command = [
+            'bash',
+            '-c',
+            vsprintf($cmdPattern, $cmdArgs),
+        ];
 
         return $cb
             ->addCode(function () use ($command) {
                 $this->output()->writeln(strtr(
                     '<question>[{name}]</question> runs <info>{command}</info>',
                     [
                         '{name}' => 'Codeception',
-                        '{command}' => $command,
+                        '{command}' => implode(' ', $command),
                     ]
                 ));
                 $process = new Process($command, null, null, null, null);
@@ -457,7 +461,10 @@ protected function isPhpExtensionAvailable(string $extension): bool
 
     protected function isPhpDbgAvailable(): bool
     {
-        $command = sprintf('%s -qrr', escapeshellcmd($this->getPhpdbgExecutable()));
+        $command = [
+            escapeshellcmd($this->getPhpdbgExecutable()),
+            '-qrr',
+        ];
 
         return (new Process($command))->run() === 0;
     }
@@ -481,13 +488,20 @@ protected function getCodeceptionSuiteNames(): array
                 ->in($this->codeceptionInfo['paths']['tests'])
                 ->files()
                 ->name('*.suite.yml')
+                ->name('*.suite.dist.yml')
                 ->depth(0);
 
             foreach ($suiteFiles as $suiteFile) {
-                $this->codeceptionSuiteNames[] = $suiteFile->getBasename('.suite.yml');
+                $this->codeceptionSuiteNames[] = preg_replace(
+                    '/\.suite(\.dist)?\.yml$/',
+                    '',
+                    $suiteFile->getBasename()
+                );
             }
         }
 
+        $this->codeceptionSuiteNames = array_unique($this->codeceptionSuiteNames);
+
         return $this->codeceptionSuiteNames;
     }
 

diff --git a/codeception.yml → codeception.dist.yml b/codeception.yml → codeception.dist.yml
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
         "php": ">=7.2",
         "ext-dom": "*",
         "ext-json": "*",
-        "sweetchuck/lint-report": "^0.0",
+        "sweetchuck/lint-report": "^0.1",
         "consolidation/robo": "^2.0",
         "webmozart/path-util": "^2.3"
     },
@@ -23,11 +23,12 @@
         "codeception/module-asserts": "^1.1",
         "cweagans/composer-patches": "^1.6",
         "mikey179/vfsstream": "^1.6",
+        "phpunit/phpunit": "^8.0",
         "squizlabs/php_codesniffer": "^3.0",
-        "sweetchuck/codeception-module-robo-task-runner": "^0.7",
-        "sweetchuck/git-hooks": "^0.0",
-        "sweetchuck/robo-git": "^0.2",
-        "symfony/yaml": "^4.0"
+        "sweetchuck/codeception-module-robo-task-runner": "^0.8",
+        "sweetchuck/git-hooks": "^0.1",
+        "sweetchuck/robo-git": "^0.3",
+        "symfony/yaml": "^4.0 || ^5.0"
     },
     "autoload": {
         "psr-4": {
@@ -41,13 +42,6 @@
             "Sweetchuck\\Robo\\Phpcs\\Tests\\Unit\\": "tests/unit/"
         }
     },
-    "scripts": {
-        "post-install-cmd": [
-            "@deploy-git-hooks"
-        ],
-        "post-update-cmd": [
-            "@deploy-git-hooks"
-        ],
-        "deploy-git-hooks": "\\Sweetchuck\\GitHooks\\Composer\\Scripts::deploy"
-    }
+    "scripts": {},
+    "scripts-descriptions": {}
 }