From 29702a9c43518c7eedc0c623f7d83106c0cc2cfe Mon Sep 17 00:00:00 2001 From: James Wragg Date: Fri, 16 Feb 2024 15:22:38 +0000 Subject: [PATCH 1/8] fix: remove createService and interop for ApplicationCreateConversationControllerFactory --- ...ionCreateConversationControllerFactory.php | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/module/Olcs/src/Controller/Factory/Messages/ApplicationCreateConversationControllerFactory.php b/module/Olcs/src/Controller/Factory/Messages/ApplicationCreateConversationControllerFactory.php index a38f290c84..224c6bd022 100644 --- a/module/Olcs/src/Controller/Factory/Messages/ApplicationCreateConversationControllerFactory.php +++ b/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); - } } From 885bf874feaa476fa4112d645af3c6e3230fdffb Mon Sep 17 00:00:00 2001 From: James Wragg Date: Fri, 16 Feb 2024 15:24:25 +0000 Subject: [PATCH 2/8] fix: removed interop container interface for LicenceCreateConversationControllerFactory and cleanup --- .../LicenceCreateConversationControllerFactory.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/module/Olcs/src/Controller/Factory/Messages/LicenceCreateConversationControllerFactory.php b/module/Olcs/src/Controller/Factory/Messages/LicenceCreateConversationControllerFactory.php index f380d83c1e..e393bf737b 100644 --- a/module/Olcs/src/Controller/Factory/Messages/LicenceCreateConversationControllerFactory.php +++ b/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 { From 84d891e65710809bb113e9d6949d4d390fa0b83c Mon Sep 17 00:00:00 2001 From: James Wragg Date: Fri, 16 Feb 2024 15:25:37 +0000 Subject: [PATCH 3/8] fix: swap interop for psr for container in LicenceEnableDisableMessagingControllerFactory --- .../Messages/LicenceEnableDisableMessagingControllerFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/Olcs/src/Controller/Factory/Messages/LicenceEnableDisableMessagingControllerFactory.php b/module/Olcs/src/Controller/Factory/Messages/LicenceEnableDisableMessagingControllerFactory.php index 4c993c1d69..bf46a0791b 100644 --- a/module/Olcs/src/Controller/Factory/Messages/LicenceEnableDisableMessagingControllerFactory.php +++ b/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; From bde2155322c1eafdb20f1e04ebd095df520371d4 Mon Sep 17 00:00:00 2001 From: James Wragg Date: Fri, 16 Feb 2024 15:26:37 +0000 Subject: [PATCH 4/8] fix: swap interop for psr for container in RouteParam/Conversation --- module/Olcs/src/Listener/RouteParam/Conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/Olcs/src/Listener/RouteParam/Conversation.php b/module/Olcs/src/Listener/RouteParam/Conversation.php index 5c5f50f9af..a632f6718d 100644 --- a/module/Olcs/src/Listener/RouteParam/Conversation.php +++ b/module/Olcs/src/Listener/RouteParam/Conversation.php @@ -8,7 +8,7 @@ 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; From b8fcc0314fe78c239759c918b9114d77d89ccba1 Mon Sep 17 00:00:00 2001 From: James Wragg Date: Fri, 16 Feb 2024 15:27:25 +0000 Subject: [PATCH 5/8] fix: swap interop for psr for container in RouteParam/ConversationTest & cleanup imports --- module/Olcs/src/Listener/RouteParam/Conversation.php | 1 - test/Olcs/src/Listener/RouteParam/ConversationTest.php | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/module/Olcs/src/Listener/RouteParam/Conversation.php b/module/Olcs/src/Listener/RouteParam/Conversation.php index a632f6718d..5175984c9a 100644 --- a/module/Olcs/src/Listener/RouteParam/Conversation.php +++ b/module/Olcs/src/Listener/RouteParam/Conversation.php @@ -10,7 +10,6 @@ use Dvsa\Olcs\Transfer\Util\Annotation\AnnotationBuilder; use Psr\Container\ContainerInterface; use Laminas\EventManager\EventInterface; -use Laminas\View\HelperPluginManager; use Olcs\Listener\RouteParams; use Laminas\EventManager\EventManagerInterface; use Laminas\EventManager\ListenerAggregateInterface; diff --git a/test/Olcs/src/Listener/RouteParam/ConversationTest.php b/test/Olcs/src/Listener/RouteParam/ConversationTest.php index 1940ff8044..742c440a66 100644 --- a/test/Olcs/src/Listener/RouteParam/ConversationTest.php +++ b/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 { From 64efb4302e1ce90068930bf677fa5da166529a7d Mon Sep 17 00:00:00 2001 From: James Wragg Date: Fri, 16 Feb 2024 15:28:11 +0000 Subject: [PATCH 6/8] fix: swap interop for psr for container in ApplicationCloseConversationControllerFactory --- .../Messages/ApplicationCloseConversationControllerFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/Olcs/src/Controller/Factory/Messages/ApplicationCloseConversationControllerFactory.php b/module/Olcs/src/Controller/Factory/Messages/ApplicationCloseConversationControllerFactory.php index a47cedfe5c..e069b8b3b8 100644 --- a/module/Olcs/src/Controller/Factory/Messages/ApplicationCloseConversationControllerFactory.php +++ b/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; From 7c697ab9a3d66b172e419cfa94dddfc45cf28b76 Mon Sep 17 00:00:00 2001 From: James Wragg Date: Fri, 16 Feb 2024 15:28:49 +0000 Subject: [PATCH 7/8] fix: swap interop for psr for container in ApplicationConversationListControllerFactory --- .../Messages/ApplicationConversationListControllerFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/Olcs/src/Controller/Factory/Messages/ApplicationConversationListControllerFactory.php b/module/Olcs/src/Controller/Factory/Messages/ApplicationConversationListControllerFactory.php index 4517c489ca..4c13bbaf1c 100644 --- a/module/Olcs/src/Controller/Factory/Messages/ApplicationConversationListControllerFactory.php +++ b/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; From 185f0ee2871617f45556604b0629828889ee9f1d Mon Sep 17 00:00:00 2001 From: James Wragg Date: Fri, 16 Feb 2024 15:29:40 +0000 Subject: [PATCH 8/8] fix: swap interop for psr for container in ApplicationConversationMessagesControllerFactory --- .../ApplicationConversationMessagesControllerFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/Olcs/src/Controller/Factory/Messages/ApplicationConversationMessagesControllerFactory.php b/module/Olcs/src/Controller/Factory/Messages/ApplicationConversationMessagesControllerFactory.php index 165349cd6a..c80ccce6e0 100644 --- a/module/Olcs/src/Controller/Factory/Messages/ApplicationConversationMessagesControllerFactory.php +++ b/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;