Merge branch 'develop'

Author: michalbundyra

.travis.yml

@@ -1,5 +1,3 @@
-sudo: false
-
 language: php
 
 services:
@@ -14,60 +12,64 @@ env:
     - COMPOSER_ARGS="--no-interaction"
     - ADAPTER_DEPS="alcaeus/mongo-php-adapter"
     - COVERAGE_DEPS="php-coveralls/php-coveralls"
-    - MONGO_DRIVER=mongo
+    - MONGO_DRIVER=mongodb
 
 matrix:
   include:
     - php: 5.6
       env:
         - DEPS=lowest
+        - MONGO_DRIVER=mongo
     - php: 5.6
       env:
         - DEPS=locked
-        - LEGACY_DEPS="doctrine/doctrine-module doctrine/doctrine-orm-module phpunit/phpunit zendframework/zend-hydrator zfcampus/zf-apigility-doctrine"
+        - LEGACY_DEPS="doctrine/doctrine-module doctrine/doctrine-mongo-odm-module doctrine/doctrine-orm-module phpunit/phpunit symfony/yaml zendframework/zend-hydrator zfcampus/zf-apigility-doctrine"
+        - MONGO_DRIVER=mongo
     - php: 5.6
       env:
         - DEPS=latest
+        - MONGO_DRIVER=mongo
     - php: 7
       env:
         - DEPS=lowest
-        - MONGO_DRIVER=mongodb
     - php: 7
       env:
         - DEPS=locked
-        - LEGACY_DEPS="doctrine/doctrine-module doctrine/doctrine-orm-module phpunit/phpunit zendframework/zend-hydrator zfcampus/zf-apigility-doctrine"
-        - MONGO_DRIVER=mongodb
+        - LEGACY_DEPS="doctrine/doctrine-module doctrine/doctrine-mongo-odm-module doctrine/doctrine-orm-module phpunit/phpunit symfony/yaml zendframework/zend-hydrator zfcampus/zf-apigility-doctrine"
     - php: 7
       env:
         - DEPS=latest
-        - MONGO_DRIVER=mongodb
     - php: 7.1
       env:
         - DEPS=lowest
-        - MONGO_DRIVER=mongodb
     - php: 7.1
       env:
         - DEPS=locked
         - LEGACY_DEPS="zendframework/zend-hydrator"
         - CS_CHECK=true
         - TEST_COVERAGE=true
-        - MONGO_DRIVER=mongodb
     - php: 7.1
       env:
         - DEPS=latest
-        - MONGO_DRIVER=mongodb
     - php: 7.2
       env:
         - DEPS=lowest
-        - MONGO_DRIVER=mongodb
     - php: 7.2
       env:
         - DEPS=locked
-        - MONGO_DRIVER=mongodb
     - php: 7.2
       env:
         - DEPS=latest
-        - MONGO_DRIVER=mongodb
+    # Disabled because some lowest dependencies are not compatible with PHP 7.3
+    # - php: 7.3
+    #   env:
+    #     - DEPS=lowest
+    - php: 7.3
+      env:
+        - DEPS=locked
+    - php: 7.3
+      env:
+        - DEPS=latest
 
 before_install:
   - if [[ $TEST_COVERAGE != 'true' ]]; then phpenv config-rm xdebug.ini || return 0 ; fi

CHANGELOG.md

@@ -2,6 +2,31 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## 1.8.0 - TBD
+
+### Added
+
+- [#52](https://github.com/zfcampus/zf-doctrine-querybuilder/pull/52) adds support for PHP 7.3.
+
+- [#46](https://github.com/zfcampus/zf-doctrine-querybuilder/pull/46) adds support for DoctrineModule 2.1
+  and DoctrineORMModule 2.1.
+
+### Changed
+
+- Nothing.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## 1.7.1 - TBD
 
 ### Added

composer.json

@@ -34,7 +34,7 @@
     },
     "require": {
         "php": "^5.6 || ^7.0",
-        "doctrine/doctrine-module": "^1.2",
+        "doctrine/doctrine-module": "^1.2 || ^2.1.8",
         "zendframework/zend-hydrator": "^1.1 || ^2.2.1 || ^3.0",
         "zendframework/zend-modulemanager": "^2.7.2",
         "zendframework/zend-mvc": "^2.7.13 || ^3.0.2",
@@ -44,9 +44,10 @@
         "zfcampus/zf-hal": "^1.4.2"
     },
     "require-dev": {
-        "doctrine/doctrine-mongo-odm-module": "^1.0",
-        "doctrine/doctrine-orm-module": "^1.1",
-        "phpunit/phpunit": "^5.7.26",
+        "doctrine/doctrine-mongo-odm-module": "^0.11 || ^1.0",
+        "doctrine/doctrine-orm-module": "^1.1 || ^2.1.3",
+        "phpunit/phpunit": "^5.7.27 || ^6.5.14 || ^7.5.3",
+        "symfony/yaml": "^2.3 || ^3.0 || ^4.0",
         "zendframework/zend-coding-standard": "~1.0.0",
         "zendframework/zend-i18n": "^2.7.3",
         "zendframework/zend-log": "^2.9.1",
@@ -57,7 +58,7 @@
     "suggest": {
         "ext/mongo": "Mongo extension, if using ODM",
         "doctrine/doctrine-mongo-odm-module": "^1.0, if you wish to use the Doctrine ODM",
-        "doctrine/doctrine-orm-module": "^1.1, if you wish to use the Doctrine ORM"
+        "doctrine/doctrine-orm-module": "^1.1 || ^2.1.3, if you wish to use the Doctrine ORM"
     },
     "autoload": {
         "files": [