feat!: VOL-3691 switch to Psr Container (#58)

* feat: VOL-3691 switch to Psr Container BREAKING CHANGE: interop/container no longer supported * fix: psr/container now specifc dependency * feat: update to version 6 of olcs dependencies
dvsa · Feb 21, 2024 · 2cc08c1 · 2cc08c1
1 parent 49b2cdc
commit 2cc08c1
Show file tree

Hide file tree

Showing 198 changed files with 249 additions and 248 deletions.
diff --git a/composer.json b/composer.json
@@ -24,17 +24,18 @@
         "laminas/laminas-mvc-plugin-prg": "^1.7",
         "laminas/laminas-navigation": "^2.15",
         "laminas/laminas-serializer": "^2.10",
-        "laminas/laminas-servicemanager": "^3.0",
+        "laminas/laminas-servicemanager": "^3.3",
         "laminas/laminas-session": "^2.8",
         "laminas/laminas-stdlib": "^3.0",
         "laminas/laminas-validator": "^2.25",
         "laminas/laminas-view": "^2.11",
         "lm-commons/lmc-rbac-mvc": "^3.3",
-        "olcs/olcs-auth": "^5.0.0",
-        "olcs/olcs-common": "^5.0.0",
-        "olcs/olcs-logging": "^5.0.0",
-        "olcs/olcs-transfer": "^5.0.0",
-        "olcs/olcs-utils": "^5.0.0"
+        "olcs/olcs-auth": "^6.0.0",
+        "olcs/olcs-common": "^6.0.0",
+        "olcs/olcs-logging": "^6.0.0",
+        "olcs/olcs-transfer": "^6.0.0",
+        "olcs/olcs-utils": "^6.0.0",
+        "psr/container": "^1.1|^2"
     },
     "require-dev": {
         "bamarni/composer-bin-plugin": "^1.8",

diff --git a/composer.lock b/composer.lock
diff --git a/module/Application/src/Controller/Factory/AddVehiclesQuestionControllerFactory.php b/module/Application/src/Controller/Factory/AddVehiclesQuestionControllerFactory.php
@@ -25,7 +25,7 @@
 use Dvsa\Olcs\Application\Controller\AddVehiclesQuestionController;
 use Dvsa\Olcs\Application\Controller\LvaVehicleController;
 use Dvsa\Olcs\Utils\Translation\NiTextTranslation;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\Mvc\Controller\Plugin\Url;
 use LmcRbacMvc\Service\AuthorizationService;
 

diff --git a/module/Application/src/Controller/Factory/AddressesControllerFactory.php b/module/Application/src/Controller/Factory/AddressesControllerFactory.php
@@ -10,7 +10,7 @@
 use Common\Service\Script\ScriptFactory;
 use Dvsa\Olcs\Application\Controller\AddressesController;
 use Dvsa\Olcs\Utils\Translation\NiTextTranslation;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcRbacMvc\Service\AuthorizationService;
 

diff --git a/module/Application/src/Controller/Factory/BusinessDetailsControllerFactory.php b/module/Application/src/Controller/Factory/BusinessDetailsControllerFactory.php
@@ -12,7 +12,7 @@
 use Common\Service\Table\TableFactory;
 use Dvsa\Olcs\Application\Controller\BusinessDetailsController;
 use Dvsa\Olcs\Utils\Translation\NiTextTranslation;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcRbacMvc\Identity\IdentityProviderInterface;
 use LmcRbacMvc\Service\AuthorizationService;

diff --git a/module/Application/src/Controller/Factory/BusinessTypeControllerFactory.php b/module/Application/src/Controller/Factory/BusinessTypeControllerFactory.php
@@ -14,7 +14,7 @@
 use Dvsa\Olcs\Application\Controller\BusinessTypeController;
 use Dvsa\Olcs\Transfer\Util\Annotation\AnnotationBuilder;
 use Dvsa\Olcs\Utils\Translation\NiTextTranslation;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcRbacMvc\Identity\IdentityProviderInterface;
 use LmcRbacMvc\Service\AuthorizationService;

diff --git a/module/Application/src/Controller/Factory/ConvictionsPenaltiesControllerFactory.php b/module/Application/src/Controller/Factory/ConvictionsPenaltiesControllerFactory.php
@@ -11,7 +11,7 @@
 use Common\Service\Table\TableFactory;
 use Dvsa\Olcs\Application\Controller\ConvictionsPenaltiesController;
 use Dvsa\Olcs\Utils\Translation\NiTextTranslation;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcRbacMvc\Service\AuthorizationService;
 

diff --git a/module/Application/src/Controller/Factory/FinancialEvidenceControllerFactory.php b/module/Application/src/Controller/Factory/FinancialEvidenceControllerFactory.php
@@ -14,7 +14,7 @@
 use Dvsa\Olcs\Application\Controller\FinancialEvidenceController;
 use Dvsa\Olcs\Transfer\Util\Annotation\AnnotationBuilder;
 use Dvsa\Olcs\Utils\Translation\NiTextTranslation;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcRbacMvc\Service\AuthorizationService;
 

diff --git a/module/Application/src/Controller/Factory/FinancialHistoryControllerFactory.php b/module/Application/src/Controller/Factory/FinancialHistoryControllerFactory.php
@@ -11,7 +11,7 @@
 use Common\Service\Script\ScriptFactory;
 use Dvsa\Olcs\Application\Controller\FinancialHistoryController;
 use Dvsa\Olcs\Utils\Translation\NiTextTranslation;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 
 use LmcRbacMvc\Service\AuthorizationService;

diff --git a/module/Application/src/Controller/Factory/LicenceHistoryControllerFactory.php b/module/Application/src/Controller/Factory/LicenceHistoryControllerFactory.php
@@ -11,7 +11,7 @@
 use Common\Service\Table\TableFactory;
 use Dvsa\Olcs\Application\Controller\LicenceHistoryController;
 use Dvsa\Olcs\Utils\Translation\NiTextTranslation;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcRbacMvc\Service\AuthorizationService;
 

diff --git a/module/Application/src/Controller/Factory/LvaVehicleControllerFactory.php b/module/Application/src/Controller/Factory/LvaVehicleControllerFactory.php
@@ -15,7 +15,7 @@
 use Common\Service\Table\TableFactory;
 use Dvsa\Olcs\Application\Controller\LvaVehicleController;
 use Dvsa\Olcs\Utils\Translation\NiTextTranslation;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcRbacMvc\Service\AuthorizationService;
 

diff --git a/module/Application/src/Controller/Factory/OperatingCentresControllerFactory.php b/module/Application/src/Controller/Factory/OperatingCentresControllerFactory.php
@@ -13,7 +13,7 @@
 use Common\Service\Script\ScriptFactory;
 use Dvsa\Olcs\Application\Controller\OperatingCentresController;
 use Dvsa\Olcs\Utils\Translation\NiTextTranslation;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcRbacMvc\Service\AuthorizationService;
 

diff --git a/module/Application/src/Controller/Factory/OverviewControllerFactory.php b/module/Application/src/Controller/Factory/OverviewControllerFactory.php
@@ -8,7 +8,7 @@
 use Common\Service\Helper\StringHelperService;
 use Dvsa\Olcs\Application\Controller\OverviewController;
 use Dvsa\Olcs\Utils\Translation\NiTextTranslation;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcRbacMvc\Service\AuthorizationService;
 

diff --git a/module/Application/src/Controller/Factory/PaymentSubmissionControllerFactory.php b/module/Application/src/Controller/Factory/PaymentSubmissionControllerFactory.php
@@ -10,7 +10,7 @@
 use Common\Service\Table\TableFactory;
 use Dvsa\Olcs\Application\Controller\PaymentSubmissionController;
 use Dvsa\Olcs\Utils\Translation\NiTextTranslation;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcRbacMvc\Service\AuthorizationService;
 

diff --git a/module/Application/src/Controller/Factory/PeopleControllerFactory.php b/module/Application/src/Controller/Factory/PeopleControllerFactory.php
@@ -12,7 +12,7 @@
 use Common\Service\Script\ScriptFactory;
 use Dvsa\Olcs\Application\Controller\PeopleController;
 use Dvsa\Olcs\Utils\Translation\NiTextTranslation;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Olcs\Controller\Lva\Adapters\ApplicationPeopleAdapter;
 use LmcRbacMvc\Service\AuthorizationService;

diff --git a/module/Application/src/Controller/Factory/SafetyControllerFactory.php b/module/Application/src/Controller/Factory/SafetyControllerFactory.php
@@ -12,7 +12,7 @@
 use Common\Service\Table\TableFactory;
 use Dvsa\Olcs\Application\Controller\SafetyController;
 use Dvsa\Olcs\Utils\Translation\NiTextTranslation;
-use Interop\Container\ContainerInterface;
+use Psr\Container\ContainerInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use LmcRbacMvc\Service\AuthorizationService;