Merge pull request #37 from martin-helmich/feature/support-phpunit9

Add support for PHPUnit 9

Author: martin-helmich

.github/workflows/php.yml

@@ -7,7 +7,10 @@ jobs:
     strategy:      
       matrix:
         php: ['7.2', '7.3', '7.4']
-        phpunit: ['6.0', '7.0', '8.0']
+        phpunit: ['6.0', '7.0', '8.0', '9.0']
+        exclude:
+        - php: '7.2'
+          phpunit: '9.0'
     runs-on: ubuntu-latest
 
     steps:

composer.json

@@ -13,24 +13,19 @@
     "php": ">=7.1.0,<8.0",
     "ext-mongodb": "*",
     "mongodb/mongodb": "^1.0",
-    "phpunit/phpunit": ">=6.0,<9.0"
+    "phpunit/phpunit": ">=6.0,<10.0",
+    "ext-json": "*"
   },
   "autoload": {
     "psr-4": {
       "Helmich\\MongoMock\\": "src"
     }
   },
   "autoload-dev": {
-    "files": [
-      "vendor/phpunit/phpunit/src/Framework/Assert/Functions.php"
-    ],
     "psr-4": {
       "Helmich\\MongoMock\\Tests\\": "tests"
     }
   },
-  "require-dev": {
-    "codeclimate/php-test-reporter": "^0.3.0 || ^0.4.0"
-  },
   "scripts": {
     "test": [
       "phpunit"

src/Assert/HasDocumentConstraint.php

@@ -15,7 +15,6 @@ class HasDocumentConstraint extends Constraint
 
     public function __construct($filter)
     {
-        parent::__construct();
         $this->filter = $filter;
     }
 

src/Assert/IndexWasCreatedConstraint.php

@@ -4,6 +4,7 @@
 
 use Helmich\MongoMock\Log\Index;
 use Helmich\MongoMock\MockCollection;
+use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\Constraint\Constraint;
 
 class IndexWasCreatedConstraint extends Constraint
@@ -20,7 +21,6 @@ class IndexWasCreatedConstraint extends Constraint
 
     public function __construct($key, $options = [])
     {
-        parent::__construct();
         $this->key = $key;
         $this->options = $options;
     }
@@ -31,7 +31,7 @@ protected function matches($other): bool
             return false;
         }
 
-        $constraint = \PHPUnit_Framework_Assert::equalTo(new Index($this->key, $this->options));
+        $constraint = Assert::equalTo(new Index($this->key, $this->options));
 
         foreach ($other->indices as $index) {
             if ($constraint->evaluate($index, '', true)) {

src/Assert/QueryWasExecutedConstraint.php

@@ -4,6 +4,7 @@
 
 use Helmich\MongoMock\Log\Query;
 use Helmich\MongoMock\MockCollection;
+use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\Constraint\Constraint;
 
 class QueryWasExecutedConstraint extends Constraint
@@ -17,7 +18,6 @@ class QueryWasExecutedConstraint extends Constraint
 
     public function __construct($filter, $options = [])
     {
-        parent::__construct();
         $this->filter = $filter;
         $this->options = $options;
     }
@@ -28,7 +28,7 @@ protected function matches($other): bool
             return false;
         }
 
-        $constraint = \PHPUnit_Framework_Assert::equalTo(new Query($this->filter, $this->options));
+        $constraint = Assert::equalTo(new Query($this->filter, $this->options));
 
         foreach ($other->queries as $query) {
             if ($constraint->evaluate($query, '', true)) {