laminas-api-tools#28 Removed ODM support, fixed dependencies and PHPU…

…nit tests.
orderadmin · Apr 20, 2022 · 37a292a · 37a292a
1 parent 831b12d
commit 37a292a
Show file tree

Hide file tree

Showing 7 changed files with 650 additions and 2,486 deletions.
diff --git a/composer.json b/composer.json
@@ -42,10 +42,10 @@
         "api-skeletons/doctrine-orm-hydration-module": "^1.0"
     },
     "require-dev": {
-        "doctrine/doctrine-module": "^4.0 || ^5.1",
-        "doctrine/doctrine-mongo-odm-module": "^0.11.0 || ^1.0.0 || ^2.0.0",
-        "doctrine/doctrine-orm-module": "^4.0 || ^5.1",
-        "doctrine/mongodb-odm": "^1.1.0",
+        "doctrine/common": "^2.1",
+        "doctrine/dbal": "^2.10",
+        "doctrine/doctrine-module": "^5.1",
+        "doctrine/doctrine-orm-module": "^5.1",
         "laminas-api-tools/api-tools-admin": "^1.5.7",
         "laminas-api-tools/api-tools-hal": "^1.6.1",
         "laminas/laminas-coding-standard": "~2.3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/test/src/Admin/Model/DoctrineAutodiscoveryModelTest.php b/test/src/Admin/Model/DoctrineAutodiscoveryModelTest.php
@@ -46,23 +46,4 @@ public function testORMAutodiscoveryEntitiesWithFields(): void
         $this->assertEquals('Product', $result[2]['service_name']);
         $this->assertCount(1, $result[2]['fields']);
     }
-
-    public function testODMAutodiscoveryEntitiesWithFields(): void
-    {
-        $this->setApplicationConfig(
-            include __DIR__ . '/../../../config/ODM/application.config.php'
-        );
-
-        $model = new DoctrineAutodiscoveryModel([]);
-        $model->setServiceLocator($this->getApplicationServiceLocator());
-
-        $result = $model->fetchFields(null, null, 'doctrine.documentmanager.odm_default');
-
-        $this->assertIsArray($result);
-        $this->assertCount(1, $result);
-
-        $this->assertEquals(Meta::class, $result[0]['entity_class']);
-        $this->assertEquals('Meta', $result[0]['service_name']);
-        $this->assertCount(2, $result[0]['fields']);
-    }
 }
diff --git a/test/src/Server/Event/Listener/CollectionListenerTest.php b/test/src/Server/Event/Listener/CollectionListenerTest.php
@@ -6,10 +6,12 @@
 
 use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Instantiator\InstantiatorInterface;
+use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Mapping\ClassMetadata;
 use Laminas\ApiTools\Doctrine\Server\Event\Listener\CollectionListener;
 use Laminas\Hydrator\HydratorInterface;
 use LaminasTestApiToolsDb\Entity\Artist;
+use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 use PHPUnit_Framework_MockObject_MockObject;
 use ReflectionMethod;
@@ -19,19 +21,22 @@ class CollectionListenerTest extends TestCase
 {
     /**
      * @dataProvider trueFalseProvider
+     *
      * @param bool $withEntityFactory
+     *
      * @return void
      */
     public function testProcessNewEntity($withEntityFactory)
     {
         $artist = $this->getMockBuilder(Artist::class)->getMock();
-        $data   = [];
+        $data = [];
 
-        /** @var ObjectManager|PHPUnit_Framework_MockObject_MockObject $om */
-        $om            = $this->getMockBuilder(ObjectManager::class)->getMock();
+        /** @var EntityManager|MockObject $om */
+        $om = $this->getMockBuilder(EntityManager::class)
+            ->disableOriginalConstructor()->getMock();
         $classMetadata = $this->getMockBuilder(ClassMetadata::class)
-                ->disableOriginalConstructor()
-                ->getMock();
+            ->disableOriginalConstructor()
+            ->getMock();
         $classMetadata->expects(self::once())
             ->method('getIdentifierFieldNames')
             ->with(Artist::class)
@@ -53,7 +58,8 @@ public function testProcessNewEntity($withEntityFactory)
 
         if ($withEntityFactory) {
             /** @var InstantiatorInterface|PHPUnit_Framework_MockObject_MockObject $entityFactory */
-            $entityFactory = $this->getMockBuilder(InstantiatorInterface::class)->getMock();
+            $entityFactory = $this->getMockBuilder(InstantiatorInterface::class)
+                ->getMock();
 
             $entityFactory->expects(self::once())
                 ->method('instantiate')
@@ -66,7 +72,9 @@ public function testProcessNewEntity($withEntityFactory)
         $listener = new CollectionListener($entityFactory);
         $listener->setObjectManager($om);
 
-        $hydratorMapProperty = new ReflectionProperty($listener, 'entityHydratorMap');
+        $hydratorMapProperty = new ReflectionProperty(
+            $listener, 'entityHydratorMap'
+        );
         $hydratorMapProperty->setAccessible(true);
         $hydratorMapProperty->setValue($listener, [Artist::class => $hydrator]);