Merge branch '1.3'

* 1.3:
  Drop phpcr-odm from testing
  Add all dev dependencies to composer.json
  Remove hack for doctrine/phpcr-odm
  Fix risky test
  Remove unsupported attribute in PHPUnit configuration
  Test against MongoDB ODM 1.x only
  Drop nightly build

.travis.yml

@@ -10,11 +10,6 @@ php:
   - 7.1
   - 7.2
   - 7.3
-  - nightly
-
-matrix:
-  allow_failures:
-    - php: nightly
 
 services: mongodb
 
@@ -23,11 +18,7 @@ before_install:
   - composer validate --strict
 
 before_script:
-  - composer install --prefer-source
-  - composer config "platform.ext-mongo" "1.6.16"
-  - composer require alcaeus/mongo-php-adapter
-  - composer require doctrine/mongodb-odm
-  - composer require jackalope/jackalope-doctrine-dbal doctrine/phpcr-odm
+  - composer install
 
 script:
   - ./vendor/bin/phpunit -v

composer.json

@@ -21,7 +21,9 @@
         "doctrine/phpcr-odm": "<1.3.0"
     },
     "require-dev": {
+        "alcaeus/mongo-php-adapter": "^1.1",
         "doctrine/dbal": "^2.5.4",
+        "doctrine/mongodb-odm": "^1.3.0",
         "doctrine/orm": "^2.5.4",
         "phpunit/phpunit": "^7.0"
     },
@@ -32,6 +34,9 @@
         "doctrine/phpcr-odm": "For loading PHPCR ODM fixtures"
     },
     "config": {
+        "platform": {
+            "ext-mongo": "1.6.16"
+        },
         "sort-packages": true
     },
     "extra": {

tests/Doctrine/Tests/Common/DataFixtures/Executor/ORMExecutorTest.php

@@ -49,6 +49,9 @@ public function testExecuteTransaction()
         $em = $this->getMockSqliteEntityManager();
         $executor = new ORMExecutor($em);
         $fixture = $this->getMockFixture();
+        $fixture->expects($this->once())
+            ->method('load')
+            ->with($em);
         $executor->execute([$fixture], true);
     }
 

tests/Doctrine/Tests/Common/DataFixtures/Executor/PHPCRExecutorTest.php

@@ -128,7 +128,9 @@ private function getPurger()
      */
     private function getDocumentManager()
     {
-        $this->loadDocumentManagerClass();
+        if (!class_exists(DocumentManager::class)) {
+            $this->markTestSkipped('Missing doctrine/phpcr-odm');
+        }
 
         return $this
             ->getMockBuilder(DocumentManager::class)
@@ -148,39 +150,4 @@ private function getMockFixture()
     {
         return $this->createMock(FixtureInterface::class);
     }
-
-    /**
-     * Ensures that the {@see \Doctrine\ODM\PHPCR\DocumentManager} class exists
-     */
-    private function loadDocumentManagerClass()
-    {
-
-        if (class_exists(DocumentManager::class)) {
-            return;
-        }
-
-        // hold my beer while I do some mocking
-        eval(
-        <<<'PHP'
-namespace Doctrine\ODM\PHPCR;
-
-class DocumentManager implements \Doctrine\Common\Persistence\ObjectManager
-{
-    public function find($className, $id) {}
-    public function persist($object) {}
-    public function remove($object) {}
-    public function merge($object) {}
-    public function clear($objectName = null) {}
-    public function detach($object) {}
-    public function refresh($object) {}
-    public function flush() {}
-    public function getRepository($className) {}
-    public function getClassMetadata($className) {}
-    public function getMetadataFactory() {}
-    public function initializeObject($obj) {}
-    public function contains($object) {}
-}
-PHP
-        );
-    }
 }