fixed 6.0

Author: DavertMik

.gitignore

@@ -1,2 +1,3 @@
 .idea
-vendor
+composer.lock
+vendor

src/Constraint/JsonType.php

@@ -39,7 +39,7 @@ protected function matches($jsonArray)
             }
         } else {
             if ($matched === true) {
-                throw new \PHPUnit\Framework\ExpectationFailedException('Unexpectedly response matched: ' . json\encode($jsonArray));
+                throw new \PHPUnit\Framework\ExpectationFailedException('Unexpectedly response matched: ' . json_encode($jsonArray));
             }
         }
         return true;

src/shim.php

@@ -2,6 +2,7 @@
 // @codingStandardsIgnoreStart
 // Add aliases for PHPUnit 6
 namespace {
+
     if (!class_exists('PHPUnit\Framework\Assert') && class_exists('PHPUnit_Framework_Assert')) {
         class_alias('PHPUnit_Framework_Assert', 'PHPUnit\Framework\Assert');
     }
@@ -39,12 +40,14 @@ class_alias('PHPUnit_Util_Test', 'PHPUnit\Util\Test');
         class_alias('PHPUnit_Util_TestDox_ResultPrinter', 'PHPUnit\Util\TestDox\ResultPrinter');
 
     }
-    if (!class_exists('\PHPUnit\Util\Log\JSON') || !class_exists('\PHPUnit\Util\Log\TAP')) {
-        require_once __DIR__ . '/phpunit5-loggers.php'; // TAP and JSON loggers were removed in PHPUnit 6
+    if (!class_exists('PHPUnit\Util\Log\JSON') || !class_exists('PHPUnit\Util\Log\TAP')) {
+        if (class_exists('PHPUnit\Util\Printer')) {
+            require_once __DIR__ . '/phpunit5-loggers.php'; // TAP and JSON loggers were removed in PHPUnit 6
+        }
     }
 
     // phpunit codecoverage updates
-    if (!class_exists('SebastianBergmann\CodeCoverage\CodeCoverage')) {
+    if (class_exists('PHP_CodeCoverage' && !class_exists('SebastianBergmann\CodeCoverage\CodeCoverage'))) {
         class_alias('PHP_CodeCoverage', 'SebastianBergmann\CodeCoverage\CodeCoverage');
         class_alias('PHP_CodeCoverage_Report_Text', 'SebastianBergmann\CodeCoverage\Report\Text');
         class_alias('PHP_CodeCoverage_Report_PHP', 'SebastianBergmann\CodeCoverage\Report\PHP');
@@ -54,6 +57,14 @@ class_alias('PHP_CodeCoverage_Report_HTML', 'SebastianBergmann\CodeCoverage\Repo
         class_alias('PHP_CodeCoverage_Report_XML', 'SebastianBergmann\CodeCoverage\Report\Xml\Facade');
         class_alias('PHP_CodeCoverage_Exception', 'SebastianBergmann\CodeCoverage\Exception');
     }
+
+    if (class_exists('PHP_Timer') && !class_exists('SebastianBergmann\Timer\Timer')) {
+        class_alias('PHP_Timer', 'SebastianBergmann\Timer\Timer');
+    }
+
+    if (!class_exists('\PHPUnit\Framework\Constraint\LogicalNot') && class_exists('\PHPUnit\Framework\Constraint\Not')) {
+        class_alias('\PHPUnit\Framework\Constraint\Not', '\PHPUnit\Framework\Constraint\LogicalNot');
+    }
 }
 
-// @codingStandardsIgnoreEnd
+// @codingStandardsIgnoreEnd