Merge pull request #11 from Sweetchuck/upgrade-dependencies

Upgrade dependencies
Sweetchuck · Aug 9, 2020 · 2167f21 · 2167f21
2 parents cb34555 + 788ad58
commit 2167f21
Show file tree

Hide file tree

Showing 11 changed files with 1,288 additions and 522 deletions.
diff --git a/RoboFile.php b/RoboFile.php
@@ -379,18 +379,22 @@ 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 = Process::fromShellCommandline($command, null, null, null, null);
+                $process = new Process($command, null, null, null, null);
 
                 return $process->run(function ($type, $data) {
                     switch ($type) {
@@ -477,10 +481,15 @@ 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()
+                );
             }
         }
 

diff --git a/codeception.yml → codeception.dist.yml b/codeception.yml → codeception.dist.yml
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "sweetchuck/robo-phpmd",
-    "description": "Template to create a new Robo task.",
+    "description": "Robo task wrapper for PHPMD commands",
     "license": "GPL-2.0-or-later",
     "config": {
         "bin-dir": "bin",
@@ -20,14 +20,15 @@
         "codeception/codeception": "^4.0",
         "codeception/module-asserts": "^1.1",
         "mikey179/vfsstream": "^1.6",
+        "phpunit/phpunit": "^8.0",
         "squizlabs/php_codesniffer": "^3.5",
         "sweetchuck/codeception-module-robo-task-runner": "^0.7",
-        "sweetchuck/git-hooks": "^0.0",
-        "sweetchuck/robo-git": "^0.2",
-        "sweetchuck/robo-phpcs": "^0.1",
+        "sweetchuck/git-hooks": "^0.1",
+        "sweetchuck/robo-git": "^0.3",
+        "sweetchuck/robo-phpcs": "^0.2",
         "symfony/error-handler": "^5.0",
-        "symfony/finder": "^4.0",
-        "symfony/yaml": "^4.0"
+        "symfony/finder": "^4.0 || ^5.0",
+        "symfony/yaml": "^4.0 || ^5.0"
     },
     "autoload": {
         "psr-4": {
@@ -36,18 +37,11 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "Sweetchuck\\Robo\\PhpMessDetector\\Composer\\": "src-dev/Composer/",
             "Sweetchuck\\Robo\\PhpMessDetector\\Test\\Helper\\": "tests/_support/Helper/",
             "Sweetchuck\\Robo\\PhpMessDetector\\Tests\\Acceptance\\": "tests/acceptance/",
             "Sweetchuck\\Robo\\PhpMessDetector\\Tests\\Unit\\": "tests/unit/"
         }
     },
-    "scripts": {
-        "post-install-cmd": [
-            "\\Sweetchuck\\Robo\\PhpMessDetector\\Composer\\Scripts::postInstallCmd"
-        ],
-        "post-update-cmd": [
-            "\\Sweetchuck\\Robo\\PhpMessDetector\\Composer\\Scripts::postUpdateCmd"
-        ]
-    }
+    "scripts": {},
+    "scripts-descriptions": {}
 }