Merge 96d36aa into aefea9a

doctrine · Mar 7, 2020 · 18f64d0 · 18f64d0
2 parents aefea9a + 96d36aa
commit 18f64d0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 77 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -74,11 +74,11 @@ install:
   - composer show
 
 script:
-  - cp ./tests/TestConfiguration.php ./config/application.config.php
+  - cp ./test/TestConfiguration.php ./config/application.config.php
   - ./vendor/bin/doctrine-module odm:schema:create
   - ./vendor/bin/doctrine-module odm:schema:drop
   - if $TEST_COVERAGE; 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
+  - if $CHECK_CS; then php vendor/bin/phpcs --standard=PSR2 ./src/ ./test/ ./config/ ; fi
 
 after_script:
   - if $TEST_COVERAGE; then php vendor/bin/php-coveralls -v ; fi
diff --git a/composer.json b/composer.json
@@ -52,7 +52,7 @@
     "require": {
         "php": "^7.2",
         "alcaeus/mongo-php-adapter": "^1.1",
-        "doctrine/doctrine-module": "^3.0",
+        "doctrine/doctrine-module": "^4.0",
         "doctrine/mongodb-odm": "^1.1",
         "laminas/laminas-hydrator": "^3.0.2",
         "laminas/laminas-mvc": "^3.1.1",

diff --git a/composer.lock b/composer.lock
diff --git a/src/DoctrineMongoODMModule/Service/MongoLoggerCollectorFactory.php b/src/DoctrineMongoODMModule/Service/MongoLoggerCollectorFactory.php
@@ -71,7 +71,7 @@ public function createService(ServiceLocatorInterface $container)
     /**
      * {@inheritDoc}
      */
-    public function getOptionsClass()
+    public function getOptionsClass() : string
     {
         return Options\MongoLoggerCollector::class;
     }