diff --git a/composer.json b/composer.json index 54382b1e0..548b67974 100644 --- 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 index 2509701d2..b3a06d19f 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ee109a47f556b23ead54adbd0e62c99e", + "content-hash": "18d4a42caf28538763e6a0b1f2e11bde", "packages": [ { "name": "brick/varexporter", @@ -3924,39 +3924,38 @@ }, { "name": "olcs/olcs-auth", - "version": "5.0.0-beta.1", + "version": "v6.0.0", "source": { "type": "git", "url": "https://github.com/dvsa/olcs-auth.git", - "reference": "144eb3f73682efa55f284b8c523c8157bebd7def" + "reference": "0f6697ca81e8c169af0aca385781a52ac0b9dc55" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dvsa/olcs-auth/zipball/144eb3f73682efa55f284b8c523c8157bebd7def", - "reference": "144eb3f73682efa55f284b8c523c8157bebd7def", + "url": "https://api.github.com/repos/dvsa/olcs-auth/zipball/0f6697ca81e8c169af0aca385781a52ac0b9dc55", + "reference": "0f6697ca81e8c169af0aca385781a52ac0b9dc55", "shasum": "" }, "require": { - "container-interop/container-interop": "^1.2", "laminas/laminas-authentication": "^2.5", "laminas/laminas-form": "^3.0.0", "laminas/laminas-http": "^2.5", "laminas/laminas-mvc": "^3.3.0", "laminas/laminas-mvc-plugin-flashmessenger": "^1.8", - "laminas/laminas-servicemanager": "^3.0.0", + "laminas/laminas-servicemanager": "^3.3", "laminas/laminas-session": "^2.8.1", "laminas/laminas-stdlib": "^3.0.0", "laminas/laminas-view": "^2.11", "lm-commons/lmc-rbac-mvc": "^3.3", "php": "^7.4", - "psr/container": "^1.1.2" + "psr/container": "^1.1|^2" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8", "johnkary/phpunit-speedtrap": "^4.0", "mockery/mockery": "^1.6", - "olcs/olcs-common": "^5.0.0", - "olcs/olcs-transfer": "^5.0.0", + "olcs/olcs-common": "^6.0", + "olcs/olcs-transfer": "^6.0", "phpunit/phpunit": "^9.6" }, "type": "library", @@ -3977,26 +3976,25 @@ ], "description": "OLCS Authentication", "support": { - "source": "https://github.com/dvsa/olcs-auth/tree/5.0.0-beta.1" + "source": "https://github.com/dvsa/olcs-auth/tree/v6.0.0" }, - "time": "2024-01-16T17:02:18+00:00" + "time": "2024-02-20T12:13:06+00:00" }, { "name": "olcs/olcs-common", - "version": "v5.1.1", + "version": "v6.0.0", "source": { "type": "git", "url": "https://github.com/dvsa/olcs-common.git", - "reference": "73b1c0cf809b50138dd1f5b471905361f1cd868e" + "reference": "3f4192f5df14a23a77797c7acd0454856500a483" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dvsa/olcs-common/zipball/73b1c0cf809b50138dd1f5b471905361f1cd868e", - "reference": "73b1c0cf809b50138dd1f5b471905361f1cd868e", + "url": "https://api.github.com/repos/dvsa/olcs-common/zipball/3f4192f5df14a23a77797c7acd0454856500a483", + "reference": "3f4192f5df14a23a77797c7acd0454856500a483", "shasum": "" }, "require": { - "container-interop/container-interop": "^1.2", "ezyang/htmlpurifier": "^4.17", "laminas/laminas-authentication": "^2.6", "laminas/laminas-cache": "^3.0", @@ -4014,10 +4012,11 @@ "laminas/laminas-stdlib": "^3.0", "laminas/laminas-validator": "^2.11", "laminas/laminas-view": "^2.11", - "olcs/olcs-logging": "^5.0.0", - "olcs/olcs-transfer": "^5.0.0", - "olcs/olcs-utils": "^5.0", - "php": "^7.4" + "olcs/olcs-logging": "^6.0", + "olcs/olcs-transfer": "^6.0", + "olcs/olcs-utils": "^6.0", + "php": "^7.4", + "psr/container": "^1.1|^2" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8", @@ -4050,22 +4049,22 @@ "notification-url": "https://packagist.org/downloads/", "description": "Common library for the OLCS Project", "support": { - "source": "https://github.com/dvsa/olcs-common/tree/v5.1.1" + "source": "https://github.com/dvsa/olcs-common/tree/v6.0.0" }, - "time": "2024-02-16T10:40:20+00:00" + "time": "2024-02-20T12:08:06+00:00" }, { "name": "olcs/olcs-logging", - "version": "5.0.0.beta1", + "version": "v6.0.0", "source": { "type": "git", "url": "https://github.com/dvsa/olcs-logging.git", - "reference": "41f38b368ec4bd6530b04396215e577bb466b494" + "reference": "558e3fbd7a53e1483658d2b2edd8c2de6bef220a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dvsa/olcs-logging/zipball/41f38b368ec4bd6530b04396215e577bb466b494", - "reference": "41f38b368ec4bd6530b04396215e577bb466b494", + "url": "https://api.github.com/repos/dvsa/olcs-logging/zipball/558e3fbd7a53e1483658d2b2edd8c2de6bef220a", + "reference": "558e3fbd7a53e1483658d2b2edd8c2de6bef220a", "shasum": "" }, "require": { @@ -4076,6 +4075,7 @@ "laminas/laminas-session": "^2.8.7", "laminas/laminas-stdlib": "^3.0", "php": "^7.4", + "psr/container": "^1.1|^2", "psr/log": "^1.0" }, "require-dev": { @@ -4102,22 +4102,22 @@ ], "description": "Logging Module for OLCS", "support": { - "source": "https://github.com/dvsa/olcs-logging/tree/5.0.0.beta1" + "source": "https://github.com/dvsa/olcs-logging/tree/v6.0.0" }, - "time": "2023-11-28T16:45:42+00:00" + "time": "2024-02-20T11:41:22+00:00" }, { "name": "olcs/olcs-transfer", - "version": "v5.1.0", + "version": "v6.0.0", "source": { "type": "git", "url": "https://github.com/dvsa/olcs-transfer.git", - "reference": "b1fe910e1dafbf495367d16fe1953cf1aa9f88b6" + "reference": "147e9c70bb96e2e0da3f4828b582ec70c039f171" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dvsa/olcs-transfer/zipball/b1fe910e1dafbf495367d16fe1953cf1aa9f88b6", - "reference": "b1fe910e1dafbf495367d16fe1953cf1aa9f88b6", + "url": "https://api.github.com/repos/dvsa/olcs-transfer/zipball/147e9c70bb96e2e0da3f4828b582ec70c039f171", + "reference": "147e9c70bb96e2e0da3f4828b582ec70c039f171", "shasum": "" }, "require": { @@ -4129,11 +4129,12 @@ "laminas/laminas-form": "^3.1.1", "laminas/laminas-inputfilter": "^2.10.1", "laminas/laminas-router": "^3.9", - "laminas/laminas-servicemanager": "^3.0", + "laminas/laminas-servicemanager": "^3.3", "laminas/laminas-stdlib": "^3.0", "laminas/laminas-validator": "^2.11.1", "laminas/laminas-xml": "^1.4.0", - "php": "^7.4" + "php": "^7.4", + "psr/container": "^1.1|^2" }, "require-dev": { "bamarni/composer-bin-plugin": "^1.8", @@ -4157,32 +4158,31 @@ "notification-url": "https://packagist.org/downloads/", "description": "OLCS Transfer", "support": { - "source": "https://github.com/dvsa/olcs-transfer/tree/v5.1.0" + "source": "https://github.com/dvsa/olcs-transfer/tree/v6.0.0" }, - "time": "2024-02-16T10:21:39+00:00" + "time": "2024-02-20T11:53:18+00:00" }, { "name": "olcs/olcs-utils", - "version": "5.0.0-beta.2", + "version": "v6.0.0", "source": { "type": "git", "url": "https://github.com/dvsa/olcs-utils.git", - "reference": "9ec3b807ff8ca1670989ced79010bd3db53f2010" + "reference": "d639bbac153fc7bf7c940b3ebf67c3a239011818" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dvsa/olcs-utils/zipball/9ec3b807ff8ca1670989ced79010bd3db53f2010", - "reference": "9ec3b807ff8ca1670989ced79010bd3db53f2010", + "url": "https://api.github.com/repos/dvsa/olcs-utils/zipball/d639bbac153fc7bf7c940b3ebf67c3a239011818", + "reference": "d639bbac153fc7bf7c940b3ebf67c3a239011818", "shasum": "" }, "require": { - "container-interop/container-interop": "^1.2", "laminas/laminas-eventmanager": "^3.0", "laminas/laminas-http": "^2.8", "laminas/laminas-i18n": "^2.14", "laminas/laminas-mvc": "^3.3", "laminas/laminas-mvc-i18n": "^1.4", - "laminas/laminas-servicemanager": "^3.0", + "laminas/laminas-servicemanager": "^3.3", "laminas/laminas-view": "^2.11", "php": "^7.4", "psr/container": "^1.1|^2.0" @@ -4191,7 +4191,7 @@ "bamarni/composer-bin-plugin": "^1.8", "johnkary/phpunit-speedtrap": "^4.0", "mockery/mockery": "^1.6", - "olcs/olcs-logging": "^5.0.0", + "olcs/olcs-logging": "^6.0", "phpunit/phpunit": "^9.6" }, "type": "library", @@ -4209,9 +4209,9 @@ "notification-url": "https://packagist.org/downloads/", "description": "OLCS Utils", "support": { - "source": "https://github.com/dvsa/olcs-utils/tree/5.0.0-beta.2" + "source": "https://github.com/dvsa/olcs-utils/tree/v6.0.0" }, - "time": "2023-12-19T14:01:18+00:00" + "time": "2024-02-20T11:46:06+00:00" }, { "name": "psr/cache", diff --git a/module/Application/src/Controller/Factory/AddVehiclesQuestionControllerFactory.php b/module/Application/src/Controller/Factory/AddVehiclesQuestionControllerFactory.php index ef36e8e3e..8442a77a1 100644 --- 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 index d327f8667..d3e22cdd2 100644 --- 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 index 3b2288ea4..eda5e3cd7 100644 --- 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 index 342761d88..f3f19907b 100644 --- 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 index 43f3180de..b1061c76a 100644 --- 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 index f54219501..09409cac1 100644 --- 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 index 24c1415e0..76f14e6b7 100644 --- 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 index e4fa4d5b4..e8636ad0f 100644 --- 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 index 9a1144ae8..8f4b569ef 100644 --- 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 index 3450f7c29..7a0edd88f 100644 --- 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 index fa0b37388..e69b40b74 100644 --- 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 index 6c9cca23c..39855af84 100644 --- 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 index 269c14b6b..ed5a94a96 100644 --- 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 index 0244dfc6b..1cc067aee 100644 --- 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; diff --git a/module/Application/src/Controller/Factory/SummaryControllerFactory.php b/module/Application/src/Controller/Factory/SummaryControllerFactory.php index 6adccdf89..199ab6779 100644 --- a/module/Application/src/Controller/Factory/SummaryControllerFactory.php +++ b/module/Application/src/Controller/Factory/SummaryControllerFactory.php @@ -6,7 +6,7 @@ use Common\Service\Helper\StringHelperService; use Dvsa\Olcs\Application\Controller\SummaryController; 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/TaxiPhvControllerFactory.php b/module/Application/src/Controller/Factory/TaxiPhvControllerFactory.php index 6c5b2d23f..e3375d4af 100644 --- a/module/Application/src/Controller/Factory/TaxiPhvControllerFactory.php +++ b/module/Application/src/Controller/Factory/TaxiPhvControllerFactory.php @@ -12,7 +12,7 @@ use Common\Service\Table\TableFactory; use Dvsa\Olcs\Application\Controller\TaxiPhvController; 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/TransportManagersControllerFactory.php b/module/Application/src/Controller/Factory/TransportManagersControllerFactory.php index 6bc52ac1a..b105f6b9a 100644 --- a/module/Application/src/Controller/Factory/TransportManagersControllerFactory.php +++ b/module/Application/src/Controller/Factory/TransportManagersControllerFactory.php @@ -18,7 +18,7 @@ use Dvsa\Olcs\Application\Controller\TransportManagersController; 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/TypeOfLicenceControllerFactory.php b/module/Application/src/Controller/Factory/TypeOfLicenceControllerFactory.php index bb9452973..95acd9396 100644 --- a/module/Application/src/Controller/Factory/TypeOfLicenceControllerFactory.php +++ b/module/Application/src/Controller/Factory/TypeOfLicenceControllerFactory.php @@ -13,7 +13,7 @@ use Dvsa\Olcs\Application\Controller\TypeOfLicenceController; 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/UndertakingsControllerFactory.php b/module/Application/src/Controller/Factory/UndertakingsControllerFactory.php index 35e78f62f..de94d527c 100644 --- a/module/Application/src/Controller/Factory/UndertakingsControllerFactory.php +++ b/module/Application/src/Controller/Factory/UndertakingsControllerFactory.php @@ -12,7 +12,7 @@ use Dvsa\Olcs\Application\Controller\UndertakingsController; 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/UploadEvidenceControllerFactory.php b/module/Application/src/Controller/Factory/UploadEvidenceControllerFactory.php index 38e4863d0..0222cf05b 100644 --- a/module/Application/src/Controller/Factory/UploadEvidenceControllerFactory.php +++ b/module/Application/src/Controller/Factory/UploadEvidenceControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\StringHelperService; use Dvsa\Olcs\Application\Controller\UploadEvidenceController; 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/VehiclesDeclarationsControllerFactory.php b/module/Application/src/Controller/Factory/VehiclesDeclarationsControllerFactory.php index de29cef49..c3fe695d8 100644 --- a/module/Application/src/Controller/Factory/VehiclesDeclarationsControllerFactory.php +++ b/module/Application/src/Controller/Factory/VehiclesDeclarationsControllerFactory.php @@ -10,7 +10,7 @@ use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Application\Controller\VehiclesDeclarationsController; 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/VehiclesPsvControllerFactory.php b/module/Application/src/Controller/Factory/VehiclesPsvControllerFactory.php index 0613809ab..a8a72155f 100644 --- a/module/Application/src/Controller/Factory/VehiclesPsvControllerFactory.php +++ b/module/Application/src/Controller/Factory/VehiclesPsvControllerFactory.php @@ -15,7 +15,7 @@ use Common\Service\Table\TableFactory; use Dvsa\Olcs\Application\Controller\VehiclesPsvController; 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/Olcs/src/Auth/Adapter/SelfserveCommandAdapterFactory.php b/module/Olcs/src/Auth/Adapter/SelfserveCommandAdapterFactory.php index 347c265e4..5aebdcdff 100644 --- a/module/Olcs/src/Auth/Adapter/SelfserveCommandAdapterFactory.php +++ b/module/Olcs/src/Auth/Adapter/SelfserveCommandAdapterFactory.php @@ -3,7 +3,7 @@ namespace Olcs\Auth\Adapter; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class SelfserveCommandAdapterFactory implements FactoryInterface diff --git a/module/Olcs/src/Controller/Auth/LoginControllerFactory.php b/module/Olcs/src/Controller/Auth/LoginControllerFactory.php index c99a45d48..4341a29ca 100644 --- a/module/Olcs/src/Controller/Auth/LoginControllerFactory.php +++ b/module/Olcs/src/Controller/Auth/LoginControllerFactory.php @@ -10,7 +10,7 @@ use Common\Controller\Plugin\Redirect; use Common\Service\Helper\FormHelperService; use Dvsa\Olcs\Auth\Container\AuthChallengeContainer; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Auth\Adapter\SelfserveCommandAdapter; diff --git a/module/Olcs/src/Controller/Cookie/DetailsControllerFactory.php b/module/Olcs/src/Controller/Cookie/DetailsControllerFactory.php index e0668a793..9e63d94cc 100644 --- a/module/Olcs/src/Controller/Cookie/DetailsControllerFactory.php +++ b/module/Olcs/src/Controller/Cookie/DetailsControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Cookie/SettingsControllerFactory.php b/module/Olcs/src/Controller/Cookie/SettingsControllerFactory.php index fa347c346..afe78bdde 100644 --- a/module/Olcs/src/Controller/Cookie/SettingsControllerFactory.php +++ b/module/Olcs/src/Controller/Cookie/SettingsControllerFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Controller\Cookie; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class SettingsControllerFactory implements FactoryInterface diff --git a/module/Olcs/src/Controller/Factory/BusReg/BusRegBrowseControllerFactory.php b/module/Olcs/src/Controller/Factory/BusReg/BusRegBrowseControllerFactory.php index da414e236..c490ff001 100644 --- a/module/Olcs/src/Controller/Factory/BusReg/BusRegBrowseControllerFactory.php +++ b/module/Olcs/src/Controller/Factory/BusReg/BusRegBrowseControllerFactory.php @@ -6,7 +6,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\BusReg\BusRegBrowseController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Factory/BusReg/BusRegRegistrationsControllerFactory.php b/module/Olcs/src/Controller/Factory/BusReg/BusRegRegistrationsControllerFactory.php index a6e97fc23..6f0be83a9 100644 --- a/module/Olcs/src/Controller/Factory/BusReg/BusRegRegistrationsControllerFactory.php +++ b/module/Olcs/src/Controller/Factory/BusReg/BusRegRegistrationsControllerFactory.php @@ -6,7 +6,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\BusReg\BusRegRegistrationsController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Factory/CorrespondenceControllerFactory.php b/module/Olcs/src/Controller/Factory/CorrespondenceControllerFactory.php index 1cfe81e48..bda6df056 100644 --- a/module/Olcs/src/Controller/Factory/CorrespondenceControllerFactory.php +++ b/module/Olcs/src/Controller/Factory/CorrespondenceControllerFactory.php @@ -5,7 +5,7 @@ use Common\Service\Helper\FlashMessengerHelperService; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\CorrespondenceController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Factory/DashboardControllerFactory.php b/module/Olcs/src/Controller/Factory/DashboardControllerFactory.php index d5ffded8c..f5e2ef64b 100644 --- a/module/Olcs/src/Controller/Factory/DashboardControllerFactory.php +++ b/module/Olcs/src/Controller/Factory/DashboardControllerFactory.php @@ -5,7 +5,7 @@ use Common\Service\Table\DataMapper\DashboardTmApplications; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\Authentication\Storage\Session; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\DashboardController; diff --git a/module/Olcs/src/Controller/Factory/Ebsr/BusRegApplicationsControllerFactory.php b/module/Olcs/src/Controller/Factory/Ebsr/BusRegApplicationsControllerFactory.php index 971a3dc8f..5d7fbe90f 100644 --- a/module/Olcs/src/Controller/Factory/Ebsr/BusRegApplicationsControllerFactory.php +++ b/module/Olcs/src/Controller/Factory/Ebsr/BusRegApplicationsControllerFactory.php @@ -6,7 +6,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Ebsr\BusRegApplicationsController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Factory/Ebsr/UploadsControllerFactory.php b/module/Olcs/src/Controller/Factory/Ebsr/UploadsControllerFactory.php index 09ea1ced6..a5836e2d6 100644 --- a/module/Olcs/src/Controller/Factory/Ebsr/UploadsControllerFactory.php +++ b/module/Olcs/src/Controller/Factory/Ebsr/UploadsControllerFactory.php @@ -5,7 +5,7 @@ use Common\Service\Helper\FileUploadHelperService; use Common\Service\Helper\FormHelperService; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Ebsr\UploadsController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Factory/Entity/ViewControllerFactory.php b/module/Olcs/src/Controller/Factory/Entity/ViewControllerFactory.php index de2431038..2124d799c 100644 --- a/module/Olcs/src/Controller/Factory/Entity/ViewControllerFactory.php +++ b/module/Olcs/src/Controller/Factory/Entity/ViewControllerFactory.php @@ -5,7 +5,7 @@ use Common\Service\Helper\FlashMessengerHelperService; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Entity\ViewController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Factory/FeesControllerFactory.php b/module/Olcs/src/Controller/Factory/FeesControllerFactory.php index f614c8995..48fee7ab7 100644 --- a/module/Olcs/src/Controller/Factory/FeesControllerFactory.php +++ b/module/Olcs/src/Controller/Factory/FeesControllerFactory.php @@ -9,7 +9,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\FeesController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Factory/GdsVerifyControllerFactory.php b/module/Olcs/src/Controller/Factory/GdsVerifyControllerFactory.php index efa6276ce..0d00bae85 100644 --- a/module/Olcs/src/Controller/Factory/GdsVerifyControllerFactory.php +++ b/module/Olcs/src/Controller/Factory/GdsVerifyControllerFactory.php @@ -6,7 +6,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\Cache\Storage\Adapter\Redis; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\GdsVerifyController; diff --git a/module/Olcs/src/Controller/Factory/IndexControllerFactory.php b/module/Olcs/src/Controller/Factory/IndexControllerFactory.php index 2467a0310..9691f7996 100644 --- a/module/Olcs/src/Controller/Factory/IndexControllerFactory.php +++ b/module/Olcs/src/Controller/Factory/IndexControllerFactory.php @@ -3,7 +3,7 @@ namespace Olcs\Controller\Factory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\IndexController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Factory/MyDetailsControllerFactory.php b/module/Olcs/src/Controller/Factory/MyDetailsControllerFactory.php index 48155753d..88ef8d4b0 100644 --- a/module/Olcs/src/Controller/Factory/MyDetailsControllerFactory.php +++ b/module/Olcs/src/Controller/Factory/MyDetailsControllerFactory.php @@ -6,7 +6,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\DashboardController; use Olcs\Controller\MyDetailsController; diff --git a/module/Olcs/src/Controller/Factory/UserControllerFactory.php b/module/Olcs/src/Controller/Factory/UserControllerFactory.php index 9ff3b557c..74076b300 100644 --- a/module/Olcs/src/Controller/Factory/UserControllerFactory.php +++ b/module/Olcs/src/Controller/Factory/UserControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\TranslationHelperService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\DashboardController; use Olcs\Controller\UserController; diff --git a/module/Olcs/src/Controller/Factory/UserForgotUsernameControllerFactory.php b/module/Olcs/src/Controller/Factory/UserForgotUsernameControllerFactory.php index 2804837af..76a5a3586 100644 --- a/module/Olcs/src/Controller/Factory/UserForgotUsernameControllerFactory.php +++ b/module/Olcs/src/Controller/Factory/UserForgotUsernameControllerFactory.php @@ -5,7 +5,7 @@ use Common\Service\Helper\FlashMessengerHelperService; use Common\Service\Helper\FormHelperService; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\UserForgotUsernameController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Factory/UserRegistrationControllerFactory.php b/module/Olcs/src/Controller/Factory/UserRegistrationControllerFactory.php index 339c0dfb1..c465e8bd2 100644 --- a/module/Olcs/src/Controller/Factory/UserRegistrationControllerFactory.php +++ b/module/Olcs/src/Controller/Factory/UserRegistrationControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\UrlHelperService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\UserRegistrationController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Initializer/Navigation.php b/module/Olcs/src/Controller/Initializer/Navigation.php index ab90c9b85..6eb05c70d 100644 --- a/module/Olcs/src/Controller/Initializer/Navigation.php +++ b/module/Olcs/src/Controller/Initializer/Navigation.php @@ -3,7 +3,7 @@ namespace Olcs\Controller\Initializer; use Dvsa\Olcs\Auth\Controller\LoginController; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\Mvc\MvcEvent; use Laminas\ServiceManager\Initializer\InitializerInterface; use Olcs\Controller\Listener\Navigation as NavigationListener; diff --git a/module/Olcs/src/Controller/Licence/Surrender/AddressDetailsControllerFactory.php b/module/Olcs/src/Controller/Licence/Surrender/AddressDetailsControllerFactory.php index 05578f399..4a03cdc60 100644 --- a/module/Olcs/src/Controller/Licence/Surrender/AddressDetailsControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Surrender/AddressDetailsControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Surrender/CommunityLicenceControllerFactory.php b/module/Olcs/src/Controller/Licence/Surrender/CommunityLicenceControllerFactory.php index c20871b9e..ad720f390 100644 --- a/module/Olcs/src/Controller/Licence/Surrender/CommunityLicenceControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Surrender/CommunityLicenceControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Surrender/ConfirmationControllerFactory.php b/module/Olcs/src/Controller/Licence/Surrender/ConfirmationControllerFactory.php index 7b623a965..f8faac0a4 100644 --- a/module/Olcs/src/Controller/Licence/Surrender/ConfirmationControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Surrender/ConfirmationControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Surrender/CurrentDiscsControllerFactory.php b/module/Olcs/src/Controller/Licence/Surrender/CurrentDiscsControllerFactory.php index 7eb996553..c081ffe0d 100644 --- a/module/Olcs/src/Controller/Licence/Surrender/CurrentDiscsControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Surrender/CurrentDiscsControllerFactory.php @@ -9,7 +9,7 @@ use Common\Service\Helper\TranslationHelperService; use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Surrender/DeclarationControllerFactory.php b/module/Olcs/src/Controller/Licence/Surrender/DeclarationControllerFactory.php index e4928af6f..93382a65b 100644 --- a/module/Olcs/src/Controller/Licence/Surrender/DeclarationControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Surrender/DeclarationControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Surrender/DestroyControllerFactory.php b/module/Olcs/src/Controller/Licence/Surrender/DestroyControllerFactory.php index c4d9ae1e7..6761ec0c5 100644 --- a/module/Olcs/src/Controller/Licence/Surrender/DestroyControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Surrender/DestroyControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Surrender/InformationChangedControllerFactory.php b/module/Olcs/src/Controller/Licence/Surrender/InformationChangedControllerFactory.php index 336082c9c..f51f1d9f5 100644 --- a/module/Olcs/src/Controller/Licence/Surrender/InformationChangedControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Surrender/InformationChangedControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Surrender/OperatorLicenceControllerFactory.php b/module/Olcs/src/Controller/Licence/Surrender/OperatorLicenceControllerFactory.php index 14af328e1..3ab5fd385 100644 --- a/module/Olcs/src/Controller/Licence/Surrender/OperatorLicenceControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Surrender/OperatorLicenceControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Surrender/PrintSignReturnControllerFactory.php b/module/Olcs/src/Controller/Licence/Surrender/PrintSignReturnControllerFactory.php index 13d2312b6..a5594aa32 100644 --- a/module/Olcs/src/Controller/Licence/Surrender/PrintSignReturnControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Surrender/PrintSignReturnControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Surrender/ReviewContactDetailsControllerFactory.php b/module/Olcs/src/Controller/Licence/Surrender/ReviewContactDetailsControllerFactory.php index 68942d368..4a3313401 100644 --- a/module/Olcs/src/Controller/Licence/Surrender/ReviewContactDetailsControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Surrender/ReviewContactDetailsControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Surrender/ReviewControllerFactory.php b/module/Olcs/src/Controller/Licence/Surrender/ReviewControllerFactory.php index de0950d96..14a026f41 100644 --- a/module/Olcs/src/Controller/Licence/Surrender/ReviewControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Surrender/ReviewControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Surrender/StartControllerFactory.php b/module/Olcs/src/Controller/Licence/Surrender/StartControllerFactory.php index 9b23398c0..d25697627 100644 --- a/module/Olcs/src/Controller/Licence/Surrender/StartControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Surrender/StartControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Vehicle/AddDuplicateVehicleControllerFactory.php b/module/Olcs/src/Controller/Licence/Vehicle/AddDuplicateVehicleControllerFactory.php index f96f4600a..03e082064 100644 --- a/module/Olcs/src/Controller/Licence/Vehicle/AddDuplicateVehicleControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Vehicle/AddDuplicateVehicleControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Vehicle/AddVehicleSearchControllerFactory.php b/module/Olcs/src/Controller/Licence/Vehicle/AddVehicleSearchControllerFactory.php index d165e85e1..5de281539 100644 --- a/module/Olcs/src/Controller/Licence/Vehicle/AddVehicleSearchControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Vehicle/AddVehicleSearchControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Vehicle/ListVehicleControllerFactory.php b/module/Olcs/src/Controller/Licence/Vehicle/ListVehicleControllerFactory.php index 9f63f66f8..813b03599 100644 --- a/module/Olcs/src/Controller/Licence/Vehicle/ListVehicleControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Vehicle/ListVehicleControllerFactory.php @@ -13,7 +13,7 @@ use Common\Service\Helper\ResponseHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\Mvc\Controller\Plugin\Url; use Laminas\ServiceManager\Factory\FactoryInterface; diff --git a/module/Olcs/src/Controller/Licence/Vehicle/RemoveVehicleConfirmationControllerFactory.php b/module/Olcs/src/Controller/Licence/Vehicle/RemoveVehicleConfirmationControllerFactory.php index 5a43b6e3e..c8f5b3b18 100644 --- a/module/Olcs/src/Controller/Licence/Vehicle/RemoveVehicleConfirmationControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Vehicle/RemoveVehicleConfirmationControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Vehicle/RemoveVehicleControllerFactory.php b/module/Olcs/src/Controller/Licence/Vehicle/RemoveVehicleControllerFactory.php index 2ae5cb6e5..f9ec2260b 100644 --- a/module/Olcs/src/Controller/Licence/Vehicle/RemoveVehicleControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Vehicle/RemoveVehicleControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Vehicle/Reprint/ReprintLicenceVehicleDiscConfirmationControllerFactory.php b/module/Olcs/src/Controller/Licence/Vehicle/Reprint/ReprintLicenceVehicleDiscConfirmationControllerFactory.php index 94c2aaf85..6f9d4e223 100644 --- a/module/Olcs/src/Controller/Licence/Vehicle/Reprint/ReprintLicenceVehicleDiscConfirmationControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Vehicle/Reprint/ReprintLicenceVehicleDiscConfirmationControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Vehicle/Reprint/ReprintLicenceVehicleDiscControllerFactory.php b/module/Olcs/src/Controller/Licence/Vehicle/Reprint/ReprintLicenceVehicleDiscControllerFactory.php index 2fb84b255..6866e8081 100644 --- a/module/Olcs/src/Controller/Licence/Vehicle/Reprint/ReprintLicenceVehicleDiscControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Vehicle/Reprint/ReprintLicenceVehicleDiscControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Vehicle/SwitchBoardControllerFactory.php b/module/Olcs/src/Controller/Licence/Vehicle/SwitchBoardControllerFactory.php index 133dfec09..2a31d1b2b 100644 --- a/module/Olcs/src/Controller/Licence/Vehicle/SwitchBoardControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Vehicle/SwitchBoardControllerFactory.php @@ -10,7 +10,7 @@ use Common\Form\FormValidator; use Common\Service\Helper\FormHelperService; use Common\Service\Helper\ResponseHelperService; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger; use Laminas\Mvc\Controller\Plugin\Url; use Laminas\ServiceManager\Factory\FactoryInterface; diff --git a/module/Olcs/src/Controller/Licence/Vehicle/TransferVehicleConfirmationControllerFactory.php b/module/Olcs/src/Controller/Licence/Vehicle/TransferVehicleConfirmationControllerFactory.php index 5d469fa1d..fff124ab9 100644 --- a/module/Olcs/src/Controller/Licence/Vehicle/TransferVehicleConfirmationControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Vehicle/TransferVehicleConfirmationControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Vehicle/TransferVehicleControllerFactory.php b/module/Olcs/src/Controller/Licence/Vehicle/TransferVehicleControllerFactory.php index d8b2eab68..048796f0f 100644 --- a/module/Olcs/src/Controller/Licence/Vehicle/TransferVehicleControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Vehicle/TransferVehicleControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Licence/Vehicle/ViewVehicleControllerFactory.php b/module/Olcs/src/Controller/Licence/Vehicle/ViewVehicleControllerFactory.php index 00d66c144..2a22fddfb 100644 --- a/module/Olcs/src/Controller/Licence/Vehicle/ViewVehicleControllerFactory.php +++ b/module/Olcs/src/Controller/Licence/Vehicle/ViewVehicleControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/Listener/NavigationFactory.php b/module/Olcs/src/Controller/Listener/NavigationFactory.php index d6005767b..3bc0be35d 100644 --- a/module/Olcs/src/Controller/Listener/NavigationFactory.php +++ b/module/Olcs/src/Controller/Listener/NavigationFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Controller\Listener; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Adapters/ApplicationPeopleAdapter.php b/module/Olcs/src/Controller/Lva/Adapters/ApplicationPeopleAdapter.php index 98ffb3ca9..1e7e85516 100644 --- a/module/Olcs/src/Controller/Lva/Adapters/ApplicationPeopleAdapter.php +++ b/module/Olcs/src/Controller/Lva/Adapters/ApplicationPeopleAdapter.php @@ -3,7 +3,7 @@ namespace Olcs\Controller\Lva\Adapters; use Common\Service\Lva\PeopleLvaService; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; /** * External Application People Adapter diff --git a/module/Olcs/src/Controller/Lva/Adapters/LicencePeopleAdapter.php b/module/Olcs/src/Controller/Lva/Adapters/LicencePeopleAdapter.php index 9147bb3a0..67938141b 100644 --- a/module/Olcs/src/Controller/Lva/Adapters/LicencePeopleAdapter.php +++ b/module/Olcs/src/Controller/Lva/Adapters/LicencePeopleAdapter.php @@ -13,7 +13,7 @@ use Common\Service\Table\TableBuilder; use Dvsa\Olcs\Transfer\Command\AbstractCommand; use Dvsa\Olcs\Transfer\Command\Licence\DeletePeopleViaVariation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\Form\Form; /** diff --git a/module/Olcs/src/Controller/Lva/Adapters/LicenceTransportManagerAdapter.php b/module/Olcs/src/Controller/Lva/Adapters/LicenceTransportManagerAdapter.php index 9996452ed..1ab4436a9 100644 --- a/module/Olcs/src/Controller/Lva/Adapters/LicenceTransportManagerAdapter.php +++ b/module/Olcs/src/Controller/Lva/Adapters/LicenceTransportManagerAdapter.php @@ -7,7 +7,7 @@ use Common\Service\Cqrs\Query\CachingQueryService; use Common\Service\Lva\VariationLvaService; use Dvsa\Olcs\Transfer\Util\Annotation\AnnotationBuilder as TransferAnnotationBuilder; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; /** * External Licence Transport Manager Adater diff --git a/module/Olcs/src/Controller/Lva/Adapters/VariationPeopleAdapter.php b/module/Olcs/src/Controller/Lva/Adapters/VariationPeopleAdapter.php index d0c3fd682..d84b248ad 100644 --- a/module/Olcs/src/Controller/Lva/Adapters/VariationPeopleAdapter.php +++ b/module/Olcs/src/Controller/Lva/Adapters/VariationPeopleAdapter.php @@ -4,7 +4,7 @@ use Common\Controller\Lva\Adapters\AbstractPeopleAdapter; use Common\Service\Lva\PeopleLvaService; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\Form\Form; /** diff --git a/module/Olcs/src/Controller/Lva/Adapters/VariationTransportManagerAdapter.php b/module/Olcs/src/Controller/Lva/Adapters/VariationTransportManagerAdapter.php index cc7bbb48a..a403558cb 100644 --- a/module/Olcs/src/Controller/Lva/Adapters/VariationTransportManagerAdapter.php +++ b/module/Olcs/src/Controller/Lva/Adapters/VariationTransportManagerAdapter.php @@ -6,7 +6,7 @@ use Common\Service\Cqrs\Command\CommandService; use Common\Service\Cqrs\Query\CachingQueryService; use Dvsa\Olcs\Transfer\Util\Annotation\AnnotationBuilder as TransferAnnotationBuilder; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; /** * Variation Transport Manager Adapter diff --git a/module/Olcs/src/Controller/Lva/Factory/Adapter/ApplicationPeopleAdapterFactory.php b/module/Olcs/src/Controller/Lva/Factory/Adapter/ApplicationPeopleAdapterFactory.php index 0c70edf0a..0ef1a9652 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Adapter/ApplicationPeopleAdapterFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Adapter/ApplicationPeopleAdapterFactory.php @@ -5,7 +5,7 @@ namespace Olcs\Controller\Lva\Factory\Adapter; use Common\Service\Lva\PeopleLvaService; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Adapters\ApplicationPeopleAdapter; diff --git a/module/Olcs/src/Controller/Lva/Factory/Adapter/LicencePeopleAdapterFactory.php b/module/Olcs/src/Controller/Lva/Factory/Adapter/LicencePeopleAdapterFactory.php index 784dc57e5..faea7bf2b 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Adapter/LicencePeopleAdapterFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Adapter/LicencePeopleAdapterFactory.php @@ -5,7 +5,7 @@ namespace Olcs\Controller\Lva\Factory\Adapter; use Common\Service\Lva\PeopleLvaService; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Adapters\LicencePeopleAdapter; diff --git a/module/Olcs/src/Controller/Lva/Factory/Adapter/LicenceTransportManagerAdapterFactory.php b/module/Olcs/src/Controller/Lva/Factory/Adapter/LicenceTransportManagerAdapterFactory.php index b74d4c69b..819ed084a 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Adapter/LicenceTransportManagerAdapterFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Adapter/LicenceTransportManagerAdapterFactory.php @@ -6,7 +6,7 @@ use Common\Service\Cqrs\Query\CachingQueryService; use Common\Service\Lva\VariationLvaService; use Dvsa\Olcs\Transfer\Util\Annotation\AnnotationBuilder; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Adapters\LicenceTransportManagerAdapter; diff --git a/module/Olcs/src/Controller/Lva/Factory/Adapter/VariationPeopleAdapterFactory.php b/module/Olcs/src/Controller/Lva/Factory/Adapter/VariationPeopleAdapterFactory.php index fed1cf1c7..ba27dc8d8 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Adapter/VariationPeopleAdapterFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Adapter/VariationPeopleAdapterFactory.php @@ -5,7 +5,7 @@ namespace Olcs\Controller\Lva\Factory\Adapter; use Common\Service\Lva\PeopleLvaService; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Adapters\VariationPeopleAdapter; diff --git a/module/Olcs/src/Controller/Lva/Factory/Adapter/VariationTransportManagerAdapterFactory.php b/module/Olcs/src/Controller/Lva/Factory/Adapter/VariationTransportManagerAdapterFactory.php index 62043ab0a..4f50c104e 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Adapter/VariationTransportManagerAdapterFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Adapter/VariationTransportManagerAdapterFactory.php @@ -5,7 +5,7 @@ use Common\Service\Cqrs\Command\CommandService; use Common\Service\Cqrs\Query\CachingQueryService; use Dvsa\Olcs\Transfer\Util\Annotation\AnnotationBuilder; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Adapters\VariationTransportManagerAdapter; use Psr\Container\ContainerExceptionInterface; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/ConvictionsPenaltiesControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/ConvictionsPenaltiesControllerFactory.php index a22522b4e..a756cbdaa 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/ConvictionsPenaltiesControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/ConvictionsPenaltiesControllerFactory.php @@ -9,7 +9,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\DirectorChange\ConvictionsPenaltiesController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/FinancialHistoryControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/FinancialHistoryControllerFactory.php index 023fd9860..265d521b5 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/FinancialHistoryControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/FinancialHistoryControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FlashMessengerHelperService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\DirectorChange\FinancialHistoryController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/LicenceHistoryControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/LicenceHistoryControllerFactory.php index 99974b950..3e2f4a946 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/LicenceHistoryControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/LicenceHistoryControllerFactory.php @@ -10,7 +10,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\DirectorChange\LicenceHistoryController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/PeopleControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/PeopleControllerFactory.php index 92ca16a0f..71eea7e6d 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/PeopleControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/DirectorChange/PeopleControllerFactory.php @@ -4,7 +4,7 @@ use Common\FormService\FormServiceManager; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Adapters\VariationPeopleAdapter; use Olcs\Controller\Lva\DirectorChange\PeopleController; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/AddressesControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/AddressesControllerFactory.php index 064b1ea05..a2df4f82d 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/AddressesControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/AddressesControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Licence\AddressesController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/BusinessDetailsControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/BusinessDetailsControllerFactory.php index c2563d912..822830af3 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/BusinessDetailsControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/BusinessDetailsControllerFactory.php @@ -10,7 +10,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Licence\BusinessDetailsController; use LmcRbacMvc\Identity\IdentityProviderInterface; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/BusinessTypeControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/BusinessTypeControllerFactory.php index beb569c97..aaea2ce62 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/BusinessTypeControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/BusinessTypeControllerFactory.php @@ -11,7 +11,7 @@ use Common\Service\Script\ScriptFactory; 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 Olcs\Controller\Lva\Licence\BusinessTypeController; use LmcRbacMvc\Identity\IdentityProviderInterface; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/ConditionsUndertakingsControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/ConditionsUndertakingsControllerFactory.php index 1d0b0d464..11610564a 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/ConditionsUndertakingsControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/ConditionsUndertakingsControllerFactory.php @@ -5,7 +5,7 @@ use Common\Service\Helper\GuidanceHelperService; use Common\Service\Review\LicenceConditionsUndertakingsReviewService; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Licence\ConditionsUndertakingsController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/DiscsControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/DiscsControllerFactory.php index 3725bdb0b..3289355f0 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/DiscsControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/DiscsControllerFactory.php @@ -10,7 +10,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Licence\DiscsController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/OperatingCentresControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/OperatingCentresControllerFactory.php index fe18da222..075ac579d 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/OperatingCentresControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/OperatingCentresControllerFactory.php @@ -11,7 +11,7 @@ use Common\Service\Lva\VariationLvaService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Licence\OperatingCentresController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/OverviewControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/OverviewControllerFactory.php index b34726f5a..c302f5385 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/OverviewControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/OverviewControllerFactory.php @@ -4,7 +4,7 @@ use Common\Controller\Lva\Adapters\LicenceLvaAdapter; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Licence\OverviewController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/PeopleControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/PeopleControllerFactory.php index 2707bd0f9..bf3f60064 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/PeopleControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/PeopleControllerFactory.php @@ -10,7 +10,7 @@ use Common\Service\Lva\VariationLvaService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Adapters\LicencePeopleAdapter; use Olcs\Controller\Lva\Licence\PeopleController; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/SafetyControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/SafetyControllerFactory.php index fa3780558..9845264df 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/SafetyControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/SafetyControllerFactory.php @@ -10,7 +10,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Licence\SafetyController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TaxiPhvControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TaxiPhvControllerFactory.php index 05d0c7d02..008f35e8c 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TaxiPhvControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TaxiPhvControllerFactory.php @@ -10,7 +10,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Licence\TaxiPhvController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TrailersControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TrailersControllerFactory.php index b6c0b9428..bf838eef7 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TrailersControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TrailersControllerFactory.php @@ -11,7 +11,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Licence\TrailersController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TransportManagersControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TransportManagersControllerFactory.php index 764e4e4ec..6b6933379 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TransportManagersControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TransportManagersControllerFactory.php @@ -11,7 +11,7 @@ use Common\Service\Script\ScriptFactory; 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 Olcs\Controller\Lva\Adapters\LicenceTransportManagerAdapter; use Olcs\Controller\Lva\Licence\TransportManagersController; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TypeOfLicenceControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TypeOfLicenceControllerFactory.php index b61d81d30..8e8cdd1a5 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TypeOfLicenceControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/TypeOfLicenceControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Lva\VariationLvaService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Licence\TypeOfLicenceController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/VariationControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/VariationControllerFactory.php index 3e5c263ef..64b29a859 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/VariationControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/VariationControllerFactory.php @@ -6,7 +6,7 @@ use Common\Service\Helper\FlashMessengerHelperService; use Common\Service\Helper\TranslationHelperService; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Licence\VariationController; use Olcs\Service\Processing\CreateVariationProcessingService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/VehiclesControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/VehiclesControllerFactory.php index 6a9540646..8dcc283f7 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/VehiclesControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/VehiclesControllerFactory.php @@ -17,7 +17,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Olcs\Controller\Licence\Vehicle\SwitchBoardControllerFactory; use Olcs\Controller\Lva\Licence\VehiclesController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/VehiclesPsvControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/VehiclesPsvControllerFactory.php index 2a1afc4c4..db68b3fc4 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/VehiclesPsvControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Licence/VehiclesPsvControllerFactory.php @@ -13,7 +13,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Licence\VehiclesPsvController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/CheckAnswersControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/CheckAnswersControllerFactory.php index d60f622e9..63e0bc4de 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/CheckAnswersControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/CheckAnswersControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\TranslationHelperService; 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 Olcs\Controller\Lva\TransportManager\CheckAnswersController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/ConfirmationControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/ConfirmationControllerFactory.php index 77684cc57..b0a632257 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/ConfirmationControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/ConfirmationControllerFactory.php @@ -6,7 +6,7 @@ use Common\Service\Helper\TranslationHelperService; 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 Olcs\Controller\Lva\TransportManager\ConfirmationController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/OperatorDeclarationControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/OperatorDeclarationControllerFactory.php index 06f605905..6a486c3f2 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/OperatorDeclarationControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/OperatorDeclarationControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Script\ScriptFactory; 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 Olcs\Controller\Lva\TransportManager\OperatorDeclarationController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/TmDeclarationControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/TmDeclarationControllerFactory.php index 8cccefd9b..56efc4c0f 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/TmDeclarationControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/TransportManager/TmDeclarationControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Script\ScriptFactory; 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 Olcs\Controller\Lva\TransportManager\TmDeclarationController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/AddressesControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/AddressesControllerFactory.php index c7133484e..a5e0f09d0 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/AddressesControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/AddressesControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\AddressesController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/BusinessDetailsControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/BusinessDetailsControllerFactory.php index aa84fed1f..8d149eb96 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/BusinessDetailsControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/BusinessDetailsControllerFactory.php @@ -9,7 +9,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\BusinessDetailsController; use LmcRbacMvc\Identity\IdentityProviderInterface; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/BusinessTypeControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/BusinessTypeControllerFactory.php index 5aac963cf..962a31ab5 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/BusinessTypeControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/BusinessTypeControllerFactory.php @@ -11,7 +11,7 @@ use Common\Service\Script\ScriptFactory; 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 Olcs\Controller\Lva\Variation\BusinessTypeController; use LmcRbacMvc\Identity\IdentityProviderInterface; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/ConvictionsPenaltiesControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/ConvictionsPenaltiesControllerFactory.php index 57cdd0826..47cbda7b4 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/ConvictionsPenaltiesControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/ConvictionsPenaltiesControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\ConvictionsPenaltiesController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/DiscsControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/DiscsControllerFactory.php index 49bbee01e..2df398e1a 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/DiscsControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/DiscsControllerFactory.php @@ -9,7 +9,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\DiscsController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/FinancialEvidenceControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/FinancialEvidenceControllerFactory.php index 4cd3188a7..a62f1f7a0 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/FinancialEvidenceControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/FinancialEvidenceControllerFactory.php @@ -11,7 +11,7 @@ use Common\Service\Table\TableFactory; 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 Olcs\Controller\Lva\Variation\FinancialEvidenceController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/FinancialHistoryControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/FinancialHistoryControllerFactory.php index 96109e085..5e04a5b46 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/FinancialHistoryControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/FinancialHistoryControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FlashMessengerHelperService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\FinancialHistoryController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/LicenceHistoryControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/LicenceHistoryControllerFactory.php index 196510d4e..cea35062d 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/LicenceHistoryControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/LicenceHistoryControllerFactory.php @@ -9,7 +9,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\LicenceHistoryController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/OperatingCentresControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/OperatingCentresControllerFactory.php index a364b6ffa..5b28d578d 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/OperatingCentresControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/OperatingCentresControllerFactory.php @@ -10,7 +10,7 @@ use Common\Service\Lva\VariationLvaService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\OperatingCentresController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/OverviewControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/OverviewControllerFactory.php index 37e04fdf7..629ae2f56 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/OverviewControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/OverviewControllerFactory.php @@ -5,7 +5,7 @@ use Common\FormService\FormServiceManager; use Common\Service\Helper\FormHelperService; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\OverviewController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/PaymentSubmissionControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/PaymentSubmissionControllerFactory.php index 2637fd71d..3a94a1d12 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/PaymentSubmissionControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/PaymentSubmissionControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\PaymentSubmissionController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/PeopleControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/PeopleControllerFactory.php index fb8bb72a9..92d9184c8 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/PeopleControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/PeopleControllerFactory.php @@ -9,7 +9,7 @@ use Common\Service\Lva\VariationLvaService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Adapters\VariationPeopleAdapter; use Olcs\Controller\Lva\Variation\PeopleController; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/SafetyControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/SafetyControllerFactory.php index 0c9b05383..3e64b060d 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/SafetyControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/SafetyControllerFactory.php @@ -9,7 +9,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\SafetyController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/SummaryControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/SummaryControllerFactory.php index 895970260..847eeaf2a 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/SummaryControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/SummaryControllerFactory.php @@ -3,7 +3,7 @@ namespace Olcs\Controller\Lva\Factory\Controller\Variation; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\SummaryController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/TaxiPhvControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/TaxiPhvControllerFactory.php index 5155a4ea6..c46d0d743 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/TaxiPhvControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/TaxiPhvControllerFactory.php @@ -9,7 +9,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\TaxiPhvController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/TransportManagersControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/TransportManagersControllerFactory.php index 12e8ba78e..dbcbb12ae 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/TransportManagersControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/TransportManagersControllerFactory.php @@ -14,7 +14,7 @@ use Common\Service\Table\TableFactory; 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 Olcs\Controller\Lva\Adapters\VariationTransportManagerAdapter; use Olcs\Controller\Lva\Variation\TransportManagersController; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/TypeOfLicenceControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/TypeOfLicenceControllerFactory.php index ee9956b6a..c5cd0d2df 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/TypeOfLicenceControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/TypeOfLicenceControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\TypeOfLicenceController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/UndertakingsControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/UndertakingsControllerFactory.php index d7eb1df13..9efdd077b 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/UndertakingsControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/UndertakingsControllerFactory.php @@ -9,7 +9,7 @@ use Common\Service\Script\ScriptFactory; 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 Olcs\Controller\Lva\Licence\ConditionsUndertakingsController; use Olcs\Controller\Lva\Variation\UndertakingsController; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/UploadEvidenceControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/UploadEvidenceControllerFactory.php index 295aa97a5..7f9005455 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/UploadEvidenceControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/UploadEvidenceControllerFactory.php @@ -5,7 +5,7 @@ use Common\Service\Helper\FileUploadHelperService; use Common\Service\Helper\FormHelperService; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\UploadEvidenceController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/VehiclesControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/VehiclesControllerFactory.php index 8204c0b60..7eed04052 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/VehiclesControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/VehiclesControllerFactory.php @@ -13,7 +13,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\VehiclesController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/VehiclesDeclarationsControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/VehiclesDeclarationsControllerFactory.php index 4edf1f699..aee480f7d 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/VehiclesDeclarationsControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/VehiclesDeclarationsControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Script\ScriptFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\VehiclesDeclarationsController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/VehiclesPsvControllerFactory.php b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/VehiclesPsvControllerFactory.php index 7f35ecd5c..369329f57 100644 --- a/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/VehiclesPsvControllerFactory.php +++ b/module/Olcs/src/Controller/Lva/Factory/Controller/Variation/VehiclesPsvControllerFactory.php @@ -12,7 +12,7 @@ use Common\Service\Script\ScriptFactory; use Common\Service\Table\TableFactory; use Dvsa\Olcs\Utils\Translation\NiTextTranslation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Olcs\Controller\Lva\Variation\VehiclesPsvController; use LmcRbacMvc\Service\AuthorizationService; diff --git a/module/Olcs/src/Controller/PromptControllerFactory.php b/module/Olcs/src/Controller/PromptControllerFactory.php index 681ba9caf..39e452505 100644 --- a/module/Olcs/src/Controller/PromptControllerFactory.php +++ b/module/Olcs/src/Controller/PromptControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/Controller/SessionTimeoutControllerFactory.php b/module/Olcs/src/Controller/SessionTimeoutControllerFactory.php index 38b06402c..f121dc34a 100644 --- a/module/Olcs/src/Controller/SessionTimeoutControllerFactory.php +++ b/module/Olcs/src/Controller/SessionTimeoutControllerFactory.php @@ -6,7 +6,7 @@ use Common\Controller\Dispatcher; use Common\Controller\Plugin\Redirect; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use LmcRbacMvc\Identity\IdentityProviderInterface; diff --git a/module/Olcs/src/Controller/SignatureVerificationControllerFactory.php b/module/Olcs/src/Controller/SignatureVerificationControllerFactory.php index 9813a99c3..63c248ec2 100644 --- a/module/Olcs/src/Controller/SignatureVerificationControllerFactory.php +++ b/module/Olcs/src/Controller/SignatureVerificationControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Olcs/src/FormService/Form/Lva/ApplicationOverviewSubmissionFactory.php b/module/Olcs/src/FormService/Form/Lva/ApplicationOverviewSubmissionFactory.php index e314ac341..e9ba5b96f 100644 --- a/module/Olcs/src/FormService/Form/Lva/ApplicationOverviewSubmissionFactory.php +++ b/module/Olcs/src/FormService/Form/Lva/ApplicationOverviewSubmissionFactory.php @@ -4,7 +4,7 @@ use Common\Service\Helper\FormHelperService; use Laminas\ServiceManager\Factory\FactoryInterface; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; class ApplicationOverviewSubmissionFactory implements FactoryInterface { diff --git a/module/Olcs/src/FormService/Form/Lva/VariationOverviewSubmissionFactory.php b/module/Olcs/src/FormService/Form/Lva/VariationOverviewSubmissionFactory.php index 604a9fca4..dee9f8df3 100644 --- a/module/Olcs/src/FormService/Form/Lva/VariationOverviewSubmissionFactory.php +++ b/module/Olcs/src/FormService/Form/Lva/VariationOverviewSubmissionFactory.php @@ -4,7 +4,7 @@ use Common\Service\Helper\FormHelperService; use Laminas\ServiceManager\Factory\FactoryInterface; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; class VariationOverviewSubmissionFactory implements FactoryInterface { diff --git a/module/Olcs/src/InputFilter/EbsrPackFactory.php b/module/Olcs/src/InputFilter/EbsrPackFactory.php index 33f8242a4..40905b8b2 100644 --- a/module/Olcs/src/InputFilter/EbsrPackFactory.php +++ b/module/Olcs/src/InputFilter/EbsrPackFactory.php @@ -2,7 +2,7 @@ namespace Olcs\InputFilter; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\InputFilter\Input; use Laminas\ServiceManager\Factory\FactoryInterface; diff --git a/module/Olcs/src/Mvc/Controller/Plugin/PlaceholderFactory.php b/module/Olcs/src/Mvc/Controller/Plugin/PlaceholderFactory.php index edef1fd61..28786e0ab 100644 --- a/module/Olcs/src/Mvc/Controller/Plugin/PlaceholderFactory.php +++ b/module/Olcs/src/Mvc/Controller/Plugin/PlaceholderFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Mvc\Controller\Plugin; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; /** diff --git a/module/Olcs/src/Mvc/CookieBannerListenerFactory.php b/module/Olcs/src/Mvc/CookieBannerListenerFactory.php index 173afc23b..81aadec53 100644 --- a/module/Olcs/src/Mvc/CookieBannerListenerFactory.php +++ b/module/Olcs/src/Mvc/CookieBannerListenerFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Mvc; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class CookieBannerListenerFactory implements FactoryInterface diff --git a/module/Olcs/src/Mvc/CookieListenerFactory.php b/module/Olcs/src/Mvc/CookieListenerFactory.php index 6c5d6834e..2fe7b1e23 100644 --- a/module/Olcs/src/Mvc/CookieListenerFactory.php +++ b/module/Olcs/src/Mvc/CookieListenerFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Mvc; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class CookieListenerFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Cookie/AcceptAllSetCookieGeneratorFactory.php b/module/Olcs/src/Service/Cookie/AcceptAllSetCookieGeneratorFactory.php index 5170d8d0e..936e5f9a2 100644 --- a/module/Olcs/src/Service/Cookie/AcceptAllSetCookieGeneratorFactory.php +++ b/module/Olcs/src/Service/Cookie/AcceptAllSetCookieGeneratorFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Cookie; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class AcceptAllSetCookieGeneratorFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Cookie/AnalyticsCookieNamesProviderFactory.php b/module/Olcs/src/Service/Cookie/AnalyticsCookieNamesProviderFactory.php index 630584fc8..af50f90ac 100644 --- a/module/Olcs/src/Service/Cookie/AnalyticsCookieNamesProviderFactory.php +++ b/module/Olcs/src/Service/Cookie/AnalyticsCookieNamesProviderFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Cookie; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class AnalyticsCookieNamesProviderFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Cookie/BannerVisibilityProviderFactory.php b/module/Olcs/src/Service/Cookie/BannerVisibilityProviderFactory.php index 98b6ffacc..70e95d5ee 100644 --- a/module/Olcs/src/Service/Cookie/BannerVisibilityProviderFactory.php +++ b/module/Olcs/src/Service/Cookie/BannerVisibilityProviderFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Cookie; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class BannerVisibilityProviderFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Cookie/CookieReaderFactory.php b/module/Olcs/src/Service/Cookie/CookieReaderFactory.php index 233bfce42..56e3d12db 100644 --- a/module/Olcs/src/Service/Cookie/CookieReaderFactory.php +++ b/module/Olcs/src/Service/Cookie/CookieReaderFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Cookie; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class CookieReaderFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Cookie/CurrentPreferencesProviderFactory.php b/module/Olcs/src/Service/Cookie/CurrentPreferencesProviderFactory.php index bc8728830..4fbebccfa 100644 --- a/module/Olcs/src/Service/Cookie/CurrentPreferencesProviderFactory.php +++ b/module/Olcs/src/Service/Cookie/CurrentPreferencesProviderFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Cookie; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class CurrentPreferencesProviderFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Cookie/DeleteCookieNamesProviderFactory.php b/module/Olcs/src/Service/Cookie/DeleteCookieNamesProviderFactory.php index c48ac9b1d..70ff54b28 100644 --- a/module/Olcs/src/Service/Cookie/DeleteCookieNamesProviderFactory.php +++ b/module/Olcs/src/Service/Cookie/DeleteCookieNamesProviderFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Cookie; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class DeleteCookieNamesProviderFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Cookie/DeleteSetCookieGeneratorFactory.php b/module/Olcs/src/Service/Cookie/DeleteSetCookieGeneratorFactory.php index 0a8f6ae49..6ee918dae 100644 --- a/module/Olcs/src/Service/Cookie/DeleteSetCookieGeneratorFactory.php +++ b/module/Olcs/src/Service/Cookie/DeleteSetCookieGeneratorFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Cookie; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class DeleteSetCookieGeneratorFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Cookie/PreferencesSetCookieGeneratorFactory.php b/module/Olcs/src/Service/Cookie/PreferencesSetCookieGeneratorFactory.php index e01f239da..46c57a96a 100644 --- a/module/Olcs/src/Service/Cookie/PreferencesSetCookieGeneratorFactory.php +++ b/module/Olcs/src/Service/Cookie/PreferencesSetCookieGeneratorFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Cookie; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class PreferencesSetCookieGeneratorFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Cookie/SetCookieArrayGeneratorFactory.php b/module/Olcs/src/Service/Cookie/SetCookieArrayGeneratorFactory.php index f9dac76ce..33546c411 100644 --- a/module/Olcs/src/Service/Cookie/SetCookieArrayGeneratorFactory.php +++ b/module/Olcs/src/Service/Cookie/SetCookieArrayGeneratorFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Cookie; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class SetCookieArrayGeneratorFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Processing/CreateVariationProcessingServiceFactory.php b/module/Olcs/src/Service/Processing/CreateVariationProcessingServiceFactory.php index e08dfadea..7a1327af2 100644 --- a/module/Olcs/src/Service/Processing/CreateVariationProcessingServiceFactory.php +++ b/module/Olcs/src/Service/Processing/CreateVariationProcessingServiceFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Processing; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class CreateVariationProcessingServiceFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Processing/DashboardProcessingServiceFactory.php b/module/Olcs/src/Service/Processing/DashboardProcessingServiceFactory.php index 99a463e8a..e1f8a6a43 100644 --- a/module/Olcs/src/Service/Processing/DashboardProcessingServiceFactory.php +++ b/module/Olcs/src/Service/Processing/DashboardProcessingServiceFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Processing; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class DashboardProcessingServiceFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Qa/FormFactory.php b/module/Olcs/src/Service/Qa/FormFactory.php index 529950b15..7ec6672a7 100644 --- a/module/Olcs/src/Service/Qa/FormFactory.php +++ b/module/Olcs/src/Service/Qa/FormFactory.php @@ -3,7 +3,7 @@ namespace Olcs\Service\Qa; use Common\Form\QaForm; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; class FormFactory { diff --git a/module/Olcs/src/Service/Qa/FormFactoryFactory.php b/module/Olcs/src/Service/Qa/FormFactoryFactory.php index 0c5a53891..12a2c606d 100644 --- a/module/Olcs/src/Service/Qa/FormFactoryFactory.php +++ b/module/Olcs/src/Service/Qa/FormFactoryFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Qa; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class FormFactoryFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Qa/FormProviderFactory.php b/module/Olcs/src/Service/Qa/FormProviderFactory.php index eba4a42f2..2f34ee1c5 100644 --- a/module/Olcs/src/Service/Qa/FormProviderFactory.php +++ b/module/Olcs/src/Service/Qa/FormProviderFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Qa; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Laminas\Form\Factory as FormFactory; diff --git a/module/Olcs/src/Service/Qa/QuestionArrayProviderFactory.php b/module/Olcs/src/Service/Qa/QuestionArrayProviderFactory.php index 321d17b00..825606481 100644 --- a/module/Olcs/src/Service/Qa/QuestionArrayProviderFactory.php +++ b/module/Olcs/src/Service/Qa/QuestionArrayProviderFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Qa; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class QuestionArrayProviderFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Qa/TemplateVarsGeneratorFactory.php b/module/Olcs/src/Service/Qa/TemplateVarsGeneratorFactory.php index 17adbd898..e5ae82d7b 100644 --- a/module/Olcs/src/Service/Qa/TemplateVarsGeneratorFactory.php +++ b/module/Olcs/src/Service/Qa/TemplateVarsGeneratorFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Qa; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class TemplateVarsGeneratorFactory implements FactoryInterface diff --git a/module/Olcs/src/Service/Qa/ViewGeneratorProviderFactory.php b/module/Olcs/src/Service/Qa/ViewGeneratorProviderFactory.php index 6372595ae..7ea58ef3c 100644 --- a/module/Olcs/src/Service/Qa/ViewGeneratorProviderFactory.php +++ b/module/Olcs/src/Service/Qa/ViewGeneratorProviderFactory.php @@ -2,7 +2,7 @@ namespace Olcs\Service\Qa; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class ViewGeneratorProviderFactory implements FactoryInterface diff --git a/module/Olcs/src/View/Helper/CookieManagerFactory.php b/module/Olcs/src/View/Helper/CookieManagerFactory.php index b34adf4b3..8f65fa9b8 100644 --- a/module/Olcs/src/View/Helper/CookieManagerFactory.php +++ b/module/Olcs/src/View/Helper/CookieManagerFactory.php @@ -2,7 +2,7 @@ namespace Olcs\View\Helper; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class CookieManagerFactory implements FactoryInterface diff --git a/module/Olcs/src/View/Helper/SessionTimeoutWarning/SessionTimeoutWarningFactory.php b/module/Olcs/src/View/Helper/SessionTimeoutWarning/SessionTimeoutWarningFactory.php index 3bf7d235e..263326f69 100644 --- a/module/Olcs/src/View/Helper/SessionTimeoutWarning/SessionTimeoutWarningFactory.php +++ b/module/Olcs/src/View/Helper/SessionTimeoutWarning/SessionTimeoutWarningFactory.php @@ -3,7 +3,7 @@ namespace Olcs\View\Helper\SessionTimeoutWarning; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\factory\FactoryInterface; use Laminas\View\Helper\HeadMeta; diff --git a/module/Olcs/src/View/Model/UserFactory.php b/module/Olcs/src/View/Model/UserFactory.php index 5e61b6ec0..4b3c1b1a6 100644 --- a/module/Olcs/src/View/Model/UserFactory.php +++ b/module/Olcs/src/View/Model/UserFactory.php @@ -4,7 +4,7 @@ namespace Olcs\View\Model; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class UserFactory implements FactoryInterface diff --git a/module/Permits/src/Permits/Controller/CancelIrhpApplicationControllerFactory.php b/module/Permits/src/Permits/Controller/CancelIrhpApplicationControllerFactory.php index d8809fa30..52048d8d1 100644 --- a/module/Permits/src/Permits/Controller/CancelIrhpApplicationControllerFactory.php +++ b/module/Permits/src/Permits/Controller/CancelIrhpApplicationControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/EssentialInformationControllerFactory.php b/module/Permits/src/Permits/Controller/EssentialInformationControllerFactory.php index de4f4d385..6241095c6 100644 --- a/module/Permits/src/Permits/Controller/EssentialInformationControllerFactory.php +++ b/module/Permits/src/Permits/Controller/EssentialInformationControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpApplicationControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpApplicationControllerFactory.php index 3802ffb1a..333e9c8c9 100644 --- a/module/Permits/src/Permits/Controller/IrhpApplicationControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpApplicationControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpApplicationCountryConfirmationControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpApplicationCountryConfirmationControllerFactory.php index bec12ba92..002b60483 100644 --- a/module/Permits/src/Permits/Controller/IrhpApplicationCountryConfirmationControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpApplicationCountryConfirmationControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpApplicationCountryControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpApplicationCountryControllerFactory.php index 7a0f77893..465884e9a 100644 --- a/module/Permits/src/Permits/Controller/IrhpApplicationCountryControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpApplicationCountryControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpApplicationDeclarationControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpApplicationDeclarationControllerFactory.php index be5f6cd40..ee04888e5 100644 --- a/module/Permits/src/Permits/Controller/IrhpApplicationDeclarationControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpApplicationDeclarationControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpApplicationFeeControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpApplicationFeeControllerFactory.php index 1daf825af..71bf10086 100644 --- a/module/Permits/src/Permits/Controller/IrhpApplicationFeeControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpApplicationFeeControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpApplicationPeriodControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpApplicationPeriodControllerFactory.php index d224506ee..bff231b92 100644 --- a/module/Permits/src/Permits/Controller/IrhpApplicationPeriodControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpApplicationPeriodControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpAwaitingFeeControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpAwaitingFeeControllerFactory.php index 754c6363c..3bb4f379d 100644 --- a/module/Permits/src/Permits/Controller/IrhpAwaitingFeeControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpAwaitingFeeControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpCandidatePermitSelectionControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpCandidatePermitSelectionControllerFactory.php index 9d3f4fe1b..78fcc3576 100644 --- a/module/Permits/src/Permits/Controller/IrhpCandidatePermitSelectionControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpCandidatePermitSelectionControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpCheckAnswersControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpCheckAnswersControllerFactory.php index a00502369..44ccebe25 100644 --- a/module/Permits/src/Permits/Controller/IrhpCheckAnswersControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpCheckAnswersControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpDeclineControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpDeclineControllerFactory.php index 0c68a6584..c30e73934 100644 --- a/module/Permits/src/Permits/Controller/IrhpDeclineControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpDeclineControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpNoLicencesControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpNoLicencesControllerFactory.php index 59e9b6427..2669d81d4 100644 --- a/module/Permits/src/Permits/Controller/IrhpNoLicencesControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpNoLicencesControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpNotEligibleControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpNotEligibleControllerFactory.php index 26fa6290b..1d56f4dc2 100644 --- a/module/Permits/src/Permits/Controller/IrhpNotEligibleControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpNotEligibleControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpPermitAppCheckAnswersControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpPermitAppCheckAnswersControllerFactory.php index 6dd610a9e..b15b2d8bd 100644 --- a/module/Permits/src/Permits/Controller/IrhpPermitAppCheckAnswersControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpPermitAppCheckAnswersControllerFactory.php @@ -8,7 +8,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpPermitsExhaustedControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpPermitsExhaustedControllerFactory.php index fd0162a43..38df816b0 100644 --- a/module/Permits/src/Permits/Controller/IrhpPermitsExhaustedControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpPermitsExhaustedControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpStockControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpStockControllerFactory.php index 0a6d82e14..518bf6f32 100644 --- a/module/Permits/src/Permits/Controller/IrhpStockControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpStockControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpUnderConsiderationControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpUnderConsiderationControllerFactory.php index b87682a6a..d1c16084d 100644 --- a/module/Permits/src/Permits/Controller/IrhpUnderConsiderationControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpUnderConsiderationControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpUnpaidPermitsControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpUnpaidPermitsControllerFactory.php index 1f57b8986..bb1d21088 100644 --- a/module/Permits/src/Permits/Controller/IrhpUnpaidPermitsControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpUnpaidPermitsControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpValidPermitsControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpValidPermitsControllerFactory.php index cf2b7b750..cda827cdd 100644 --- a/module/Permits/src/Permits/Controller/IrhpValidPermitsControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpValidPermitsControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/IrhpWithdrawControllerFactory.php b/module/Permits/src/Permits/Controller/IrhpWithdrawControllerFactory.php index e3b6445b9..be9b5f216 100644 --- a/module/Permits/src/Permits/Controller/IrhpWithdrawControllerFactory.php +++ b/module/Permits/src/Permits/Controller/IrhpWithdrawControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/LicenceControllerFactory.php b/module/Permits/src/Permits/Controller/LicenceControllerFactory.php index ae3fe3738..87782a731 100644 --- a/module/Permits/src/Permits/Controller/LicenceControllerFactory.php +++ b/module/Permits/src/Permits/Controller/LicenceControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/MaxPermittedReachedForStockControllerFactory.php b/module/Permits/src/Permits/Controller/MaxPermittedReachedForStockControllerFactory.php index 5cbde4657..161fa7053 100644 --- a/module/Permits/src/Permits/Controller/MaxPermittedReachedForStockControllerFactory.php +++ b/module/Permits/src/Permits/Controller/MaxPermittedReachedForStockControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/MaxPermittedReachedForTypeControllerFactory.php b/module/Permits/src/Permits/Controller/MaxPermittedReachedForTypeControllerFactory.php index ff63d2c67..107c4403b 100644 --- a/module/Permits/src/Permits/Controller/MaxPermittedReachedForTypeControllerFactory.php +++ b/module/Permits/src/Permits/Controller/MaxPermittedReachedForTypeControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/NoOfPermitsControllerFactory.php b/module/Permits/src/Permits/Controller/NoOfPermitsControllerFactory.php index 2e6f0a79d..0a7b72365 100644 --- a/module/Permits/src/Permits/Controller/NoOfPermitsControllerFactory.php +++ b/module/Permits/src/Permits/Controller/NoOfPermitsControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/PermitsControllerFactory.php b/module/Permits/src/Permits/Controller/PermitsControllerFactory.php index a749331c5..cd1350a00 100644 --- a/module/Permits/src/Permits/Controller/PermitsControllerFactory.php +++ b/module/Permits/src/Permits/Controller/PermitsControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/QaControllerFactory.php b/module/Permits/src/Permits/Controller/QaControllerFactory.php index 59a955d75..077645ba9 100644 --- a/module/Permits/src/Permits/Controller/QaControllerFactory.php +++ b/module/Permits/src/Permits/Controller/QaControllerFactory.php @@ -3,7 +3,7 @@ namespace Permits\Controller; use Common\Service\Helper\FileUploadHelperService; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class QaControllerFactory implements FactoryInterface diff --git a/module/Permits/src/Permits/Controller/SubmittedControllerFactory.php b/module/Permits/src/Permits/Controller/SubmittedControllerFactory.php index 4f9419f4a..b05a365f8 100644 --- a/module/Permits/src/Permits/Controller/SubmittedControllerFactory.php +++ b/module/Permits/src/Permits/Controller/SubmittedControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/TypeControllerFactory.php b/module/Permits/src/Permits/Controller/TypeControllerFactory.php index 4e59cfbd7..1d091346f 100644 --- a/module/Permits/src/Permits/Controller/TypeControllerFactory.php +++ b/module/Permits/src/Permits/Controller/TypeControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/WindowClosedControllerFactory.php b/module/Permits/src/Permits/Controller/WindowClosedControllerFactory.php index 3a41b6605..9d46b6174 100644 --- a/module/Permits/src/Permits/Controller/WindowClosedControllerFactory.php +++ b/module/Permits/src/Permits/Controller/WindowClosedControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Controller/YearControllerFactory.php b/module/Permits/src/Permits/Controller/YearControllerFactory.php index bd5cd173d..3420babb6 100644 --- a/module/Permits/src/Permits/Controller/YearControllerFactory.php +++ b/module/Permits/src/Permits/Controller/YearControllerFactory.php @@ -7,7 +7,7 @@ use Common\Service\Helper\FormHelperService; use Common\Service\Helper\TranslationHelperService; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; use Permits\Data\Mapper\MapperManager; diff --git a/module/Permits/src/Permits/Data/Mapper/AvailableBilateralStocksFactory.php b/module/Permits/src/Permits/Data/Mapper/AvailableBilateralStocksFactory.php index e7aaf7617..31dd1219f 100644 --- a/module/Permits/src/Permits/Data/Mapper/AvailableBilateralStocksFactory.php +++ b/module/Permits/src/Permits/Data/Mapper/AvailableBilateralStocksFactory.php @@ -3,7 +3,7 @@ namespace Permits\Data\Mapper; use Common\Service\Helper\TranslationHelperService; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class AvailableBilateralStocksFactory implements FactoryInterface diff --git a/module/Permits/src/Permits/Data/Mapper/AvailableYearsFactory.php b/module/Permits/src/Permits/Data/Mapper/AvailableYearsFactory.php index 1d8d568ee..6fd5bcbd3 100644 --- a/module/Permits/src/Permits/Data/Mapper/AvailableYearsFactory.php +++ b/module/Permits/src/Permits/Data/Mapper/AvailableYearsFactory.php @@ -3,7 +3,7 @@ namespace Permits\Data\Mapper; use Common\Service\Helper\TranslationHelperService; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class AvailableYearsFactory implements FactoryInterface diff --git a/module/Permits/src/Permits/Data/Mapper/CandidatePermitSelectionFactory.php b/module/Permits/src/Permits/Data/Mapper/CandidatePermitSelectionFactory.php index b6c8f36a9..cc8cf878d 100644 --- a/module/Permits/src/Permits/Data/Mapper/CandidatePermitSelectionFactory.php +++ b/module/Permits/src/Permits/Data/Mapper/CandidatePermitSelectionFactory.php @@ -4,7 +4,7 @@ use Common\Service\Qa\Custom\Common\HtmlAdder; use Common\Service\Table\TableFactory; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class CandidatePermitSelectionFactory implements FactoryInterface diff --git a/module/Permits/src/Permits/Data/Mapper/EcmtNoOfPermitsFactory.php b/module/Permits/src/Permits/Data/Mapper/EcmtNoOfPermitsFactory.php index 3357336a1..bc390dd66 100644 --- a/module/Permits/src/Permits/Data/Mapper/EcmtNoOfPermitsFactory.php +++ b/module/Permits/src/Permits/Data/Mapper/EcmtNoOfPermitsFactory.php @@ -3,7 +3,7 @@ namespace Permits\Data\Mapper; use Common\Service\Helper\TranslationHelperService; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class EcmtNoOfPermitsFactory implements FactoryInterface diff --git a/module/Permits/src/Permits/Data/Mapper/MapperManagerFactory.php b/module/Permits/src/Permits/Data/Mapper/MapperManagerFactory.php index b23e4a699..f3350d694 100644 --- a/module/Permits/src/Permits/Data/Mapper/MapperManagerFactory.php +++ b/module/Permits/src/Permits/Data/Mapper/MapperManagerFactory.php @@ -2,7 +2,7 @@ namespace Permits\Data\Mapper; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\ServiceManager\Factory\FactoryInterface; class MapperManagerFactory implements FactoryInterface diff --git a/module/Permits/src/Permits/Data/Mapper/NoOfPermitsFactory.php b/module/Permits/src/Permits/Data/Mapper/NoOfPermitsFactory.php index cf0c4d5c4..ba032c3be 100644 --- a/module/Permits/src/Permits/Data/Mapper/NoOfPermitsFactory.php +++ b/module/Permits/src/Permits/Data/Mapper/NoOfPermitsFactory.php @@ -2,7 +2,7 @@ namespace Permits\Data\Mapper; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Common\Data\Mapper\Permits\NoOfPermits as CommonNoOfPermits; use Laminas\ServiceManager\Factory\FactoryInterface; diff --git a/test/Olcs/src/Controller/Initializer/NavigationTest.php b/test/Olcs/src/Controller/Initializer/NavigationTest.php index 377aceac6..c02e680b6 100644 --- a/test/Olcs/src/Controller/Initializer/NavigationTest.php +++ b/test/Olcs/src/Controller/Initializer/NavigationTest.php @@ -4,7 +4,7 @@ use Common\Controller\AbstractOlcsController; use Dvsa\Olcs\Auth\Controller\LoginController; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\Mvc\MvcEvent; use Olcs\Controller\Initializer\Navigation as NavigationInitializer; use Olcs\Controller\Listener\Navigation as NavigationListener; diff --git a/test/Olcs/src/Controller/Listener/NavigationFactoryTest.php b/test/Olcs/src/Controller/Listener/NavigationFactoryTest.php index 2cfe65727..a2a0a5906 100644 --- a/test/Olcs/src/Controller/Listener/NavigationFactoryTest.php +++ b/test/Olcs/src/Controller/Listener/NavigationFactoryTest.php @@ -4,7 +4,7 @@ use Common\Rbac\User as RbacUser; use Common\Service\Cqrs\Query\QuerySender; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Mockery as m; use Olcs\Controller\Listener\Navigation as NavigationListener; use Olcs\Controller\Listener\NavigationFactory; diff --git a/test/Olcs/src/Controller/Lva/Adapters/LicencePeopleAdapterTest.php b/test/Olcs/src/Controller/Lva/Adapters/LicencePeopleAdapterTest.php index bbf075356..10dcbca2d 100644 --- a/test/Olcs/src/Controller/Lva/Adapters/LicencePeopleAdapterTest.php +++ b/test/Olcs/src/Controller/Lva/Adapters/LicencePeopleAdapterTest.php @@ -13,7 +13,7 @@ use Common\Service\Lva\PeopleLvaService; use Common\Service\Table\TableBuilder; use Dvsa\Olcs\Transfer\Command\Licence\DeletePeopleViaVariation; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Mockery as m; use Mockery\Adapter\Phpunit\MockeryTestCase; use Olcs\Controller\Lva\Adapters\LicencePeopleAdapter; diff --git a/test/Olcs/src/Controller/Lva/Adapters/LicenceTransportManagerAdapterTest.php b/test/Olcs/src/Controller/Lva/Adapters/LicenceTransportManagerAdapterTest.php index d0cee1410..dfb320944 100644 --- a/test/Olcs/src/Controller/Lva/Adapters/LicenceTransportManagerAdapterTest.php +++ b/test/Olcs/src/Controller/Lva/Adapters/LicenceTransportManagerAdapterTest.php @@ -6,7 +6,7 @@ use Common\Service\Cqrs\Query\CachingQueryService; use Common\Service\Lva\VariationLvaService; use Dvsa\Olcs\Transfer\Util\Annotation\AnnotationBuilder as TransferAnnotationBuilder; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Mockery as m; use Mockery\Adapter\Phpunit\MockeryTestCase; use Olcs\Controller\Lva\Adapters\LicenceTransportManagerAdapter; diff --git a/test/Olcs/src/Controller/Lva/Adapters/VariationPeopleAdapterTest.php b/test/Olcs/src/Controller/Lva/Adapters/VariationPeopleAdapterTest.php index 272d09337..8b08a6f2a 100644 --- a/test/Olcs/src/Controller/Lva/Adapters/VariationPeopleAdapterTest.php +++ b/test/Olcs/src/Controller/Lva/Adapters/VariationPeopleAdapterTest.php @@ -5,7 +5,7 @@ use Common\RefData; use Common\Service\Lva\PeopleLvaService; use Dvsa\Olcs\Transfer\Command as TransferCmd; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Mockery as m; use Mockery\Adapter\Phpunit\MockeryTestCase; use Olcs\Controller\Lva\Adapters\VariationPeopleAdapter; diff --git a/test/Olcs/src/Controller/Lva/Factory/Adapter/TransportManagerAdapterFactoryTest.php b/test/Olcs/src/Controller/Lva/Factory/Adapter/TransportManagerAdapterFactoryTest.php index 69b0926d1..20ed6e9e3 100644 --- a/test/Olcs/src/Controller/Lva/Factory/Adapter/TransportManagerAdapterFactoryTest.php +++ b/test/Olcs/src/Controller/Lva/Factory/Adapter/TransportManagerAdapterFactoryTest.php @@ -6,7 +6,7 @@ use Common\Service\Cqrs\Query\CachingQueryService; use Common\Service\Lva\VariationLvaService; use Dvsa\Olcs\Transfer\Util\Annotation\AnnotationBuilder; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Mockery as m; use Mockery\Adapter\Phpunit\MockeryTestCase; use Olcs\Controller\Lva\Adapters; diff --git a/test/Olcs/src/InputFilter/EbsrPackFactoryTest.php b/test/Olcs/src/InputFilter/EbsrPackFactoryTest.php index 2ec564ef5..59294e416 100644 --- a/test/Olcs/src/InputFilter/EbsrPackFactoryTest.php +++ b/test/Olcs/src/InputFilter/EbsrPackFactoryTest.php @@ -2,7 +2,7 @@ namespace OlcsTest\InputFilter; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Laminas\InputFilter\Input; use Mockery as m; use Mockery\Adapter\Phpunit\MockeryTestCase; diff --git a/test/Olcs/src/Mvc/Controller/Plugin/PlaceholderFactoryTest.php b/test/Olcs/src/Mvc/Controller/Plugin/PlaceholderFactoryTest.php index 65cbd8dbc..1862d88c3 100644 --- a/test/Olcs/src/Mvc/Controller/Plugin/PlaceholderFactoryTest.php +++ b/test/Olcs/src/Mvc/Controller/Plugin/PlaceholderFactoryTest.php @@ -5,7 +5,7 @@ */ namespace OlcsTest\Mvc\Controller\Plugin; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Mockery as m; use Mockery\Adapter\Phpunit\MockeryTestCase; use Olcs\Mvc\Controller\Plugin\Placeholder; diff --git a/test/Olcs/src/View/Helper/SessionTimeoutWarningFactoryTest.php b/test/Olcs/src/View/Helper/SessionTimeoutWarningFactoryTest.php index facf54ba7..093ab2112 100644 --- a/test/Olcs/src/View/Helper/SessionTimeoutWarningFactoryTest.php +++ b/test/Olcs/src/View/Helper/SessionTimeoutWarningFactoryTest.php @@ -2,7 +2,7 @@ namespace OlcsTest\View\Helper\SessionTimeoutWarning; -use Interop\Container\ContainerInterface; +use Psr\Container\ContainerInterface; use Mockery\Adapter\Phpunit\MockeryTestCase; use Mockery as m; use Olcs\View\Helper\SessionTimeoutWarning\SessionTimeoutWarning;