Merge pull request #12 from javabudd/master

PHP8 Support

Author: weierophinney

.gitignore

@@ -3,3 +3,4 @@
 /coveralls-upload.json
 /phpunit.xml
 /vendor/
+.phpunit.result.cache

.travis.yml

@@ -6,6 +6,7 @@ services:
 cache:
   directories:
     - $HOME/.composer/cache
+    - vendor
 
 env:
   global:
@@ -17,41 +18,25 @@ env:
 matrix:
   fast_finish: true
   include:
-    - php: 5.6
+    - php: 7.3
       env:
         - DEPS=lowest
-        - MONGO_DRIVER=mongo
-    - php: 5.6
+    - php: 7.3
       env:
         - DEPS=latest
-        - MONGO_DRIVER=mongo
-    - php: 7
-      env:
-        - DEPS=lowest
-    - php: 7
-      env:
-        - DEPS=latest
-    - php: 7.1
-      env:
-        - DEPS=lowest
-    - php: 7.1
+    - php: 7.4
       env:
         - DEPS=latest
         - CS_CHECK=true
         - TEST_COVERAGE=true
-    - php: 7.2
+    - php: 8.0
       env:
         - DEPS=lowest
-    - php: 7.2
-      env:
-        - DEPS=latest
-    # Disabled because some lowest dependencies are not compatible with PHP 7.3
-    # - php: 7.3
-    #   env:
-    #     - DEPS=lowest
-    - php: 7.3
+        - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
+    - php: 8.0
       env:
         - DEPS=latest
+        - COMPOSER_ARGS="--no-interaction --ignore-platform-reqs"
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

composer.json

@@ -29,8 +29,8 @@
         }
     },
     "require": {
-        "php": "^5.6 || ^7.0",
-        "doctrine/doctrine-module": "^1.2 || ^2.1.8",
+        "php": "^7.3 || ~8.0.0",
+        "doctrine/doctrine-module": "^2.1.8 || ^3.0.1 || ^4.1.0",
         "laminas-api-tools/api-tools-api-problem": "^1.2.2",
         "laminas-api-tools/api-tools-doctrine": "^2.1",
         "laminas-api-tools/api-tools-hal": "^1.4.2",
@@ -41,20 +41,23 @@
         "laminas/laminas-zendframework-bridge": "^1.0"
     },
     "require-dev": {
-        "doctrine/doctrine-mongo-odm-module": "^0.11 || ^1.0",
-        "doctrine/doctrine-orm-module": "^1.1 || ^2.1.3",
+        "doctrine/dbal": "^2.12.1 || ^3.0.0",
+        "doctrine/orm": "^2.7.5",
+        "doctrine/doctrine-mongo-odm-module": "^1.0 || ^2.0.2 || ^3.0.2",
+        "doctrine/doctrine-orm-module": "^2.1.3",
         "laminas-api-tools/api-tools-provider": "^1.2",
-        "laminas/laminas-coding-standard": "~1.0.0",
+        "laminas/laminas-coding-standard": "^2.1.4",
         "laminas/laminas-i18n": "^2.7.3",
         "laminas/laminas-log": "^2.9.1",
         "laminas/laminas-serializer": "^2.8",
         "laminas/laminas-test": "^2.6.1 || ^3.0.1",
-        "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.3",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.5.0",
         "symfony/yaml": "^2.3 || ^3.0 || ^4.0"
     },
     "suggest": {
-        "doctrine/doctrine-mongo-odm-module": "^1.0, if you wish to use the Doctrine ODM",
-        "doctrine/doctrine-orm-module": "^1.1 || ^2.1.3, if you wish to use the Doctrine ORM",
+        "doctrine/doctrine-mongo-odm-module": "^1.0 || ^2.0.2 || ^3.0.2, if you wish to use the Doctrine ODM",
+        "doctrine/doctrine-orm-module": "^2.1.3 || ^3.1.1, if you wish to use the Doctrine ORM",
         "ext/mongo": "Mongo extension, if using ODM"
     },
     "autoload": {

phpcs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ruleset name="Laminas Coding Standard">
-    <rule ref="./vendor/laminas/laminas-coding-standard/ruleset.xml"/>
+    <rule ref="./vendor/laminas/laminas-coding-standard/phpcs.xml.dist"/>
 
     <!-- Paths to check -->
     <file>config</file>

phpunit.xml.dist

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd" bootstrap="vendor/autoload.php" colors="true">
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">./src</directory>
+        </include>
+    </coverage>
     <testsuites>
         <testsuite name="Laminas\ApiTools\Doctrine\QueryBuilder Module Tests">
             <directory>./test</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
 </phpunit>

test/Filter/ODMFilterTest.php

@@ -30,7 +30,7 @@ private function countResult($filters, $entity = 'DbMongo\Document\Meta')
         return sizeof($result);
     }
 
-    protected function setUp()
+    public function setUp(): void
     {
         $this->setApplicationConfig(
             include __DIR__ . '/application.config.php'