Merge 0c14d9c into 24e83ae

.gitignore

@@ -3,3 +3,4 @@ vendor/
 .idea/
 phpunit.xml
 phpcs.xml
+build

.travis.yml

@@ -9,7 +9,7 @@ cache:
 env:
   global:
     - COMPOSER_ARGS="--no-interaction"
-    - ADAPTER_DEPS="alcaeus/mongo-php-adapter"
+    - COVERAGE_DEPS="php-coveralls/php-coveralls"
 
 matrix:
   fast_finish: true
@@ -21,6 +21,7 @@ matrix:
       env:
         - DEPS=locked
         - CS_CHECK=true
+        - TEST_COVERAGE=true
     - php: 7.2
       env:
         - DEPS=latest
@@ -52,18 +53,32 @@ matrix:
       env:
         - DEPS=latest
 
+before_install:
+  - shopt -s expand_aliases
+  - 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"
+  - docker-compose build --build-arg PHP_VERSION=${TRAVIS_PHP_VERSION} --build-arg XDEBUG=${TEST_COVERAGE:+1} --no-cache php
+  - composer --version
+  - php -v
+  - php -m
+
 install:
+  - php --info
   - composer install $COMPOSER_ARGS --ignore-platform-reqs
-  - if [[ $DEPS == 'latest' ]]; then travis_retry composer config "platform.ext-mongo" "1.6.16" && composer update $COMPOSER_ARGS ; fi
-  - if [[ $DEPS == 'lowest' ]]; then travis_retry composer config "platform.ext-mongo" "1.6.16" && composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
-
-  - travis_retry composer config "platform.ext-mongo" "1.6.16" && composer require --dev $COMPOSER_ARGS $ADAPTER_DEPS
-  - travis_retry composer config "platform.ext-mongo" "1.6.16" && composer install $COMPOSER_ARGS
+  - if [[ $DEPS == 'latest' ]]; then composer update $COMPOSER_ARGS ; fi
+  - if [[ $DEPS == 'lowest' ]]; then composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+  - composer require --dev $COMPOSER_ARGS 
+  - composer install $COMPOSER_ARGS
   - stty cols 120 && composer show
+  - composer show
 
 script:
   - cp ./tests/TestConfiguration.php ./config/application.config.php
   - ./vendor/bin/doctrine-module odm:schema:create
   - ./vendor/bin/doctrine-module odm:schema:drop
-  - if [[ $TEST_COVERAGE == 'true' ]]; then ./vendor/bin/phpunit --coverage-clover clover.xml ; else ./vendor/bin/phpunit ; fi
-  - if [[ $CHECK_CS == 'true' ]]; then ./vendor/bin/phpcs --standard=PSR2 ./src/ ./tests/ ./config/ ; fi
+  - if [[ $TEST_COVERAGE == 'true' ]]; then php vendor/bin/phpunit --coverage-clover build/logs/clover.xml ; else php vendor/bin/phpunit ; fi
+  - if $CHECK_CS; 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

README.md

@@ -1,8 +1,8 @@
-# Doctrine MongoDB ODM Module for Zend Framework 2
+# Doctrine MongoDB ODM Module for Laminas
 
 Master: [![Build Status](https://secure.travis-ci.org/doctrine/DoctrineMongoODMModule.png?branch=master)](http://travis-ci.org/doctrine/DoctrineMongoODMModule)
 
-The DoctrineMongoODMModule integrates Doctrine 2 MongoDB ODM with Zend Framework 2
+The DoctrineMongoODMModule integrates Doctrine 2 MongoDB ODM with Laminas
 quickly and easily. The following features are intended to work out of the box:
 
   - MongoDB support
@@ -12,6 +12,7 @@ quickly and easily. The following features are intended to work out of the box:
   - Doctrine Cli support
 
 ## Requirements
+
 [Laminas MVC Skeleton Application](https://www.github.com/laminas/laminas-mvc-skeleton) (or compatible
 architecture)
 
@@ -28,7 +29,7 @@ Installation of this module uses composer. For composer documentation, please re
      ```json
      {
          "require": {
-             "doctrine/doctrine-mongo-odm-module": "^1.0"
+             "doctrine/doctrine-mongo-odm-module": "^2.0"
          }
      }
      ```

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "doctrine/doctrine-mongo-odm-module",
-    "description": "Laminas Module that provides Doctrine MongoDB ODM functionality",
+    "description": "Laminas Module which provides Doctrine MongoDB ODM functionality",
     "keywords": [
         "doctrine",
         "odm",
@@ -38,6 +38,10 @@
         {
             "name": "Andreas Braun",
             "email": "alcaeus@alcaeus.org"
+        },
+        {
+            "name": "Tom H Anderson",
+            "email": "tom.h.anderson@gmail.com"
         }
     ],
     "extra": {
@@ -48,11 +52,9 @@
             "module": "DoctrineMongoODMModule"
         }
     },
-    "config": {
-        "sort-packages": true
-    },
     "require": {
         "php": "^7.2",
+        "alcaeus/mongo-php-adapter": "^1.1",
         "doctrine/doctrine-module": "^3.0",
         "doctrine/mongodb-odm": "^1.1",
         "laminas/laminas-hydrator": "^3.0.2",
@@ -61,7 +63,6 @@
         "laminas/laminas-stdlib": "^3.2.1"
     },
     "require-dev": {
-        "alcaeus/mongo-php-adapter": "^1.1",
         "laminas/laminas-console": "^2.8",
         "laminas/laminas-i18n": "^2.10.1",
         "laminas/laminas-log": "^2.12",
@@ -96,6 +97,7 @@
         "update-dev": "composer update"
     },
     "config": {
+        "sort-packages": true,
         "platform": {
             "ext-mongo": "1.6.16"
         }