Merge 97737b5 into 1cdbb69

.travis.yml

@@ -57,7 +57,7 @@ before_install:
   - shopt -s expand_aliases
   - alias docker="travis_retry docker-compose run --rm php"
   - alias composer="travis_retry docker-compose run --rm php composer"
-  - alias php="travis_retry docker-compose run -e TRAVIS -e TRAVIS_JOB_ID --rm php php"
+  - alias php="travis_retry docker-compose run -e TRAVIS -e TRAVIS_JOB_ID -e TRAVIS_BUILD_NUMBER --rm php php"
   - docker-compose build --build-arg PHP_VERSION=${TRAVIS_PHP_VERSION} --build-arg XDEBUG=${TEST_COVERAGE:+1} --no-cache php
   - composer --version
   - php -v
@@ -77,7 +77,7 @@ script:
   - docker vendor/bin/doctrine-module odm:schema:create
   - docker vendor/bin/doctrine-module odm:schema:drop
   - if [[ $TEST_COVERAGE == 'true' ]]; then php vendor/bin/phpunit --coverage-clover build/logs/clover.xml ; else php vendor/bin/phpunit ; fi
-  - if [[ $CHECK_CS == 'true' ]]; then php vendor/bin/phpcs --standard=PSR2 ./src/ ./test/ ./config/ ; fi
+  - if [[ $CS_CHECK == 'true' ]]; then php vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/ ./config/ ; fi
 
 after_script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then php vendor/bin/php-coveralls -v ; fi

CHANGELOG.md

@@ -1,17 +1,48 @@
 # Changelog
 
-## Version 2.0.0
+## 3.0.0 - TBD
+
+### Added
+
+- Nothing.
+
+### Changed
+
+- Configuration was changed to use `Doctrine\ODM\MongoDB\Configuration:AUTOGENERATE_*` constants for `generate_proxies`
+ and `generate_hydrators` instead of removed `AbstractProxyFactory::AUTOGENERATE_*`. If you override those settings in your local config, ensure the proper constants are used.
+- Adapt to `doctrine/peristence:2.0`
+- `DoctrineMongoODMModule\Options\Configuration::getGenerateHydrators()` returns an `int` instead of a `bool`
+- `DoctrineMongoODMModule\Options\Configuration::setGenerateHydrators()` requires an `int` instead of a `bool` for its first parameter
+- `DoctrineMongoODMModule\Options\Configuration`: The methods `getPersistentCollectionFactory` and `getPersistentCollectionGenerator` can now return `null`.
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- `DoctrineMongoODMModule\Paginator\Adapter\DoctrinePaginator` was removed because `Doctrine\ODM\MongoDB\Cursor` doesn't exist anymore and there is no simple workaround.
+- The CLI commands `odm:generate:documents` and `odm:generate:repositories` were removed because they no longer exist.
+- The Configuration options `retryConnect` and `retryQuery` were removed.
+- The `DoctrineMongoODMModule\Logging\Logger` interface was removed. Existing implementations directly implement `\Doctrine\ODM\MongoDB\APM\CommandLoggerInterface` now.
+- The `DoctrineMongoODMModule\Logging\LoggerChain` was removed. Loggers can now be subscribed with the MongoDB driver directly.
+
+### Fixed
+
+- Nothing.
+
+## 2.0.0 - 2020-04-06
 
 - Drop PHP 7.1 support.
 - Add Laminas support.
 
-## Version 1.1.0
+## 1.1.0
 
 - [#206](https://github.com/docrine/DoctrineMongoODMModule/pull/206) Drop PHP 5.6 and 7.0 support
 - [#206](https://github.com/docrine/DoctrineMongoODMModule/pull/206) Add PHP 7.3 support
 - [#206](https://github.com/docrine/DoctrineMongoODMModule/pull/206) Add DoctrineModule ^2.1 support, while retaining compatibility with previous version
 
-## Version 1.0.0
+## 1.0.0
 
 - [#159](https://github.com/docrine/DoctrineMongoODMModule/pull/159) Add support for hydrator and proxy generation strategies
 - [#178](https://github.com/docrine/DoctrineMongoODMModule/pull/178) Make code examples PHP 7 compatible
@@ -21,13 +52,13 @@
 - [#182](https://github.com/docrine/DoctrineMongoODMModule/pull/182) Test PHP 7.1 on travis
 - [#184](https://github.com/docrine/DoctrineMongoODMModule/pull/184) Code cleanup
 
-## Version 0.11.0
+## 0.11.0
 
 - [#161](https://github.com/docrine/DoctrineMongoODMModule/pull/161) Add PHP 7 to the build matrix
 - [#168](https://github.com/docrine/DoctrineMongoODMModule/pull/168) ZF3 compatibility
 - [#172](https://github.com/docrine/DoctrineMongoODMModule/pull/172) Require stable version of DoctrineModule 1.2.0 instead of dev-master
 
-## Version 0.10.0
+## 0.10.0
 
 - [#146](https://github.com/doctrine/DoctrineMongoODMModule/pull/146) Support for `odm:schema:update` command
 - [#153](https://github.com/doctrine/DoctrineMongoODMModule/pull/153) Update to stable package versions
@@ -36,16 +67,16 @@
 - [#156](https://github.com/doctrine/DoctrineMongoODMModule/pull/156) Remove support for old PHP versions
 - [#160](https://github.com/doctrine/DoctrineMongoODMModule/pull/160) Fixed Zend\Mvc 2.7 compatibility
 
-## Version 0.9.1
+## 0.9.1
 - [#140](https://github.com/doctrine/DoctrineMongoODMModule/pull/140) Fixed #139 add minimum stabiliy dev for mongodb-odm
 
-## Version 0.9.0
+## 0.9.0
 - [#125](https://github.com/doctrine/DoctrineMongoODMModule/pull/125) Drop PHP 5.3 support
 - [#124](https://github.com/doctrine/DoctrineMongoODMModule/pull/124) Add DoctrineObject factory for DocumentManager
 - [#128](https://github.com/doctrine/DoctrineMongoODMModule/pull/128) allow adding custom types via module config
 - [#135](https://github.com/doctrine/DoctrineMongoODMModule/pull/135) Stable composer configuration
 
-## Version 0.8.2
+## 0.8.2
 
 - [#108](https://github.com/doctrine/DoctrineMongoODMModule/pull/108) updated paginator documentation
 - [#108](https://github.com/doctrine/DoctrineMongoODMModule/pull/109) added user guide

composer.json

@@ -51,25 +51,28 @@
     },
     "require": {
         "php": "^7.2",
-        "alcaeus/mongo-php-adapter": "^1.1",
+        "ext-mongodb": "*",
         "doctrine/doctrine-module": "^4.0",
-        "doctrine/mongodb-odm": "^1.3",
+        "doctrine/mongodb-odm": "^2.0",
+        "doctrine/persistence": "^1.3 || ^2.0",
         "laminas/laminas-hydrator": "^3.0.2",
         "laminas/laminas-mvc": "^3.1.1",
         "laminas/laminas-servicemanager": "^3.4",
-        "laminas/laminas-stdlib": "^3.2.1"
+        "laminas/laminas-stdlib": "^3.2.1",
+        "symfony/var-dumper": "^5.1"
     },
     "require-dev": {
-        "doctrine/coding-standard": "^7.0.2",
         "laminas/laminas-console": "^2.8",
+        "laminas/laminas-developer-tools": "^2.0",
         "laminas/laminas-i18n": "^2.10.1",
         "laminas/laminas-log": "^2.12",
         "laminas/laminas-modulemanager": "^2.8.4",
         "laminas/laminas-mvc-console": "^1.2",
         "laminas/laminas-serializer": "^2.9.1",
         "laminas/laminas-session": "^2.9.1",
         "laminas/laminas-view": "^2.11.4",
-        "phpunit/phpunit": "^8.5.2"
+        "phpunit/phpunit": "^8.5.2",
+        "squizlabs/php_codesniffer": "^3.5"
     },
     "autoload": {
         "psr-4": {