Fix code style issues.

Signed-off-by: Dan Johansson <[email protected]>

Author: datasage

composer.json

@@ -36,7 +36,7 @@
         "datasage/laminas-doctrine-hydration-module": "^5.0",
         "doctrine/persistence": "^2.0 || ^3.0",
         "laminas-api-tools/api-tools": "^1.3",
-        "laminas-api-tools/api-tools-rest": "^1.3.2",
+        "laminas-api-tools/api-tools-rest": "^1.6.0",
         "laminas/laminas-hydrator": "^3.0 || ^4.0",
         "laminas/laminas-stdlib": "^3.3",
         "laminas/laminas-view": "^2.11.3",

src/Server/Resource/DoctrineResourceFactory.php

@@ -172,7 +172,7 @@ protected function getResourceClassFromConfig($config, $requestedName)
      * @param string $requestedName
      * @return bool
      */
-    protected function isValidConfig(array $config, $requestedName, containerinterface $container)
+    protected function isValidConfig(array $config, $requestedName, ContainerInterface $container)
     {
         if (
             ! isset($config['object_manager'])
@@ -213,7 +213,7 @@ protected function normalizeClassname($className)
      * @return HydratorInterface
      */
     protected function loadHydrator(
-        containerinterface $container,
+        ContainerInterface $container,
         array $doctrineConnectedConfig,
         array $doctrineHydratorConfig
     ) {
@@ -249,7 +249,7 @@ protected function loadHydrator(
      * @param ObjectManager $objectManager
      * @return QueryCreateFilterInterface
      */
-    protected function loadQueryCreateFilter(containerinterface $container, array $config, $objectManager)
+    protected function loadQueryCreateFilter(ContainerInterface $container, array $config, $objectManager)
     {
         $createFilterManager = $container->get('LaminasApiToolsDoctrineQueryCreateFilterManager');
         $filterManagerAlias  = $config['query_create_filter'] ?? 'default';
@@ -269,7 +269,7 @@ protected function loadQueryCreateFilter(containerinterface $container, array $c
      * @return array
      * @throws ServiceNotCreatedException
      */
-    protected function loadQueryProviders(containerinterface $serviceLocator, array $config, $objectManager)
+    protected function loadQueryProviders(ContainerInterface $serviceLocator, array $config, $objectManager)
     {
         $queryProviders = [];
         $queryManager   = $serviceLocator->get('LaminasApiToolsDoctrineQueryProviderManager');
@@ -308,7 +308,7 @@ class_exists(DocumentManager::class)
      * @param array $config
      * @return array
      */
-    protected function loadConfiguredListeners(containerinterface $container, array $config)
+    protected function loadConfiguredListeners(ContainerInterface $container, array $config)
     {
         if (! isset($config['listeners'])) {
             return [];

test/src/Server/Event/Listener/CollectionListenerTest.php

@@ -4,14 +4,14 @@
 
 namespace LaminasTest\ApiTools\Doctrine\Server\Event\Listener;
 
-use Doctrine\Persistence\ObjectManager;
 use Doctrine\Instantiator\InstantiatorInterface;
 use Doctrine\ORM\Mapping\ClassMetadata;
+use Doctrine\Persistence\ObjectManager;
 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;
 use ReflectionProperty;
 
@@ -27,7 +27,7 @@ public function testProcessNewEntity($withEntityFactory)
         $artist = $this->getMockBuilder(Artist::class)->getMock();
         $data   = [];
 
-        /** @var ObjectManager|PHPUnit_Framework_MockObject_MockObject $om */
+        /** @var ObjectManager|MockObject $om */
         $om            = $this->getMockBuilder(ObjectManager::class)->getMock();
         $classMetadata = $this->getMockBuilder(ClassMetadata::class)
                 ->disableOriginalConstructor()
@@ -52,7 +52,7 @@ public function testProcessNewEntity($withEntityFactory)
             ->with($data, self::isInstanceOf(Artist::class));
 
         if ($withEntityFactory) {
-            /** @var InstantiatorInterface|PHPUnit_Framework_MockObject_MockObject $entityFactory */
+            /** @var InstantiatorInterface|MockObject $entityFactory */
             $entityFactory = $this->getMockBuilder(InstantiatorInterface::class)->getMock();
 
             $entityFactory->expects(self::once())

test/src/Server/ODM/CRUD/CRUDTest.php

@@ -11,17 +11,15 @@
 use Laminas\ApiTools\ApiProblem\ApiProblemResponse;
 use Laminas\ApiTools\Doctrine\Admin\Model\DoctrineRestServiceEntity;
 use Laminas\ApiTools\Doctrine\Admin\Model\DoctrineRestServiceResource;
-use Laminas\ApiTools\Doctrine\DoctrineResource;
 use Laminas\ApiTools\Doctrine\Server\Event\DoctrineResourceEvent;
+use Laminas\ApiTools\Doctrine\Server\Resource\DoctrineResource;
 use Laminas\Http\Request;
 use Laminas\ServiceManager\ServiceManager;
 use LaminasTest\ApiTools\Doctrine\TestCase;
 use LaminasTestApiToolsDbMongo\Document\Meta;
 use LaminasTestApiToolsGeneral\Listener\EventCatcher;
-use MongoClient;
 use MongoDB\Client;
-use MongoDB\Driver\Manager;
-use PHPUnit_Framework_MockObject_MockObject;
+use PHPUnit\Framework\MockObject\MockObject;
 
 use function json_decode;
 use function json_encode;
@@ -136,7 +134,7 @@ function (DoctrineResourceEvent $e) {
 
     public function testCreateByExplicitlySettingEntityFactoryInConstructor(): void
     {
-        /** @var InstantiatorInterface|PHPUnit_Framework_MockObject_MockObject $entityFactoryMock */
+        /** @var InstantiatorInterface|MockObject $entityFactoryMock */
         $entityFactoryMock = $this->getMockBuilder(InstantiatorInterface::class)->getMock();
         $entityFactoryMock->expects(self::once())
             ->method('instantiate')

test/src/Server/Validator/NoObjectExistsFactoryTest.php

@@ -4,8 +4,8 @@
 
 namespace LaminasTest\ApiTools\Doctrine\Server\Validator;
 
-use Doctrine\Persistence\ObjectRepository;
 use Doctrine\ORM\EntityManager;
+use Doctrine\Persistence\ObjectRepository;
 use DoctrineModule\Validator\NoObjectExists as NoObjectExistsOrigin;
 use Laminas\ApiTools\Doctrine\Server\Validator\NoObjectExists;
 use Laminas\ServiceManager\ServiceManager;

test/src/Server/Validator/ObjectExistsFactoryTest.php

@@ -4,8 +4,8 @@
 
 namespace LaminasTest\ApiTools\Doctrine\Server\Validator;
 
-use Doctrine\Persistence\ObjectRepository;
 use Doctrine\ORM\EntityManager;
+use Doctrine\Persistence\ObjectRepository;
 use DoctrineModule\Validator\ObjectExists as ObjectExistsOrigin;
 use Laminas\ApiTools\Doctrine\Server\Validator\ObjectExists;
 use Laminas\ServiceManager\ServiceManager;