chore: release 0.27 -- phpunit 9 support

mikeerickson · Feb 29, 2020 · b132164 · b132164
1 parent 953a82f
commit b132164
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "codedungeon/phpunit-result-printer",
-  "version": "0.26.2",
+  "version": "0.27.0",
   "description": "PHPUnit Pretty Result Printer",
   "keywords": [
     "phpunit",
@@ -25,7 +25,7 @@
     "symfony/yaml": "^2.7|^3.0|^4.0",
     "codedungeon/php-cli-colors": "^1.10.2",
     "2bj/phanybar": "^1.0",
-    "phpunit/phpunit": "^8.0"
+    "phpunit/phpunit": "^8.0|^9.0"
   },
   "require-dev": {
     "spatie/phpunit-watcher": "^1.6"

diff --git a/phpunit-printer.yml b/phpunit-printer.yml
@@ -9,6 +9,6 @@ markers:
   cd-pass: "✔ "
   cd-fail: "✖ "
   cd-error: "⚈ "
-  cd-skipped: "=> "
+  cd-skipped: "⇢ "
   cd-incomplete: "∅ "
   cd-risky: "⌽ "
diff --git a/src/ResultPrinter80.php b/src/ResultPrinter80.php
@@ -11,11 +11,7 @@
 use PHPUnit\Framework\TestFailure;
 
 $low  = version_compare(Version::series(), '8.0', '>=');
-<<<<<<< HEAD
-$high = true; // version_compare(Version::series(),'7.1.99','<=');
-=======
 $high = version_compare(Version::series(),'8.99.99','<=');
->>>>>>> php74-phpunit9
 
 if ($low && $high) {
     class ResultPrinter80 extends ResultPrinter
@@ -87,7 +83,7 @@ protected function formatExceptionMsg($exceptionMessage): string
             return "$exceptionMessage";
         }
 
-        protected function printDefectTrace(TestFailure $defect): void
+        protected function printDefectTrace(TestFailure $defect):void
         {
             $this->write($this->formatExceptionMsg($defect->getExceptionAsString()));
             $trace = Filter::getFilteredStacktrace(
@@ -100,8 +96,8 @@ protected function printDefectTrace(TestFailure $defect): void
             while ($exception) {
                 $this->write(
                     "\nCaused by\n" .
-                        TestFailure::exceptionToString($exception) . "\n" .
-                        Filter::getFilteredStacktrace($exception)
+                    TestFailure::exceptionToString($exception) . "\n" .
+                    Filter::getFilteredStacktrace($exception)
                 );
                 $exception = $exception->getPrevious();
             }

diff --git a/src/phpunit-printer.yml b/src/phpunit-printer.yml
@@ -9,6 +9,6 @@ markers:
   cd-pass: "✔ "
   cd-fail: "✖ "
   cd-error: "⚈ "
-  cd-skipped: "=> "
+  cd-skipped: "⇢ "
   cd-incomplete: "∅ "
-  cd-risky: "⌽ "
+  cd-risky: "⌽ "