Merge branch 'master' of https://github.com/porebskk/php-mongomock into porebskk-master

Author: martin-helmich

.github/workflows/php.yml

@@ -9,7 +9,7 @@ jobs:
   build:
     strategy:      
       matrix:
-        php: ['7.2', '7.3', '7.4']
+        php: ['7.2', '7.3', '7.4', '8.0']
         phpunit: ['6.0', '7.0', '8.0', '9.0']
         exclude:
         - php: '7.2'

README.md

@@ -85,7 +85,8 @@ testability:
 To run the tests (anywhere with a running Docker installation):
 
 ```
-$ docker-compose run phpunit
+$ docker-compose run php7phpunit
+$ docker-compose run php8phpunit
 ```
 
 [mongo-collection]: http://php.net/manual/en/class.mongocollection.php

composer.json

@@ -10,7 +10,7 @@
     }
   ],
   "require": {
-    "php": ">=7.1.0,<8.0",
+    "php": "^7.1.0 || ^8.0",
     "ext-mongodb": "*",
     "mongodb/mongodb": "^1.0",
     "phpunit/phpunit": ">=6.0,<10.0",

docker-compose.yml

@@ -1,15 +1,29 @@
 version: "3"
 services:
-  phpunit:
+  php7phpunit:
     build:
       context: .
-      dockerfile: phpunit.DOCKERFILE
-    command: 
+      dockerfile: php7phpunit.DOCKERFILE
+    command:
       - bash
       - -c
       - |
-        composer install
+        composer update
         vendor/bin/phpunit
     working_dir: /work
     volumes:
-      - .:/work
+       - .:/work
+
+  php8phpunit:
+    build:
+      context: .
+      dockerfile: php8phpunit.DOCKERFILE
+    command:
+      - bash
+      - -c
+      - |
+        composer update
+        vendor/bin/phpunit
+    working_dir: /work
+    volumes:
+       - .:/work

php7phpunit.DOCKERFILE

@@ -0,0 +1,6 @@
+FROM php:7.4
+
+RUN pecl install --force mongodb
+RUN echo "extension=mongodb.so" > /usr/local/etc/php/conf.d/mongodb.ini
+COPY --from=composer:2.1 /usr/bin/composer /usr/bin/composer
+RUN apt-get update && apt-get install -y git zip

php8phpunit.DOCKERFILE

@@ -0,0 +1,6 @@
+FROM php:8
+
+RUN pecl install --force mongodb
+RUN echo "extension=mongodb.so" > /usr/local/etc/php/conf.d/mongodb.ini
+COPY --from=composer:2.1 /usr/bin/composer /usr/bin/composer
+RUN apt-get update && apt-get install -y git zip