fix: modules.config.php

module/Olcs/config/module.config.php

@@ -1,7 +1,6 @@
 <?php
 
-use Laminas\Router\Http\Segment;
-use Laminas\Router\Http\HttpRouterFactory;
+use Laminas\Mvc\Router\Http\Segment;
 use Olcs\Auth\Adapter\CommandAdapter;
 use Olcs\Auth\Adapter\CommandAdapterFactory;
 use Olcs\Auth\Adapter\SelfserveCommandAdapter;
@@ -16,7 +15,6 @@
 use Olcs\Controller\Factory\CorrespondenceControllerFactory;
 use Olcs\Controller\Factory\Ebsr\UploadsControllerFactory;
 use Olcs\Controller\Factory\IndexControllerFactory;
-use Olcs\Controller\Factory\MessagesControllerFactory;
 use Olcs\Controller\Factory\MyDetailsControllerFactory;
 use Olcs\Controller\IndexController;
 use Olcs\Controller\Licence\Vehicle\ListVehicleController;
@@ -43,8 +41,6 @@
 use Olcs\Form\Element\SearchOrderFieldset;
 use Olcs\Form\Element\SearchOrderFieldsetFactory;
 use Olcs\FormService\Form\Lva as LvaFormService;
-use Olcs\Logging\Log\Processor\CorrelationId;
-use Olcs\Logging\Log\Processor\CorrelationIdFactory;
 use Olcs\Service\Cookie as CookieService;
 use Olcs\Service\Processing as ProcessingService;
 use Olcs\Service\Qa as QaService;
@@ -438,28 +434,6 @@
             ]
         ]
     ],
-    'messages' => [
-        'type' => Segment::class,
-        'options' => [
-            'route' => '/messages[/]',
-            'defaults' => [
-                'controller' => Olcs\Controller\MessagesController::class,
-                'action' => 'index',
-            ],
-        ],
-        'may_terminate' => true,
-        'child_routes' => [
-            'view' => [
-                'type' => Segment::class,
-                'options' => [
-                    'route' => ':conversationId[/]',
-                    'defaults' => [
-                        'action' => 'view',
-                    ],
-                ],
-            ],
-        ],
-    ],
     'create_variation' => [
         'type' => 'segment',
         'options' => [
@@ -545,7 +519,7 @@
         ]
     ],
     'govuk-account' => [
-        'type' => \Laminas\Router\Http\Literal::class,
+        'type' => \Laminas\Mvc\Router\Http\Literal::class,
         'options' => [
             'route' => '/govuk-account',
             'defaults' => [
@@ -555,7 +529,7 @@
         'may_terminate' => false,
         'child_routes' => [
             'process' => [
-                'type' => \Laminas\Router\Http\Literal::class,
+                'type' => \Laminas\Mvc\Router\Http\Literal::class,
                 'options' => [
                     'route' => '/process',
                     'defaults' => [
@@ -566,7 +540,7 @@
         ],
     ],
     'verify' => [
-        'type' => \Laminas\Router\Http\Literal::class,
+        'type' => \Laminas\Mvc\Router\Http\Literal::class,
         'options' => [
             'route' => '/verify',
             'defaults' => [
@@ -1220,7 +1194,7 @@
             'LvaDirectorChange/People' => \Olcs\Controller\Lva\DirectorChange\PeopleController::class,
             'LvaDirectorChange/FinancialHistory' => Olcs\Controller\Lva\DirectorChange\FinancialHistoryController::class,
             'LvaDirectorChange/LicenceHistory' => \Olcs\Controller\Lva\DirectorChange\LicenceHistoryController::class,
-            'LvaDirectorChange/ConvictionsPenalties' => \Olcs\Controller\Lva\DirectorChange\ConvictionsPenaltiesController::class,
+            'LvaDirectorChange/ConvictionsPenalties' => \Olcs\Controller\Lva\DirectorChange\ConvictionsPenaltiesControllerFactory::class,
             'LvaTransportManager/CheckAnswers' => \Olcs\Controller\Lva\TransportManager\CheckAnswersController::class,
             'LvaTransportManager/Confirmation' => \Olcs\Controller\Lva\TransportManager\ConfirmationController::class,
             'LvaTransportManager/OperatorDeclaration' => \Olcs\Controller\Lva\TransportManager\OperatorDeclarationController::class,
@@ -1309,8 +1283,6 @@
 
             Olcs\Controller\GdsVerifyController::class => \Olcs\Controller\Factory\GdsVerifyControllerFactory::class,
 
-            Olcs\Controller\MessagesController::class => MessagesControllerFactory::class,
-
             // License - Surrender
             Olcs\Controller\Licence\Surrender\ReviewContactDetailsController::class => Olcs\Controller\Licence\Surrender\ReviewContactDetailsControllerFactory::class,
             Olcs\Controller\Licence\Surrender\AddressDetailsController::class =>
@@ -1335,6 +1307,7 @@
             \Olcs\Controller\Licence\Vehicle\TransferVehicleConfirmationController::class => \Olcs\Controller\Licence\Vehicle\TransferVehicleConfirmationControllerFactory::class,
             \Olcs\Controller\Licence\Vehicle\Reprint\ReprintLicenceVehicleDiscController::class => \Olcs\Controller\Licence\Vehicle\Reprint\ReprintLicenceVehicleDiscControllerFactory::class,
             \Olcs\Controller\Licence\Vehicle\Reprint\ReprintLicenceVehicleDiscConfirmationController::class => \Olcs\Controller\Licence\Vehicle\Reprint\ReprintLicenceVehicleDiscConfirmationControllerFactory::class,
+            Olcs\Controller\MessagesController::class => Olcs\Controller\Factory\MessagesControllerFactory::class,
             PromptController::class => \Olcs\Controller\PromptControllerFactory::class,
             // Process Signature from GOV.UK Account
             \Olcs\Controller\SignatureVerificationController::class => \Olcs\Controller\SignatureVerificationControllerFactory::class,
@@ -1450,14 +1423,8 @@
             LicenceTransportManagerAdapter::class => LicenceTransportManagerAdapterFactory::class,
             VariationTransportManagerAdapter::class => VariationTransportManagerAdapterFactory::class,
             VariationPeopleAdapter::class => VariationPeopleAdapterFactory::class,
-            \Olcs\Logging\Log\Processor\CorrelationId::class => \Olcs\Logging\Log\Processor\CorrelationIdFactory::class,
         ]
     ),
-    'log_processors' => [
-        'factories' => [
-            CorrelationId::class => CorrelationIdFactory::class,
-        ],
-    ],
     'search' => [
         'invokables' => [
             'operator'          => Common\Data\Object\Search\LicenceSelfserve::class, // Selfserve licence search
@@ -1610,12 +1577,12 @@
             'lva-variation-overview-submission' => LvaFormService\VariationOverviewSubmissionFactory::class,
         ]
     ],
-    'lmc_rbac' => [
+    'zfc_rbac' => [
         'assertion_map' => [
             'selfserve-ebsr-list' => \Olcs\Assertion\Ebsr\EbsrList::class,
         ],
         'guards' => [
-            'LmcRbacMvc\Guard\RoutePermissionsGuard' => [
+            'ZfcRbac\Guard\RoutePermissionsGuard' => [
                 // Dashboard Page
                 'dashboard' => ['selfserve-nav-dashboard'],