Rework phpunit.xml; remove references to mongo

Author: TomHAnderson

.gitignore

@@ -1,3 +1,6 @@
 vendor/
 composer.phar
-composer.lock
+composer.lock
+.phpunit.cache/
+.phpunit.result.cache
+coverage/

phpunit.xml

@@ -1,10 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="./test/src/Bootstrap.php" colors="true">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.5/phpunit.xsd"
+         bootstrap="test/src/Bootstrap.php"
+         colors="true"
+         cacheResultFile=".phpunit.cache/test-results"
+         executionOrder="depends,defects"
+         forceCoversAnnotation="false"
+         beStrictAboutCoversAnnotation="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         failOnRisky="true"
+         failOnWarning="true"
+         verbose="true">
     <testsuites>
-        <testsuite name="Main">
+        <testsuite name="default">
             <file>./test/src/Tests/ModuleTest.php</file>
-            <directory>./test/src/Tests/Service</directory>
+            <directory suffix="Test.php">test/src/Tests/Service</directory>
             <file>./test/src/Tests/Hydrator/DoctrineHydratorTest.php</file>
         </testsuite>
     </testsuites>
+
+    <coverage cacheDirectory=".phpunit.cache/code-coverage"
+              processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">src</directory>
+        </include>
+    </coverage>
 </phpunit>

src/Service/DoctrineHydratorFactory.php

@@ -3,14 +3,12 @@
 namespace ApiSkeletons\DoctrineORMHydrationModule\Service;
 
 use Doctrine\Common\Persistence\ObjectManager;
-use Doctrine\ODM\MongoDB\DocumentManager;
 use Doctrine\ORM\EntityManager;
 use DoctrineModule\Persistence\ObjectManagerAwareInterface;
 use DoctrineModule\Stdlib\Hydrator;
 use Doctrine\Laminas\Hydrator\DoctrineObject;
 use Interop\Container\ContainerInterface;
 use ApiSkeletons\DoctrineORMHydrationModule\Hydrator\DoctrineHydrator;
-use ApiSkeletons\DoctrineORMHydrationModule\Hydrator\ODM\MongoDB;
 use Laminas\Hydrator\AbstractHydrator;
 use Laminas\Hydrator\Filter\FilterComposite;
 use Laminas\Hydrator\Filter\FilterInterface;
@@ -32,7 +30,6 @@ class DoctrineHydratorFactory implements AbstractFactoryInterface
 {
     const FACTORY_NAMESPACE = 'doctrine-hydrator';
 
-    const OBJECT_MANAGER_TYPE_ODM_MONGODB = 'ODM/MongoDB';
     const OBJECT_MANAGER_TYPE_ORM = 'ORM';
 
     /**
@@ -190,9 +187,7 @@ public function createServiceWithName(ServiceLocatorInterface $hydratorManager,
      */
     protected function getObjectManagerType($objectManager)
     {
-        if (class_exists(DocumentManager::class) && $objectManager instanceof DocumentManager) {
-            return self::OBJECT_MANAGER_TYPE_ODM_MONGODB;
-        } elseif (class_exists(EntityManager::class) && $objectManager instanceof EntityManager) {
+        if (class_exists(EntityManager::class) && $objectManager instanceof EntityManager) {
             return self::OBJECT_MANAGER_TYPE_ORM;
         }
 
@@ -226,14 +221,7 @@ protected function loadObjectManager(ContainerInterface $container, $config)
     protected function loadEntityHydrator(ContainerInterface $container, $config, $objectManager)
     {
         $objectManagerType = $this->getObjectManagerType($objectManager);
-        if ($objectManagerType != self::OBJECT_MANAGER_TYPE_ODM_MONGODB) {
-            return;
-        }
-
-        $hydratorFactory = $objectManager->getHydratorFactory();
-        $hydrator = $hydratorFactory->getHydratorFor($config['entity_class']);
-
-        return $hydrator;
+        return;
     }
 
     /**
@@ -247,11 +235,7 @@ protected function loadDoctrineModuleHydrator(ContainerInterface $container, $co
     {
         $objectManagerType = $this->getObjectManagerType($objectManager);
 
-        if ($objectManagerType == self::OBJECT_MANAGER_TYPE_ODM_MONGODB) {
-            $hydrator = new MongoDB\DoctrineObject($objectManager, $config['by_value']);
-        } else {
-            $hydrator = new DoctrineObject($objectManager, $config['by_value']);
-        }
+        $hydrator = new DoctrineObject($objectManager, $config['by_value']);
 
         return $hydrator;
     }

test/src/Bootstrap.php

@@ -35,7 +35,6 @@ public function __construct($autoLoader)
     public function init()
     {
         $this->initAutoLoading();
-        $this->configureDoctrineODM();
     }
 
     /**
@@ -50,19 +49,6 @@ protected function initAutoLoading()
             'Doctrine\\ODM\\MongoDB\\Tests\\BaseTest' => PROJECT_BASE_PATH.'/vendor/doctrine/mongodb-odm/tests/Doctrine/ODM/MongoDB/Tests/BaseTest.php',
         ));
     }
-
-    /**
-     * Load all doctrine ODM configuration:.
-     */
-    protected function configureDoctrineODM()
-    {
-        // Constants
-        define('DOCTRINE_MONGODB_DATABASE', 'hydrator-tests');
-        define('DOCTRINE_MONGODB_SERVER', 'mongodb://mongo:27017');
-
-        // Load annotated classes
-//        \Doctrine\ODM\MongoDB\Mapping\Driver\AnnotationDriver::registerAnnotationClasses();
-    }
 }
 
 $autoLoader = require $autoloadFile;