PHP 8 support

.travis.yml

@@ -1,5 +1,6 @@
 language: php
 dist: xenial
+php: "7.4"
 
 addons:
   apt:
@@ -32,7 +33,6 @@ jobs:
   include:
 
     - stage: Smoke Testing
-      php: "7.3"
       env:
         - CHECKS=phpunit
     - stage: Smoke Testing
@@ -56,7 +56,7 @@ jobs:
     - stage: Test
       php: "7.2"
     - stage: Test
-      php: "7.4"
+      php: "7.3"
 
     # Test against lowest supported dependencies
     - stage: Test
@@ -91,59 +91,64 @@ jobs:
       env:
         - SERVER_VERSION=3.6.19
     - stage: Test
-      php: "7.3"
       env:
         - SERVER_VERSION=4.0.19
     - stage: Test
-      php: "7.3"
       env:
         - SERVER_VERSION=4.2.8
 
     # Test upcoming server version
     #- stage: Test
-    #  php: "7.3"
     #  env:
     #    - SERVER_VERSION=4.5.0
 
     # Test other server configurations
     - stage: Test
-      php: "7.3"
       env:
         - DEPLOYMENT=STANDALONE_AUTH
     - stage: Test
-      php: "7.3"
       env:
         - DEPLOYMENT=STANDALONE_SSL
     - stage: Test
-      php: "7.3"
       env:
         - SERVER_VERSION=3.6.13
         - DEPLOYMENT=REPLICASET
     - stage: Test
-      php: "7.3"
       env:
         - DEPLOYMENT=REPLICASET
     - stage: Test
-      php: "7.3"
       env:
         - DEPLOYMENT=SHARDED_CLUSTER
     - stage: Test
-      php: "7.3"
       env:
         - DEPLOYMENT=SHARDED_CLUSTER_RS
 
     # Test next patch release for driver
     - stage: Test
-      php: "7.3"
       env:
         - DRIVER_BRANCH="v1.8"
 
     # Test next minor release for driver
     - stage: Test
-      php: "7.3"
       env:
         - DRIVER_BRANCH="master"
 
+    # Test upcoming PHP version
+    - stage: Test
+      php: "nightly"
+      env:
+        - DRIVER_BRANCH="master"
+    - stage: Test
+      php: "nightly"
+      env:
+        - DRIVER_BRANCH="master"
+        - DEPLOYMENT=REPLICASET
+    - stage: Test
+      php: "nightly"
+      env:
+        - DRIVER_BRANCH="master"
+        - DEPLOYMENT=SHARDED_CLUSTER_RS
+
 before_install:
   - pip install "mongo-orchestration>=0.6.7,<1.0" --user `whoami`
   - export SERVER_FILENAME=mongodb-linux-x86_64-${SERVER_DISTRO}-${SERVER_VERSION}

CONTRIBUTING.md

@@ -36,6 +36,14 @@ test suite. In addition to various PHPUnit options, it defines required
 this configuration by creating your own `phpunit.xml` file based on the
 `phpunit.xml.dist` file we provide.
 
+By default, the `simple-phpunit` binary chooses the correct PHPUnit version for
+the PHP version you are running. To run tests against a specific PHPUnit version,
+use the `SYMFONY_PHPUNIT_VERSION` environment variable:
+
+```
+$ SYMFONY_PHPUNIT_VERSION=7.5 vendor/bin/simple-phpunit
+```
+
 ## Checking coding standards
 
 The library's code is checked using [PHP_CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer),

composer.json

@@ -9,37 +9,28 @@
         { "name": "Jeremy Mikola", "email": "[email protected]" }
     ],
     "require": {
-        "php": "^7.0",
+        "php": "^7.0 || ^8.0",
         "ext-hash": "*",
         "ext-json": "*",
         "ext-mongodb": "^1.8.1",
-        "jean85/pretty-package-versions": "^1.2"
+        "jean85/pretty-package-versions": "^1.2",
+        "symfony/polyfill-php80": "^1.19"
     },
     "require-dev": {
         "squizlabs/php_codesniffer": "^3.5, <3.5.5",
-        "symfony/phpunit-bridge": "^5.2@beta"
+        "symfony/phpunit-bridge": "5.x-dev"
     },
     "autoload": {
         "psr-4": { "MongoDB\\": "src/" },
         "files": [ "src/functions.php" ]
     },
     "autoload-dev": {
         "psr-4": { "MongoDB\\Tests\\": "tests/" },
-        "// Manually include assertion functions for PHPUnit 8.x and earlier ":"",
-        "// See: https://github.com/sebastianbergmann/phpunit/issues/3746 ":"",
-        "files": [
-            "vendor/bin/.phpunit/phpunit/src/Framework/Assert/Functions.php",
-            "tests/PHPUnit/FunctionsPolyfill.php"
-        ]
+        "files": [ "tests/PHPUnit/Functions.php" ]
     },
     "extra": {
         "branch-alias": {
             "dev-master": "1.8.x-dev"
         }
-    },
-    "scripts": {
-        "// Ensure PHPUnit is installed through the PHPUnit bridge before ":"",
-        "// dumping the autoloader to avoid errors due to missing files.":"",
-        "pre-autoload-dump": "if test -f vendor/bin/simple-phpunit; then vendor/bin/simple-phpunit --version > /dev/null; fi"
     }
 }

src/Exception/InvalidArgumentException.php

@@ -20,11 +20,9 @@
 use MongoDB\Driver\Exception\InvalidArgumentException as DriverInvalidArgumentException;
 use function array_pop;
 use function count;
-use function get_class;
-use function gettype;
+use function get_debug_type;
 use function implode;
 use function is_array;
-use function is_object;
 use function sprintf;
 
 class InvalidArgumentException extends DriverInvalidArgumentException implements Exception
@@ -58,6 +56,6 @@ public static function invalidType($name, $value, $expectedType)
             $expectedType = $typeString;
         }
 
-        return new static(sprintf('Expected %s to have type "%s" but found "%s"', $name, $expectedType, is_object($value) ? get_class($value) : gettype($value)));
+        return new static(sprintf('Expected %s to have type "%s" but found "%s"', $name, $expectedType, get_debug_type($value)));
     }
 }

src/Exception/ResumeTokenException.php

@@ -17,7 +17,7 @@
 
 namespace MongoDB\Exception;
 
-use function gettype;
+use function get_debug_type;
 use function sprintf;
 
 class ResumeTokenException extends RuntimeException
@@ -30,7 +30,7 @@ class ResumeTokenException extends RuntimeException
      */
     public static function invalidType($value)
     {
-        return new static(sprintf('Expected resume token to have type "array or object" but found "%s"', gettype($value)));
+        return new static(sprintf('Expected resume token to have type "array or object" but found "%s"', get_debug_type($value)));
     }
 
     /**

tests/Collection/FunctionalTestCase.php

@@ -32,5 +32,7 @@ private function doTearDown()
         }
 
         $this->dropCollection();
+
+        parent::tearDown();
     }
 }

tests/DocumentationExamplesTest.php

@@ -42,6 +42,8 @@ private function doTearDown()
         }
 
         $this->dropCollection();
+
+        parent::tearDown();
     }
 
     public function testExample_1_2()

tests/Model/IndexInfoFunctionalTest.php

@@ -29,6 +29,8 @@ private function doTearDown()
         }
 
         $this->collection->drop();
+
+        parent::tearDown();
     }
 
     public function testIs2dSphere()

tests/Operation/FunctionalTestCase.php

@@ -28,6 +28,8 @@ private function doTearDown()
         }
 
         $this->dropCollection();
+
+        parent::tearDown();
     }
 
     protected function createDefaultReadConcern()