fix: interop > psr for container and removal of createService for factories

module/Olcs/src/Controller/Factory/Messages/ApplicationCloseConversationControllerFactory.php

@@ -8,7 +8,7 @@
 use Common\Service\Helper\FormHelperService;
 use Common\Service\Script\ScriptFactory;
 use Common\Service\Table\TableFactory;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Laminas\View\HelperPluginManager;
 use Olcs\Controller\Messages\ApplicationCloseConversationController;

module/Olcs/src/Controller/Factory/Messages/ApplicationConversationListControllerFactory.php

@@ -5,7 +5,7 @@
 use Common\Service\Helper\FlashMessengerHelperService;
 use Common\Service\Helper\FormHelperService;
 use Common\Service\Helper\TranslationHelperService;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Olcs\Controller\Messages\ApplicationConversationListController;
 

module/Olcs/src/Controller/Factory/Messages/ApplicationConversationMessagesControllerFactory.php

@@ -8,7 +8,7 @@
 use Common\Service\Helper\FormHelperService;
 use Common\Service\Helper\TranslationHelperService;
 use Common\Service\Script\ScriptFactory;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Olcs\Controller\Messages\ApplicationConversationMessagesController;
 

module/Olcs/src/Controller/Factory/Messages/ApplicationCreateConversationControllerFactory.php

@@ -5,13 +5,8 @@
 use Common\Service\Helper\FlashMessengerHelperService;
 use Common\Service\Helper\FormHelperService;
 use Common\Service\Helper\TranslationHelperService;
-use Common\Service\Script\ScriptFactory;
-use Common\Service\Table\TableFactory;
-use Laminas\Navigation\Navigation;
-use Interop\Container\ContainerInterface;
-use Laminas\ServiceManager\FactoryInterface;
-use Laminas\ServiceManager\ServiceLocatorInterface;
-use Laminas\View\HelperPluginManager;
+use Psr\Container\ContainerInterface;
+use Laminas\ServiceManager\Factory\FactoryInterface;
 use Olcs\Controller\Messages\ApplicationCreateConversationController;
 
 class ApplicationCreateConversationControllerFactory implements FactoryInterface
@@ -41,16 +36,4 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
             $navigation
         );
     }
-
-    /**
-     * Create service
-     *
-     * @param ServiceLocatorInterface $serviceLocator
-     *
-     * @return ApplicationCreateConversationController
-     */
-    public function createService(ServiceLocatorInterface $serviceLocator): ApplicationCreateConversationController
-    {
-        return $this->__invoke($serviceLocator, ApplicationCreateConversationController::class);
-    }
 }

module/Olcs/src/Controller/Factory/Messages/LicenceCreateConversationControllerFactory.php

@@ -5,18 +5,21 @@
 use Common\Service\Helper\FlashMessengerHelperService;
 use Common\Service\Helper\FormHelperService;
 use Common\Service\Helper\TranslationHelperService;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Olcs\Controller\Messages\LicenceCreateConversationController;
-use Olcs\Service\Data\MessagingSubject;
+use Psr\Container\NotFoundExceptionInterface;
 
 class LicenceCreateConversationControllerFactory implements FactoryInterface
 {
     /**
-     * @param  ContainerInterface $container
-     * @param  $requestedName
-     * @param  array|null         $options
+     * @param ContainerInterface $container
+     * @param                    $requestedName
+     * @param array|null         $options
      * @return LicenceCreateConversationController
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): LicenceCreateConversationController
     {

module/Olcs/src/Controller/Factory/Messages/LicenceEnableDisableMessagingControllerFactory.php

@@ -12,7 +12,7 @@
 use Common\Service\Helper\UrlHelperService;
 use Common\Service\Script\ScriptFactory;
 use Common\Service\Table\TableFactory;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Laminas\View\HelperPluginManager;
 use Olcs\Controller\Messages\LicenceEnableDisableMessagingController;

module/Olcs/src/Listener/RouteParam/Conversation.php

@@ -8,9 +8,8 @@
 use Common\Service\Cqrs\Query\CachingQueryService as QueryService;
 use Dvsa\Olcs\Transfer\Query\Search\Licence as LicenceQuery;
 use Dvsa\Olcs\Transfer\Util\Annotation\AnnotationBuilder;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\EventManager\EventInterface;
-use Laminas\View\HelperPluginManager;
 use Olcs\Listener\RouteParams;
 use Laminas\EventManager\EventManagerInterface;
 use Laminas\EventManager\ListenerAggregateInterface;

test/Olcs/src/Listener/RouteParam/ConversationTest.php

@@ -5,27 +5,21 @@
 namespace OlcsTest\Listener\RouteParam;
 
 use Common\Service\Cqrs\Query\CachingQueryService as QueryService;
-use Common\Service\Helper\UrlHelperService;
 use Dvsa\Olcs\Transfer\Query\QueryContainerInterface;
 use Dvsa\Olcs\Transfer\Query\Search\Licence;
 use Dvsa\Olcs\Transfer\Util\Annotation\AnnotationBuilder;
-use Interop\Container\ContainerInterface;
-use Laminas\EventManager\Event;
+use Psr\Container\ContainerInterface;
 use Laminas\EventManager\EventInterface;
 use Laminas\EventManager\EventManagerInterface;
 use Laminas\Http\Response;
 use Laminas\Navigation\AbstractContainer;
 use Laminas\Navigation\Page\AbstractPage;
 use Laminas\View\Helper\Navigation;
-use Laminas\View\HelperPluginManager;
 use Mockery\Adapter\Phpunit\MockeryTestCase as TestCase;
 use Olcs\Event\RouteParam;
 use Olcs\Listener\RouteParam\Conversation;
 use Mockery as m;
 use Olcs\Listener\RouteParams;
-use Common\RefData;
-use Laminas\View\Model\ViewModel;
-use Laminas\View\Helper\Url;
 
 class ConversationTest extends TestCase
 {