diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 2857adac68..83d497a0c5 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -14,10 +14,10 @@ jobs:
   static-analysis:
     uses: dvsa/.github/.github/workflows/php-static.yml@main
     with:
-      php-version: '8.0'
+      php-version: '8.2'
 
   tests:
     uses: dvsa/.github/.github/workflows/php-tests.yml@main
     with:
-      php-versions: '["8.0"]'
+      php-versions: '["8.2"]'
       fail-fast: false
diff --git a/composer.json b/composer.json
index 0c85915496..d953615804 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "olcs/backend",
     "description": "Back End Application for OLCS Project",
     "require": {
-        "php": "~8.0.0",
+        "php": "~8.2.0",
         "ext-intl": "*",
         "ext-json": "*",
         "ext-curl": "*",
@@ -16,14 +16,14 @@
         "doctrine/persistence": "^2.1",
         "dvsa/authentication-cognito": "^2.0",
         "dvsa/laminas-config-cloud-parameters": "^0.1.0",
-        "dvsa/php-govuk-account": "^1.0",
+        "dvsa/php-govuk-account": "^2.0.1",
         "gedmo/doctrine-extensions": "^3",
         "guzzlehttp/guzzle": "^7.5",
         "league/flysystem": "^1.0",
         "league/flysystem-webdav": "1.0.10",
         "monolog/monolog": "^2.9",
         "olcs/olcs-logging": "^7.0",
-        "olcs/olcs-transfer": "~7.0.0",
+        "olcs/olcs-transfer": "^7.1.2",
         "olcs/olcs-utils": "^6.0.0",
         "olcs/olcs-xmltools": "~7.0.0",
         "oro/doctrine-extensions": "^2",
@@ -31,7 +31,7 @@
         "phpseclib/phpseclib": "^2.0.6",
         "qandidate/toggle": "^1.1",
         "ramsey/uuid": "^3.6",
-        "ruflin/elastica": "7.1",
+        "ruflin/elastica": "^7.0",
         "saeven/zf3-purifier": "^1.1",
         "simplesamlphp/saml2": "~3.4.2",
         "symfony/filesystem": "^5",
diff --git a/composer.lock b/composer.lock
index 56dc8f212a..46b52e8671 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "4ffaf9968a97a5527a3d3271893d8a10",
+    "content-hash": "78cefa2a6902dd7d8b33f5c77a96c132",
     "packages": [
         {
             "name": "aws/aws-crt-php",
-            "version": "v1.2.4",
+            "version": "v1.2.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/awslabs/aws-crt-php.git",
-                "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2"
+                "reference": "0ea1f04ec5aa9f049f97e012d1ed63b76834a31b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/eb0c6e4e142224a10b08f49ebf87f32611d162b2",
-                "reference": "eb0c6e4e142224a10b08f49ebf87f32611d162b2",
+                "url": "https://api.github.com/repos/awslabs/aws-crt-php/zipball/0ea1f04ec5aa9f049f97e012d1ed63b76834a31b",
+                "reference": "0ea1f04ec5aa9f049f97e012d1ed63b76834a31b",
                 "shasum": ""
             },
             "require": {
@@ -56,22 +56,22 @@
             ],
             "support": {
                 "issues": "https://github.com/awslabs/aws-crt-php/issues",
-                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.4"
+                "source": "https://github.com/awslabs/aws-crt-php/tree/v1.2.5"
             },
-            "time": "2023-11-08T00:42:13+00:00"
+            "time": "2024-04-19T21:30:56+00:00"
         },
         {
             "name": "aws/aws-sdk-php",
-            "version": "3.293.5",
+            "version": "3.306.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/aws/aws-sdk-php.git",
-                "reference": "f2002e52b382b45231da3f9552033f769acfebd8"
+                "reference": "79a618bb5624e52f31de7083a26d1749050aa5a0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/f2002e52b382b45231da3f9552033f769acfebd8",
-                "reference": "f2002e52b382b45231da3f9552033f769acfebd8",
+                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/79a618bb5624e52f31de7083a26d1749050aa5a0",
+                "reference": "79a618bb5624e52f31de7083a26d1749050aa5a0",
                 "shasum": ""
             },
             "require": {
@@ -151,9 +151,9 @@
             "support": {
                 "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                 "issues": "https://github.com/aws/aws-sdk-php/issues",
-                "source": "https://github.com/aws/aws-sdk-php/tree/3.293.5"
+                "source": "https://github.com/aws/aws-sdk-php/tree/3.306.6"
             },
-            "time": "2023-12-06T19:09:15+00:00"
+            "time": "2024-05-14T18:05:44+00:00"
         },
         {
             "name": "beberlei/doctrineextensions",
@@ -263,26 +263,26 @@
         },
         {
             "name": "brick/varexporter",
-            "version": "0.3.8",
+            "version": "0.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/varexporter.git",
-                "reference": "b5853edea6204ff8fa10633c3a4cccc4058410ed"
+                "reference": "2fd038f7c9d12d468130c6e1b3ce06e4160a7dbb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/varexporter/zipball/b5853edea6204ff8fa10633c3a4cccc4058410ed",
-                "reference": "b5853edea6204ff8fa10633c3a4cccc4058410ed",
+                "url": "https://api.github.com/repos/brick/varexporter/zipball/2fd038f7c9d12d468130c6e1b3ce06e4160a7dbb",
+                "reference": "2fd038f7c9d12d468130c6e1b3ce06e4160a7dbb",
                 "shasum": ""
             },
             "require": {
                 "nikic/php-parser": "^4.0",
-                "php": "^7.2 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
                 "phpunit/phpunit": "^8.5 || ^9.0",
-                "vimeo/psalm": "4.23.0"
+                "vimeo/psalm": "5.15.0"
             },
             "type": "library",
             "autoload": {
@@ -300,7 +300,7 @@
             ],
             "support": {
                 "issues": "https://github.com/brick/varexporter/issues",
-                "source": "https://github.com/brick/varexporter/tree/0.3.8"
+                "source": "https://github.com/brick/varexporter/tree/0.4.0"
             },
             "funding": [
                 {
@@ -308,7 +308,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-01-21T23:05:38+00:00"
+            "time": "2023-09-01T21:10:07+00:00"
         },
         {
             "name": "caseyamcl/guzzle_retry_middleware",
@@ -629,16 +629,16 @@
         },
         {
             "name": "doctrine/common",
-            "version": "3.4.3",
+            "version": "3.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/common.git",
-                "reference": "8b5e5650391f851ed58910b3e3d48a71062eeced"
+                "reference": "0aad4b7ab7ce8c6602dfbb1e1a24581275fb9d1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/8b5e5650391f851ed58910b3e3d48a71062eeced",
-                "reference": "8b5e5650391f851ed58910b3e3d48a71062eeced",
+                "url": "https://api.github.com/repos/doctrine/common/zipball/0aad4b7ab7ce8c6602dfbb1e1a24581275fb9d1a",
+                "reference": "0aad4b7ab7ce8c6602dfbb1e1a24581275fb9d1a",
                 "shasum": ""
             },
             "require": {
@@ -700,7 +700,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/common/issues",
-                "source": "https://github.com/doctrine/common/tree/3.4.3"
+                "source": "https://github.com/doctrine/common/tree/3.4.4"
             },
             "funding": [
                 {
@@ -716,20 +716,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-10-09T11:47:59+00:00"
+            "time": "2024-04-16T13:35:33+00:00"
         },
         {
             "name": "doctrine/dbal",
-            "version": "3.7.2",
+            "version": "3.8.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/dbal.git",
-                "reference": "0ac3c270590e54910715e9a1a044cc368df282b2"
+                "reference": "b05e48a745f722801f55408d0dbd8003b403dbbd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/0ac3c270590e54910715e9a1a044cc368df282b2",
-                "reference": "0ac3c270590e54910715e9a1a044cc368df282b2",
+                "url": "https://api.github.com/repos/doctrine/dbal/zipball/b05e48a745f722801f55408d0dbd8003b403dbbd",
+                "reference": "b05e48a745f722801f55408d0dbd8003b403dbbd",
                 "shasum": ""
             },
             "require": {
@@ -745,14 +745,14 @@
                 "doctrine/coding-standard": "12.0.0",
                 "fig/log-test": "^1",
                 "jetbrains/phpstorm-stubs": "2023.1",
-                "phpstan/phpstan": "1.10.42",
+                "phpstan/phpstan": "1.10.58",
                 "phpstan/phpstan-strict-rules": "^1.5",
-                "phpunit/phpunit": "9.6.13",
+                "phpunit/phpunit": "9.6.16",
                 "psalm/plugin-phpunit": "0.18.4",
                 "slevomat/coding-standard": "8.13.1",
-                "squizlabs/php_codesniffer": "3.7.2",
-                "symfony/cache": "^5.4|^6.0",
-                "symfony/console": "^4.4|^5.4|^6.0",
+                "squizlabs/php_codesniffer": "3.9.0",
+                "symfony/cache": "^5.4|^6.0|^7.0",
+                "symfony/console": "^4.4|^5.4|^6.0|^7.0",
                 "vimeo/psalm": "4.30.0"
             },
             "suggest": {
@@ -813,7 +813,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/dbal/issues",
-                "source": "https://github.com/doctrine/dbal/tree/3.7.2"
+                "source": "https://github.com/doctrine/dbal/tree/3.8.4"
             },
             "funding": [
                 {
@@ -829,7 +829,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-19T08:06:58+00:00"
+            "time": "2024-04-25T07:04:44+00:00"
         },
         {
             "name": "doctrine/deprecations",
@@ -876,32 +876,32 @@
         },
         {
             "name": "doctrine/doctrine-laminas-hydrator",
-            "version": "3.2.1",
+            "version": "3.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/doctrine-laminas-hydrator.git",
-                "reference": "84610892fb75584e9c85724b3032f5826b833b69"
+                "reference": "3026b89388106f1a4404d1be569e81221b568563"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/doctrine-laminas-hydrator/zipball/84610892fb75584e9c85724b3032f5826b833b69",
-                "reference": "84610892fb75584e9c85724b3032f5826b833b69",
+                "url": "https://api.github.com/repos/doctrine/doctrine-laminas-hydrator/zipball/3026b89388106f1a4404d1be569e81221b568563",
+                "reference": "3026b89388106f1a4404d1be569e81221b568563",
                 "shasum": ""
             },
             "require": {
-                "doctrine/collections": "^1.6.8",
+                "doctrine/collections": "^1.8.0 || ^2.0.0",
                 "doctrine/inflector": "^2.0.4",
-                "doctrine/persistence": "^2.2.3 || ^3.0.0",
+                "doctrine/persistence": "^2.5.0 || ^3.0.0",
                 "ext-ctype": "*",
-                "laminas/laminas-hydrator": "^4.3.1",
-                "laminas/laminas-stdlib": "^3.6.1",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0"
+                "laminas/laminas-hydrator": "^4.13.0",
+                "laminas/laminas-stdlib": "^3.14.0",
+                "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^9.0.2",
+                "doctrine/coding-standard": "^12.0.0",
                 "phpstan/phpstan": "^1.9.2",
                 "phpunit/phpunit": "^9.5.26",
-                "vimeo/psalm": "^4.30"
+                "vimeo/psalm": "^5.15.0"
             },
             "type": "library",
             "autoload": {
@@ -938,7 +938,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-02-06T09:18:11+00:00"
+            "time": "2023-11-21T16:38:19+00:00"
         },
         {
             "name": "doctrine/doctrine-module",
@@ -1293,16 +1293,16 @@
         },
         {
             "name": "doctrine/inflector",
-            "version": "2.0.8",
+            "version": "2.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff"
+                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
-                "reference": "f9301a5b2fb1216b2b08f02ba04dc45423db6bff",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5817d0659c5b50c9b950feb9af7b9668e2c436bc",
+                "reference": "5817d0659c5b50c9b950feb9af7b9668e2c436bc",
                 "shasum": ""
             },
             "require": {
@@ -1364,7 +1364,7 @@
             ],
             "support": {
                 "issues": "https://github.com/doctrine/inflector/issues",
-                "source": "https://github.com/doctrine/inflector/tree/2.0.8"
+                "source": "https://github.com/doctrine/inflector/tree/2.0.10"
             },
             "funding": [
                 {
@@ -1380,7 +1380,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-06-16T13:40:37+00:00"
+            "time": "2024-02-18T20:23:39+00:00"
         },
         {
             "name": "doctrine/instantiator",
@@ -1901,16 +1901,16 @@
         },
         {
             "name": "dvsa/php-govuk-account",
-            "version": "1.0.4",
+            "version": "2.0.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dvsa/php-govuk-account.git",
-                "reference": "980bc170250dcc6843be94f91e09f46b6021d077"
+                "reference": "3b2652973e6162c6da6df4ca1b74343f229711c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dvsa/php-govuk-account/zipball/980bc170250dcc6843be94f91e09f46b6021d077",
-                "reference": "980bc170250dcc6843be94f91e09f46b6021d077",
+                "url": "https://api.github.com/repos/dvsa/php-govuk-account/zipball/3b2652973e6162c6da6df4ca1b74343f229711c5",
+                "reference": "3b2652973e6162c6da6df4ca1b74343f229711c5",
                 "shasum": ""
             },
             "require": {
@@ -1921,7 +1921,7 @@
                 "illuminate/collections": "^8.0",
                 "league/oauth2-client": "^2.6",
                 "paragonie/random_compat": "^9.99",
-                "php": "^7.4 || ^8.0",
+                "php": "^8.2",
                 "psr/cache": "^1.0",
                 "psr/http-client": "^1.0",
                 "psr/http-factory": "^1.0",
@@ -1957,16 +1957,16 @@
             ],
             "support": {
                 "issues": "https://github.com/dvsa/php-govuk-account/issues",
-                "source": "https://github.com/dvsa/php-govuk-account/tree/1.0.4"
+                "source": "https://github.com/dvsa/php-govuk-account/tree/2.0.1"
             },
-            "time": "2023-11-09T15:29:00+00:00"
+            "time": "2024-05-16T08:52:39+00:00"
         },
         {
             "name": "elasticsearch/elasticsearch",
             "version": "v7.17.2",
             "source": {
                 "type": "git",
-                "url": "git@github.com:elastic/elasticsearch-php.git",
+                "url": "https://github.com/elastic/elasticsearch-php.git",
                 "reference": "2d302233f2bb0926812d82823bb820d405e130fc"
             },
             "dist": {
@@ -2022,6 +2022,10 @@
                 "elasticsearch",
                 "search"
             ],
+            "support": {
+                "issues": "https://github.com/elastic/elasticsearch-php/issues",
+                "source": "https://github.com/elastic/elasticsearch-php/tree/v7.17.2"
+            },
             "time": "2023-04-21T15:31:12+00:00"
         },
         {
@@ -2860,38 +2864,38 @@
         },
         {
             "name": "laminas/laminas-authentication",
-            "version": "2.12.0",
+            "version": "2.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-authentication.git",
-                "reference": "ecb59c6d7f7d0ed39790264ca16a94636cac98ae"
+                "reference": "755b30a37de0f8649bad86dfdc46a0d57cb0d70f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-authentication/zipball/ecb59c6d7f7d0ed39790264ca16a94636cac98ae",
-                "reference": "ecb59c6d7f7d0ed39790264ca16a94636cac98ae",
+                "url": "https://api.github.com/repos/laminas/laminas-authentication/zipball/755b30a37de0f8649bad86dfdc46a0d57cb0d70f",
+                "reference": "755b30a37de0f8649bad86dfdc46a0d57cb0d70f",
                 "shasum": ""
             },
             "require": {
                 "laminas/laminas-stdlib": "^3.6.0",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0"
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-authentication": "*"
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~2.4.0",
-                "laminas/laminas-crypt": "^2.6.0 || ^3.2.1",
-                "laminas/laminas-db": "^2.13.0",
-                "laminas/laminas-http": "^2.15.0",
-                "laminas/laminas-ldap": "^2.12.0",
-                "laminas/laminas-session": "^2.12.0",
-                "laminas/laminas-uri": "^2.9.1",
-                "laminas/laminas-validator": "^2.15.0",
-                "phpunit/phpunit": "^9.3.4",
-                "psalm/plugin-phpunit": "^0.15.1",
-                "squizlabs/php_codesniffer": "^3.6.0",
-                "vimeo/psalm": "^4.6.0"
+                "laminas/laminas-crypt": "^2.6.0 || ^3.10.0",
+                "laminas/laminas-db": "^2.18.0",
+                "laminas/laminas-http": "^2.18.0",
+                "laminas/laminas-ldap": "^2.17",
+                "laminas/laminas-session": "^2.16.0",
+                "laminas/laminas-uri": "^2.10.0",
+                "laminas/laminas-validator": "^2.30.1",
+                "phpunit/phpunit": "^9.6.13",
+                "psalm/plugin-phpunit": "^0.17.0",
+                "squizlabs/php_codesniffer": "^3.7.2",
+                "vimeo/psalm": "^4.30.0"
             },
             "suggest": {
                 "laminas/laminas-crypt": "Laminas\\Crypt component",
@@ -2932,34 +2936,35 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-09-12T18:40:34+00:00"
+            "time": "2023-11-06T09:32:35+00:00"
         },
         {
             "name": "laminas/laminas-cache",
-            "version": "3.6.0",
+            "version": "3.12.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-cache.git",
-                "reference": "4929dea8c0d5468701fa5073cd6ef7efe5ff0043"
+                "reference": "bf8bc7f92e15925991c46079c6cd727372af5a46"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-cache/zipball/4929dea8c0d5468701fa5073cd6ef7efe5ff0043",
-                "reference": "4929dea8c0d5468701fa5073cd6ef7efe5ff0043",
+                "url": "https://api.github.com/repos/laminas/laminas-cache/zipball/bf8bc7f92e15925991c46079c6cd727372af5a46",
+                "reference": "bf8bc7f92e15925991c46079c6cd727372af5a46",
                 "shasum": ""
             },
             "require": {
                 "laminas/laminas-cache-storage-implementation": "1.0",
                 "laminas/laminas-eventmanager": "^3.4",
-                "laminas/laminas-servicemanager": "^3.11.1",
+                "laminas/laminas-servicemanager": "^3.21",
                 "laminas/laminas-stdlib": "^3.6",
-                "php": "~7.4.0 || ~8.0.0 || ~8.1.0",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
                 "psr/cache": "^1.0",
+                "psr/clock": "^1.0",
                 "psr/simple-cache": "^1.0",
-                "stella-maris/clock": "^0.1.5",
                 "webmozart/assert": "^1.9"
             },
             "conflict": {
+                "stella-maris/clock": "<0.1.7",
                 "symfony/console": "<5.1"
             },
             "provide": {
@@ -2967,20 +2972,20 @@
                 "psr/simple-cache-implementation": "1.0"
             },
             "require-dev": {
-                "laminas/laminas-cache-storage-adapter-apcu": "^2.0",
-                "laminas/laminas-cache-storage-adapter-blackhole": "^2.0",
-                "laminas/laminas-cache-storage-adapter-filesystem": "^2.0",
-                "laminas/laminas-cache-storage-adapter-memory": "^2.0",
-                "laminas/laminas-cache-storage-adapter-test": "^2.3",
-                "laminas/laminas-cli": "^1.0",
-                "laminas/laminas-coding-standard": "~2.4.0",
-                "laminas/laminas-config-aggregator": "^1.5",
-                "laminas/laminas-feed": "^2.14",
-                "laminas/laminas-serializer": "^2.6.1",
-                "phpbench/phpbench": "^1.0",
-                "phpunit/phpunit": "^9.5.23",
-                "psalm/plugin-phpunit": "^0.17.0",
-                "vimeo/psalm": "^4.24"
+                "laminas/laminas-cache-storage-adapter-apcu": "^2.4",
+                "laminas/laminas-cache-storage-adapter-blackhole": "^2.3",
+                "laminas/laminas-cache-storage-adapter-filesystem": "^2.3",
+                "laminas/laminas-cache-storage-adapter-memory": "^2.2",
+                "laminas/laminas-cache-storage-adapter-test": "^2.4",
+                "laminas/laminas-cli": "^1.7",
+                "laminas/laminas-coding-standard": "~2.5.0",
+                "laminas/laminas-config-aggregator": "^1.13",
+                "laminas/laminas-feed": "^2.20",
+                "laminas/laminas-serializer": "^2.14",
+                "phpbench/phpbench": "^1.2.7",
+                "phpunit/phpunit": "^9.5.27",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "vimeo/psalm": "^5.4"
             },
             "suggest": {
                 "laminas/laminas-cache-storage-adapter-apcu": "APCu implementation",
@@ -3032,26 +3037,26 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-09-19T21:06:59+00:00"
+            "time": "2024-01-19T20:42:11+00:00"
         },
         {
             "name": "laminas/laminas-cache-storage-adapter-redis",
-            "version": "2.4.0",
+            "version": "2.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-cache-storage-adapter-redis.git",
-                "reference": "0135f355edb1e289dfad24c003fd94fc29e43db3"
+                "reference": "81aea68071958341bd53b1e8e1b593ab29c3c8b8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-cache-storage-adapter-redis/zipball/0135f355edb1e289dfad24c003fd94fc29e43db3",
-                "reference": "0135f355edb1e289dfad24c003fd94fc29e43db3",
+                "url": "https://api.github.com/repos/laminas/laminas-cache-storage-adapter-redis/zipball/81aea68071958341bd53b1e8e1b593ab29c3c8b8",
+                "reference": "81aea68071958341bd53b1e8e1b593ab29c3c8b8",
                 "shasum": ""
             },
             "require": {
                 "ext-redis": "^4.3 || ^5.0.2",
                 "laminas/laminas-cache": "^3.0",
-                "php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0"
+                "php": "~8.0.0 || ~8.1.0 || ~8.2.0"
             },
             "provide": {
                 "laminas/laminas-cache-storage-implementation": "1.0"
@@ -3062,8 +3067,8 @@
                 "laminas/laminas-cache-storage-adapter-test": "^2.3",
                 "laminas/laminas-coding-standard": "~2.4.0",
                 "laminas/laminas-serializer": "^2.13.0",
-                "psalm/plugin-phpunit": "^0.17.0",
-                "vimeo/psalm": "^4.24.0"
+                "psalm/plugin-phpunit": "^0.18.4",
+                "vimeo/psalm": "^5.1.0"
             },
             "type": "library",
             "extra": {
@@ -3099,39 +3104,39 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-12-17T04:29:51+00:00"
+            "time": "2022-12-18T14:05:21+00:00"
         },
         {
             "name": "laminas/laminas-cli",
-            "version": "1.5.0",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-cli.git",
-                "reference": "fb1076fbd0cb472fff3ebf9e08a7a9dbd70634a7"
+                "reference": "cc59875b2a983b05a70abf4f9b3af739b1257f34"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-cli/zipball/fb1076fbd0cb472fff3ebf9e08a7a9dbd70634a7",
-                "reference": "fb1076fbd0cb472fff3ebf9e08a7a9dbd70634a7",
+                "url": "https://api.github.com/repos/laminas/laminas-cli/zipball/cc59875b2a983b05a70abf4f9b3af739b1257f34",
+                "reference": "cc59875b2a983b05a70abf4f9b3af739b1257f34",
                 "shasum": ""
             },
             "require": {
                 "composer-runtime-api": "^2.0.0",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
                 "psr/container": "^1.0 || ^2.0",
-                "symfony/console": "^5.3.7 || ^6.0",
-                "symfony/event-dispatcher": "^5.0 || ^6.0",
+                "symfony/console": "^6.0 || ^7.0",
+                "symfony/event-dispatcher": "^6.0 || ^7.0",
                 "symfony/polyfill-php80": "^1.17",
                 "webmozart/assert": "^1.10"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~2.3.0",
-                "laminas/laminas-mvc": "^3.1.1",
-                "laminas/laminas-servicemanager": "^3.15.1",
+                "laminas/laminas-coding-standard": "~2.5.0",
+                "laminas/laminas-mvc": "^3.7.0",
+                "laminas/laminas-servicemanager": "^3.22.1",
                 "mikey179/vfsstream": "2.0.x-dev",
-                "phpunit/phpunit": "^9.5.9",
-                "psalm/plugin-phpunit": "^0.17.0",
-                "vimeo/psalm": "^4.24.0"
+                "phpunit/phpunit": "^10.5.5",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "vimeo/psalm": "^5.18"
             },
             "bin": [
                 "bin/laminas"
@@ -3167,26 +3172,26 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-08-03T17:19:22+00:00"
+            "time": "2024-01-02T15:08:03+00:00"
         },
         {
             "name": "laminas/laminas-config",
-            "version": "3.7.0",
+            "version": "3.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-config.git",
-                "reference": "e43d13dcfc273d4392812eb395ce636f73f34dfd"
+                "reference": "e53717277f6c22b1c697a46473b9a5ec9a438efa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-config/zipball/e43d13dcfc273d4392812eb395ce636f73f34dfd",
-                "reference": "e43d13dcfc273d4392812eb395ce636f73f34dfd",
+                "url": "https://api.github.com/repos/laminas/laminas-config/zipball/e53717277f6c22b1c697a46473b9a5ec9a438efa",
+                "reference": "e53717277f6c22b1c697a46473b9a5ec9a438efa",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "laminas/laminas-stdlib": "^3.6",
-                "php": "^7.3 || ~8.0.0 || ~8.1.0",
+                "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
                 "psr/container": "^1.0"
             },
             "conflict": {
@@ -3194,11 +3199,11 @@
                 "zendframework/zend-config": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-filter": "^2.7.2",
-                "laminas/laminas-i18n": "^2.10.3",
-                "laminas/laminas-servicemanager": "^3.7",
-                "phpunit/phpunit": "^9.5.5"
+                "laminas/laminas-coding-standard": "~2.4.0",
+                "laminas/laminas-filter": "~2.23.0",
+                "laminas/laminas-i18n": "~2.19.0",
+                "laminas/laminas-servicemanager": "~3.19.0",
+                "phpunit/phpunit": "~9.5.25"
             },
             "suggest": {
                 "laminas/laminas-filter": "^2.7.2; install if you want to use the Filter processor",
@@ -3235,26 +3240,26 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2021-10-01T16:07:46+00:00"
+            "time": "2023-09-19T12:02:54+00:00"
         },
         {
             "name": "laminas/laminas-config-aggregator",
-            "version": "1.9.0",
+            "version": "1.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-config-aggregator.git",
-                "reference": "14cd94568ac8e4a8cf005c7e81509b8599fe3b20"
+                "reference": "102e048734413a4499846571b156aeaa6c2aba56"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-config-aggregator/zipball/14cd94568ac8e4a8cf005c7e81509b8599fe3b20",
-                "reference": "14cd94568ac8e4a8cf005c7e81509b8599fe3b20",
+                "url": "https://api.github.com/repos/laminas/laminas-config-aggregator/zipball/102e048734413a4499846571b156aeaa6c2aba56",
+                "reference": "102e048734413a4499846571b156aeaa6c2aba56",
                 "shasum": ""
             },
             "require": {
-                "brick/varexporter": "^0.3.7",
-                "laminas/laminas-stdlib": "^3.10.1",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0",
+                "brick/varexporter": "^0.5.0 || ^0.4.0",
+                "laminas/laminas-stdlib": "^3.18.0",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
                 "webimpress/safe-writer": "^2.2.0"
             },
             "conflict": {
@@ -3262,12 +3267,11 @@
                 "zendframework/zend-config-aggregator": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~2.4.0",
-                "laminas/laminas-config": "^3.7.0",
-                "laminas/laminas-servicemanager": "^3.15.1",
-                "phpunit/phpunit": "^9.5.21",
-                "psalm/plugin-phpunit": "^0.17.0",
-                "vimeo/psalm": "^4.24.0"
+                "laminas/laminas-coding-standard": "~2.5.0",
+                "laminas/laminas-config": "^3.9.0",
+                "phpunit/phpunit": "^10.5.11",
+                "psalm/plugin-phpunit": "^0.19.0",
+                "vimeo/psalm": "^5.22.2"
             },
             "suggest": {
                 "laminas/laminas-config": "Allows loading configuration from XML, INI, YAML, and JSON files",
@@ -3304,36 +3308,36 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-09-15T13:40:43+00:00"
+            "time": "2024-05-12T10:04:30+00:00"
         },
         {
             "name": "laminas/laminas-crypt",
-            "version": "3.8.0",
+            "version": "3.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-crypt.git",
-                "reference": "0972bb907fd555c16e2a65309b66720acf2b8699"
+                "reference": "098fc61a895d1ff5d1c2b861525b4428bf6c3240"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-crypt/zipball/0972bb907fd555c16e2a65309b66720acf2b8699",
-                "reference": "0972bb907fd555c16e2a65309b66720acf2b8699",
+                "url": "https://api.github.com/repos/laminas/laminas-crypt/zipball/098fc61a895d1ff5d1c2b861525b4428bf6c3240",
+                "reference": "098fc61a895d1ff5d1c2b861525b4428bf6c3240",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
                 "laminas/laminas-math": "^3.4",
                 "laminas/laminas-servicemanager": "^3.11.2",
-                "laminas/laminas-stdlib": "^3.6",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0",
+                "laminas/laminas-stdlib": "^3.8",
+                "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0",
                 "psr/container": "^1.1"
             },
             "conflict": {
                 "zendframework/zend-crypt": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~2.3.0",
-                "phpunit/phpunit": "^9.5.11"
+                "laminas/laminas-coding-standard": "~2.4.0",
+                "phpunit/phpunit": "^9.5.25"
             },
             "suggest": {
                 "ext-openssl": "Required for most features of Laminas\\Crypt"
@@ -3368,37 +3372,37 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-04-12T14:28:29+00:00"
+            "time": "2023-11-06T23:02:42+00:00"
         },
         {
             "name": "laminas/laminas-escaper",
-            "version": "2.12.0",
+            "version": "2.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-escaper.git",
-                "reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490"
+                "reference": "af459883f4018d0f8a0c69c7a209daef3bf973ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490",
-                "reference": "ee7a4c37bf3d0e8c03635d5bddb5bb3184ead490",
+                "url": "https://api.github.com/repos/laminas/laminas-escaper/zipball/af459883f4018d0f8a0c69c7a209daef3bf973ba",
+                "reference": "af459883f4018d0f8a0c69c7a209daef3bf973ba",
                 "shasum": ""
             },
             "require": {
                 "ext-ctype": "*",
                 "ext-mbstring": "*",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0"
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-escaper": "*"
             },
             "require-dev": {
-                "infection/infection": "^0.26.6",
-                "laminas/laminas-coding-standard": "~2.4.0",
+                "infection/infection": "^0.27.0",
+                "laminas/laminas-coding-standard": "~2.5.0",
                 "maglnet/composer-require-checker": "^3.8.0",
-                "phpunit/phpunit": "^9.5.18",
-                "psalm/plugin-phpunit": "^0.17.0",
-                "vimeo/psalm": "^4.22.0"
+                "phpunit/phpunit": "^9.6.7",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "vimeo/psalm": "^5.9"
             },
             "type": "library",
             "autoload": {
@@ -3430,36 +3434,37 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-10-10T10:11:09+00:00"
+            "time": "2023-10-10T08:35:13+00:00"
         },
         {
             "name": "laminas/laminas-eventmanager",
-            "version": "3.5.0",
+            "version": "3.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-eventmanager.git",
-                "reference": "41f7209428f37cab9573365e361f4078209aaafa"
+                "reference": "ce5ba8bde378fca5cb0cd514f01823637215b2f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/41f7209428f37cab9573365e361f4078209aaafa",
-                "reference": "41f7209428f37cab9573365e361f4078209aaafa",
+                "url": "https://api.github.com/repos/laminas/laminas-eventmanager/zipball/ce5ba8bde378fca5cb0cd514f01823637215b2f3",
+                "reference": "ce5ba8bde378fca5cb0cd514f01823637215b2f3",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.4 || ~8.0.0 || ~8.1.0"
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "container-interop/container-interop": "<1.2",
                 "zendframework/zend-eventmanager": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~2.2.1",
-                "laminas/laminas-stdlib": "^3.6",
-                "phpbench/phpbench": "^1.1",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5.5",
-                "psr/container": "^1.1.2 || ^2.0.2"
+                "laminas/laminas-coding-standard": "~2.5.0",
+                "laminas/laminas-stdlib": "^3.18",
+                "phpbench/phpbench": "^1.2.15",
+                "phpunit/phpunit": "^10.5.5",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "psr/container": "^1.1.2 || ^2.0.2",
+                "vimeo/psalm": "^5.18"
             },
             "suggest": {
                 "laminas/laminas-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature",
@@ -3497,27 +3502,27 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-04-06T21:05:17+00:00"
+            "time": "2024-01-03T17:43:50+00:00"
         },
         {
             "name": "laminas/laminas-filter",
-            "version": "2.31.0",
+            "version": "2.35.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-filter.git",
-                "reference": "548a6597d357b0b0b139cc7bffea4dfbc50eb5a8"
+                "reference": "3e821b33a787253d56046f9258174a22de1bd267"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/548a6597d357b0b0b139cc7bffea4dfbc50eb5a8",
-                "reference": "548a6597d357b0b0b139cc7bffea4dfbc50eb5a8",
+                "url": "https://api.github.com/repos/laminas/laminas-filter/zipball/3e821b33a787253d56046f9258174a22de1bd267",
+                "reference": "3e821b33a787253d56046f9258174a22de1bd267",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "laminas/laminas-servicemanager": "^3.14.0",
+                "laminas/laminas-servicemanager": "^3.21.0",
                 "laminas/laminas-stdlib": "^3.13.0",
-                "php": "~8.0.0 || ~8.1.0 || ~8.2.0"
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "laminas/laminas-validator": "<2.10.1",
@@ -3525,13 +3530,14 @@
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~2.5.0",
-                "laminas/laminas-crypt": "^3.9",
-                "laminas/laminas-uri": "^2.10",
+                "laminas/laminas-crypt": "^3.11",
+                "laminas/laminas-i18n": "^2.26.0",
+                "laminas/laminas-uri": "^2.11",
                 "pear/archive_tar": "^1.4.14",
-                "phpunit/phpunit": "^9.5.27",
-                "psalm/plugin-phpunit": "^0.18.4",
-                "psr/http-factory": "^1.0.1",
-                "vimeo/psalm": "^5.3"
+                "phpunit/phpunit": "^10.5.11",
+                "psalm/plugin-phpunit": "^0.19.0",
+                "psr/http-factory": "^1.0.2",
+                "vimeo/psalm": "^5.22.2"
             },
             "suggest": {
                 "laminas/laminas-crypt": "Laminas\\Crypt component, for encryption filters",
@@ -3575,67 +3581,66 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-01-12T06:17:48+00:00"
+            "time": "2024-04-11T08:13:56+00:00"
         },
         {
             "name": "laminas/laminas-form",
-            "version": "3.4.1",
+            "version": "3.19.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-form.git",
-                "reference": "cd3f9d3e345b075d34793e46b0759a4dfd12f674"
+                "reference": "f2ae01f6574ff9ca5139232c168e80b557b2b2aa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-form/zipball/cd3f9d3e345b075d34793e46b0759a4dfd12f674",
-                "reference": "cd3f9d3e345b075d34793e46b0759a4dfd12f674",
+                "url": "https://api.github.com/repos/laminas/laminas-form/zipball/f2ae01f6574ff9ca5139232c168e80b557b2b2aa",
+                "reference": "f2ae01f6574ff9ca5139232c168e80b557b2b2aa",
                 "shasum": ""
             },
             "require": {
-                "laminas/laminas-hydrator": "^4.3.1",
-                "laminas/laminas-inputfilter": "^2.19.1",
-                "laminas/laminas-stdlib": "^3.7.1",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0"
+                "laminas/laminas-hydrator": "^4.13.0",
+                "laminas/laminas-inputfilter": "^2.24.0",
+                "laminas/laminas-stdlib": "^3.16.1",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
-                "doctrine/annotations": "<1.12.0",
-                "laminas/laminas-captcha": "<2.11.0",
-                "laminas/laminas-eventmanager": "<3.4.0",
-                "laminas/laminas-i18n": "<2.12.0",
-                "laminas/laminas-recaptcha": "<3.4.0",
-                "laminas/laminas-servicemanager": "<3.10.0",
-                "laminas/laminas-view": "<2.14.0"
+                "doctrine/annotations": "<1.14.0",
+                "laminas/laminas-captcha": "<2.16.0",
+                "laminas/laminas-eventmanager": "<3.10.0",
+                "laminas/laminas-i18n": "<2.21.0",
+                "laminas/laminas-recaptcha": "<3.6.0",
+                "laminas/laminas-servicemanager": "<3.20.0",
+                "laminas/laminas-view": "<2.27.0"
             },
             "require-dev": {
-                "doctrine/annotations": "^1.13.3",
+                "doctrine/annotations": "^1.14.3 || ^2.0.1",
                 "ext-intl": "*",
-                "laminas/laminas-captcha": "^2.11.0",
-                "laminas/laminas-coding-standard": "^2.3.0",
-                "laminas/laminas-db": "^2.13.4",
-                "laminas/laminas-escaper": "^2.9.0",
-                "laminas/laminas-eventmanager": "^3.4.0",
-                "laminas/laminas-filter": "^2.14.0",
-                "laminas/laminas-i18n": "^2.14.0",
-                "laminas/laminas-modulemanager": "^2.11.0",
-                "laminas/laminas-recaptcha": "^3.4.0",
-                "laminas/laminas-servicemanager": "^3.15.1",
-                "laminas/laminas-session": "^2.12.1",
-                "laminas/laminas-text": "^2.9.0",
-                "laminas/laminas-validator": "^2.16.0",
-                "laminas/laminas-view": "^2.19.1",
-                "phpspec/prophecy-phpunit": "^2.0.1",
-                "phpunit/phpunit": "^9.5.14",
-                "psalm/plugin-phpunit": "^0.17.0",
-                "vimeo/psalm": "^4.21.0"
+                "laminas/laminas-captcha": "^2.17",
+                "laminas/laminas-coding-standard": "^2.5",
+                "laminas/laminas-db": "^2.18",
+                "laminas/laminas-escaper": "^2.13",
+                "laminas/laminas-eventmanager": "^3.12",
+                "laminas/laminas-filter": "^2.33",
+                "laminas/laminas-i18n": "^2.24.1",
+                "laminas/laminas-modulemanager": "^2.15.0",
+                "laminas/laminas-recaptcha": "^3.7",
+                "laminas/laminas-servicemanager": "^3.22.1",
+                "laminas/laminas-session": "^2.17",
+                "laminas/laminas-text": "^2.11.0",
+                "laminas/laminas-validator": "^2.43",
+                "laminas/laminas-view": "^2.32",
+                "phpunit/phpunit": "^10.4.2",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "vimeo/psalm": "^5.16"
             },
             "suggest": {
-                "doctrine/annotations": "^1.12, required to use laminas-form annotations support",
-                "laminas/laminas-captcha": "^2.11, required for using CAPTCHA form elements",
-                "laminas/laminas-eventmanager": "^3.4, reuired for laminas-form annotations support",
-                "laminas/laminas-i18n": "^2.12, required when using laminas-form view helpers",
-                "laminas/laminas-recaptcha": "^3.4, in order to use the ReCaptcha form element",
-                "laminas/laminas-servicemanager": "^3.10, required to use the form factories or provide services",
-                "laminas/laminas-view": "^2.14, required for using the laminas-form view helpers"
+                "doctrine/annotations": "^1.14, required to use laminas-form annotations support",
+                "laminas/laminas-captcha": "^2.16, required for using CAPTCHA form elements",
+                "laminas/laminas-eventmanager": "^3.10, reuired for laminas-form annotations support",
+                "laminas/laminas-i18n": "^2.21, required when using laminas-form view helpers",
+                "laminas/laminas-recaptcha": "^3.6, in order to use the ReCaptcha form element",
+                "laminas/laminas-servicemanager": "^3.20, required to use the form factories or provide services",
+                "laminas/laminas-view": "^2.27, required for using the laminas-form view helpers"
             },
             "type": "library",
             "extra": {
@@ -3673,36 +3678,36 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-08-01T09:48:44+00:00"
+            "time": "2024-02-19T07:08:43+00:00"
         },
         {
             "name": "laminas/laminas-http",
-            "version": "2.16.1",
+            "version": "2.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-http.git",
-                "reference": "838825d42b03aedcb1d8b5a61ebfe28967bbfbfb"
+                "reference": "26dd6d1177e25d970058863c2afed12bb9dbff4d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-http/zipball/838825d42b03aedcb1d8b5a61ebfe28967bbfbfb",
-                "reference": "838825d42b03aedcb1d8b5a61ebfe28967bbfbfb",
+                "url": "https://api.github.com/repos/laminas/laminas-http/zipball/26dd6d1177e25d970058863c2afed12bb9dbff4d",
+                "reference": "26dd6d1177e25d970058863c2afed12bb9dbff4d",
                 "shasum": ""
             },
             "require": {
-                "laminas/laminas-loader": "^2.8",
+                "laminas/laminas-loader": "^2.10",
                 "laminas/laminas-stdlib": "^3.6",
-                "laminas/laminas-uri": "^2.9.1",
+                "laminas/laminas-uri": "^2.11",
                 "laminas/laminas-validator": "^2.15",
-                "php": "^7.3 || ~8.0.0 || ~8.1.0"
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-http": "*"
             },
             "require-dev": {
                 "ext-curl": "*",
-                "laminas/laminas-coding-standard": "~2.2.1",
-                "phpunit/phpunit": "^9.5.5"
+                "laminas/laminas-coding-standard": "~2.4.0",
+                "phpunit/phpunit": "^9.5.25"
             },
             "suggest": {
                 "paragonie/certainty": "For automated management of cacert.pem"
@@ -3738,25 +3743,25 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-11-11T09:12:35+00:00"
+            "time": "2023-11-02T16:27:41+00:00"
         },
         {
             "name": "laminas/laminas-hydrator",
-            "version": "4.13.0",
+            "version": "4.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-hydrator.git",
-                "reference": "de6da92da20873d569532adec94afa7285f21157"
+                "reference": "43ccca88313fdcceca37865109dffc69ecd2cf8f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-hydrator/zipball/de6da92da20873d569532adec94afa7285f21157",
-                "reference": "de6da92da20873d569532adec94afa7285f21157",
+                "url": "https://api.github.com/repos/laminas/laminas-hydrator/zipball/43ccca88313fdcceca37865109dffc69ecd2cf8f",
+                "reference": "43ccca88313fdcceca37865109dffc69ecd2cf8f",
                 "shasum": ""
             },
             "require": {
                 "laminas/laminas-stdlib": "^3.3",
-                "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
                 "webmozart/assert": "^1.10"
             },
             "conflict": {
@@ -3765,14 +3770,14 @@
             },
             "require-dev": {
                 "laminas/laminas-coding-standard": "~2.5.0",
-                "laminas/laminas-eventmanager": "^3.10",
-                "laminas/laminas-modulemanager": "^2.14.0",
-                "laminas/laminas-serializer": "^2.14.0",
-                "laminas/laminas-servicemanager": "^3.20",
-                "phpbench/phpbench": "^1.2.8",
-                "phpunit/phpunit": "^9.5.28",
+                "laminas/laminas-eventmanager": "^3.12",
+                "laminas/laminas-modulemanager": "^2.15.0",
+                "laminas/laminas-serializer": "^2.17.0",
+                "laminas/laminas-servicemanager": "^3.22.1",
+                "phpbench/phpbench": "^1.2.14",
+                "phpunit/phpunit": "^10.4.2",
                 "psalm/plugin-phpunit": "^0.18.4",
-                "vimeo/psalm": "^5.6"
+                "vimeo/psalm": "^5.15"
             },
             "suggest": {
                 "laminas/laminas-eventmanager": "^3.2, to support aggregate hydrator usage",
@@ -3815,47 +3820,45 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2023-03-19T20:05:31+00:00"
+            "time": "2023-11-08T11:11:45+00:00"
         },
         {
             "name": "laminas/laminas-i18n",
-            "version": "2.17.0",
+            "version": "2.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-i18n.git",
-                "reference": "7e8e63353b38792f2f360dc57cfa7187be20f182"
+                "reference": "01738410cb263994d1d192861f642387e7e12ace"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/7e8e63353b38792f2f360dc57cfa7187be20f182",
-                "reference": "7e8e63353b38792f2f360dc57cfa7187be20f182",
+                "url": "https://api.github.com/repos/laminas/laminas-i18n/zipball/01738410cb263994d1d192861f642387e7e12ace",
+                "reference": "01738410cb263994d1d192861f642387e7e12ace",
                 "shasum": ""
             },
             "require": {
                 "ext-intl": "*",
-                "laminas/laminas-servicemanager": "^3.14.0",
-                "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0"
+                "laminas/laminas-servicemanager": "^3.21.0",
+                "laminas/laminas-stdlib": "^3.0",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "laminas/laminas-view": "<2.20.0",
-                "phpspec/prophecy": "<1.9.0",
                 "zendframework/zend-i18n": "*"
             },
             "require-dev": {
-                "laminas/laminas-cache": "^3.1.2",
-                "laminas/laminas-cache-storage-adapter-memory": "^2.0.0",
-                "laminas/laminas-cache-storage-deprecated-factory": "^1.0.0",
-                "laminas/laminas-coding-standard": "~2.3.0",
-                "laminas/laminas-config": "^3.4.0",
-                "laminas/laminas-eventmanager": "^3.5.0",
-                "laminas/laminas-filter": "^2.16.0",
-                "laminas/laminas-validator": "^2.17.0",
-                "laminas/laminas-view": "^2.21.0",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5.21",
-                "psalm/plugin-phpunit": "^0.17.0",
-                "vimeo/psalm": "^4.24.0"
+                "laminas/laminas-cache": "^3.12.0",
+                "laminas/laminas-cache-storage-adapter-memory": "^2.3.0",
+                "laminas/laminas-cache-storage-deprecated-factory": "^1.2",
+                "laminas/laminas-coding-standard": "~2.5.0",
+                "laminas/laminas-config": "^3.9.0",
+                "laminas/laminas-eventmanager": "^3.13",
+                "laminas/laminas-filter": "^2.34",
+                "laminas/laminas-validator": "^2.46",
+                "laminas/laminas-view": "^2.33",
+                "phpunit/phpunit": "^10.5.5",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "vimeo/psalm": "^5.18.0"
             },
             "suggest": {
                 "laminas/laminas-cache": "You should install this package to cache the translations",
@@ -3902,40 +3905,39 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-07-27T11:23:29+00:00"
+            "time": "2024-01-04T13:49:00+00:00"
         },
         {
             "name": "laminas/laminas-inputfilter",
-            "version": "2.21.0",
+            "version": "2.30.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-inputfilter.git",
-                "reference": "8668227246d19564f339643f0f2aedcdff66612b"
+                "reference": "f07a908df1052f28b18904d3745cdd5b183938c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/8668227246d19564f339643f0f2aedcdff66612b",
-                "reference": "8668227246d19564f339643f0f2aedcdff66612b",
+                "url": "https://api.github.com/repos/laminas/laminas-inputfilter/zipball/f07a908df1052f28b18904d3745cdd5b183938c9",
+                "reference": "f07a908df1052f28b18904d3745cdd5b183938c9",
                 "shasum": ""
             },
             "require": {
-                "laminas/laminas-filter": "^2.13",
-                "laminas/laminas-servicemanager": "^3.16.0",
+                "laminas/laminas-filter": "^2.19",
+                "laminas/laminas-servicemanager": "^3.21.0",
                 "laminas/laminas-stdlib": "^3.0",
-                "laminas/laminas-validator": "^2.15",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0"
+                "laminas/laminas-validator": "^2.52",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-inputfilter": "*"
             },
             "require-dev": {
                 "ext-json": "*",
-                "laminas/laminas-coding-standard": "~2.4.0",
-                "laminas/laminas-db": "^2.15.0",
-                "phpunit/phpunit": "^9.5.24",
-                "psalm/plugin-phpunit": "^0.17.0",
-                "psr/http-message": "^1.0",
-                "vimeo/psalm": "^4.27.0",
+                "laminas/laminas-coding-standard": "~2.5.0",
+                "phpunit/phpunit": "^10.5.15",
+                "psalm/plugin-phpunit": "^0.19.0",
+                "psr/http-message": "^2.0",
+                "vimeo/psalm": "^5.23.1",
                 "webmozart/assert": "^1.11"
             },
             "suggest": {
@@ -3977,32 +3979,32 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-09-20T10:03:09+00:00"
+            "time": "2024-04-03T15:14:05+00:00"
         },
         {
             "name": "laminas/laminas-json",
-            "version": "3.3.0",
+            "version": "3.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-json.git",
-                "reference": "9a0ce9f330b7d11e70c4acb44d67e8c4f03f437f"
+                "reference": "53ff787b20b77197f38680c737e8dfffa846b85b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-json/zipball/9a0ce9f330b7d11e70c4acb44d67e8c4f03f437f",
-                "reference": "9a0ce9f330b7d11e70c4acb44d67e8c4f03f437f",
+                "url": "https://api.github.com/repos/laminas/laminas-json/zipball/53ff787b20b77197f38680c737e8dfffa846b85b",
+                "reference": "53ff787b20b77197f38680c737e8dfffa846b85b",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ~8.0.0 || ~8.1.0"
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-json": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~2.2.1",
-                "laminas/laminas-stdlib": "^2.7.7 || ^3.1",
-                "phpunit/phpunit": "^9.3"
+                "laminas/laminas-coding-standard": "~2.4.0",
+                "laminas/laminas-stdlib": "^2.7.7 || ^3.8",
+                "phpunit/phpunit": "^9.5.25"
             },
             "suggest": {
                 "laminas/laminas-json-server": "For implementing JSON-RPC servers",
@@ -4038,31 +4040,31 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2021-09-02T18:02:31+00:00"
+            "time": "2023-10-18T09:54:55+00:00"
         },
         {
             "name": "laminas/laminas-loader",
-            "version": "2.8.0",
+            "version": "2.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-loader.git",
-                "reference": "d0589ec9dd48365fd95ad10d1c906efd7711c16b"
+                "reference": "e6fe952304ef40ce45cd814751ab35d42afdad12"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-loader/zipball/d0589ec9dd48365fd95ad10d1c906efd7711c16b",
-                "reference": "d0589ec9dd48365fd95ad10d1c906efd7711c16b",
+                "url": "https://api.github.com/repos/laminas/laminas-loader/zipball/e6fe952304ef40ce45cd814751ab35d42afdad12",
+                "reference": "e6fe952304ef40ce45cd814751ab35d42afdad12",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ~8.0.0 || ~8.1.0"
+                "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-loader": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~2.2.1",
-                "phpunit/phpunit": "^9.3"
+                "laminas/laminas-coding-standard": "~2.4.0",
+                "phpunit/phpunit": "~9.5.25"
             },
             "type": "library",
             "autoload": {
@@ -4094,26 +4096,26 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2021-09-02T18:30:53+00:00"
+            "time": "2023-10-18T09:58:51+00:00"
         },
         {
             "name": "laminas/laminas-log",
-            "version": "2.15.3",
+            "version": "2.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-log.git",
-                "reference": "1deab9c4bc484bbe21be5f0119a90e91d0da548c"
+                "reference": "f24c4c78d3024bb59610845328d7876d6c797065"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-log/zipball/1deab9c4bc484bbe21be5f0119a90e91d0da548c",
-                "reference": "1deab9c4bc484bbe21be5f0119a90e91d0da548c",
+                "url": "https://api.github.com/repos/laminas/laminas-log/zipball/f24c4c78d3024bb59610845328d7876d6c797065",
+                "reference": "f24c4c78d3024bb59610845328d7876d6c797065",
                 "shasum": ""
             },
             "require": {
-                "laminas/laminas-servicemanager": "^3.3.0",
+                "laminas/laminas-servicemanager": "^3.21.0",
                 "laminas/laminas-stdlib": "^3.0",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
                 "psr/log": "^1.1.2"
             },
             "conflict": {
@@ -4182,49 +4184,44 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-10-26T13:19:12+00:00"
+            "time": "2023-12-05T18:27:50+00:00"
         },
         {
             "name": "laminas/laminas-mail",
-            "version": "2.16.0",
+            "version": "2.25.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-mail.git",
-                "reference": "1ee1a384b96c8af29ecad9b3a7adc27a150ebc49"
+                "reference": "110e04497395123998220e244cceecb167cc6dda"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/1ee1a384b96c8af29ecad9b3a7adc27a150ebc49",
-                "reference": "1ee1a384b96c8af29ecad9b3a7adc27a150ebc49",
+                "url": "https://api.github.com/repos/laminas/laminas-mail/zipball/110e04497395123998220e244cceecb167cc6dda",
+                "reference": "110e04497395123998220e244cceecb167cc6dda",
                 "shasum": ""
             },
             "require": {
                 "ext-iconv": "*",
-                "laminas/laminas-loader": "^2.8",
-                "laminas/laminas-mime": "^2.9.1",
-                "laminas/laminas-stdlib": "^3.6",
-                "laminas/laminas-validator": "^2.15",
-                "php": "^7.3 || ~8.0.0 || ~8.1.0",
-                "symfony/polyfill-intl-idn": "^1.24.0",
-                "symfony/polyfill-mbstring": "^1.12.0",
-                "webmozart/assert": "^1.10"
-            },
-            "conflict": {
-                "zendframework/zend-mail": "*"
+                "laminas/laminas-loader": "^2.9.0",
+                "laminas/laminas-mime": "^2.11.0",
+                "laminas/laminas-stdlib": "^3.17.0",
+                "laminas/laminas-validator": "^2.31.0",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+                "symfony/polyfill-intl-idn": "^1.27.0",
+                "symfony/polyfill-mbstring": "^1.27.0",
+                "webmozart/assert": "^1.11.0"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "laminas/laminas-crypt": "^2.6 || ^3.4",
-                "laminas/laminas-db": "^2.13.3",
-                "laminas/laminas-servicemanager": "^3.7",
-                "phpunit/phpunit": "^9.5.5",
-                "psalm/plugin-phpunit": "^0.15.1",
-                "symfony/process": "^5.3.7",
-                "vimeo/psalm": "^4.7"
+                "laminas/laminas-coding-standard": "~2.5.0",
+                "laminas/laminas-db": "^2.18",
+                "laminas/laminas-servicemanager": "^3.22.1",
+                "phpunit/phpunit": "^10.4.2",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "symfony/process": "^6.3.4",
+                "vimeo/psalm": "^5.15"
             },
             "suggest": {
-                "laminas/laminas-crypt": "Crammd5 support in SMTP Auth",
-                "laminas/laminas-servicemanager": "^2.7.10 || ^3.3.1 when using SMTP to deliver messages"
+                "laminas/laminas-servicemanager": "^3.21 when using SMTP to deliver messages"
             },
             "type": "library",
             "extra": {
@@ -4262,32 +4259,32 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-02-23T21:08:17+00:00"
+            "time": "2023-11-02T10:32:34+00:00"
         },
         {
             "name": "laminas/laminas-math",
-            "version": "3.5.0",
+            "version": "3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-math.git",
-                "reference": "146d8187ab247ae152e811a6704a953d43537381"
+                "reference": "3e90445828fd64308de2a600b48c3df051b3b17a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-math/zipball/146d8187ab247ae152e811a6704a953d43537381",
-                "reference": "146d8187ab247ae152e811a6704a953d43537381",
+                "url": "https://api.github.com/repos/laminas/laminas-math/zipball/3e90445828fd64308de2a600b48c3df051b3b17a",
+                "reference": "3e90445828fd64308de2a600b48c3df051b3b17a",
                 "shasum": ""
             },
             "require": {
                 "ext-mbstring": "*",
-                "php": "^7.3 || ~8.0.0 || ~8.1.0"
+                "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-math": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~1.0.0",
-                "phpunit/phpunit": "^9.5.5"
+                "laminas/laminas-coding-standard": "~2.4.0",
+                "phpunit/phpunit": "~9.5.25"
             },
             "suggest": {
                 "ext-bcmath": "If using the bcmath functionality",
@@ -4329,33 +4326,33 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2021-12-06T02:02:07+00:00"
+            "time": "2023-10-18T09:53:37+00:00"
         },
         {
             "name": "laminas/laminas-mime",
-            "version": "2.10.0",
+            "version": "2.12.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-mime.git",
-                "reference": "62a899a7c9100889c2d2386b1357003a2cb52fa9"
+                "reference": "08cc544778829b7d68d27a097885bd6e7130135e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-mime/zipball/62a899a7c9100889c2d2386b1357003a2cb52fa9",
-                "reference": "62a899a7c9100889c2d2386b1357003a2cb52fa9",
+                "url": "https://api.github.com/repos/laminas/laminas-mime/zipball/08cc544778829b7d68d27a097885bd6e7130135e",
+                "reference": "08cc544778829b7d68d27a097885bd6e7130135e",
                 "shasum": ""
             },
             "require": {
                 "laminas/laminas-stdlib": "^2.7 || ^3.0",
-                "php": "^7.3 || ~8.0.0 || ~8.1.0"
+                "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-mime": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~2.2.1",
-                "laminas/laminas-mail": "^2.12",
-                "phpunit/phpunit": "^9.5"
+                "laminas/laminas-coding-standard": "~2.4.0",
+                "laminas/laminas-mail": "^2.19.0",
+                "phpunit/phpunit": "~9.5.25"
             },
             "suggest": {
                 "laminas/laminas-mail": "Laminas\\Mail component"
@@ -4390,41 +4387,41 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-08-30T09:38:41+00:00"
+            "time": "2023-11-02T16:47:19+00:00"
         },
         {
             "name": "laminas/laminas-modulemanager",
-            "version": "2.12.0",
+            "version": "2.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-modulemanager.git",
-                "reference": "cd2dd3b3dc59e75a9f2117374222c0d84b25bf19"
+                "reference": "4c4e6f29f0b1a770c8ce4f30dd3a48eb45ed7d3b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-modulemanager/zipball/cd2dd3b3dc59e75a9f2117374222c0d84b25bf19",
-                "reference": "cd2dd3b3dc59e75a9f2117374222c0d84b25bf19",
+                "url": "https://api.github.com/repos/laminas/laminas-modulemanager/zipball/4c4e6f29f0b1a770c8ce4f30dd3a48eb45ed7d3b",
+                "reference": "4c4e6f29f0b1a770c8ce4f30dd3a48eb45ed7d3b",
                 "shasum": ""
             },
             "require": {
-                "brick/varexporter": "^0.3.2",
+                "brick/varexporter": "^0.3.2 || ^0.4",
                 "laminas/laminas-config": "^3.7",
                 "laminas/laminas-eventmanager": "^3.4",
                 "laminas/laminas-stdlib": "^3.6",
-                "php": "^7.3 || ~8.0.0 || ~8.1.0",
+                "php": "~8.1.0 || ~8.2.0|| ~8.3.0",
                 "webimpress/safe-writer": "^1.0.2 || ^2.1"
             },
             "conflict": {
                 "zendframework/zend-modulemanager": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "^2.3",
-                "laminas/laminas-loader": "^2.8",
-                "laminas/laminas-mvc": "^3.1.1",
-                "laminas/laminas-servicemanager": "^3.7",
-                "phpunit/phpunit": "^9.5.5",
-                "psalm/plugin-phpunit": "^0.16.1",
-                "vimeo/psalm": "^4.10"
+                "laminas/laminas-coding-standard": "^2.5",
+                "laminas/laminas-loader": "^2.10",
+                "laminas/laminas-mvc": "^3.6.1",
+                "laminas/laminas-servicemanager": "^3.22.1",
+                "phpunit/phpunit": "^10.4.2",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "vimeo/psalm": "^5.15"
             },
             "suggest": {
                 "laminas/laminas-console": "Laminas\\Console component",
@@ -4462,20 +4459,20 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-09-07T11:22:27+00:00"
+            "time": "2023-11-02T09:09:35+00:00"
         },
         {
             "name": "laminas/laminas-mvc",
-            "version": "3.3.5",
+            "version": "3.7.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-mvc.git",
-                "reference": "43fa8b0a02376cfe3209a91140bc97e94cd62d6e"
+                "reference": "3f65447addf487189000e54dc1525cd952951da4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-mvc/zipball/43fa8b0a02376cfe3209a91140bc97e94cd62d6e",
-                "reference": "43fa8b0a02376cfe3209a91140bc97e94cd62d6e",
+                "url": "https://api.github.com/repos/laminas/laminas-mvc/zipball/3f65447addf487189000e54dc1525cd952951da4",
+                "reference": "3f65447addf487189000e54dc1525cd952951da4",
                 "shasum": ""
             },
             "require": {
@@ -4483,23 +4480,22 @@
                 "laminas/laminas-eventmanager": "^3.4",
                 "laminas/laminas-http": "^2.15",
                 "laminas/laminas-modulemanager": "^2.8",
-                "laminas/laminas-router": "^3.5",
-                "laminas/laminas-servicemanager": "^3.7",
+                "laminas/laminas-router": "^3.11.1",
+                "laminas/laminas-servicemanager": "^3.20.0",
                 "laminas/laminas-stdlib": "^3.6",
                 "laminas/laminas-view": "^2.14",
-                "php": "^7.3 || ~8.0.0 || ~8.1.0"
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-mvc": "*"
             },
             "require-dev": {
-                "http-interop/http-middleware": "^0.4.1",
-                "laminas/laminas-coding-standard": "^1.0.0",
-                "laminas/laminas-json": "^3.3",
-                "laminas/laminas-psr7bridge": "^1.0",
-                "laminas/laminas-stratigility": ">=2.0.1 <2.2",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5.5"
+                "laminas/laminas-coding-standard": "^2.5.0",
+                "laminas/laminas-json": "^3.6",
+                "phpspec/prophecy": "^1.17.0",
+                "phpspec/prophecy-phpunit": "^2.0.2",
+                "phpunit/phpunit": "^9.6.13",
+                "webmozart/assert": "^1.11"
             },
             "suggest": {
                 "laminas/laminas-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable",
@@ -4544,20 +4540,20 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-09-20T12:37:51+00:00"
+            "time": "2023-11-14T09:44:53+00:00"
         },
         {
             "name": "laminas/laminas-mvc-i18n",
-            "version": "1.4.0",
+            "version": "1.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-mvc-i18n.git",
-                "reference": "6dc949c045d7a2c27652a3bb891d46ef5e1814e4"
+                "reference": "669a00f36dd9fba8ec95516fe4afde7c4d8b8faa"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-mvc-i18n/zipball/6dc949c045d7a2c27652a3bb891d46ef5e1814e4",
-                "reference": "6dc949c045d7a2c27652a3bb891d46ef5e1814e4",
+                "url": "https://api.github.com/repos/laminas/laminas-mvc-i18n/zipball/669a00f36dd9fba8ec95516fe4afde7c4d8b8faa",
+                "reference": "669a00f36dd9fba8ec95516fe4afde7c4d8b8faa",
                 "shasum": ""
             },
             "require": {
@@ -4568,7 +4564,7 @@
                 "laminas/laminas-servicemanager": "^3.15.1",
                 "laminas/laminas-stdlib": "^3.10.1",
                 "laminas/laminas-validator": "^2.19.0",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0"
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "laminas/laminas-mvc": "<3.0.0",
@@ -4576,11 +4572,11 @@
                 "zendframework/zend-mvc-i18n": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~2.3.0",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5",
-                "psalm/plugin-phpunit": "^0.17.0",
-                "vimeo/psalm": "^4.24.0"
+                "laminas/laminas-coding-standard": "~2.5.0",
+                "phpspec/prophecy-phpunit": "^2.0.2",
+                "phpunit/phpunit": "^9.6.13",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "vimeo/psalm": "^5.15"
             },
             "suggest": {
                 "laminas/laminas-cache": "To enable caching of translation strings"
@@ -4622,41 +4618,41 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-07-21T16:59:34+00:00"
+            "time": "2023-11-06T09:31:01+00:00"
         },
         {
             "name": "laminas/laminas-paginator",
-            "version": "2.13.0",
+            "version": "2.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-paginator.git",
-                "reference": "2d6a9d21f5d67963347d497cd53873e3e693b0b5"
+                "reference": "6a03499a899fb8ba650594ddf4b4338d4235252a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-paginator/zipball/2d6a9d21f5d67963347d497cd53873e3e693b0b5",
-                "reference": "2d6a9d21f5d67963347d497cd53873e3e693b0b5",
+                "url": "https://api.github.com/repos/laminas/laminas-paginator/zipball/6a03499a899fb8ba650594ddf4b4338d4235252a",
+                "reference": "6a03499a899fb8ba650594ddf4b4338d4235252a",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
                 "laminas/laminas-stdlib": "^3.10.1",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0"
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-paginator": "*"
             },
             "require-dev": {
-                "laminas/laminas-cache": "^3.1.2",
-                "laminas/laminas-cache-storage-adapter-memory": "^2.0.0",
-                "laminas/laminas-coding-standard": "^2.3.0",
-                "laminas/laminas-config": "^3.7.0",
-                "laminas/laminas-filter": "^2.13.0",
-                "laminas/laminas-servicemanager": "^3.14.0",
-                "laminas/laminas-view": "^2.15.0",
-                "phpunit/phpunit": "^9.5.21",
-                "psalm/plugin-phpunit": "^0.16.1",
-                "vimeo/psalm": "^4.24.0"
+                "laminas/laminas-cache": "^3.9",
+                "laminas/laminas-cache-storage-adapter-memory": "^2.2.0",
+                "laminas/laminas-coding-standard": "^2.4.0",
+                "laminas/laminas-config": "^3.8.0",
+                "laminas/laminas-filter": "^2.30",
+                "laminas/laminas-servicemanager": "^3.22",
+                "laminas/laminas-view": "^2.25",
+                "phpunit/phpunit": "^9.5.27",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "vimeo/psalm": "^5.4"
             },
             "suggest": {
                 "laminas/laminas-cache": "Laminas\\Cache component to support cache features",
@@ -4701,37 +4697,37 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-07-12T11:56:05+00:00"
+            "time": "2024-01-11T11:00:36+00:00"
         },
         {
             "name": "laminas/laminas-router",
-            "version": "3.9.0",
+            "version": "3.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-router.git",
-                "reference": "ebd084f7fda7520394b9ddc1e9ec2cbdf2094daa"
+                "reference": "04e14e757303787c83f79298dbd4483eebacfeb9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-router/zipball/ebd084f7fda7520394b9ddc1e9ec2cbdf2094daa",
-                "reference": "ebd084f7fda7520394b9ddc1e9ec2cbdf2094daa",
+                "url": "https://api.github.com/repos/laminas/laminas-router/zipball/04e14e757303787c83f79298dbd4483eebacfeb9",
+                "reference": "04e14e757303787c83f79298dbd4483eebacfeb9",
                 "shasum": ""
             },
             "require": {
                 "laminas/laminas-http": "^2.15",
                 "laminas/laminas-servicemanager": "^3.14.0",
                 "laminas/laminas-stdlib": "^3.10.1",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0"
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-router": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~2.4.0",
-                "laminas/laminas-i18n": "^2.15.0",
-                "phpunit/phpunit": "^9.5.5",
-                "psalm/plugin-phpunit": "^0.17.0",
-                "vimeo/psalm": "^4.24.0"
+                "laminas/laminas-coding-standard": "~2.5.0",
+                "laminas/laminas-i18n": "^2.26.0",
+                "phpunit/phpunit": "^10.5.11",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "vimeo/psalm": "^5.22.2"
             },
             "suggest": {
                 "laminas/laminas-i18n": "^2.15.0 if defining translatable HTTP path segments"
@@ -4772,35 +4768,35 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-08-30T22:41:24+00:00"
+            "time": "2024-03-05T12:54:05+00:00"
         },
         {
             "name": "laminas/laminas-serializer",
-            "version": "2.13.0",
+            "version": "2.17.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-serializer.git",
-                "reference": "aa72a694d79f01ef1252b276ca9930158c3b877d"
+                "reference": "9641dee4208078ff8dfbcdd74048adb0b3ee517e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-serializer/zipball/aa72a694d79f01ef1252b276ca9930158c3b877d",
-                "reference": "aa72a694d79f01ef1252b276ca9930158c3b877d",
+                "url": "https://api.github.com/repos/laminas/laminas-serializer/zipball/9641dee4208078ff8dfbcdd74048adb0b3ee517e",
+                "reference": "9641dee4208078ff8dfbcdd74048adb0b3ee517e",
                 "shasum": ""
             },
             "require": {
                 "laminas/laminas-json": "^3.1",
                 "laminas/laminas-stdlib": "^3.2",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0"
+                "php": "~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-serializer": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~2.3.0",
-                "laminas/laminas-math": "^3.3",
-                "laminas/laminas-servicemanager": "^3.6",
-                "phpunit/phpunit": "^9.3"
+                "laminas/laminas-coding-standard": "~2.4.0",
+                "laminas/laminas-math": "^3.6",
+                "laminas/laminas-servicemanager": "~3.19.0",
+                "phpunit/phpunit": "~9.6.0"
             },
             "suggest": {
                 "laminas/laminas-math": "(^3.3) To support Python Pickle serialization",
@@ -4842,30 +4838,30 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-04-11T19:50:04+00:00"
+            "time": "2023-10-01T15:38:34+00:00"
         },
         {
             "name": "laminas/laminas-servicemanager",
-            "version": "3.17.0",
+            "version": "3.22.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-servicemanager.git",
-                "reference": "360be5f16955dd1edbcce1cfaa98ed82a17f02ec"
+                "reference": "de98d297d4743956a0558a6d71616979ff779328"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/360be5f16955dd1edbcce1cfaa98ed82a17f02ec",
-                "reference": "360be5f16955dd1edbcce1cfaa98ed82a17f02ec",
+                "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/de98d297d4743956a0558a6d71616979ff779328",
+                "reference": "de98d297d4743956a0558a6d71616979ff779328",
                 "shasum": ""
             },
             "require": {
-                "laminas/laminas-stdlib": "^3.2.1",
-                "php": "~7.4.0 || ~8.0.0 || ~8.1.0",
+                "laminas/laminas-stdlib": "^3.17",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
                 "psr/container": "^1.0"
             },
             "conflict": {
                 "ext-psr": "*",
-                "laminas/laminas-code": "<3.3.1",
+                "laminas/laminas-code": "<4.10.0",
                 "zendframework/zend-code": "<3.3.1",
                 "zendframework/zend-servicemanager": "*"
             },
@@ -4876,20 +4872,19 @@
                 "container-interop/container-interop": "^1.2.0"
             },
             "require-dev": {
-                "composer/package-versions-deprecated": "^1.0",
-                "laminas/laminas-coding-standard": "~2.4.0",
-                "laminas/laminas-container-config-test": "^0.7",
-                "laminas/laminas-dependency-plugin": "^2.1.2",
-                "mikey179/vfsstream": "^1.6.10@alpha",
-                "ocramius/proxy-manager": "^2.11",
-                "phpbench/phpbench": "^1.1",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5.5",
-                "psalm/plugin-phpunit": "^0.17.0",
-                "vimeo/psalm": "^4.8"
+                "composer/package-versions-deprecated": "^1.11.99.5",
+                "friendsofphp/proxy-manager-lts": "^1.0.14",
+                "laminas/laminas-code": "^4.10.0",
+                "laminas/laminas-coding-standard": "~2.5.0",
+                "laminas/laminas-container-config-test": "^0.8",
+                "mikey179/vfsstream": "^1.6.11",
+                "phpbench/phpbench": "^1.2.9",
+                "phpunit/phpunit": "^10.4",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "vimeo/psalm": "^5.8.0"
             },
             "suggest": {
-                "ocramius/proxy-manager": "ProxyManager ^2.1.1 to handle lazy initialization of services"
+                "friendsofphp/proxy-manager-lts": "ProxyManager ^2.1.1 to handle lazy initialization of services"
             },
             "bin": [
                 "bin/generate-deps-for-config-factory",
@@ -4933,44 +4928,43 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-09-22T11:33:46+00:00"
+            "time": "2023-10-24T11:19:47+00:00"
         },
         {
             "name": "laminas/laminas-session",
-            "version": "2.13.0",
+            "version": "2.20.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-session.git",
-                "reference": "9f8a6077dd22b3b253583b1be84ddd5bf6fa1ef4"
+                "reference": "16876aa20a6688d06291a972f7e1eb0b74b05d51"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-session/zipball/9f8a6077dd22b3b253583b1be84ddd5bf6fa1ef4",
-                "reference": "9f8a6077dd22b3b253583b1be84ddd5bf6fa1ef4",
+                "url": "https://api.github.com/repos/laminas/laminas-session/zipball/16876aa20a6688d06291a972f7e1eb0b74b05d51",
+                "reference": "16876aa20a6688d06291a972f7e1eb0b74b05d51",
                 "shasum": ""
             },
             "require": {
-                "laminas/laminas-eventmanager": "^3.5",
-                "laminas/laminas-servicemanager": "^3.15.1",
-                "laminas/laminas-stdlib": "^3.10.1",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0"
+                "laminas/laminas-eventmanager": "^3.12",
+                "laminas/laminas-servicemanager": "^3.22",
+                "laminas/laminas-stdlib": "^3.18",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-session": "*"
             },
             "require-dev": {
-                "laminas/laminas-cache": "^3.1.3",
-                "laminas/laminas-cache-storage-adapter-memory": "^2.0.0",
-                "laminas/laminas-coding-standard": "~2.3.0",
-                "laminas/laminas-db": "^2.13.4",
-                "laminas/laminas-http": "^2.15",
-                "laminas/laminas-validator": "^2.15",
-                "mongodb/mongodb": "~1.12.0",
-                "php-mock/php-mock-phpunit": "^1.1.2 || ^2.0",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5.9",
-                "psalm/plugin-phpunit": "^0.17.0",
-                "vimeo/psalm": "^4.24.0"
+                "ext-xdebug": "*",
+                "laminas/laminas-cache": "^3.12.1",
+                "laminas/laminas-cache-storage-adapter-memory": "^2.3",
+                "laminas/laminas-coding-standard": "~2.5.0",
+                "laminas/laminas-db": "^2.19.0",
+                "laminas/laminas-http": "^2.19",
+                "laminas/laminas-validator": "^2.49.0",
+                "mongodb/mongodb": "~1.17.0",
+                "phpunit/phpunit": "^9.6.17",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "vimeo/psalm": "^5.22.2"
             },
             "suggest": {
                 "laminas/laminas-cache": "Laminas\\Cache component",
@@ -5016,34 +5010,34 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-07-22T10:26:33+00:00"
+            "time": "2024-03-08T11:02:36+00:00"
         },
         {
             "name": "laminas/laminas-stdlib",
-            "version": "3.16.1",
+            "version": "3.19.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-stdlib.git",
-                "reference": "f4f773641807c7ccee59b758bfe4ac4ba33ecb17"
+                "reference": "6a192dd0882b514e45506f533b833b623b78fff3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/f4f773641807c7ccee59b758bfe4ac4ba33ecb17",
-                "reference": "f4f773641807c7ccee59b758bfe4ac4ba33ecb17",
+                "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/6a192dd0882b514e45506f533b833b623b78fff3",
+                "reference": "6a192dd0882b514e45506f533b833b623b78fff3",
                 "shasum": ""
             },
             "require": {
-                "php": "~8.0.0 || ~8.1.0 || ~8.2.0"
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-stdlib": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "^2.4.0",
-                "phpbench/phpbench": "^1.2.7",
-                "phpunit/phpunit": "^9.5.26",
-                "psalm/plugin-phpunit": "^0.18.0",
-                "vimeo/psalm": "^5.0.0"
+                "laminas/laminas-coding-standard": "^2.5",
+                "phpbench/phpbench": "^1.2.15",
+                "phpunit/phpunit": "^10.5.8",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "vimeo/psalm": "^5.20.0"
             },
             "type": "library",
             "autoload": {
@@ -5075,33 +5069,33 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-12-03T18:48:01+00:00"
+            "time": "2024-01-19T12:39:49+00:00"
         },
         {
             "name": "laminas/laminas-uri",
-            "version": "2.9.1",
+            "version": "2.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-uri.git",
-                "reference": "7e837dc15c8fd3949df7d1213246fd7c8640032b"
+                "reference": "e662c685125061d3115906e5eb30f966842cc226"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-uri/zipball/7e837dc15c8fd3949df7d1213246fd7c8640032b",
-                "reference": "7e837dc15c8fd3949df7d1213246fd7c8640032b",
+                "url": "https://api.github.com/repos/laminas/laminas-uri/zipball/e662c685125061d3115906e5eb30f966842cc226",
+                "reference": "e662c685125061d3115906e5eb30f966842cc226",
                 "shasum": ""
             },
             "require": {
                 "laminas/laminas-escaper": "^2.9",
-                "laminas/laminas-validator": "^2.15",
-                "php": "^7.3 || ~8.0.0 || ~8.1.0"
+                "laminas/laminas-validator": "^2.39",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zend-uri": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "~2.2.1",
-                "phpunit/phpunit": "^9.5.5"
+                "laminas/laminas-coding-standard": "~2.4.0",
+                "phpunit/phpunit": "^9.5.25"
             },
             "type": "library",
             "autoload": {
@@ -5133,45 +5127,43 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2021-09-09T18:37:15+00:00"
+            "time": "2023-10-18T09:56:55+00:00"
         },
         {
             "name": "laminas/laminas-validator",
-            "version": "2.25.0",
+            "version": "2.53.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-validator.git",
-                "reference": "42de39b78e73b321db7d948cf8530a2764f8b9aa"
+                "reference": "dbcfc19cb7f2e3eb3a27ba5d059c200e8404d72c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/42de39b78e73b321db7d948cf8530a2764f8b9aa",
-                "reference": "42de39b78e73b321db7d948cf8530a2764f8b9aa",
+                "url": "https://api.github.com/repos/laminas/laminas-validator/zipball/dbcfc19cb7f2e3eb3a27ba5d059c200e8404d72c",
+                "reference": "dbcfc19cb7f2e3eb3a27ba5d059c200e8404d72c",
                 "shasum": ""
             },
             "require": {
-                "laminas/laminas-servicemanager": "^3.12.0",
+                "laminas/laminas-servicemanager": "^3.21.0",
                 "laminas/laminas-stdlib": "^3.13",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0"
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
+                "psr/http-message": "^1.0.1 || ^2.0.0"
             },
             "conflict": {
                 "zendframework/zend-validator": "*"
             },
             "require-dev": {
-                "laminas/laminas-coding-standard": "^2.4.0",
-                "laminas/laminas-db": "^2.15.0",
-                "laminas/laminas-filter": "^2.18.0",
-                "laminas/laminas-http": "^2.16.0",
-                "laminas/laminas-i18n": "^2.17.0",
-                "laminas/laminas-session": "^2.13.0",
-                "laminas/laminas-uri": "^2.9.1",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5.24",
-                "psalm/plugin-phpunit": "^0.17.0",
-                "psr/http-client": "^1.0",
-                "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.0",
-                "vimeo/psalm": "^4.27.0"
+                "laminas/laminas-coding-standard": "^2.5",
+                "laminas/laminas-db": "^2.19",
+                "laminas/laminas-filter": "^2.34",
+                "laminas/laminas-i18n": "^2.26.0",
+                "laminas/laminas-session": "^2.20",
+                "laminas/laminas-uri": "^2.11.0",
+                "phpunit/phpunit": "^10.5.15",
+                "psalm/plugin-phpunit": "^0.19.0",
+                "psr/http-client": "^1.0.3",
+                "psr/http-factory": "^1.0.2",
+                "vimeo/psalm": "^5.23.1"
             },
             "suggest": {
                 "laminas/laminas-db": "Laminas\\Db component, required by the (No)RecordExists validator",
@@ -5219,68 +5211,62 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-09-20T11:33:19+00:00"
+            "time": "2024-04-01T09:26:32+00:00"
         },
         {
             "name": "laminas/laminas-view",
-            "version": "2.23.0",
+            "version": "2.34.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-view.git",
-                "reference": "69ea122cd53f7839e58cb250975932332e542524"
+                "reference": "53136a59622c8809c519b29dbbaa346aa39e834a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-view/zipball/69ea122cd53f7839e58cb250975932332e542524",
-                "reference": "69ea122cd53f7839e58cb250975932332e542524",
+                "url": "https://api.github.com/repos/laminas/laminas-view/zipball/53136a59622c8809c519b29dbbaa346aa39e834a",
+                "reference": "53136a59622c8809c519b29dbbaa346aa39e834a",
                 "shasum": ""
             },
             "require": {
-                "container-interop/container-interop": "^1.2",
                 "ext-dom": "*",
                 "ext-filter": "*",
                 "ext-json": "*",
                 "laminas/laminas-escaper": "^2.5",
                 "laminas/laminas-eventmanager": "^3.4",
                 "laminas/laminas-json": "^3.3",
-                "laminas/laminas-servicemanager": "^3.14.0",
+                "laminas/laminas-servicemanager": "^3.21.0",
                 "laminas/laminas-stdlib": "^3.10.1",
-                "php": "^7.4 || ~8.0.0 || ~8.1.0",
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
                 "psr/container": "^1 || ^2"
             },
             "conflict": {
                 "container-interop/container-interop": "<1.2",
                 "laminas/laminas-router": "<3.0.1",
-                "laminas/laminas-servicemanager": "<3.3",
                 "laminas/laminas-session": "<2.12",
                 "zendframework/zend-view": "*"
             },
             "require-dev": {
-                "laminas/laminas-authentication": "^2.5",
-                "laminas/laminas-coding-standard": "~2.3.0",
-                "laminas/laminas-console": "^2.6",
-                "laminas/laminas-feed": "^2.15",
-                "laminas/laminas-filter": "^2.13.0",
-                "laminas/laminas-http": "^2.15",
-                "laminas/laminas-i18n": "^2.6",
-                "laminas/laminas-modulemanager": "^2.7.1",
-                "laminas/laminas-mvc": "^3.0",
-                "laminas/laminas-mvc-i18n": "^1.1",
-                "laminas/laminas-mvc-plugin-flashmessenger": "^1.5.0",
-                "laminas/laminas-navigation": "^2.13.1",
-                "laminas/laminas-paginator": "^2.11.0",
-                "laminas/laminas-permissions-acl": "^2.6",
-                "laminas/laminas-router": "^3.0.1",
-                "laminas/laminas-uri": "^2.5",
-                "phpspec/prophecy": "^1.12",
-                "phpspec/prophecy-phpunit": "^2.0",
-                "phpunit/phpunit": "^9.5.5",
-                "psalm/plugin-phpunit": "^0.17.0",
-                "vimeo/psalm": "^4.10"
+                "laminas/laminas-authentication": "^2.16",
+                "laminas/laminas-coding-standard": "~2.5.0",
+                "laminas/laminas-feed": "^2.22",
+                "laminas/laminas-filter": "^2.34",
+                "laminas/laminas-http": "^2.19",
+                "laminas/laminas-i18n": "^2.26.0",
+                "laminas/laminas-modulemanager": "^2.15",
+                "laminas/laminas-mvc": "^3.7.0",
+                "laminas/laminas-mvc-i18n": "^1.8",
+                "laminas/laminas-mvc-plugin-flashmessenger": "^1.10.1",
+                "laminas/laminas-navigation": "^2.19.1",
+                "laminas/laminas-paginator": "^2.18.1",
+                "laminas/laminas-permissions-acl": "^2.16",
+                "laminas/laminas-router": "^3.12.0",
+                "laminas/laminas-uri": "^2.11",
+                "phpunit/phpunit": "^10.5.9",
+                "psalm/plugin-phpunit": "^0.18.4",
+                "vimeo/psalm": "^5.20"
             },
             "suggest": {
                 "laminas/laminas-authentication": "Laminas\\Authentication component",
-                "laminas/laminas-escaper": "Laminas\\Escaper component",
                 "laminas/laminas-feed": "Laminas\\Feed component",
                 "laminas/laminas-filter": "Laminas\\Filter component",
                 "laminas/laminas-http": "Laminas\\Http component",
@@ -5290,7 +5276,6 @@
                 "laminas/laminas-navigation": "Laminas\\Navigation component",
                 "laminas/laminas-paginator": "Laminas\\Paginator component",
                 "laminas/laminas-permissions-acl": "Laminas\\Permissions\\Acl component",
-                "laminas/laminas-servicemanager": "Laminas\\ServiceManager component",
                 "laminas/laminas-uri": "Laminas\\Uri component"
             },
             "bin": [
@@ -5326,26 +5311,26 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2022-09-19T15:43:14+00:00"
+            "time": "2024-01-25T11:26:39+00:00"
         },
         {
             "name": "laminas/laminas-xml",
-            "version": "1.4.0",
+            "version": "1.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laminas/laminas-xml.git",
-                "reference": "dcadeefdb6d7ed6b39d772b47e3845003d6ea60f"
+                "reference": "c35aab57d1d0a970b53965046d535b88c3dc8bea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laminas/laminas-xml/zipball/dcadeefdb6d7ed6b39d772b47e3845003d6ea60f",
-                "reference": "dcadeefdb6d7ed6b39d772b47e3845003d6ea60f",
+                "url": "https://api.github.com/repos/laminas/laminas-xml/zipball/c35aab57d1d0a970b53965046d535b88c3dc8bea",
+                "reference": "c35aab57d1d0a970b53965046d535b88c3dc8bea",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-simplexml": "*",
-                "php": "^7.3 || ~8.0.0 || ~8.1.0"
+                "php": "~8.1.0 || ~8.2.0 || ~8.3.0"
             },
             "conflict": {
                 "zendframework/zendxml": "*"
@@ -5386,7 +5371,7 @@
                     "type": "community_bridge"
                 }
             ],
-            "time": "2021-11-30T02:16:35+00:00"
+            "time": "2023-11-23T10:03:52+00:00"
         },
         {
             "name": "league/flysystem",
@@ -5535,16 +5520,16 @@
         },
         {
             "name": "league/mime-type-detection",
-            "version": "1.14.0",
+            "version": "1.15.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/mime-type-detection.git",
-                "reference": "b6a5854368533df0295c5761a0253656a2e52d9e"
+                "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e",
-                "reference": "b6a5854368533df0295c5761a0253656a2e52d9e",
+                "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301",
+                "reference": "ce0f4d1e8a6f4eb0ddff33f57c69c50fd09f4301",
                 "shasum": ""
             },
             "require": {
@@ -5575,7 +5560,7 @@
             "description": "Mime-type detection for Flysystem",
             "support": {
                 "issues": "https://github.com/thephpleague/mime-type-detection/issues",
-                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0"
+                "source": "https://github.com/thephpleague/mime-type-detection/tree/1.15.0"
             },
             "funding": [
                 {
@@ -5587,7 +5572,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-17T14:13:20+00:00"
+            "time": "2024-01-28T23:22:08+00:00"
         },
         {
             "name": "league/oauth2-client",
@@ -5745,16 +5730,16 @@
         },
         {
             "name": "monolog/monolog",
-            "version": "2.9.2",
+            "version": "2.9.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f"
+                "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
-                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
+                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/a30bfe2e142720dfa990d0a7e573997f5d884215",
+                "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215",
                 "shasum": ""
             },
             "require": {
@@ -5775,8 +5760,8 @@
                 "mongodb/mongodb": "^1.8",
                 "php-amqplib/php-amqplib": "~2.4 || ^3",
                 "phpspec/prophecy": "^1.15",
-                "phpstan/phpstan": "^0.12.91",
-                "phpunit/phpunit": "^8.5.14",
+                "phpstan/phpstan": "^1.10",
+                "phpunit/phpunit": "^8.5.38 || ^9.6.19",
                 "predis/predis": "^1.1 || ^2.0",
                 "rollbar/rollbar": "^1.3 || ^2 || ^3",
                 "ruflin/elastica": "^7",
@@ -5831,7 +5816,7 @@
             ],
             "support": {
                 "issues": "https://github.com/Seldaek/monolog/issues",
-                "source": "https://github.com/Seldaek/monolog/tree/2.9.2"
+                "source": "https://github.com/Seldaek/monolog/tree/2.9.3"
             },
             "funding": [
                 {
@@ -5843,7 +5828,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-10-27T15:25:26+00:00"
+            "time": "2024-04-12T20:52:51+00:00"
         },
         {
             "name": "mtdowling/jmespath.php",
@@ -5913,21 +5898,21 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.17.1",
+            "version": "v4.19.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d"
+                "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
-                "reference": "a6303e50c90c355c7eeee2c4a8b27fe8dc8fef1d",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b",
+                "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": ">=7.0"
+                "php": ">=7.1"
             },
             "require-dev": {
                 "ircmaxell/php-yacc": "^0.0.7",
@@ -5963,9 +5948,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v4.17.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1"
             },
-            "time": "2023-08-13T19:53:39+00:00"
+            "time": "2024-03-17T08:10:35+00:00"
         },
         {
             "name": "nyholm/dsn",
@@ -6084,16 +6069,16 @@
         },
         {
             "name": "olcs/olcs-transfer",
-            "version": "v7.0.1",
+            "version": "v7.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dvsa/olcs-transfer.git",
-                "reference": "fa56bc7dd9ee127fe593c13239fbc3887fd45c6b"
+                "reference": "11e2325b6ab7536dd522266c4487b17c42e48677"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dvsa/olcs-transfer/zipball/fa56bc7dd9ee127fe593c13239fbc3887fd45c6b",
-                "reference": "fa56bc7dd9ee127fe593c13239fbc3887fd45c6b",
+                "url": "https://api.github.com/repos/dvsa/olcs-transfer/zipball/11e2325b6ab7536dd522266c4487b17c42e48677",
+                "reference": "11e2325b6ab7536dd522266c4487b17c42e48677",
                 "shasum": ""
             },
             "require": {
@@ -6109,7 +6094,7 @@
                 "laminas/laminas-stdlib": "^3.0",
                 "laminas/laminas-validator": "^2.11.1",
                 "laminas/laminas-xml": "^1.4.0",
-                "php": "~8.0.0",
+                "php": "^8.0",
                 "psr/container": "^1.1|^2"
             },
             "require-dev": {
@@ -6135,9 +6120,9 @@
             "notification-url": "https://packagist.org/downloads/",
             "description": "OLCS Transfer",
             "support": {
-                "source": "https://github.com/dvsa/olcs-transfer/tree/v7.0.1"
+                "source": "https://github.com/dvsa/olcs-transfer/tree/v7.1.2"
             },
-            "time": "2024-04-17T10:45:52+00:00"
+            "time": "2024-05-16T08:59:13+00:00"
         },
         {
             "name": "olcs/olcs-utils",
@@ -6695,20 +6680,20 @@
         },
         {
             "name": "psr/http-factory",
-            "version": "1.0.2",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35"
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0",
+                "php": ">=7.1",
                 "psr/http-message": "^1.0 || ^2.0"
             },
             "type": "library",
@@ -6732,7 +6717,7 @@
                     "homepage": "https://www.php-fig.org/"
                 }
             ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
             "keywords": [
                 "factory",
                 "http",
@@ -6744,9 +6729,9 @@
                 "response"
             ],
             "support": {
-                "source": "https://github.com/php-fig/http-factory/tree/1.0.2"
+                "source": "https://github.com/php-fig/http-factory"
             },
-            "time": "2023-04-10T20:10:41+00:00"
+            "time": "2024-04-15T12:06:14+00:00"
         },
         {
             "name": "psr/http-message",
@@ -7224,36 +7209,38 @@
         },
         {
             "name": "ruflin/elastica",
-            "version": "7.1.0",
+            "version": "7.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ruflin/Elastica.git",
-                "reference": "ec22ea0797c4087514e720af428fa5fc189c59a3"
+                "reference": "84ba137678707a1aa4242d12bad891dc38fa2608"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ruflin/Elastica/zipball/ec22ea0797c4087514e720af428fa5fc189c59a3",
-                "reference": "ec22ea0797c4087514e720af428fa5fc189c59a3",
+                "url": "https://api.github.com/repos/ruflin/Elastica/zipball/84ba137678707a1aa4242d12bad891dc38fa2608",
+                "reference": "84ba137678707a1aa4242d12bad891dc38fa2608",
                 "shasum": ""
             },
             "require": {
-                "elasticsearch/elasticsearch": "^7.1.1",
+                "elasticsearch/elasticsearch": "^7.10",
                 "ext-json": "*",
                 "nyholm/dsn": "^2.0.0",
                 "php": "^7.2 || ^8.0",
-                "psr/log": "^1.0",
-                "symfony/deprecation-contracts": "^2.2"
+                "psr/log": "^1.0 || ^2.0 || ^3.0",
+                "symfony/deprecation-contracts": "^2.2 || ^3.0",
+                "symfony/polyfill-php73": "^1.19"
             },
             "require-dev": {
                 "aws/aws-sdk-php": "^3.155",
                 "guzzlehttp/guzzle": "^6.3 || ^7.2",
+                "phpstan/phpstan": "^1.5",
+                "phpstan/phpstan-phpunit": "^1.1",
                 "phpunit/phpunit": "^8.5.8 || ^9.4",
-                "symfony/phpunit-bridge": "^5.1.1"
+                "symfony/phpunit-bridge": "^6.0"
             },
             "suggest": {
                 "aws/aws-sdk-php": "Allow using IAM authentication with Amazon ElasticSearch Service",
-                "egeloen/http-adapter": "Allow using httpadapter transport",
-                "guzzlehttp/guzzle": "Allow using guzzle 6 as the http transport",
+                "guzzlehttp/guzzle": "Allow using guzzle as transport",
                 "monolog/monolog": "Logging request"
             },
             "type": "library",
@@ -7285,22 +7272,22 @@
             ],
             "support": {
                 "issues": "https://github.com/ruflin/Elastica/issues",
-                "source": "https://github.com/ruflin/Elastica/tree/7.1.0"
+                "source": "https://github.com/ruflin/Elastica/tree/7.3.2"
             },
-            "time": "2021-02-15T10:32:48+00:00"
+            "time": "2024-03-11T14:11:50+00:00"
         },
         {
             "name": "sabre/dav",
-            "version": "4.5.1",
+            "version": "4.6.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/dav.git",
-                "reference": "b29899b675371aee73920165d1dc5a2235aa104b"
+                "reference": "554145304b4a026477d130928d16e626939b0b2a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabre-io/dav/zipball/b29899b675371aee73920165d1dc5a2235aa104b",
-                "reference": "b29899b675371aee73920165d1dc5a2235aa104b",
+                "url": "https://api.github.com/repos/sabre-io/dav/zipball/554145304b4a026477d130928d16e626939b0b2a",
+                "reference": "554145304b4a026477d130928d16e626939b0b2a",
                 "shasum": ""
             },
             "require": {
@@ -7324,7 +7311,7 @@
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^2.19",
-                "monolog/monolog": "^1.27",
+                "monolog/monolog": "^1.27 || ^2.0",
                 "phpstan/phpstan": "^0.12 || ^1.0",
                 "phpstan/phpstan-phpunit": "^1.0",
                 "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
@@ -7370,7 +7357,7 @@
                 "issues": "https://github.com/sabre-io/dav/issues",
                 "source": "https://github.com/fruux/sabre-dav"
             },
-            "time": "2023-11-23T04:33:31+00:00"
+            "time": "2023-12-11T13:01:23+00:00"
         },
         {
             "name": "sabre/event",
@@ -7667,16 +7654,16 @@
         },
         {
             "name": "sabre/xml",
-            "version": "2.2.6",
+            "version": "2.2.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sabre-io/xml.git",
-                "reference": "9cde7cdab1e50893cc83b037b40cd47bfde42a2b"
+                "reference": "f1d53d55976bbd4cf3e640dda6ebc31120c71a4e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sabre-io/xml/zipball/9cde7cdab1e50893cc83b037b40cd47bfde42a2b",
-                "reference": "9cde7cdab1e50893cc83b037b40cd47bfde42a2b",
+                "url": "https://api.github.com/repos/sabre-io/xml/zipball/f1d53d55976bbd4cf3e640dda6ebc31120c71a4e",
+                "reference": "f1d53d55976bbd4cf3e640dda6ebc31120c71a4e",
                 "shasum": ""
             },
             "require": {
@@ -7732,7 +7719,7 @@
                 "issues": "https://github.com/sabre-io/xml/issues",
                 "source": "https://github.com/fruux/sabre-xml"
             },
-            "time": "2023-06-28T12:56:05+00:00"
+            "time": "2024-04-18T10:15:43+00:00"
         },
         {
             "name": "saeven/zf3-purifier",
@@ -7879,65 +7866,18 @@
             },
             "time": "2020-05-14T16:38:12+00:00"
         },
-        {
-            "name": "stella-maris/clock",
-            "version": "0.1.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/stella-maris-solutions/clock.git",
-                "reference": "fa23ce16019289a18bb3446fdecd45befcdd94f8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/stella-maris-solutions/clock/zipball/fa23ce16019289a18bb3446fdecd45befcdd94f8",
-                "reference": "fa23ce16019289a18bb3446fdecd45befcdd94f8",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0|^8.0",
-                "psr/clock": "^1.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "StellaMaris\\Clock\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Andreas Heigl",
-                    "role": "Maintainer"
-                }
-            ],
-            "description": "A pre-release of the proposed PSR-20 Clock-Interface",
-            "homepage": "https://gitlab.com/stella-maris/clock",
-            "keywords": [
-                "clock",
-                "datetime",
-                "point in time",
-                "psr20"
-            ],
-            "support": {
-                "source": "https://github.com/stella-maris-solutions/clock/tree/0.1.7"
-            },
-            "time": "2022-11-25T16:15:06+00:00"
-        },
         {
             "name": "symfony/cache",
-            "version": "v5.4.32",
+            "version": "v5.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "2553faca77502a4f68dc93cd2f3b9ec650751e40"
+                "reference": "982237e35079fdcc31ab724f06b6131992c4fd24"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/2553faca77502a4f68dc93cd2f3b9ec650751e40",
-                "reference": "2553faca77502a4f68dc93cd2f3b9ec650751e40",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/982237e35079fdcc31ab724f06b6131992c4fd24",
+                "reference": "982237e35079fdcc31ab724f06b6131992c4fd24",
                 "shasum": ""
             },
             "require": {
@@ -8005,7 +7945,7 @@
                 "psr6"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache/tree/v5.4.32"
+                "source": "https://github.com/symfony/cache/tree/v5.4.39"
             },
             "funding": [
                 {
@@ -8021,20 +7961,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-24T13:04:07+00:00"
+            "time": "2024-04-18T08:26:06+00:00"
         },
         {
             "name": "symfony/cache-contracts",
-            "version": "v2.5.2",
+            "version": "v2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache-contracts.git",
-                "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc"
+                "reference": "fee6db04d913094e2fb55ff8e7db5685a8134463"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
-                "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
+                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/fee6db04d913094e2fb55ff8e7db5685a8134463",
+                "reference": "fee6db04d913094e2fb55ff8e7db5685a8134463",
                 "shasum": ""
             },
             "require": {
@@ -8084,7 +8024,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/cache-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/cache-contracts/tree/v2.5.3"
             },
             "funding": [
                 {
@@ -8100,56 +8040,51 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2024-01-23T13:51:25+00:00"
         },
         {
             "name": "symfony/console",
-            "version": "v5.4.32",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7"
+                "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/c70df1ffaf23a8d340bded3cfab1b86752ad6ed7",
-                "reference": "c70df1ffaf23a8d340bded3cfab1b86752ad6ed7",
+                "url": "https://api.github.com/repos/symfony/console/zipball/a170e64ae10d00ba89e2acbb590dc2e54da8ad8f",
+                "reference": "a170e64ae10d00ba89e2acbb590dc2e54da8ad8f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php73": "^1.9",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/string": "^5.1|^6.0"
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/string": "^5.4|^6.0|^7.0"
             },
             "conflict": {
-                "psr/log": ">=3",
-                "symfony/dependency-injection": "<4.4",
-                "symfony/dotenv": "<5.1",
-                "symfony/event-dispatcher": "<4.4",
-                "symfony/lock": "<4.4",
-                "symfony/process": "<4.4"
+                "symfony/dependency-injection": "<5.4",
+                "symfony/dotenv": "<5.4",
+                "symfony/event-dispatcher": "<5.4",
+                "symfony/lock": "<5.4",
+                "symfony/process": "<5.4"
             },
             "provide": {
-                "psr/log-implementation": "1.0|2.0"
+                "psr/log-implementation": "1.0|2.0|3.0"
             },
             "require-dev": {
-                "psr/log": "^1|^2",
-                "symfony/config": "^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
-                "symfony/lock": "^4.4|^5.0|^6.0",
-                "symfony/process": "^4.4|^5.0|^6.0",
-                "symfony/var-dumper": "^4.4|^5.0|^6.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/lock": "",
-                "symfony/process": ""
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/event-dispatcher": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/lock": "^5.4|^6.0|^7.0",
+                "symfony/messenger": "^5.4|^6.0|^7.0",
+                "symfony/process": "^5.4|^6.0|^7.0",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -8183,7 +8118,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v5.4.32"
+                "source": "https://github.com/symfony/console/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -8199,20 +8134,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-18T18:23:04+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/dependency-injection",
-            "version": "v5.4.33",
+            "version": "v5.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/dependency-injection.git",
-                "reference": "14969a558cd6382b2a12b14b20ef9a851a02da79"
+                "reference": "5b4505f2afbe1d11d43a3917d0c1c178a38f6f19"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/14969a558cd6382b2a12b14b20ef9a851a02da79",
-                "reference": "14969a558cd6382b2a12b14b20ef9a851a02da79",
+                "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/5b4505f2afbe1d11d43a3917d0c1c178a38f6f19",
+                "reference": "5b4505f2afbe1d11d43a3917d0c1c178a38f6f19",
                 "shasum": ""
             },
             "require": {
@@ -8272,7 +8207,7 @@
             "description": "Allows you to standardize and centralize the way objects are constructed in your application",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/dependency-injection/tree/v5.4.33"
+                "source": "https://github.com/symfony/dependency-injection/tree/v5.4.39"
             },
             "funding": [
                 {
@@ -8288,29 +8223,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-30T08:15:37+00:00"
+            "time": "2024-04-18T08:26:06+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.5.2",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
+                "reference": "0e0d29ce1f20deffb4ab1b016a7257c4f1e789a1",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
+                "php": ">=8.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -8339,7 +8274,7 @@
             "description": "A generic function and convention to trigger deprecation notices",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -8355,48 +8290,43 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.4.35",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38"
+                "reference": "d84384f3f67de3cb650db64d685d70395dacfc3f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7a69a85c7ea5bdd1e875806a99c51a87d3a74b38",
-                "reference": "7a69a85c7ea5bdd1e875806a99c51a87d3a74b38",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/d84384f3f67de3cb650db64d685d70395dacfc3f",
+                "reference": "d84384f3f67de3cb650db64d685d70395dacfc3f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1|^3",
-                "symfony/event-dispatcher-contracts": "^2|^3",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1",
+                "symfony/event-dispatcher-contracts": "^2.5|^3"
             },
             "conflict": {
-                "symfony/dependency-injection": "<4.4"
+                "symfony/dependency-injection": "<5.4",
+                "symfony/service-contracts": "<2.5"
             },
             "provide": {
                 "psr/event-dispatcher-implementation": "1.0",
-                "symfony/event-dispatcher-implementation": "2.0"
+                "symfony/event-dispatcher-implementation": "2.0|3.0"
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^4.4|^5.0|^6.0",
-                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
-                "symfony/error-handler": "^4.4|^5.0|^6.0",
-                "symfony/expression-language": "^4.4|^5.0|^6.0",
-                "symfony/http-foundation": "^4.4|^5.0|^6.0",
-                "symfony/service-contracts": "^1.1|^2|^3",
-                "symfony/stopwatch": "^4.4|^5.0|^6.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
+                "symfony/config": "^5.4|^6.0|^7.0",
+                "symfony/dependency-injection": "^5.4|^6.0|^7.0",
+                "symfony/error-handler": "^5.4|^6.0|^7.0",
+                "symfony/expression-language": "^5.4|^6.0|^7.0",
+                "symfony/http-foundation": "^5.4|^6.0|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/stopwatch": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -8424,7 +8354,7 @@
             "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher/tree/v5.4.35"
+                "source": "https://github.com/symfony/event-dispatcher/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -8440,33 +8370,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-01-23T13:51:25+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.5.2",
+            "version": "v3.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1"
+                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1",
-                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/8f93aec25d41b72493c6ddff14e916177c9efc50",
+                "reference": "8f93aec25d41b72493c6ddff14e916177c9efc50",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.1",
                 "psr/event-dispatcher": "^1"
             },
-            "suggest": {
-                "symfony/event-dispatcher-implementation": ""
-            },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
+                    "dev-main": "3.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -8503,7 +8430,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.5.0"
             },
             "funding": [
                 {
@@ -8519,27 +8446,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2024-04-18T09:32:20+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.4.25",
+            "version": "v5.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364"
+                "reference": "e6edd875d5d39b03de51f3c3951148cfa79a4d12"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/0ce3a62c9579a53358d3a7eb6b3dfb79789a6364",
-                "reference": "0ce3a62c9579a53358d3a7eb6b3dfb79789a6364",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/e6edd875d5d39b03de51f3c3951148cfa79a4d12",
+                "reference": "e6edd875d5d39b03de51f3c3951148cfa79a4d12",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-mbstring": "~1.8",
-                "symfony/polyfill-php80": "^1.16"
+                "symfony/polyfill-php80": "^1.16",
+                "symfony/process": "^5.4|^6.4"
             },
             "type": "library",
             "autoload": {
@@ -8567,7 +8495,7 @@
             "description": "Provides basic utilities for the filesystem",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/filesystem/tree/v5.4.25"
+                "source": "https://github.com/symfony/filesystem/tree/v5.4.39"
             },
             "funding": [
                 {
@@ -8583,20 +8511,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-05-31T13:04:02+00:00"
+            "time": "2024-04-18T08:26:06+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.4.27",
+            "version": "v5.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d"
+                "reference": "f6a96e4fcd468a25fede16ee665f50ced856bd0a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/ff4bce3c33451e7ec778070e45bd23f74214cd5d",
-                "reference": "ff4bce3c33451e7ec778070e45bd23f74214cd5d",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/f6a96e4fcd468a25fede16ee665f50ced856bd0a",
+                "reference": "f6a96e4fcd468a25fede16ee665f50ced856bd0a",
                 "shasum": ""
             },
             "require": {
@@ -8630,7 +8558,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v5.4.27"
+                "source": "https://github.com/symfony/finder/tree/v5.4.39"
             },
             "funding": [
                 {
@@ -8646,20 +8574,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-31T08:02:31+00:00"
+            "time": "2024-04-18T08:26:06+00:00"
         },
         {
             "name": "symfony/lock",
-            "version": "v5.4.32",
+            "version": "v5.4.39",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/lock.git",
-                "reference": "a6d7d829f4907134775a0e1b162780e61f80ed87"
+                "reference": "09b315b2ca2d4c7fa60a8115ae608736d77882df"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/lock/zipball/a6d7d829f4907134775a0e1b162780e61f80ed87",
-                "reference": "a6d7d829f4907134775a0e1b162780e61f80ed87",
+                "url": "https://api.github.com/repos/symfony/lock/zipball/09b315b2ca2d4c7fa60a8115ae608736d77882df",
+                "reference": "09b315b2ca2d4c7fa60a8115ae608736d77882df",
                 "shasum": ""
             },
             "require": {
@@ -8709,7 +8637,7 @@
                 "semaphore"
             ],
             "support": {
-                "source": "https://github.com/symfony/lock/tree/v5.4.32"
+                "source": "https://github.com/symfony/lock/tree/v5.4.39"
             },
             "funding": [
                 {
@@ -8725,7 +8653,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-20T15:40:25+00:00"
+            "time": "2024-04-18T08:26:06+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -8808,16 +8736,16 @@
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "875e90aeea2777b6f135677f618529449334a612"
+                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/875e90aeea2777b6f135677f618529449334a612",
-                "reference": "875e90aeea2777b6f135677f618529449334a612",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/32a9da87d7b3245e09ac426c83d334ae9f06f80f",
+                "reference": "32a9da87d7b3245e09ac426c83d334ae9f06f80f",
                 "shasum": ""
             },
             "require": {
@@ -8828,9 +8756,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -8869,7 +8794,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -8885,20 +8810,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-intl-idn",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-idn.git",
-                "reference": "ecaafce9f77234a6a449d29e49267ba10499116d"
+                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/ecaafce9f77234a6a449d29e49267ba10499116d",
-                "reference": "ecaafce9f77234a6a449d29e49267ba10499116d",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/a287ed7475f85bf6f61890146edbc932c0fff919",
+                "reference": "a287ed7475f85bf6f61890146edbc932c0fff919",
                 "shasum": ""
             },
             "require": {
@@ -8911,9 +8836,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -8956,7 +8878,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -8972,20 +8894,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:30:37+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92"
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
-                "reference": "8c4ad05dd0120b6a53c1ca374dca2ad0a1c4ed92",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/bc45c394692b948b4d383a08d7753968bed9a83d",
+                "reference": "bc45c394692b948b4d383a08d7753968bed9a83d",
                 "shasum": ""
             },
             "require": {
@@ -8996,9 +8918,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -9040,7 +8959,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -9056,20 +8975,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "42292d99c55abe617799667f454222c54c60e229"
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229",
-                "reference": "42292d99c55abe617799667f454222c54c60e229",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
+                "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec",
                 "shasum": ""
             },
             "require": {
@@ -9083,9 +9002,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -9123,7 +9039,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -9139,20 +9055,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-07-28T09:04:16+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179"
+                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/70f4aebd92afca2f865444d30a4d2151c13c3179",
-                "reference": "70f4aebd92afca2f865444d30a4d2151c13c3179",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/861391a8da9a04cbad2d232ddd9e4893220d6e25",
+                "reference": "861391a8da9a04cbad2d232ddd9e4893220d6e25",
                 "shasum": ""
             },
             "require": {
@@ -9160,9 +9076,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -9199,7 +9112,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php72/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -9215,7 +9128,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-php73",
@@ -9295,16 +9208,16 @@
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5"
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
-                "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
+                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
                 "shasum": ""
             },
             "require": {
@@ -9312,9 +9225,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -9358,7 +9268,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -9374,20 +9284,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
         },
         {
             "name": "symfony/polyfill-php81",
-            "version": "v1.28.0",
+            "version": "v1.29.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php81.git",
-                "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b"
+                "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/7581cd600fa9fd681b797d00b02f068e2f13263b",
-                "reference": "7581cd600fa9fd681b797d00b02f068e2f13263b",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/c565ad1e63f30e7477fc40738343c62b40bc672d",
+                "reference": "c565ad1e63f30e7477fc40738343c62b40bc672d",
                 "shasum": ""
             },
             "require": {
@@ -9395,9 +9305,6 @@
             },
             "type": "library",
             "extra": {
-                "branch-alias": {
-                    "dev-main": "1.28-dev"
-                },
                 "thanks": {
                     "name": "symfony/polyfill",
                     "url": "https://github.com/symfony/polyfill"
@@ -9437,7 +9344,7 @@
                 "shim"
             ],
             "support": {
-                "source": "https://github.com/symfony/polyfill-php81/tree/v1.28.0"
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.29.0"
             },
             "funding": [
                 {
@@ -9453,20 +9360,81 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-01-26T09:26:14+00:00"
+            "time": "2024-01-29T20:11:03+00:00"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v6.4.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "cdb1c81c145fd5aa9b0038bab694035020943381"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/cdb1c81c145fd5aa9b0038bab694035020943381",
+                "reference": "cdb1c81c145fd5aa9b0038bab694035020943381",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Executes commands in sub-processes",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/process/tree/v6.4.7"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.5.2",
+            "version": "v2.5.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
+                "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
-                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/a2329596ddc8fd568900e3fc76cba42489ecc7f3",
+                "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3",
                 "shasum": ""
             },
             "require": {
@@ -9520,7 +9488,7 @@
                 "standards"
             ],
             "support": {
-                "source": "https://github.com/symfony/service-contracts/tree/v2.5.2"
+                "source": "https://github.com/symfony/service-contracts/tree/v2.5.3"
             },
             "funding": [
                 {
@@ -9536,38 +9504,38 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2022-05-30T19:17:29+00:00"
+            "time": "2023-04-21T15:04:16+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.4.32",
+            "version": "v7.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "91bf4453d65d8231688a04376c3a40efe0770f04"
+                "reference": "e405b5424dc2528e02e31ba26b83a79fd4eb8f63"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/91bf4453d65d8231688a04376c3a40efe0770f04",
-                "reference": "91bf4453d65d8231688a04376c3a40efe0770f04",
+                "url": "https://api.github.com/repos/symfony/string/zipball/e405b5424dc2528e02e31ba26b83a79fd4eb8f63",
+                "reference": "e405b5424dc2528e02e31ba26b83a79fd4eb8f63",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
+                "php": ">=8.2",
                 "symfony/polyfill-ctype": "~1.8",
                 "symfony/polyfill-intl-grapheme": "~1.0",
                 "symfony/polyfill-intl-normalizer": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php80": "~1.15"
+                "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/translation-contracts": ">=3.0"
+                "symfony/translation-contracts": "<2.5"
             },
             "require-dev": {
-                "symfony/error-handler": "^4.4|^5.0|^6.0",
-                "symfony/http-client": "^4.4|^5.0|^6.0",
-                "symfony/translation-contracts": "^1.1|^2",
-                "symfony/var-exporter": "^4.4|^5.0|^6.0"
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/intl": "^6.4|^7.0",
+                "symfony/translation-contracts": "^2.5|^3.0",
+                "symfony/var-exporter": "^6.4|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -9606,7 +9574,7 @@
                 "utf8"
             ],
             "support": {
-                "source": "https://github.com/symfony/string/tree/v5.4.32"
+                "source": "https://github.com/symfony/string/tree/v7.0.7"
             },
             "funding": [
                 {
@@ -9622,28 +9590,30 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-26T13:43:46+00:00"
+            "time": "2024-04-18T09:29:19+00:00"
         },
         {
             "name": "symfony/var-exporter",
-            "version": "v5.4.32",
+            "version": "v6.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add"
+                "reference": "825f9b00c37bbe1c1691cc1aff9b5451fc9b4405"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/fdb022f0d3d41df240c18e2eb9a117c430f06add",
-                "reference": "fdb022f0d3d41df240c18e2eb9a117c430f06add",
+                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/825f9b00c37bbe1c1691cc1aff9b5451fc9b4405",
+                "reference": "825f9b00c37bbe1c1691cc1aff9b5451fc9b4405",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-php80": "^1.16"
+                "php": ">=8.1",
+                "symfony/deprecation-contracts": "^2.5|^3"
             },
             "require-dev": {
-                "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0"
+                "symfony/property-access": "^6.4|^7.0",
+                "symfony/serializer": "^6.4|^7.0",
+                "symfony/var-dumper": "^5.4|^6.0|^7.0"
             },
             "type": "library",
             "autoload": {
@@ -9676,10 +9646,12 @@
                 "export",
                 "hydrate",
                 "instantiate",
+                "lazy-loading",
+                "proxy",
                 "serialize"
             ],
             "support": {
-                "source": "https://github.com/symfony/var-exporter/tree/v5.4.32"
+                "source": "https://github.com/symfony/var-exporter/tree/v6.4.7"
             },
             "funding": [
                 {
@@ -9695,20 +9667,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-16T19:33:05+00:00"
+            "time": "2024-04-18T09:22:46+00:00"
         },
         {
             "name": "twig/twig",
-            "version": "v2.15.6",
+            "version": "v2.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "ad637405a828601a56f32ccab9a85541c4b66c9d"
+                "reference": "0c9cc7ef2e0ec6d20c5af1200522a89ba101f623"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/ad637405a828601a56f32ccab9a85541c4b66c9d",
-                "reference": "ad637405a828601a56f32ccab9a85541c4b66c9d",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/0c9cc7ef2e0ec6d20c5af1200522a89ba101f623",
+                "reference": "0c9cc7ef2e0ec6d20c5af1200522a89ba101f623",
                 "shasum": ""
             },
             "require": {
@@ -9724,7 +9696,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.15-dev"
+                    "dev-master": "2.16-dev"
                 }
             },
             "autoload": {
@@ -9763,7 +9735,7 @@
             ],
             "support": {
                 "issues": "https://github.com/twigphp/Twig/issues",
-                "source": "https://github.com/twigphp/Twig/tree/v2.15.6"
+                "source": "https://github.com/twigphp/Twig/tree/v2.16.0"
             },
             "funding": [
                 {
@@ -9775,7 +9747,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-21T17:34:48+00:00"
+            "time": "2023-12-22T07:22:15+00:00"
         },
         {
             "name": "webimpress/safe-writer",
@@ -10207,16 +10179,16 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.6.6",
+            "version": "1.6.11",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e"
+                "reference": "81a161d0b135df89951abd52296adf97deb0723d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/b8e0bb7d8c604046539c1115994632c74dcb361e",
-                "reference": "b8e0bb7d8c604046539c1115994632c74dcb361e",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d",
+                "reference": "81a161d0b135df89951abd52296adf97deb0723d",
                 "shasum": ""
             },
             "require": {
@@ -10228,10 +10200,8 @@
                 "phpunit/phpunit": "<8.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^8.5 || ^9.6.10",
-                "psalm/plugin-phpunit": "^0.18.4",
-                "symplify/easy-coding-standard": "^11.5.0",
-                "vimeo/psalm": "^4.30"
+                "phpunit/phpunit": "^8.5 || ^9.6.17",
+                "symplify/easy-coding-standard": "^12.1.14"
             },
             "type": "library",
             "autoload": {
@@ -10288,7 +10258,7 @@
                 "security": "https://github.com/mockery/mockery/security/advisories",
                 "source": "https://github.com/mockery/mockery"
             },
-            "time": "2023-08-09T00:03:52+00:00"
+            "time": "2024-03-21T18:34:15+00:00"
         },
         {
             "name": "myclabs/deep-copy",
@@ -10351,20 +10321,21 @@
         },
         {
             "name": "phar-io/manifest",
-            "version": "2.0.3",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phar-io/manifest.git",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53"
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/97803eca37d319dfa7826cc2437fc020857acb53",
-                "reference": "97803eca37d319dfa7826cc2437fc020857acb53",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
+                "ext-libxml": "*",
                 "ext-phar": "*",
                 "ext-xmlwriter": "*",
                 "phar-io/version": "^3.0.1",
@@ -10405,9 +10376,15 @@
             "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
             "support": {
                 "issues": "https://github.com/phar-io/manifest/issues",
-                "source": "https://github.com/phar-io/manifest/tree/2.0.3"
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
             },
-            "time": "2021-07-20T11:28:43+00:00"
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
         },
         {
             "name": "phar-io/version",
@@ -10462,23 +10439,23 @@
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "9.2.29",
+            "version": "9.2.31",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76"
+                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/6a3a87ac2bbe33b25042753df8195ba4aa534c76",
-                "reference": "6a3a87ac2bbe33b25042753df8195ba4aa534c76",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/48c34b5d8d983006bd2adc2d0de92963b9155965",
+                "reference": "48c34b5d8d983006bd2adc2d0de92963b9155965",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
                 "ext-xmlwriter": "*",
-                "nikic/php-parser": "^4.15",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3",
                 "phpunit/php-file-iterator": "^3.0.3",
                 "phpunit/php-text-template": "^2.0.2",
@@ -10528,7 +10505,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
                 "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.29"
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.31"
             },
             "funding": [
                 {
@@ -10536,7 +10513,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-09-19T04:57:46+00:00"
+            "time": "2024-03-02T06:37:42+00:00"
         },
         {
             "name": "phpunit/php-file-iterator",
@@ -10781,16 +10758,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "9.6.15",
+            "version": "9.6.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1"
+                "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1",
-                "reference": "05017b80304e0eb3f31d90194a563fd53a6021f1",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a1a54a473501ef4cdeaae4e06891674114d79db8",
+                "reference": "a1a54a473501ef4cdeaae4e06891674114d79db8",
                 "shasum": ""
             },
             "require": {
@@ -10864,7 +10841,7 @@
             "support": {
                 "issues": "https://github.com/sebastianbergmann/phpunit/issues",
                 "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15"
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.19"
             },
             "funding": [
                 {
@@ -10880,20 +10857,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-12-01T16:55:19+00:00"
+            "time": "2024-04-05T04:35:58+00:00"
         },
         {
             "name": "sebastian/cli-parser",
-            "version": "1.0.1",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/cli-parser.git",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2"
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2",
-                "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
                 "shasum": ""
             },
             "require": {
@@ -10928,7 +10905,7 @@
             "homepage": "https://github.com/sebastianbergmann/cli-parser",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
-                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1"
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
             },
             "funding": [
                 {
@@ -10936,7 +10913,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:08:49+00:00"
+            "time": "2024-03-02T06:27:43+00:00"
         },
         {
             "name": "sebastian/code-unit",
@@ -11125,20 +11102,20 @@
         },
         {
             "name": "sebastian/complexity",
-            "version": "2.0.2",
+            "version": "2.0.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/complexity.git",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88"
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88",
-                "reference": "739b35e53379900cc9ac327b2147867b8b6efd88",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.7",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3"
             },
             "require-dev": {
@@ -11170,7 +11147,7 @@
             "homepage": "https://github.com/sebastianbergmann/complexity",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/complexity/issues",
-                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2"
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
             },
             "funding": [
                 {
@@ -11178,20 +11155,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-10-26T15:52:27+00:00"
+            "time": "2023-12-22T06:19:30+00:00"
         },
         {
             "name": "sebastian/diff",
-            "version": "4.0.5",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131"
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
-                "reference": "74be17022044ebaaecfdf0c5cd504fc9cd5a7131",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
                 "shasum": ""
             },
             "require": {
@@ -11236,7 +11213,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.5"
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
             },
             "funding": [
                 {
@@ -11244,7 +11221,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-05-07T05:35:17+00:00"
+            "time": "2024-03-02T06:30:58+00:00"
         },
         {
             "name": "sebastian/environment",
@@ -11311,16 +11288,16 @@
         },
         {
             "name": "sebastian/exporter",
-            "version": "4.0.5",
+            "version": "4.0.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d"
+                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
-                "reference": "ac230ed27f0f98f597c8a2b6eb7ac563af5e5b9d",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/78c00df8f170e02473b682df15bfcdacc3d32d72",
+                "reference": "78c00df8f170e02473b682df15bfcdacc3d32d72",
                 "shasum": ""
             },
             "require": {
@@ -11376,7 +11353,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.5"
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.6"
             },
             "funding": [
                 {
@@ -11384,20 +11361,20 @@
                     "type": "github"
                 }
             ],
-            "time": "2022-09-14T06:03:37+00:00"
+            "time": "2024-03-02T06:33:00+00:00"
         },
         {
             "name": "sebastian/global-state",
-            "version": "5.0.6",
+            "version": "5.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bde739e7565280bda77be70044ac1047bc007e34"
+                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bde739e7565280bda77be70044ac1047bc007e34",
-                "reference": "bde739e7565280bda77be70044ac1047bc007e34",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
+                "reference": "bca7df1f32ee6fe93b4d4a9abbf69e13a4ada2c9",
                 "shasum": ""
             },
             "require": {
@@ -11440,7 +11417,7 @@
             ],
             "support": {
                 "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.6"
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.7"
             },
             "funding": [
                 {
@@ -11448,24 +11425,24 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-08-02T09:26:13+00:00"
+            "time": "2024-03-02T06:35:11+00:00"
         },
         {
             "name": "sebastian/lines-of-code",
-            "version": "1.0.3",
+            "version": "1.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/lines-of-code.git",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc"
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc",
-                "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
                 "shasum": ""
             },
             "require": {
-                "nikic/php-parser": "^4.6",
+                "nikic/php-parser": "^4.18 || ^5.0",
                 "php": ">=7.3"
             },
             "require-dev": {
@@ -11497,7 +11474,7 @@
             "homepage": "https://github.com/sebastianbergmann/lines-of-code",
             "support": {
                 "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
-                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3"
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
             },
             "funding": [
                 {
@@ -11505,7 +11482,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-11-28T06:42:11+00:00"
+            "time": "2023-12-22T06:20:34+00:00"
         },
         {
             "name": "sebastian/object-enumerator",
@@ -11684,16 +11661,16 @@
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "3.0.3",
+            "version": "3.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
-                "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
                 "shasum": ""
             },
             "require": {
@@ -11705,7 +11682,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-main": "3.0-dev"
                 }
             },
             "autoload": {
@@ -11726,8 +11703,7 @@
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
             "support": {
-                "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
-                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
             },
             "funding": [
                 {
@@ -11735,7 +11711,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2020-09-28T06:45:17+00:00"
+            "time": "2024-03-14T16:00:52+00:00"
         },
         {
             "name": "sebastian/type",
@@ -11848,16 +11824,16 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.2.2",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96"
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
-                "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
                 "shasum": ""
             },
             "require": {
@@ -11886,7 +11862,7 @@
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
             "support": {
                 "issues": "https://github.com/theseer/tokenizer/issues",
-                "source": "https://github.com/theseer/tokenizer/tree/1.2.2"
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
             },
             "funding": [
                 {
@@ -11894,7 +11870,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-11-20T00:12:19+00:00"
+            "time": "2024-03-03T12:36:25+00:00"
         }
     ],
     "aliases": [],
@@ -11903,7 +11879,7 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": "~8.0.0",
+        "php": "~8.2.0",
         "ext-intl": "*",
         "ext-json": "*",
         "ext-curl": "*",
@@ -11912,8 +11888,7 @@
     },
     "platform-dev": [],
     "platform-overrides": {
-        "ext-redis": "4.3",
-        "php": "8.0.0"
+        "ext-redis": "4.3"
     },
     "plugin-api-version": "2.6.0"
 }
diff --git a/module/AcquiredRights/src/Client/AcquiredRightsClientFactory.php b/module/AcquiredRights/src/Client/AcquiredRightsClientFactory.php
index c03dd8aa0f..25a47e46de 100644
--- a/module/AcquiredRights/src/Client/AcquiredRightsClientFactory.php
+++ b/module/AcquiredRights/src/Client/AcquiredRightsClientFactory.php
@@ -26,7 +26,7 @@ class AcquiredRightsClientFactory implements FactoryInterface
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): AcquiredRightsClient
     {
 
-        $config = $container->get('Config');
+        $config = $container->get('config');
 
         $httpClient = new Client($this->getAcquiredRightsClientConfiguration($config));
         return new AcquiredRightsClient(
diff --git a/module/AcquiredRights/src/Service/AcquiredRightsServiceFactory.php b/module/AcquiredRights/src/Service/AcquiredRightsServiceFactory.php
index 8faebff1a6..ae5b884c8c 100644
--- a/module/AcquiredRights/src/Service/AcquiredRightsServiceFactory.php
+++ b/module/AcquiredRights/src/Service/AcquiredRightsServiceFactory.php
@@ -28,8 +28,8 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
     {
 
         $logger = $container->get('Logger');
-        $acquiredRightsExpiry = $this->getAcquiredRightsExpiryFromConfig($container->get('Config'));
-        $acquiredRightsCheckEnabled = $this->getAcquiredRightsCheckEnabledFromConfig($container->get('Config'));
+        $acquiredRightsExpiry = $this->getAcquiredRightsExpiryFromConfig($container->get('config'));
+        $acquiredRightsCheckEnabled = $this->getAcquiredRightsCheckEnabledFromConfig($container->get('config'));
         $acquiredRightsClient = $container->get(AcquiredRightsClient::class);
 
         return new AcquiredRightsService($logger, $acquiredRightsClient, $acquiredRightsExpiry, $acquiredRightsCheckEnabled);
diff --git a/module/AcquiredRights/test/Client/AcquiredRightsClientFactoryTest.php b/module/AcquiredRights/test/Client/AcquiredRightsClientFactoryTest.php
index dfee9ce1ac..5c923f8de2 100644
--- a/module/AcquiredRights/test/Client/AcquiredRightsClientFactoryTest.php
+++ b/module/AcquiredRights/test/Client/AcquiredRightsClientFactoryTest.php
@@ -21,7 +21,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
@@ -104,7 +104,7 @@ protected function setUpDefaultServices(ServiceManager $serviceManager)
      */
     protected function config(array $config = []): array
     {
-        if (! $this->serviceManager->has('Config') || !empty($config)) {
+        if (! $this->serviceManager->has('config') || !empty($config)) {
             if (empty($config)) {
                 $config = [
                     'acquired_rights' => [
@@ -121,9 +121,9 @@ protected function config(array $config = []): array
                 ];
             }
 
-            $this->serviceManager->setService('Config', $config);
+            $this->serviceManager->setService('config', $config);
         }
 
-        return $this->serviceManager->get('Config');
+        return $this->serviceManager->get('config');
     }
 }
diff --git a/module/AcquiredRights/test/Service/AcquiredRightsServiceFactoryTest.php b/module/AcquiredRights/test/Service/AcquiredRightsServiceFactoryTest.php
index 0c69297f21..b1835909c2 100644
--- a/module/AcquiredRights/test/Service/AcquiredRightsServiceFactoryTest.php
+++ b/module/AcquiredRights/test/Service/AcquiredRightsServiceFactoryTest.php
@@ -25,7 +25,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
@@ -162,7 +162,7 @@ protected function setUpDefaultServices(ServiceManager $serviceManager)
      */
     protected function config(array $config = []): array
     {
-        if (! $this->serviceManager->has('Config') || !empty($config)) {
+        if (! $this->serviceManager->has('config') || !empty($config)) {
             if (empty($config)) {
                 $config = [
                     'acquired_rights' => [
@@ -179,10 +179,10 @@ protected function config(array $config = []): array
                 ];
             }
 
-            $this->serviceManager->setService('Config', $config);
+            $this->serviceManager->setService('config', $config);
         }
 
-        return $this->serviceManager->get('Config');
+        return $this->serviceManager->get('config');
     }
 
     protected function loggerInterface(): LoggerInterface
diff --git a/module/Address/src/Service/Address.php b/module/Address/src/Service/Address.php
index fca3bbb19f..fbc9364a8a 100644
--- a/module/Address/src/Service/Address.php
+++ b/module/Address/src/Service/Address.php
@@ -26,7 +26,7 @@ class Address implements AddressInterface
      *
      * @param Client $client Postcode Api Http Client
      */
-    public function __construct(private Client $client)
+    public function __construct(private readonly Client $client)
     {
     }
 
diff --git a/module/Address/src/Service/AddressFactory.php b/module/Address/src/Service/AddressFactory.php
index 6cdba4c180..652af21aa6 100644
--- a/module/Address/src/Service/AddressFactory.php
+++ b/module/Address/src/Service/AddressFactory.php
@@ -21,7 +21,7 @@ class AddressFactory implements FactoryInterface
 {
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (!isset($config['address']['client']['baseuri'])) {
             throw new \RuntimeException('Address service baseuri not set');
         }
diff --git a/module/Address/src/Service/Client.php b/module/Address/src/Service/Client.php
index ff35a474d1..a7cde38c05 100644
--- a/module/Address/src/Service/Client.php
+++ b/module/Address/src/Service/Client.php
@@ -21,7 +21,7 @@ class Client extends HttpClient
 
     public function __construct($baseUri)
     {
-        $this->baseUri = rtrim($baseUri, '/');
+        $this->baseUri = rtrim((string) $baseUri, '/');
         $this->setMethod('GET');
     }
 
diff --git a/module/Api/src/Controller/GenericController.php b/module/Api/src/Controller/GenericController.php
index cc2a2c601b..c615273962 100644
--- a/module/Api/src/Controller/GenericController.php
+++ b/module/Api/src/Controller/GenericController.php
@@ -17,7 +17,7 @@
  */
 class GenericController extends AbstractRestfulController
 {
-    public function __construct(private QueryHandlerManager $queryHandlerManager, private CommandHandlerManager $commandHandlerManager)
+    public function __construct(private readonly QueryHandlerManager $queryHandlerManager, private readonly CommandHandlerManager $commandHandlerManager)
     {
     }
 
diff --git a/module/Api/src/Controller/XmlController.php b/module/Api/src/Controller/XmlController.php
index d440b3b616..e02ad57b90 100644
--- a/module/Api/src/Controller/XmlController.php
+++ b/module/Api/src/Controller/XmlController.php
@@ -13,7 +13,7 @@
  */
 class XmlController extends AbstractRestfulController
 {
-    public function __construct(private CommandHandlerManager $commandHandlerManager)
+    public function __construct(private readonly CommandHandlerManager $commandHandlerManager)
     {
     }
     /**
diff --git a/module/Api/src/Domain/CommandHandler/AbstractCommandHandler.php b/module/Api/src/Domain/CommandHandler/AbstractCommandHandler.php
index 43a592217d..5373619a1a 100644
--- a/module/Api/src/Domain/CommandHandler/AbstractCommandHandler.php
+++ b/module/Api/src/Domain/CommandHandler/AbstractCommandHandler.php
@@ -164,7 +164,7 @@ private function applyInterfaces(ContainerInterface $mainServiceLocator): void
 
         if ($this instanceof SubmissionGeneratorAwareInterface) {
             $this->setSubmissionGenerator($mainServiceLocator->get(SubmissionGenerator::class));
-            $this->setSubmissionConfig($mainServiceLocator->get('Config')['submissions']['sections']['configuration']);
+            $this->setSubmissionConfig($mainServiceLocator->get('config')['submissions']['sections']['configuration']);
         }
 
         if ($this instanceof AddressServiceAwareInterface) {
@@ -199,7 +199,8 @@ private function applyInterfaces(ContainerInterface $mainServiceLocator): void
         }
 
         if ($this instanceof ConfigAwareInterface) {
-            $this->setConfig($mainServiceLocator->get('Config'));
+            $config = $mainServiceLocator->get('config') ?? [];
+            $this->setConfig($config);
         }
 
         if ($this instanceof FileProcessorAwareInterface) {
@@ -209,7 +210,8 @@ private function applyInterfaces(ContainerInterface $mainServiceLocator): void
         if ($this instanceof QueueInterface) {
             $this->setQueueService($mainServiceLocator->get(Queue::class));
             $this->setMessageBuilderService($mainServiceLocator->get(MessageBuilder::class));
-            $this->setQueueConfig($mainServiceLocator->get('Config')['message_queue']);
+            $messageQueueConfig = $mainServiceLocator->get('config')['message_queue'] ?? [];
+            $this->setQueueConfig($messageQueueConfig);
         }
 
         if ($this instanceof CacheAwareInterface) {
diff --git a/module/Api/src/Domain/CommandHandler/Application/CreateSnapshot.php b/module/Api/src/Domain/CommandHandler/Application/CreateSnapshot.php
index 7c566fc655..6ae9f9afdc 100644
--- a/module/Api/src/Domain/CommandHandler/Application/CreateSnapshot.php
+++ b/module/Api/src/Domain/CommandHandler/Application/CreateSnapshot.php
@@ -64,7 +64,7 @@ protected function generateDocument($content, ApplicationEntity $application, $e
         $code = $this->getDocumentCode($application);
 
         $data = [
-            'content' => base64_encode(trim($content)),
+            'content' => base64_encode(trim((string) $content)),
             'application' => $application->getId(),
             'licence' => $licenceId,
             'category' => Category::CATEGORY_APPLICATION,
diff --git a/module/Api/src/Domain/CommandHandler/Application/UpdateApplicationCompletion.php b/module/Api/src/Domain/CommandHandler/Application/UpdateApplicationCompletion.php
index 397071a7e3..109b29eaee 100644
--- a/module/Api/src/Domain/CommandHandler/Application/UpdateApplicationCompletion.php
+++ b/module/Api/src/Domain/CommandHandler/Application/UpdateApplicationCompletion.php
@@ -130,7 +130,7 @@ private function getSectionsToUpdate(Cmd $command, ApplicationCompletion $comple
         $sectionsToUpdate = [];
 
         foreach ($this->sections as $section) {
-            $status = (int)$completion->{'get' . ucfirst($section) . 'Status'}();
+            $status = (int)$completion->{'get' . ucfirst((string) $section) . 'Status'}();
             if ($this->shouldUpdateSection($section, $command, $status)) {
                 $sectionsToUpdate[$section] = $status;
             }
diff --git a/module/Api/src/Domain/CommandHandler/Application/UpdateLicenceHistory.php b/module/Api/src/Domain/CommandHandler/Application/UpdateLicenceHistory.php
index ea835bfe32..5b2b146fc5 100644
--- a/module/Api/src/Domain/CommandHandler/Application/UpdateLicenceHistory.php
+++ b/module/Api/src/Domain/CommandHandler/Application/UpdateLicenceHistory.php
@@ -82,7 +82,7 @@ private function validateOtherLicences($command, $application)
 
     private function validateField($errors, $field, $type, $application, $command)
     {
-        $method = 'get' . ucfirst($field);
+        $method = 'get' . ucfirst((string) $field);
         $value = $command->$method();
         if (
             $value === 'Y' &&
diff --git a/module/Api/src/Domain/CommandHandler/Application/UpdateVariationCompletion.php b/module/Api/src/Domain/CommandHandler/Application/UpdateVariationCompletion.php
index 930322e59e..d0b8212e0a 100644
--- a/module/Api/src/Domain/CommandHandler/Application/UpdateVariationCompletion.php
+++ b/module/Api/src/Domain/CommandHandler/Application/UpdateVariationCompletion.php
@@ -141,7 +141,7 @@ public function handleCommand(CommandInterface $command)
         $this->data = $command->getData();
 
         $filter = new CamelCaseToUnderscore();
-        $section = strtolower($filter->filter($section));
+        $section = strtolower((string) $filter->filter($section));
 
         $this->application = $this->getRepo()->fetchUsingId($command);
         $this->licence = $this->application->getLicence();
diff --git a/module/Api/src/Domain/CommandHandler/ApplicationCompletion/UpdateFinancialHistoryStatus.php b/module/Api/src/Domain/CommandHandler/ApplicationCompletion/UpdateFinancialHistoryStatus.php
index 482b75cefa..e74c4cca16 100644
--- a/module/Api/src/Domain/CommandHandler/ApplicationCompletion/UpdateFinancialHistoryStatus.php
+++ b/module/Api/src/Domain/CommandHandler/ApplicationCompletion/UpdateFinancialHistoryStatus.php
@@ -43,7 +43,7 @@ protected function isSectionValid(Application $application)
                 return false;
             }
 
-            if ($yesNo === 'Y' && strlen(preg_replace('/\s+/', '', $application->getInsolvencyDetails())) < 150) {
+            if ($yesNo === 'Y' && strlen((string) preg_replace('/\s+/', '', $application->getInsolvencyDetails())) < 150) {
                 return false;
             }
         }
diff --git a/module/Api/src/Domain/CommandHandler/Auth/ChangeExpiredPassword.php b/module/Api/src/Domain/CommandHandler/Auth/ChangeExpiredPassword.php
index e9c8c44374..bdc0b75c15 100644
--- a/module/Api/src/Domain/CommandHandler/Auth/ChangeExpiredPassword.php
+++ b/module/Api/src/Domain/CommandHandler/Auth/ChangeExpiredPassword.php
@@ -28,7 +28,7 @@ class ChangeExpiredPassword extends AbstractCommandHandler
     public const MSG_NOT_AUTHORIZED = 'auth.change-password.not-authorized';
     public const MSG_INVALID = 'auth.change-password.invalid';
 
-    public function __construct(protected ValidatableAdapterInterface $adapter, private UserRepository $userRepository)
+    public function __construct(protected ValidatableAdapterInterface $adapter, private readonly UserRepository $userRepository)
     {
     }
 
diff --git a/module/Api/src/Domain/CommandHandler/Auth/ResetPassword.php b/module/Api/src/Domain/CommandHandler/Auth/ResetPassword.php
index 122c2f2b6b..6427ae815e 100644
--- a/module/Api/src/Domain/CommandHandler/Auth/ResetPassword.php
+++ b/module/Api/src/Domain/CommandHandler/Auth/ResetPassword.php
@@ -28,7 +28,7 @@ class ResetPassword extends AbstractCommandHandler
     public const MSG_FAIL_DEBUG_LOG = '%s failed to reset password using cognito';
     public const MSG_FAIL_COGNITO_EXCEPTION = '%s failed to reset password due to cognito exception: %s';
 
-    public function __construct(private ValidatableAdapterInterface $adapter, private EventHistoryCreator $eventHistoryCreator)
+    public function __construct(private readonly ValidatableAdapterInterface $adapter, private readonly EventHistoryCreator $eventHistoryCreator)
     {
     }
 
diff --git a/module/Api/src/Domain/CommandHandler/CompaniesHouse/AbstractCommandHandler.php b/module/Api/src/Domain/CommandHandler/CompaniesHouse/AbstractCommandHandler.php
index 43b3c3cf66..41d84be608 100644
--- a/module/Api/src/Domain/CommandHandler/CompaniesHouse/AbstractCommandHandler.php
+++ b/module/Api/src/Domain/CommandHandler/CompaniesHouse/AbstractCommandHandler.php
@@ -35,7 +35,7 @@ protected function normaliseProfileData($data)
     {
         $companyDetails = [
             'companyName' => $data['company_name'],
-            'companyNumber' => strtoupper($data['company_number']),
+            'companyNumber' => strtoupper((string) $data['company_number']),
             'companyStatus' => $data['company_status'],
         ];
 
@@ -88,7 +88,7 @@ protected function getAddressDetails($data)
      */
     protected function normaliseFieldName($fieldName)
     {
-        $newFieldName = lcfirst($this->wordFilter->filter($fieldName));
+        $newFieldName = lcfirst((string) $this->wordFilter->filter($fieldName));
         return str_replace('_', '', $newFieldName);
     }
 
diff --git a/module/Api/src/Domain/CommandHandler/CompaniesHouse/Compare.php b/module/Api/src/Domain/CommandHandler/CompaniesHouse/Compare.php
index 75c35d02ad..204b334041 100644
--- a/module/Api/src/Domain/CommandHandler/CompaniesHouse/Compare.php
+++ b/module/Api/src/Domain/CommandHandler/CompaniesHouse/Compare.php
@@ -39,7 +39,7 @@ public function handleCommand(CommandInterface $command)
                 throw new ChNotFoundException('Company number has invalid characters');
             }
             $apiResult = $this->api->getCompanyProfile($companyNumber, true);
-        } catch (ChNotFoundException $e) {
+        } catch (ChNotFoundException) {
             $this->result->merge(
                 $this->createAlert(
                     [AlertEntity::REASON_INVALID_COMPANY_NUMBER],
@@ -176,7 +176,7 @@ protected function statusHasChanged($old, $new)
      */
     protected function nameHasChanged($old, $new)
     {
-        return (trim(strtolower($new['companyName'])) !== trim(strtolower($old['companyName'])));
+        return (trim(strtolower((string) $new['companyName'])) !== trim(strtolower((string) $old['companyName'])));
     }
 
     /**
@@ -206,14 +206,14 @@ protected function addressHasChanged($old, $new)
                     // field has been deleted
                     return true;
                 }
-                if (trim(strtolower($new[$field])) !== trim(strtolower($old[$field]))) {
+                if (trim(strtolower((string) $new[$field])) !== trim(strtolower((string) $old[$field]))) {
                     // field has changed!
                     return true;
                 }
             }
 
             // check for new fields that have been added
-            if (isset($new[$field]) && trim(strtolower($new[$field])) !== trim(strtolower($old[$field]))) {
+            if (isset($new[$field]) && trim(strtolower((string) $new[$field])) !== trim(strtolower((string) $old[$field]))) {
                 return true;
             }
         }
diff --git a/module/Api/src/Domain/CommandHandler/DigitalSignature/UpdateSurrender.php b/module/Api/src/Domain/CommandHandler/DigitalSignature/UpdateSurrender.php
index 02db8e1ab7..d813560288 100644
--- a/module/Api/src/Domain/CommandHandler/DigitalSignature/UpdateSurrender.php
+++ b/module/Api/src/Domain/CommandHandler/DigitalSignature/UpdateSurrender.php
@@ -24,7 +24,7 @@ final class UpdateSurrender extends AbstractCommandHandler implements Transactio
 {
     protected $repoServiceName = 'Surrender';
 
-    public function __construct(private EventHistoryCreator $eventHistoryCreator)
+    public function __construct(private readonly EventHistoryCreator $eventHistoryCreator)
     {
     }
 
diff --git a/module/Api/src/Domain/CommandHandler/Document/CopyDocument.php b/module/Api/src/Domain/CommandHandler/Document/CopyDocument.php
index 09f5519d54..6f683b6e5d 100644
--- a/module/Api/src/Domain/CommandHandler/Document/CopyDocument.php
+++ b/module/Api/src/Domain/CommandHandler/Document/CopyDocument.php
@@ -127,7 +127,7 @@ public function handleCommand(CommandInterface $command)
                         'tmp_name' => $sourceDocument->getResource(),
                         'type'     => $sourceDocument->getMimeType()
                     ],
-                    'filename'         => basename($document->getIdentifier()),
+                    'filename'         => basename((string) $document->getIdentifier()),
                     'shouldUploadOnly' => true
                 ]
             );
diff --git a/module/Api/src/Domain/CommandHandler/Document/GenerateAndStoreWithMultipleAddresses.php b/module/Api/src/Domain/CommandHandler/Document/GenerateAndStoreWithMultipleAddresses.php
index e914d3d645..6796e3577c 100644
--- a/module/Api/src/Domain/CommandHandler/Document/GenerateAndStoreWithMultipleAddresses.php
+++ b/module/Api/src/Domain/CommandHandler/Document/GenerateAndStoreWithMultipleAddresses.php
@@ -141,7 +141,7 @@ private function addAddressToMetadata($data, $addressName)
         if (!array_key_exists('metadata', $data)) {
             $data['metadata'] = json_encode([]);
         }
-        $metadata = json_decode($data['metadata'], true);
+        $metadata = json_decode((string) $data['metadata'], true);
         if (!array_key_exists('details', $metadata)) {
             $metadata['details'] = [];
         }
diff --git a/module/Api/src/Domain/CommandHandler/Document/Upload.php b/module/Api/src/Domain/CommandHandler/Document/Upload.php
index 459332999d..8f13e9591a 100644
--- a/module/Api/src/Domain/CommandHandler/Document/Upload.php
+++ b/module/Api/src/Domain/CommandHandler/Document/Upload.php
@@ -191,7 +191,7 @@ protected function getDescriptionFromCommand(TransferCmd\Document\Upload $comman
 
         $filename = $command->getFilename();
 
-        $parts = explode('.', $filename);
+        $parts = explode('.', (string) $filename);
 
         array_pop($parts);
 
@@ -233,8 +233,8 @@ protected function getAdditionalCommand($command)
         // copy necessary target entities to the new command and clear them off from original command
         $additionalEntities = $command->getAdditionalEntities();
         foreach ($additionalEntities as $additionalEntity) {
-            $getMethod = 'get' . ucfirst($additionalEntity);
-            $setMethod = 'set' . ucfirst($additionalEntity);
+            $getMethod = 'get' . ucfirst((string) $additionalEntity);
+            $setMethod = 'set' . ucfirst((string) $additionalEntity);
             $additionalCommand->$setMethod($command->$getMethod());
             $command->$setMethod(null);
         }
diff --git a/module/Api/src/Domain/CommandHandler/DvsaReports/GetRedirect.php b/module/Api/src/Domain/CommandHandler/DvsaReports/GetRedirect.php
index 6812564477..c86cdeb44f 100644
--- a/module/Api/src/Domain/CommandHandler/DvsaReports/GetRedirect.php
+++ b/module/Api/src/Domain/CommandHandler/DvsaReports/GetRedirect.php
@@ -66,7 +66,7 @@ public function handleCommand(CommandInterface $command)
         ]);
 
         $edhApiResult = $this->httpClient->send();
-        $resultBody = json_decode($edhApiResult->getContent(), true);
+        $resultBody = json_decode((string) $edhApiResult->getContent(), true);
 
         if (!isset($resultBody['redirectUrl'])) {
             Logger::err('TOPS Report API Error Message: ' . $resultBody['message']);
diff --git a/module/Api/src/Domain/CommandHandler/Email/SendPublication.php b/module/Api/src/Domain/CommandHandler/Email/SendPublication.php
index f4702a1793..d256243d5c 100644
--- a/module/Api/src/Domain/CommandHandler/Email/SendPublication.php
+++ b/module/Api/src/Domain/CommandHandler/Email/SendPublication.php
@@ -68,7 +68,7 @@ public function handleCommand(CommandInterface $command)
             $subject = self::EMAIL_SUBJECT;
         }
 
-        $templateData = ['filename' => basename($document->getFilename())];
+        $templateData = ['filename' => basename((string) $document->getFilename())];
 
         $message = new Message(self::TO_EMAIL, $subject);
         $message->setBcc($recipients);
diff --git a/module/Api/src/Domain/CommandHandler/GoodsDisc/ConfirmPrinting.php b/module/Api/src/Domain/CommandHandler/GoodsDisc/ConfirmPrinting.php
index a550661fe4..f911f23c07 100644
--- a/module/Api/src/Domain/CommandHandler/GoodsDisc/ConfirmPrinting.php
+++ b/module/Api/src/Domain/CommandHandler/GoodsDisc/ConfirmPrinting.php
@@ -59,7 +59,7 @@ protected function getDiscIds($command)
         $queueRepo = $this->getRepo('Queue');
         $queueRepo->disableSoftDeleteable();
         $queueWithDisc = $queueRepo->fetchById($command->getQueueId());
-        $options = json_decode($queueWithDisc->getOptions(), true);
+        $options = json_decode((string) $queueWithDisc->getOptions(), true);
         if (!isset($options['discs'])) {
             throw new RuntimeException('Unable to fetch discs form the queue');
         }
diff --git a/module/Api/src/Domain/CommandHandler/GovUkAccount/GetGovUkAccountRedirect.php b/module/Api/src/Domain/CommandHandler/GovUkAccount/GetGovUkAccountRedirect.php
index 74859a274d..bfd6ff7f9c 100644
--- a/module/Api/src/Domain/CommandHandler/GovUkAccount/GetGovUkAccountRedirect.php
+++ b/module/Api/src/Domain/CommandHandler/GovUkAccount/GetGovUkAccountRedirect.php
@@ -15,7 +15,7 @@ class GetGovUkAccountRedirect extends AbstractCommandHandler
     /**
      * Constructor.
      */
-    public function __construct(private GovUkAccountService $govUkAccountService)
+    public function __construct(private readonly GovUkAccountService $govUkAccountService)
     {
     }
 
diff --git a/module/Api/src/Domain/CommandHandler/GovUkAccount/ProcessAuthResponse.php b/module/Api/src/Domain/CommandHandler/GovUkAccount/ProcessAuthResponse.php
index 34b727a91e..6106faa6a5 100644
--- a/module/Api/src/Domain/CommandHandler/GovUkAccount/ProcessAuthResponse.php
+++ b/module/Api/src/Domain/CommandHandler/GovUkAccount/ProcessAuthResponse.php
@@ -28,7 +28,7 @@ class ProcessAuthResponse extends AbstractCommandHandler implements Transactione
 
     protected $repoServiceName = 'DigitalSignature';
 
-    public function __construct(private GovUkAccountService $govUkAccountService)
+    public function __construct(private readonly GovUkAccountService $govUkAccountService)
     {
     }
 
diff --git a/module/Api/src/Domain/CommandHandler/Irfo/CreateIrfoGvPermit.php b/module/Api/src/Domain/CommandHandler/Irfo/CreateIrfoGvPermit.php
index 9702eec14c..ee336bd627 100644
--- a/module/Api/src/Domain/CommandHandler/Irfo/CreateIrfoGvPermit.php
+++ b/module/Api/src/Domain/CommandHandler/Irfo/CreateIrfoGvPermit.php
@@ -62,11 +62,15 @@ private function createIrfoGvPermitObject(Cmd $command)
         $status = $this->getRepo()->getRefdataReference(IrfoGvPermit::STATUS_PENDING);
 
         $irfoGvPermit = new IrfoGvPermit($organisation, $type, $status);
+
+        $inForceDate = $command->getInForceDate() !== null ? new \DateTime($command->getInForceDate()) : new \DateTime('now');
+        $expiryDate = $command->getExpiryDate() !== null ? new \DateTime($command->getExpiryDate()) : new \DateTime('now');
+
         $irfoGvPermit->update(
             $type,
             $command->getYearRequired(),
-            new \DateTime($command->getInForceDate()),
-            new \DateTime($command->getExpiryDate()),
+            $inForceDate,
+            $expiryDate,
             $command->getNoOfCopies(),
             $command->getIsFeeExempt(),
             $command->getExemptionDetails(),
diff --git a/module/Api/src/Domain/CommandHandler/Irfo/IrfoPsvAuthUpdateTrait.php b/module/Api/src/Domain/CommandHandler/Irfo/IrfoPsvAuthUpdateTrait.php
index b796d9b1a6..7fe9e55df3 100644
--- a/module/Api/src/Domain/CommandHandler/Irfo/IrfoPsvAuthUpdateTrait.php
+++ b/module/Api/src/Domain/CommandHandler/Irfo/IrfoPsvAuthUpdateTrait.php
@@ -23,11 +23,12 @@ trait IrfoPsvAuthUpdateTrait
     public function updateIrfoPsvAuth(UpdateIrfoPsvAuthCmd $command)
     {
         $irfoPsvAuth = $this->getRepo()->fetchUsingId($command, Query::HYDRATE_OBJECT, $command->getVersion());
+        $inForceDate = $command->getInForceDate() !== null ? new \DateTime($command->getInForceDate()) : new \DateTime('now');
 
         $irfoPsvAuth->update(
             $this->getRepo()->getReference(IrfoPsvAuthType::class, $command->getIrfoPsvAuthType()),
             $command->getValidityPeriod(),
-            new \DateTime($command->getInForceDate()),
+            $inForceDate,
             $command->getServiceRouteFrom(),
             $command->getServiceRouteTo(),
             $this->getRepo()->getRefdataReference($command->getJourneyFrequency()),
diff --git a/module/Api/src/Domain/CommandHandler/Irfo/UpdateIrfoGvPermit.php b/module/Api/src/Domain/CommandHandler/Irfo/UpdateIrfoGvPermit.php
index 18ef2640ce..c81a6b6339 100644
--- a/module/Api/src/Domain/CommandHandler/Irfo/UpdateIrfoGvPermit.php
+++ b/module/Api/src/Domain/CommandHandler/Irfo/UpdateIrfoGvPermit.php
@@ -23,11 +23,14 @@ public function handleCommand(CommandInterface $command)
     {
         $irfoGvPermit = $this->getRepo()->fetchUsingId($command, Query::HYDRATE_OBJECT, $command->getVersion());
 
+        $inForceDate = $command->getInForceDate() !== null ? new \DateTime($command->getInForceDate()) : new \DateTime('now');
+        $expiryDate = $command->getExpiryDate() !== null ? new \DateTime($command->getExpiryDate()) : new \DateTime('now');
+
         $irfoGvPermit->update(
             $this->getRepo()->getReference(IrfoGvPermitType::class, $command->getIrfoGvPermitType()),
             $command->getYearRequired(),
-            new \DateTime($command->getInForceDate()),
-            new \DateTime($command->getExpiryDate()),
+            $inForceDate,
+            $expiryDate,
             $command->getNoOfCopies(),
             $command->getIsFeeExempt(),
             $command->getExemptionDetails()
diff --git a/module/Api/src/Domain/CommandHandler/IrhpApplication/UpdateMultipleNoOfPermits.php b/module/Api/src/Domain/CommandHandler/IrhpApplication/UpdateMultipleNoOfPermits.php
index 762b0badbc..997247925e 100644
--- a/module/Api/src/Domain/CommandHandler/IrhpApplication/UpdateMultipleNoOfPermits.php
+++ b/module/Api/src/Domain/CommandHandler/IrhpApplication/UpdateMultipleNoOfPermits.php
@@ -118,7 +118,7 @@ public function handleCommand(CommandInterface $command)
      */
     private function deriveMultilateralPermitsRequired(array $row, array $permitsRequiredData)
     {
-        $validToTimestamp = strtotime($row['validTo']);
+        $validToTimestamp = strtotime((string) $row['validTo']);
         $year = date('Y', $validToTimestamp);
 
         if (isset($permitsRequiredData[$year]) && is_numeric($permitsRequiredData[$year])) {
diff --git a/module/Api/src/Domain/CommandHandler/Licence/Surrender.php b/module/Api/src/Domain/CommandHandler/Licence/Surrender.php
index 73e5087091..8aa0ec5e22 100644
--- a/module/Api/src/Domain/CommandHandler/Licence/Surrender.php
+++ b/module/Api/src/Domain/CommandHandler/Licence/Surrender.php
@@ -51,7 +51,8 @@ public function handleCommand(CommandInterface $command)
         }
 
         $licence->setStatus($this->getRepo()->getRefdataReference($status));
-        $licence->setSurrenderedDate(new \DateTime($command->getSurrenderDate()));
+        $surrenderDate = $command->getSurrenderDate() !== null ? new \DateTime($command->getSurrenderDate()) : new \DateTime('now');
+        $licence->setSurrenderedDate($surrenderDate);
         $licence->setDecisions($this->buildArrayCollection(DecisionEntity::class, $command->getDecisions()));
 
         $result = new Result();
diff --git a/module/Api/src/Domain/CommandHandler/Permits/RoadworthinessReport.php b/module/Api/src/Domain/CommandHandler/Permits/RoadworthinessReport.php
index 4cabf40dcd..ef69e6827a 100644
--- a/module/Api/src/Domain/CommandHandler/Permits/RoadworthinessReport.php
+++ b/module/Api/src/Domain/CommandHandler/Permits/RoadworthinessReport.php
@@ -66,7 +66,7 @@ public function handleCommand(CommandInterface $command)
             //deal with missing user records for the document
             try {
                 $issuedBy = $document->getCreatedBy()->getContactDetails()->getPerson()->getFullName();
-            } catch (EntityNotFoundException $ex) {
+            } catch (EntityNotFoundException) {
                 $issuedBy = self::MSG_USER_MISSING;
             }
 
diff --git a/module/Api/src/Domain/CommandHandler/PreviousConviction/CreateForTma.php b/module/Api/src/Domain/CommandHandler/PreviousConviction/CreateForTma.php
index 95ae3fc753..e27ac29ef7 100644
--- a/module/Api/src/Domain/CommandHandler/PreviousConviction/CreateForTma.php
+++ b/module/Api/src/Domain/CommandHandler/PreviousConviction/CreateForTma.php
@@ -44,7 +44,7 @@ public function handleCommand(CommandInterface $command)
         $this->getRepo()->save($previousConviction);
 
         $result = new Result();
-        $result->addId(lcfirst($this->repoServiceName), $previousConviction->getId());
+        $result->addId(lcfirst((string) $this->repoServiceName), $previousConviction->getId());
         $result->addMessage("Previous Conviction ID {$previousConviction->getId()} created");
 
         return $result;
diff --git a/module/Api/src/Domain/CommandHandler/PrintScheduler/PrintJob.php b/module/Api/src/Domain/CommandHandler/PrintScheduler/PrintJob.php
index 5b0ae9e572..839fe9fca3 100644
--- a/module/Api/src/Domain/CommandHandler/PrintScheduler/PrintJob.php
+++ b/module/Api/src/Domain/CommandHandler/PrintScheduler/PrintJob.php
@@ -96,7 +96,7 @@ public function handleCommand(CommandInterface $command)
                 }
 
                 // create a temp file
-                $fileName = $this->createTmpFile($file, $this->filesPrefix, basename($document->getFilename()));
+                $fileName = $this->createTmpFile($file, $this->filesPrefix, basename((string) $document->getFilename()));
 
                 // unset no longer needed vars
                 unset($file, $document);
diff --git a/module/Api/src/Domain/CommandHandler/PrintScheduler/PrintJobFactory.php b/module/Api/src/Domain/CommandHandler/PrintScheduler/PrintJobFactory.php
index 7f9a05220c..cfc2785cb3 100644
--- a/module/Api/src/Domain/CommandHandler/PrintScheduler/PrintJobFactory.php
+++ b/module/Api/src/Domain/CommandHandler/PrintScheduler/PrintJobFactory.php
@@ -12,7 +12,7 @@ class PrintJobFactory implements FactoryInterface
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): PrintJob
     {
         $instance = new PrintJob(
-            $container->get('Config'),
+            $container->get('config'),
             $container->get('FileUploader'),
             $container->get('ConvertToPdf')
         );
diff --git a/module/Api/src/Domain/CommandHandler/PsvDisc/ConfirmPrinting.php b/module/Api/src/Domain/CommandHandler/PsvDisc/ConfirmPrinting.php
index c6681e14a2..66d65a6bb9 100644
--- a/module/Api/src/Domain/CommandHandler/PsvDisc/ConfirmPrinting.php
+++ b/module/Api/src/Domain/CommandHandler/PsvDisc/ConfirmPrinting.php
@@ -59,7 +59,7 @@ protected function getDiscIds($command)
         $queueRepo = $this->getRepo('Queue');
         $queueRepo->disableSoftDeleteable();
         $queueWithDisc = $queueRepo->fetchById($command->getQueueId());
-        $options = json_decode($queueWithDisc->getOptions(), true);
+        $options = json_decode((string) $queueWithDisc->getOptions(), true);
         if (!isset($options['discs'])) {
             throw new RuntimeException('Unable to fetch discs form the queue');
         }
diff --git a/module/Api/src/Domain/CommandHandler/Scan/CreateDocument.php b/module/Api/src/Domain/CommandHandler/Scan/CreateDocument.php
index 8344a5a80b..d431bd9d1c 100644
--- a/module/Api/src/Domain/CommandHandler/Scan/CreateDocument.php
+++ b/module/Api/src/Domain/CommandHandler/Scan/CreateDocument.php
@@ -62,7 +62,7 @@ public function handleCommand(CommandInterface $command)
 
     protected function validateFile(Cmd $command)
     {
-        $content = base64_decode($command->getContent());
+        $content = base64_decode((string) $command->getContent());
 
         $finfo = new \finfo(FILEINFO_MIME_TYPE);
         $mime = $finfo->buffer($content);
@@ -103,7 +103,7 @@ protected function generateDocument(Scan $scan, Cmd $command, $content)
         }
 
         $data = [
-            'content'       => base64_encode($content),
+            'content'       => base64_encode((string) $content),
             'filename'      => $command->getFilename(),
             'description'   => $scan->getDescription() . $descriptionPostfix,
             'isExternal'    => false,
diff --git a/module/Api/src/Domain/CommandHandler/Surrender/Snapshot.php b/module/Api/src/Domain/CommandHandler/Surrender/Snapshot.php
index 375dbf2300..6d8db298bf 100644
--- a/module/Api/src/Domain/CommandHandler/Surrender/Snapshot.php
+++ b/module/Api/src/Domain/CommandHandler/Surrender/Snapshot.php
@@ -35,7 +35,7 @@ private function uploadSnapshot($snapshot, $licId, $surrenderId)
     {
 
         $data = [
-            'content' => base64_encode(trim($snapshot)),
+            'content' => base64_encode(trim((string) $snapshot)),
             'filename' => 'Surrender Snapshot.html',
             'category' => Category::CATEGORY_APPLICATION,
             'subCategory' => Category::TASK_SUB_CATEGORY_APPLICATION_SURRENDER,
diff --git a/module/Api/src/Domain/CommandHandler/System/CreateSlaTargetDate.php b/module/Api/src/Domain/CommandHandler/System/CreateSlaTargetDate.php
index c2b824e78f..23eb24c5b2 100644
--- a/module/Api/src/Domain/CommandHandler/System/CreateSlaTargetDate.php
+++ b/module/Api/src/Domain/CommandHandler/System/CreateSlaTargetDate.php
@@ -77,7 +77,7 @@ private function createSlaTargetDate(CommandInterface $command)
      */
     private function fetchEntity(Cmd $command)
     {
-        $repoName = ucfirst($command->getEntityType());
+        $repoName = ucfirst((string) $command->getEntityType());
 
         if (!in_array($repoName, $this->extraRepos)) {
             throw new ValidationException(['Cannot add SLA target date for unsupported entity type']);
diff --git a/module/Api/src/Domain/CommandHandler/Task/CreateTask.php b/module/Api/src/Domain/CommandHandler/Task/CreateTask.php
index e61dcff9ce..ff73ca34dd 100644
--- a/module/Api/src/Domain/CommandHandler/Task/CreateTask.php
+++ b/module/Api/src/Domain/CommandHandler/Task/CreateTask.php
@@ -250,7 +250,7 @@ protected function getLetterForAlphaSplit(Entity\Task\Task $task): string
             case Entity\Organisation\Organisation::ORG_TYPE_SOLE_TRADER:
                 $organisationPerson = $organisation->getOrganisationPersons()->first();
                 if ($organisationPerson) {
-                    $letter = strtoupper(substr($organisationPerson->getPerson()->getFamilyName(), 0, 1));
+                    $letter = strtoupper(substr((string) $organisationPerson->getPerson()->getFamilyName(), 0, 1));
                 }
                 break;
             case Entity\Organisation\Organisation::ORG_TYPE_PARTNERSHIP:
@@ -261,7 +261,7 @@ protected function getLetterForAlphaSplit(Entity\Task\Task $task): string
                 $organisationPerson = $organisationPersons->matching($criteria)->first();
                 // if first person exists
                 if ($organisationPerson) {
-                    $letter = strtoupper(substr($organisationPerson->getPerson()->getFamilyName(), 0, 1));
+                    $letter = strtoupper(substr((string) $organisationPerson->getPerson()->getFamilyName(), 0, 1));
                 }
                 break;
         }
diff --git a/module/Api/src/Domain/CommandHandler/Task/FlagUrgentTasks.php b/module/Api/src/Domain/CommandHandler/Task/FlagUrgentTasks.php
index 1dc2607e88..8ed12e70c8 100644
--- a/module/Api/src/Domain/CommandHandler/Task/FlagUrgentTasks.php
+++ b/module/Api/src/Domain/CommandHandler/Task/FlagUrgentTasks.php
@@ -26,7 +26,7 @@ public function handleCommand(CommandInterface $command)
     {
         $updatedTaskCount = $this->getRepo()->flagUrgentsTasks();
 
-        $this->result->addMessage("${updatedTaskCount} task(s) flagged as urgent");
+        $this->result->addMessage("{$updatedTaskCount} task(s) flagged as urgent");
 
         return $this->result;
     }
diff --git a/module/Api/src/Domain/CommandHandler/Tm/CreateNewUser.php b/module/Api/src/Domain/CommandHandler/Tm/CreateNewUser.php
index 56d8fd01f5..78bcea8a9d 100644
--- a/module/Api/src/Domain/CommandHandler/Tm/CreateNewUser.php
+++ b/module/Api/src/Domain/CommandHandler/Tm/CreateNewUser.php
@@ -71,8 +71,8 @@ public function __construct(private PasswordService $passwordService, private ?V
      */
     public function handleCommand(CommandInterface $command)
     {
-        $username = trim($command->getUsername());
-        $emailAddress = trim($command->getEmailAddress());
+        $username = trim($command->getUsername() ?? '');
+        $emailAddress = trim($command->getEmailAddress() ?? '');
 
         if ($command->getHasEmail() === 'Y') {
             $this->validateRequired($username, $emailAddress);
diff --git a/module/Api/src/Domain/CommandHandler/TmEmployment/Create.php b/module/Api/src/Domain/CommandHandler/TmEmployment/Create.php
index f333914d2e..0f8f232591 100644
--- a/module/Api/src/Domain/CommandHandler/TmEmployment/Create.php
+++ b/module/Api/src/Domain/CommandHandler/TmEmployment/Create.php
@@ -65,7 +65,7 @@ public function handleCommand(CommandInterface $command)
 
         $result = new Result();
         $result->merge($createContactResult);
-        $result->addId(lcfirst($this->repoServiceName), $tmEmployment->getId());
+        $result->addId(lcfirst((string) $this->repoServiceName), $tmEmployment->getId());
         $result->addMessage("Tm Employment ID {$tmEmployment->getId()} created");
 
         return $result;
diff --git a/module/Api/src/Domain/CommandHandler/TransactioningCommandHandler.php b/module/Api/src/Domain/CommandHandler/TransactioningCommandHandler.php
index cfb2167fbc..a2e0451462 100644
--- a/module/Api/src/Domain/CommandHandler/TransactioningCommandHandler.php
+++ b/module/Api/src/Domain/CommandHandler/TransactioningCommandHandler.php
@@ -17,7 +17,7 @@
  */
 class TransactioningCommandHandler implements CommandHandlerInterface
 {
-    public function __construct(private CommandHandlerInterface $wrapped, private TransactionManagerInterface $repo)
+    public function __construct(private readonly CommandHandlerInterface $wrapped, private readonly TransactionManagerInterface $repo)
     {
     }
 
diff --git a/module/Api/src/Domain/CommandHandler/TranslationKey/Update.php b/module/Api/src/Domain/CommandHandler/TranslationKey/Update.php
index da8acd52dd..a46eaf3a1b 100644
--- a/module/Api/src/Domain/CommandHandler/TranslationKey/Update.php
+++ b/module/Api/src/Domain/CommandHandler/TranslationKey/Update.php
@@ -55,7 +55,7 @@ public function handleCommand(CommandInterface $command): Result
     protected function processTranslations(array $translationsArray, $parentEntity)
     {
         foreach ($translationsArray as $isoCode => $translatedText) {
-            $translatedText = base64_decode($translatedText);
+            $translatedText = base64_decode((string) $translatedText);
             if (array_key_exists($isoCode, Language::SUPPORTED_LANGUAGES)) {
                 $this->updateOrCreate($parentEntity->getId(), Language::SUPPORTED_LANGUAGES[$isoCode]['id'], $translatedText);
             } else {
diff --git a/module/Api/src/Domain/CommandHandler/TransportManagerApplication/Snapshot.php b/module/Api/src/Domain/CommandHandler/TransportManagerApplication/Snapshot.php
index 9322e21fdf..d649a1b0bd 100644
--- a/module/Api/src/Domain/CommandHandler/TransportManagerApplication/Snapshot.php
+++ b/module/Api/src/Domain/CommandHandler/TransportManagerApplication/Snapshot.php
@@ -62,7 +62,7 @@ protected function generateDocument($content, TransportManagerApplication $tma,
         );
 
         $data = [
-            'content' => base64_encode(trim($content)),
+            'content' => base64_encode(trim((string) $content)),
             'filename' => $fileName,
             'category' => Category::CATEGORY_TRANSPORT_MANAGER,
             'subCategory' => Category::DOC_SUB_CATEGORY_TRANSPORT_MANAGER_TM1_ASSISTED_DIGITAL,
diff --git a/module/Api/src/Domain/CommandHandler/User/RegisterUserSelfserve.php b/module/Api/src/Domain/CommandHandler/User/RegisterUserSelfserve.php
index b70eda86e2..f2cd2da5f0 100644
--- a/module/Api/src/Domain/CommandHandler/User/RegisterUserSelfserve.php
+++ b/module/Api/src/Domain/CommandHandler/User/RegisterUserSelfserve.php
@@ -37,7 +37,7 @@ final class RegisterUserSelfserve extends AbstractUserCommandHandler implements
     protected $extraRepos = ['ContactDetails', 'Licence', 'Organisation'];
 
 
-    public function __construct(private PasswordService $passwordService, private ?ValidatableAdapterInterface $adapter)
+    public function __construct(private readonly PasswordService $passwordService, private readonly ?ValidatableAdapterInterface $adapter)
     {
     }
 
diff --git a/module/Api/src/Domain/CommandHandler/Variation/DeleteOperatingCentre.php b/module/Api/src/Domain/CommandHandler/Variation/DeleteOperatingCentre.php
index 90835db94b..1a92d252e5 100644
--- a/module/Api/src/Domain/CommandHandler/Variation/DeleteOperatingCentre.php
+++ b/module/Api/src/Domain/CommandHandler/Variation/DeleteOperatingCentre.php
@@ -111,9 +111,9 @@ protected function canDeleteRecord(ApplicationEntity $application, $ref)
 
     protected function splitTypeAndId($ref)
     {
-        $type = substr($ref, 0, 1);
+        $type = substr((string) $ref, 0, 1);
 
-        $id = (int)substr($ref, 1);
+        $id = (int)substr((string) $ref, 1);
 
         return [$type, $id];
     }
diff --git a/module/Api/src/Domain/CommandHandler/Variation/RestoreOperatingCentre.php b/module/Api/src/Domain/CommandHandler/Variation/RestoreOperatingCentre.php
index d0f3ffa6cf..faeac7efb7 100644
--- a/module/Api/src/Domain/CommandHandler/Variation/RestoreOperatingCentre.php
+++ b/module/Api/src/Domain/CommandHandler/Variation/RestoreOperatingCentre.php
@@ -86,9 +86,9 @@ public function handleCommand(CommandInterface $command)
 
     private function splitTypeAndId($ref)
     {
-        $type = substr($ref, 0, 1);
+        $type = substr((string) $ref, 0, 1);
 
-        $id = (int)substr($ref, 1);
+        $id = (int)substr((string) $ref, 1);
 
         return [$type, $id];
     }
diff --git a/module/Api/src/Domain/CommandHandler/VariationOperatingCentre/Update.php b/module/Api/src/Domain/CommandHandler/VariationOperatingCentre/Update.php
index 323a7cfbd4..24a00d9bf3 100644
--- a/module/Api/src/Domain/CommandHandler/VariationOperatingCentre/Update.php
+++ b/module/Api/src/Domain/CommandHandler/VariationOperatingCentre/Update.php
@@ -87,9 +87,9 @@ public function handleCommand(CommandInterface $command)
 
     private function splitTypeAndId($ref)
     {
-        $type = substr($ref, 0, 1);
+        $type = substr((string) $ref, 0, 1);
 
-        $id = (int)substr($ref, 1);
+        $id = (int)substr((string) $ref, 1);
 
         return [$type, $id];
     }
diff --git a/module/Api/src/Domain/CommandHandlerManager.php b/module/Api/src/Domain/CommandHandlerManager.php
index 5f4aa3252b..11e5939c57 100644
--- a/module/Api/src/Domain/CommandHandlerManager.php
+++ b/module/Api/src/Domain/CommandHandlerManager.php
@@ -18,7 +18,7 @@
 class CommandHandlerManager extends AbstractPluginManager
 {
     protected $instanceOf = CommandHandlerInterface::class;
-    private ValidationHandlerManager $validationHandlerManager;
+    private readonly ValidationHandlerManager $validationHandlerManager;
 
     public function __construct(ContainerInterface $container, array $config = [])
     {
diff --git a/module/Api/src/Domain/Exception/NotFoundException.php b/module/Api/src/Domain/Exception/NotFoundException.php
index f48c8c7eda..3383e7259e 100644
--- a/module/Api/src/Domain/Exception/NotFoundException.php
+++ b/module/Api/src/Domain/Exception/NotFoundException.php
@@ -20,6 +20,6 @@ public function __construct($message = null)
     {
         $this->messages = [$message];
 
-        parent::__construct($message, $this->getCode(), $this->getPrevious());
+        parent::__construct($message ?? '', $this->getCode(), $this->getPrevious());
     }
 }
diff --git a/module/Api/src/Domain/QueryBuilder.php b/module/Api/src/Domain/QueryBuilder.php
index 28a53836aa..0513ac4d1a 100644
--- a/module/Api/src/Domain/QueryBuilder.php
+++ b/module/Api/src/Domain/QueryBuilder.php
@@ -37,7 +37,7 @@ class QueryBuilder implements QueryBuilderInterface
      *
      * @param QueryPartialServiceManager $queryPartialServiceManager Service manager
      */
-    public function __construct(private ServiceLocatorInterface $queryPartialServiceManager)
+    public function __construct(private readonly ServiceLocatorInterface $queryPartialServiceManager)
     {
     }
 
diff --git a/module/Api/src/Domain/QueryHandler/AbstractQueryHandler.php b/module/Api/src/Domain/QueryHandler/AbstractQueryHandler.php
index a995e6cfdb..68f9a134e4 100644
--- a/module/Api/src/Domain/QueryHandler/AbstractQueryHandler.php
+++ b/module/Api/src/Domain/QueryHandler/AbstractQueryHandler.php
@@ -280,7 +280,7 @@ private function applyInterfaces(ContainerInterface $mainServiceLocator): void
         }
 
         if ($this instanceof NationalRegisterAwareInterface) {
-            $this->setNationalRegisterConfig($mainServiceLocator->get('Config')['nr']);
+            $this->setNationalRegisterConfig($mainServiceLocator->get('config')['nr']);
         }
 
         if ($this instanceof CacheAwareInterface) {
diff --git a/module/Api/src/Domain/QueryHandler/Application/LicenceHistory.php b/module/Api/src/Domain/QueryHandler/Application/LicenceHistory.php
index 9c3a33161d..2ba69dcab3 100644
--- a/module/Api/src/Domain/QueryHandler/Application/LicenceHistory.php
+++ b/module/Api/src/Domain/QueryHandler/Application/LicenceHistory.php
@@ -41,7 +41,7 @@ public function handleQuery(QueryInterface $query)
 
         $data = [];
         foreach ($types as $type) {
-            $formattedType = lcfirst($filter->filter($type));
+            $formattedType = lcfirst((string) $filter->filter($type));
 
             $otherLicences = $application->getOtherLicencesByType($this->getRepo()->getRefdataReference($type));
             $data['otherLicences'][$formattedType] = $this->resultList($otherLicences);
diff --git a/module/Api/src/Domain/QueryHandler/ContinuationDetail/LicenceChecklist.php b/module/Api/src/Domain/QueryHandler/ContinuationDetail/LicenceChecklist.php
index cb9384ee86..cfbbbeaaa6 100644
--- a/module/Api/src/Domain/QueryHandler/ContinuationDetail/LicenceChecklist.php
+++ b/module/Api/src/Domain/QueryHandler/ContinuationDetail/LicenceChecklist.php
@@ -147,7 +147,7 @@ protected function alterSections($sections, Licence $licence)
         array_walk(
             $sections,
             function (&$item) use ($filter) {
-                $item = lcfirst($filter->filter($item));
+                $item = lcfirst((string) $filter->filter($item));
             }
         );
         return $sections;
diff --git a/module/Api/src/Domain/QueryHandler/Cpms/ReportStatus.php b/module/Api/src/Domain/QueryHandler/Cpms/ReportStatus.php
index b8e0617d80..c70b781f00 100644
--- a/module/Api/src/Domain/QueryHandler/Cpms/ReportStatus.php
+++ b/module/Api/src/Domain/QueryHandler/Cpms/ReportStatus.php
@@ -56,7 +56,7 @@ public function handleQuery(QueryInterface $query)
     private function parseToken($data)
     {
         $downloadUrl = $data['download_url'];
-        $queryString = parse_url($downloadUrl, PHP_URL_QUERY);
+        $queryString = parse_url((string) $downloadUrl, PHP_URL_QUERY);
         $vars = [];
         parse_str($queryString, $vars);
         return $vars['token'];
diff --git a/module/Api/src/Domain/QueryHandler/Document/DownloadGuide.php b/module/Api/src/Domain/QueryHandler/Document/DownloadGuide.php
index 49f8435a02..145a1516fd 100644
--- a/module/Api/src/Domain/QueryHandler/Document/DownloadGuide.php
+++ b/module/Api/src/Domain/QueryHandler/Document/DownloadGuide.php
@@ -47,6 +47,6 @@ public function handleQuery(QueryInterface $query)
     protected function getIdentifierFromSlug(string $slug)
     {
         $docTemplate = $this->getRepo('DocTemplate')->fetchByTemplateSlug($slug);
-        return basename($docTemplate->getDocument()->getIdentifier());
+        return basename((string) $docTemplate->getDocument()->getIdentifier());
     }
 }
diff --git a/module/Api/src/Domain/QueryHandler/MyAccount/MyAccount.php b/module/Api/src/Domain/QueryHandler/MyAccount/MyAccount.php
index 79d668d08b..7735845b55 100644
--- a/module/Api/src/Domain/QueryHandler/MyAccount/MyAccount.php
+++ b/module/Api/src/Domain/QueryHandler/MyAccount/MyAccount.php
@@ -65,7 +65,7 @@ public function handleQuery(QueryInterface $query)
                 SystemParameter::DATA_SEPARATION_TEAMS_EXEMPT
             );
 
-            $teamsExcluded = explode(",", $teamDataExclusionsParam->getObject()->getParamValue());
+            $teamsExcluded = explode(",", (string) $teamDataExclusionsParam->getObject()->getParamValue());
 
             $team = $user->getTeam();
 
diff --git a/module/Api/src/Domain/QueryHandler/Nr/ReputeUrl.php b/module/Api/src/Domain/QueryHandler/Nr/ReputeUrl.php
index e0ab1025fc..f27ed3c567 100644
--- a/module/Api/src/Domain/QueryHandler/Nr/ReputeUrl.php
+++ b/module/Api/src/Domain/QueryHandler/Nr/ReputeUrl.php
@@ -55,7 +55,7 @@ public function handleQuery(QueryInterface $query)
             'CA' => self::FIELD_CA,
             'GivenName' => $person->getForename(),
             'FamilyName' => $person->getFamilyName(),
-            'DateOfBirth' => date(self::DATE_FORMAT, strtotime($person->getBirthDate())),
+            'DateOfBirth' => date(self::DATE_FORMAT, strtotime((string) $person->getBirthDate())),
             'PlaceOfBirth' => $person->getBirthPlace(),
             'CPCNo' => ($serialNo ?: self::FIELD_QUAL_UNKNOWN),
             'CPCIssueDate' => date(self::DATE_FORMAT, strtotime($qualification->getIssuedDate())),
diff --git a/module/Api/src/Domain/QueryHandler/User/User.php b/module/Api/src/Domain/QueryHandler/User/User.php
index ca72e6ce8b..cd4c502c6d 100644
--- a/module/Api/src/Domain/QueryHandler/User/User.php
+++ b/module/Api/src/Domain/QueryHandler/User/User.php
@@ -97,7 +97,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
     {
         $fullContainer = $container;
 
-        $this->config = $container->get('Config');
+        $this->config = $container->get('config');
         return parent::__invoke($fullContainer, $requestedName, $options);
     }
 }
diff --git a/module/Api/src/Domain/QueryHandler/VariationOperatingCentre/VariationOperatingCentre.php b/module/Api/src/Domain/QueryHandler/VariationOperatingCentre/VariationOperatingCentre.php
index 5135309185..1dddabf3a6 100644
--- a/module/Api/src/Domain/QueryHandler/VariationOperatingCentre/VariationOperatingCentre.php
+++ b/module/Api/src/Domain/QueryHandler/VariationOperatingCentre/VariationOperatingCentre.php
@@ -56,9 +56,9 @@ public function handleQuery(QueryInterface $query)
 
     private function splitTypeAndId($ref)
     {
-        $type = substr($ref, 0, 1);
+        $type = substr((string) $ref, 0, 1);
 
-        $id = (int)substr($ref, 1);
+        $id = (int)substr((string) $ref, 1);
 
         return [$type, $id];
     }
diff --git a/module/Api/src/Domain/QueryHandlerManager.php b/module/Api/src/Domain/QueryHandlerManager.php
index d60d9d5099..df0dfbc494 100644
--- a/module/Api/src/Domain/QueryHandlerManager.php
+++ b/module/Api/src/Domain/QueryHandlerManager.php
@@ -17,7 +17,7 @@
 class QueryHandlerManager extends AbstractPluginManager
 {
     protected $instanceOf = QueryHandlerInterface::class;
-    private ValidationHandlerManager $validationHandlerManager;
+    private readonly ValidationHandlerManager $validationHandlerManager;
 
     public function __construct(ContainerInterface $container, array $config = [])
     {
diff --git a/module/Api/src/Domain/QueryPartial/Order.php b/module/Api/src/Domain/QueryPartial/Order.php
index feaf6fadcf..459e86d2de 100644
--- a/module/Api/src/Domain/QueryPartial/Order.php
+++ b/module/Api/src/Domain/QueryPartial/Order.php
@@ -29,7 +29,7 @@ public function modifyQuery(QueryBuilder $qb, array $arguments = [])
 
         [$alias] = $qb->getRootAliases();
 
-        if (str_contains($sort, '.') || in_array($sort, $compositeFields)) {
+        if (str_contains((string) $sort, '.') || in_array($sort, $compositeFields)) {
             $qb->addOrderBy($sort, $order);
         } else {
             $qb->addOrderBy($alias . '.' . $sort, $order);
diff --git a/module/Api/src/Domain/QueryPartial/With.php b/module/Api/src/Domain/QueryPartial/With.php
index 72d6b7286d..a76897b6bf 100644
--- a/module/Api/src/Domain/QueryPartial/With.php
+++ b/module/Api/src/Domain/QueryPartial/With.php
@@ -26,7 +26,7 @@ public function modifyQuery(QueryBuilder $qb, array $arguments = [])
         $property = $arguments[0];
         $alias = ($arguments[1] ?? 'w' . $this->i++);
 
-        if (!str_contains($property, '.')) {
+        if (!str_contains((string) $property, '.')) {
             $property = $qb->getRootAliases()[0] . '.' . $property;
         }
 
diff --git a/module/Api/src/Domain/QueryPartial/WithApplication.php b/module/Api/src/Domain/QueryPartial/WithApplication.php
index 4013aec25a..31b9df97b9 100644
--- a/module/Api/src/Domain/QueryPartial/WithApplication.php
+++ b/module/Api/src/Domain/QueryPartial/WithApplication.php
@@ -12,7 +12,7 @@
 /**
  * With Application
  */
-final class WithApplication implements QueryPartialInterface
+final readonly class WithApplication implements QueryPartialInterface
 {
     public function __construct(private With $with)
     {
diff --git a/module/Api/src/Domain/QueryPartial/WithBusReg.php b/module/Api/src/Domain/QueryPartial/WithBusReg.php
index 5e18e95845..7f4e346b7b 100644
--- a/module/Api/src/Domain/QueryPartial/WithBusReg.php
+++ b/module/Api/src/Domain/QueryPartial/WithBusReg.php
@@ -12,7 +12,7 @@
 /**
  * With BusReg
  */
-final class WithBusReg implements QueryPartialInterface
+final readonly class WithBusReg implements QueryPartialInterface
 {
     public function __construct(private With $with)
     {
diff --git a/module/Api/src/Domain/QueryPartial/WithCase.php b/module/Api/src/Domain/QueryPartial/WithCase.php
index 2744483182..c7a798db42 100644
--- a/module/Api/src/Domain/QueryPartial/WithCase.php
+++ b/module/Api/src/Domain/QueryPartial/WithCase.php
@@ -12,7 +12,7 @@
 /**
  * With Case
  */
-final class WithCase implements QueryPartialInterface
+final readonly class WithCase implements QueryPartialInterface
 {
     public function __construct(private With $with)
     {
diff --git a/module/Api/src/Domain/QueryPartial/WithContactDetails.php b/module/Api/src/Domain/QueryPartial/WithContactDetails.php
index 8e2850377c..5adf7105a7 100644
--- a/module/Api/src/Domain/QueryPartial/WithContactDetails.php
+++ b/module/Api/src/Domain/QueryPartial/WithContactDetails.php
@@ -15,7 +15,7 @@
 /**
  * With Contact Details
  */
-final class WithContactDetails implements QueryPartialInterface
+final readonly class WithContactDetails implements QueryPartialInterface
 {
     public function __construct(private EntityManagerInterface $em, private With $with, private WithRefdata $withRefdata)
     {
@@ -47,7 +47,7 @@ public function modifyQuery(QueryBuilder $qb, array $arguments = [])
                 break;
         }
 
-        if (!strstr($property, '.')) {
+        if (!strstr((string) $property, '.')) {
             $property = $qb->getRootAliases()[0] . '.' . $property;
         }
 
diff --git a/module/Api/src/Domain/QueryPartial/WithCreatedBy.php b/module/Api/src/Domain/QueryPartial/WithCreatedBy.php
index 8f3110cbc0..7997a8665e 100644
--- a/module/Api/src/Domain/QueryPartial/WithCreatedBy.php
+++ b/module/Api/src/Domain/QueryPartial/WithCreatedBy.php
@@ -12,7 +12,7 @@
 /**
  * With CreatedBy
  */
-final class WithCreatedBy implements QueryPartialInterface
+final readonly class WithCreatedBy implements QueryPartialInterface
 {
     public function __construct(private With $with)
     {
diff --git a/module/Api/src/Domain/QueryPartial/WithCreatedByWithTeam.php b/module/Api/src/Domain/QueryPartial/WithCreatedByWithTeam.php
index b302ff5ab2..c1fbbd3b62 100644
--- a/module/Api/src/Domain/QueryPartial/WithCreatedByWithTeam.php
+++ b/module/Api/src/Domain/QueryPartial/WithCreatedByWithTeam.php
@@ -8,7 +8,7 @@
 /**
  * With Team
  */
-final class WithCreatedByWithTeam implements QueryPartialInterface
+final readonly class WithCreatedByWithTeam implements QueryPartialInterface
 {
     public function __construct(private With $with)
     {
diff --git a/module/Api/src/Domain/QueryPartial/WithIrhpApplication.php b/module/Api/src/Domain/QueryPartial/WithIrhpApplication.php
index c47d0e242f..606e896d2f 100644
--- a/module/Api/src/Domain/QueryPartial/WithIrhpApplication.php
+++ b/module/Api/src/Domain/QueryPartial/WithIrhpApplication.php
@@ -6,7 +6,7 @@
 
 use Doctrine\ORM\QueryBuilder;
 
-final class WithIrhpApplication implements QueryPartialInterface
+final readonly class WithIrhpApplication implements QueryPartialInterface
 {
     public function __construct(private With $with)
     {
diff --git a/module/Api/src/Domain/QueryPartial/WithPersonContactDetails.php b/module/Api/src/Domain/QueryPartial/WithPersonContactDetails.php
index 1c9aba25ef..a617a0b2f7 100644
--- a/module/Api/src/Domain/QueryPartial/WithPersonContactDetails.php
+++ b/module/Api/src/Domain/QueryPartial/WithPersonContactDetails.php
@@ -12,7 +12,7 @@
 /**
  * With PersonContactDetails
  */
-final class WithPersonContactDetails implements QueryPartialInterface
+final readonly class WithPersonContactDetails implements QueryPartialInterface
 {
     public function __construct(
         /**
@@ -32,7 +32,7 @@ public function modifyQuery(QueryBuilder $qb, array $arguments = [])
     {
         $column = $arguments[0] ?? 'contactDetails';
 
-        if (!str_contains($column, '.')) {
+        if (!str_contains((string) $column, '.')) {
             $column = $qb->getRootAliases()[0] . '.' . $column;
         }
 
diff --git a/module/Api/src/Domain/QueryPartial/WithRefdata.php b/module/Api/src/Domain/QueryPartial/WithRefdata.php
index 478c3cdfb8..51a8cd4619 100644
--- a/module/Api/src/Domain/QueryPartial/WithRefdata.php
+++ b/module/Api/src/Domain/QueryPartial/WithRefdata.php
@@ -16,7 +16,7 @@ final class WithRefdata implements QueryPartialInterface
 {
     private $refDataEntity = \Dvsa\Olcs\Api\Entity\System\RefData::class;
 
-    public function __construct(private EntityManagerInterface $em, private With $with)
+    public function __construct(private readonly EntityManagerInterface $em, private readonly With $with)
     {
     }
 
diff --git a/module/Api/src/Domain/QueryPartial/WithUser.php b/module/Api/src/Domain/QueryPartial/WithUser.php
index 7ac8f282c5..1f8e379486 100644
--- a/module/Api/src/Domain/QueryPartial/WithUser.php
+++ b/module/Api/src/Domain/QueryPartial/WithUser.php
@@ -12,7 +12,7 @@
 /**
  * With User
  */
-final class WithUser implements QueryPartialInterface
+final readonly class WithUser implements QueryPartialInterface
 {
     public function __construct(private With $with)
     {
diff --git a/module/Api/src/Domain/Repository/AbstractReadonlyRepository.php b/module/Api/src/Domain/Repository/AbstractReadonlyRepository.php
index 229096e9f6..f2ee258ab9 100644
--- a/module/Api/src/Domain/Repository/AbstractReadonlyRepository.php
+++ b/module/Api/src/Domain/Repository/AbstractReadonlyRepository.php
@@ -55,7 +55,7 @@ abstract class AbstractReadonlyRepository implements ReadonlyRepositoryInterface
      * @param QueryBuilderInterface  $queryBuilder   Doctrine Query Builder
      * @param DbQueryServiceManager  $dbQueryManager Olcs Query manager
      */
-    public function __construct(private EntityManagerInterface $em, private QueryBuilderInterface $queryBuilder, private DbQueryServiceManager $dbQueryManager)
+    public function __construct(private readonly EntityManagerInterface $em, private readonly QueryBuilderInterface $queryBuilder, private readonly DbQueryServiceManager $dbQueryManager)
     {
     }
 
diff --git a/module/Api/src/Domain/Repository/BusRegHistory.php b/module/Api/src/Domain/Repository/BusRegHistory.php
index d850f0e835..ab928715c3 100644
--- a/module/Api/src/Domain/Repository/BusRegHistory.php
+++ b/module/Api/src/Domain/Repository/BusRegHistory.php
@@ -32,12 +32,12 @@ protected function applyListFilters(QueryBuilder $qb, QueryInterface $query)
         $qb->setParameter('busReg', $query->getBusReg());
     }
 
-    public function save($entity)
+    public function save($entity): never
     {
         throw new \Exception('You cannot save to a view');
     }
 
-    public function delete($entity)
+    public function delete($entity): never
     {
         throw new \Exception('You delete the contents of a view');
     }
diff --git a/module/Api/src/Domain/Repository/CompaniesHouseVsOlcsDiffs.php b/module/Api/src/Domain/Repository/CompaniesHouseVsOlcsDiffs.php
index d591a49d16..e555a5ade4 100644
--- a/module/Api/src/Domain/Repository/CompaniesHouseVsOlcsDiffs.php
+++ b/module/Api/src/Domain/Repository/CompaniesHouseVsOlcsDiffs.php
@@ -12,7 +12,7 @@
  */
 class CompaniesHouseVsOlcsDiffs
 {
-    public function __construct(private Connection $conn)
+    public function __construct(private readonly Connection $conn)
     {
     }
 
diff --git a/module/Api/src/Domain/Repository/DataDvaNi.php b/module/Api/src/Domain/Repository/DataDvaNi.php
index 97a43d5b6c..97341dc544 100644
--- a/module/Api/src/Domain/Repository/DataDvaNi.php
+++ b/module/Api/src/Domain/Repository/DataDvaNi.php
@@ -15,7 +15,7 @@ class DataDvaNi
      *
      * @param Connection $conn Database connection
      */
-    public function __construct(private Connection $conn)
+    public function __construct(private readonly Connection $conn)
     {
     }
 
diff --git a/module/Api/src/Domain/Repository/DataGovUk.php b/module/Api/src/Domain/Repository/DataGovUk.php
index 9d4604bc77..39c03dc945 100644
--- a/module/Api/src/Domain/Repository/DataGovUk.php
+++ b/module/Api/src/Domain/Repository/DataGovUk.php
@@ -20,7 +20,7 @@ class DataGovUk
      *
      * @param Connection $conn Database connection
      */
-    public function __construct(private Connection $conn)
+    public function __construct(private readonly Connection $conn)
     {
     }
 
diff --git a/module/Api/src/Domain/Repository/DocumentSearchView.php b/module/Api/src/Domain/Repository/DocumentSearchView.php
index 32ec9c7348..fa931841ae 100644
--- a/module/Api/src/Domain/Repository/DocumentSearchView.php
+++ b/module/Api/src/Domain/Repository/DocumentSearchView.php
@@ -176,7 +176,7 @@ protected function applyListFilters(QueryBuilder $qb, QueryInterface $query)
             $expr = $qb->expr();
 
             $qb->andWhere(
-                call_user_func_array([$expr, 'orX'], $idExpressions)
+                call_user_func_array($expr->orX(...), $idExpressions)
             );
         }
     }
diff --git a/module/Api/src/Domain/Repository/TaskSearchView.php b/module/Api/src/Domain/Repository/TaskSearchView.php
index 2c4561e236..133d4def59 100644
--- a/module/Api/src/Domain/Repository/TaskSearchView.php
+++ b/module/Api/src/Domain/Repository/TaskSearchView.php
@@ -159,7 +159,7 @@ protected function applyListFilters(QueryBuilder $qb, QueryInterface $query)
             $expr = $qb->expr();
 
             $qb->andWhere(
-                call_user_func_array([$expr, 'orX'], $idExpressions)
+                call_user_func_array($expr->orX(...), $idExpressions)
             );
         }
     }
diff --git a/module/Api/src/Domain/Repository/TransactionManager.php b/module/Api/src/Domain/Repository/TransactionManager.php
index d4b1678838..5cd205fb03 100644
--- a/module/Api/src/Domain/Repository/TransactionManager.php
+++ b/module/Api/src/Domain/Repository/TransactionManager.php
@@ -13,7 +13,7 @@
  * Class TransactionManager
  * @package Dvsa\Olcs\Api\Domain\Repository
  */
-final class TransactionManager implements TransactionManagerInterface
+final readonly class TransactionManager implements TransactionManagerInterface
 {
     public function __construct(private EntityManagerInterface $em)
     {
diff --git a/module/Api/src/Domain/Service/VariationOperatingCentreHelper.php b/module/Api/src/Domain/Service/VariationOperatingCentreHelper.php
index 6389932995..098d831d27 100644
--- a/module/Api/src/Domain/Service/VariationOperatingCentreHelper.php
+++ b/module/Api/src/Domain/Service/VariationOperatingCentreHelper.php
@@ -82,12 +82,12 @@ private function updateAndFilterTableData($licenceData, $applicationData, $order
         if ($order === 'ASC') {
             usort(
                 $mergedData,
-                fn($val1, $val2) => strcmp($val1['sort'], $val2['sort'])
+                fn($val1, $val2) => strcmp((string) $val1['sort'], (string) $val2['sort'])
             );
         } else {
             usort(
                 $mergedData,
-                fn($val1, $val2) => strcmp($val2['sort'], $val1['sort'])
+                fn($val1, $val2) => strcmp((string) $val2['sort'], (string) $val1['sort'])
             );
         }
 
diff --git a/module/Api/src/Domain/SubmissionGeneratorAwareTrait.php b/module/Api/src/Domain/SubmissionGeneratorAwareTrait.php
index 80b6f2e3f3..c6cdfdf1d0 100644
--- a/module/Api/src/Domain/SubmissionGeneratorAwareTrait.php
+++ b/module/Api/src/Domain/SubmissionGeneratorAwareTrait.php
@@ -17,7 +17,7 @@ trait SubmissionGeneratorAwareTrait
     /**
      * @var array $submissionConfig
      */
-    protected $submissionConfig;
+    public $submissionConfig;
 
     public function setSubmissionGenerator(SubmissionGenerator $service)
     {
diff --git a/module/Api/src/Domain/Util/DateTime/AddDaysExcludingDates.php b/module/Api/src/Domain/Util/DateTime/AddDaysExcludingDates.php
index 1fa4543331..334a491dc9 100644
--- a/module/Api/src/Domain/Util/DateTime/AddDaysExcludingDates.php
+++ b/module/Api/src/Domain/Util/DateTime/AddDaysExcludingDates.php
@@ -8,7 +8,7 @@
 
 class AddDaysExcludingDates implements DateTimeCalculatorInterface
 {
-    public function __construct(private DateTimeCalculatorInterface $wrapped, private DateProviderInterface $excluded)
+    public function __construct(private readonly DateTimeCalculatorInterface $wrapped, private readonly DateProviderInterface $excluded)
     {
     }
 
diff --git a/module/Api/src/Domain/Util/DateTime/AddWorkingDays.php b/module/Api/src/Domain/Util/DateTime/AddWorkingDays.php
index 2f7e5879be..bf53788db1 100644
--- a/module/Api/src/Domain/Util/DateTime/AddWorkingDays.php
+++ b/module/Api/src/Domain/Util/DateTime/AddWorkingDays.php
@@ -8,7 +8,7 @@
 
 class AddWorkingDays implements DateTimeCalculatorInterface
 {
-    public function __construct(private DateTimeCalculatorInterface $wrapped)
+    public function __construct(private readonly DateTimeCalculatorInterface $wrapped)
     {
     }
 
diff --git a/module/Api/src/Domain/Util/DateTime/DateTime.php b/module/Api/src/Domain/Util/DateTime/DateTime.php
index fb2ee0ed24..9ee900dbb2 100644
--- a/module/Api/src/Domain/Util/DateTime/DateTime.php
+++ b/module/Api/src/Domain/Util/DateTime/DateTime.php
@@ -15,6 +15,8 @@ public function __construct($time = 'now', \DateTimeZone $timezone = null)
             $now = static::getNow();
             $timezone = $now->getTimezone();
             $time = $now->format(\DateTime::ATOM);
+        } elseif ($time === null) {
+            $time = (new \DateTime())->format(\DateTime::ATOM);
         }
 
         parent::__construct($time, $timezone);
diff --git a/module/Api/src/Domain/Util/DateTime/PublicHolidayDateProvider.php b/module/Api/src/Domain/Util/DateTime/PublicHolidayDateProvider.php
index 4a4f7200b3..47b721cc4f 100644
--- a/module/Api/src/Domain/Util/DateTime/PublicHolidayDateProvider.php
+++ b/module/Api/src/Domain/Util/DateTime/PublicHolidayDateProvider.php
@@ -7,7 +7,7 @@
 use Dvsa\Olcs\Api\Domain\Repository\PublicHoliday;
 use Dvsa\Olcs\Api\Entity\TrafficArea\TrafficArea;
 
-final class PublicHolidayDateProvider implements DateProviderInterface
+final readonly class PublicHolidayDateProvider implements DateProviderInterface
 {
     public function __construct(private PublicHoliday $repository, private ?TrafficArea $trafficArea)
     {
diff --git a/module/Api/src/Domain/Util/EntityCloner.php b/module/Api/src/Domain/Util/EntityCloner.php
index 45b02efcb4..e5c7919b59 100644
--- a/module/Api/src/Domain/Util/EntityCloner.php
+++ b/module/Api/src/Domain/Util/EntityCloner.php
@@ -48,8 +48,8 @@ public static function cloneEntity(mixed $sourceEntity, array $ignoredProperties
 
         // Set ignored properties to their defaults
         foreach ($ignoredProperties as $ignoredProperty) {
-            $getter = 'get' . ucfirst($ignoredProperty);
-            $setter = 'set' . ucfirst($ignoredProperty);
+            $getter = 'get' . ucfirst((string) $ignoredProperty);
+            $setter = 'set' . ucfirst((string) $ignoredProperty);
 
             // check the setter exists as some properties (eg olbsKey) may get removed in the future
             if (method_exists($clone, $setter)) {
diff --git a/module/Api/src/Domain/Util/SlaCalculator.php b/module/Api/src/Domain/Util/SlaCalculator.php
index 4015263e3d..9aad8a8d0b 100644
--- a/module/Api/src/Domain/Util/SlaCalculator.php
+++ b/module/Api/src/Domain/Util/SlaCalculator.php
@@ -10,7 +10,7 @@
 
 class SlaCalculator implements SlaCalculatorInterface
 {
-    public function __construct(private TimeProcessorBuilderInterface $timeProcessorBuilder)
+    public function __construct(private readonly TimeProcessorBuilderInterface $timeProcessorBuilder)
     {
     }
 
diff --git a/module/Api/src/Domain/Util/TimeProcessorBuilder.php b/module/Api/src/Domain/Util/TimeProcessorBuilder.php
index b710ff023a..84c38cd173 100644
--- a/module/Api/src/Domain/Util/TimeProcessorBuilder.php
+++ b/module/Api/src/Domain/Util/TimeProcessorBuilder.php
@@ -15,7 +15,7 @@
 
 class TimeProcessorBuilder implements TimeProcessorBuilderInterface
 {
-    public function __construct(private PublicHoliday $publicHolidayRepo)
+    public function __construct(private readonly PublicHoliday $publicHolidayRepo)
     {
     }
 
diff --git a/module/Api/src/Domain/Validation/Handlers/Document/CanCreateDocument.php b/module/Api/src/Domain/Validation/Handlers/Document/CanCreateDocument.php
index 92b24feb95..e3c2e7359c 100644
--- a/module/Api/src/Domain/Validation/Handlers/Document/CanCreateDocument.php
+++ b/module/Api/src/Domain/Validation/Handlers/Document/CanCreateDocument.php
@@ -160,7 +160,7 @@ private function validateExtension($filename)
             : self::EXTENSIONS_KEY_EXTERNAL;
 
         $allowedExtensions = isset($this->allowedExtensions[$key])
-            ? explode(',', $this->allowedExtensions[$key])
+            ? explode(',', (string) $this->allowedExtensions[$key])
             : [];
 
         $extension = '';
diff --git a/module/Api/src/Domain/Validation/Handlers/OperatingCentre/CanAccessXocWithReference.php b/module/Api/src/Domain/Validation/Handlers/OperatingCentre/CanAccessXocWithReference.php
index e25eb5c119..3405baa8a3 100644
--- a/module/Api/src/Domain/Validation/Handlers/OperatingCentre/CanAccessXocWithReference.php
+++ b/module/Api/src/Domain/Validation/Handlers/OperatingCentre/CanAccessXocWithReference.php
@@ -37,9 +37,9 @@ public function isValid($dto)
 
     private function splitTypeAndId($ref)
     {
-        $type = substr($ref, 0, 1);
+        $type = substr((string) $ref, 0, 1);
 
-        $id = (int)substr($ref, 1);
+        $id = (int)substr((string) $ref, 1);
 
         return [$type, $id];
     }
diff --git a/module/Api/src/Entity/Application/Application.php b/module/Api/src/Entity/Application/Application.php
index 44b4222666..86974e461a 100644
--- a/module/Api/src/Entity/Application/Application.php
+++ b/module/Api/src/Entity/Application/Application.php
@@ -1126,7 +1126,7 @@ public function getVariationCompletion()
         $converter = new CamelCaseToUnderscore();
         foreach ($applicationCompletion as $key => $value) {
             if (preg_match('/^([a-zA-Z]+)Status$/', $key, $matches)) {
-                $section = strtolower($converter->filter($matches[1]));
+                $section = strtolower((string) $converter->filter($matches[1]));
                 $completions[$section] = (int)$value;
             }
         }
@@ -1193,7 +1193,7 @@ public function getSectionsRequiringAttention()
                 continue;
             }
 
-            $section = strtolower($filter->filter($matches[1]));
+            $section = strtolower((string) $filter->filter($matches[1]));
 
             if ($this->isSectionRequireAttention($section, (int)$value)) {
                 $sections[] = $section;
diff --git a/module/Api/src/Entity/Application/ApplicationCompletion.php b/module/Api/src/Entity/Application/ApplicationCompletion.php
index aac7bfc9b8..34f8ed5e92 100644
--- a/module/Api/src/Entity/Application/ApplicationCompletion.php
+++ b/module/Api/src/Entity/Application/ApplicationCompletion.php
@@ -102,7 +102,7 @@ public function getIncompleteSections($required)
         $filter = new UnderscoreToCamelCase();
 
         foreach ($required as $section) {
-            $getter = 'get' . ucfirst($filter->filter($section)) . 'Status';
+            $getter = 'get' . ucfirst((string) $filter->filter($section)) . 'Status';
             if ($this->$getter() !== self::STATUS_COMPLETE) {
                 $incompleteSections[] = $section;
             }
diff --git a/module/Api/src/Entity/Application/ApplicationTracking.php b/module/Api/src/Entity/Application/ApplicationTracking.php
index 781293c477..c255825a90 100644
--- a/module/Api/src/Entity/Application/ApplicationTracking.php
+++ b/module/Api/src/Entity/Application/ApplicationTracking.php
@@ -98,7 +98,7 @@ public static function getValueOptions()
     public function exchangeStatusArray(array $data)
     {
         foreach ($this->sections as $section) {
-            $key = lcfirst($section) . 'Status';
+            $key = lcfirst((string) $section) . 'Status';
             if (isset($data[$key])) {
                 $method = 'set' . $section . 'Status';
                 $this->$method($data[$key]);
@@ -121,7 +121,7 @@ public function isValid($sections)
         $validStatuses = [self::STATUS_ACCEPTED, self::STATUS_NOT_APPLICABLE];
 
         foreach ($sections as $section) {
-            $getter = 'get' . ucfirst($filter->filter($section)) . 'Status';
+            $getter = 'get' . ucfirst((string) $filter->filter($section)) . 'Status';
             if (!in_array($this->$getter(), $validStatuses)) {
                 return false;
             }
diff --git a/module/Api/src/Entity/DigitalSignature.php b/module/Api/src/Entity/DigitalSignature.php
index 280a2b1f2d..12309f4105 100644
--- a/module/Api/src/Entity/DigitalSignature.php
+++ b/module/Api/src/Entity/DigitalSignature.php
@@ -51,6 +51,9 @@ public function setAttributesArray(array $attributes)
      */
     public function getAttributesArray()
     {
+        if ($this->attributes === null) {
+            return [];
+        }
         $array = json_decode($this->attributes, true);
         return is_array($array) ? $array : [];
     }
@@ -73,7 +76,7 @@ public function getSignatureName()
         }
 
         foreach ($names as &$namePart) {
-            $namePart = ucfirst(strtolower($namePart));
+            $namePart = ucfirst(strtolower((string) $namePart));
         }
 
         return implode(' ', $names);
diff --git a/module/Api/src/Entity/Fee/Fee.php b/module/Api/src/Entity/Fee/Fee.php
index cdd0646188..85306e8e43 100644
--- a/module/Api/src/Entity/Fee/Fee.php
+++ b/module/Api/src/Entity/Fee/Fee.php
@@ -707,7 +707,11 @@ public function setVatAndGrossAmountsFromNetAmountUsingRate($rate)
      */
     public static function amountToPence($amount)
     {
-        return (int) number_format($amount, 2, '', '');
+        if ($amount === null) {
+            return 0;
+        }
+
+        return (int) number_format((float) $amount, 2, '', '');
     }
 
     /**
diff --git a/module/Api/src/Entity/Licence/Licence.php b/module/Api/src/Entity/Licence/Licence.php
index 66726b46d6..b640d7e696 100644
--- a/module/Api/src/Entity/Licence/Licence.php
+++ b/module/Api/src/Entity/Licence/Licence.php
@@ -762,9 +762,9 @@ function ($a, $b) {
                     // in Business Details causing trading names to have the
                     // same createdOn date. Sort alphabetically to avoid
                     // 'random' behaviour.
-                    return strcasecmp($a->getName(), $b->getName());
+                    return strcasecmp((string) $a->getName(), (string) $b->getName());
                 }
-                return strtotime($a->getCreatedOn()) < strtotime($b->getCreatedOn()) ? -1 : 1;
+                return strtotime((string) $a->getCreatedOn()) < strtotime((string) $b->getCreatedOn()) ? -1 : 1;
             }
         );
 
@@ -785,9 +785,9 @@ public function getAllTradingNames()
             $iterator,
             function ($a, $b) {
                 if ($a->getCreatedOn() == $b->getCreatedOn()) {
-                    return strcasecmp($a->getName(), $b->getName());
+                    return strcasecmp((string) $a->getName(), (string) $b->getName());
                 }
-                return strtotime($a->getCreatedOn()) < strtotime($b->getCreatedOn()) ? -1 : 1;
+                return strtotime((string) $a->getCreatedOn()) < strtotime((string) $b->getCreatedOn()) ? -1 : 1;
             }
         );
 
@@ -1165,8 +1165,8 @@ public function getLatestPublicationByType($type)
             fn($a, $b) =>
                 /** @var PublicationLinkEntity $a */
                 /** @var PublicationLinkEntity $b */
-                strtotime($b->getPublication()->getPubDate()) -
-                strtotime($a->getPublication()->getPubDate())
+                strtotime((string) $b->getPublication()->getPubDate()) -
+                strtotime((string) $a->getPublication()->getPubDate())
         );
         $publicationLinks = new ArrayCollection(iterator_to_array($iterator));
 
@@ -1605,7 +1605,7 @@ public function hasStatusRequiredForPostScoringEmail()
      */
     public function isExempt()
     {
-        return (substr($this->licNo, 0, 1) === self::LICENCE_EXEMPT_PREFIX);
+        return $this->licNo !== null && substr($this->licNo, 0, 1) === self::LICENCE_EXEMPT_PREFIX;
     }
 
     /**
diff --git a/module/Api/src/Entity/Organisation/Organisation.php b/module/Api/src/Entity/Organisation/Organisation.php
index 2e6e691565..2acb27269d 100644
--- a/module/Api/src/Entity/Organisation/Organisation.php
+++ b/module/Api/src/Entity/Organisation/Organisation.php
@@ -10,7 +10,6 @@
 use Dvsa\Olcs\Api\Entity\Organisation\OrganisationUser as OrganisationUserEntity;
 use Dvsa\Olcs\Api\Entity\OrganisationProviderInterface;
 use Dvsa\Olcs\Api\Entity\Permits\IrhpPermitStock;
-use Dvsa\Olcs\Api\Entity\System\RefData;
 use Dvsa\Olcs\Api\Entity\TrafficArea\TrafficArea as TrafficAreaEntity;
 use Dvsa\Olcs\Api\Entity\User\User as UserEntity;
 use Dvsa\Olcs\Api\Service\Document\ContextProviderInterface;
@@ -592,10 +591,15 @@ public function getAllowedOperatorLocation()
      */
     public function hasUnlicencedLicences()
     {
+        $licences = $this->getLicences();
+        if ($licences->isEmpty()) {
+            return false;
+        }
+
         $criteria = Criteria::create();
         $criteria->where($criteria->expr()->contains('licNo', 'U'));
 
-        return !empty($this->getLicences()->matching($criteria)->toArray());
+        return !empty($licences->matching($criteria)->toArray());
     }
 
     /**
@@ -626,10 +630,6 @@ public function getEligibleIrhpLicences()
 
     /**
      * Get licences eligible to apply for the specified irhp permit type/stock indexed by licence id
-     *
-     * @param IrhpPermitStock $stock permit stock
-     *
-     * @return array
      */
     public function getEligibleIrhpLicencesForStock(IrhpPermitStock $stock): array
     {
diff --git a/module/Api/src/Entity/OtherLicence/OtherLicence.php b/module/Api/src/Entity/OtherLicence/OtherLicence.php
index d656fc00c6..aeea99d248 100644
--- a/module/Api/src/Entity/OtherLicence/OtherLicence.php
+++ b/module/Api/src/Entity/OtherLicence/OtherLicence.php
@@ -87,7 +87,7 @@ public function updateOtherLicence(
                 'disqualificationDate' => $this->setDisqualificationDate(new \DateTime($disqualificationDate)),
                 'disqualificationLength' => $this->setDisqualificationLength($disqualificationLength),
                 'purchaseDate' => $this->setPurchaseDate(new \DateTime($purchaseDate)),
-                default => throw new \RuntimeException("Unexpected field '${field}'"),
+                default => throw new \RuntimeException("Unexpected field '{$field}'"),
             };
         }
         return true;
diff --git a/module/Api/src/Entity/Permits/IrhpApplication.php b/module/Api/src/Entity/Permits/IrhpApplication.php
index 75d5ee8d51..52a9cfc6ee 100644
--- a/module/Api/src/Entity/Permits/IrhpApplication.php
+++ b/module/Api/src/Entity/Permits/IrhpApplication.php
@@ -2420,7 +2420,7 @@ protected function getBilateralCountriesAndStatuses()
             $countryStatuses[$countryId][self::COUNTRY_PROPERTY_IPA_ID] = $irhpPermitApplication->getId();
         }
 
-        usort($countryStatuses, [$this, 'usortByCountryName']);
+        usort($countryStatuses, $this->usortByCountryName(...));
 
         $result = [];
         foreach ($countryStatuses as $properties) {
diff --git a/module/Api/src/Entity/Publication/Publication.php b/module/Api/src/Entity/Publication/Publication.php
index 4b003b0997..f436f8d8b5 100644
--- a/module/Api/src/Entity/Publication/Publication.php
+++ b/module/Api/src/Entity/Publication/Publication.php
@@ -138,6 +138,10 @@ public function generate(DocumentEntity $document, RefData $newPubStatus)
      */
     public function getNextPublicationDate()
     {
+        if ($this->pubDate === null) {
+            throw new RuntimeException('Current publication date is not set.');
+        }
+
         $newPubDate = \DateTime::createFromFormat('Y-m-d', $this->pubDate);
 
         if (!$newPubDate instanceof \DateTime) {
diff --git a/module/Api/src/Entity/System/DiscSequence.php b/module/Api/src/Entity/System/DiscSequence.php
index 9620265a63..49e845768d 100644
--- a/module/Api/src/Entity/System/DiscSequence.php
+++ b/module/Api/src/Entity/System/DiscSequence.php
@@ -46,7 +46,7 @@ class DiscSequence extends AbstractDiscSequence
 
     public function getDiscPrefix($licenceType)
     {
-        $method = 'get' . ucfirst($this->prefixes[$licenceType]);
+        $method = 'get' . ucfirst((string) $this->prefixes[$licenceType]);
         return $this->$method();
     }
 
@@ -57,13 +57,13 @@ public function getDiscPrefix($licenceType)
      */
     public function setDiscStartNumber($licenceType, $startNumber)
     {
-        $method = 'set' . ucfirst($this->numbers[$licenceType]);
+        $method = 'set' . ucfirst((string) $this->numbers[$licenceType]);
         return $this->$method($startNumber);
     }
 
     public function getDiscNumber($licenceType)
     {
-        $method = 'get' . ucfirst($this->numbers[$licenceType]);
+        $method = 'get' . ucfirst((string) $this->numbers[$licenceType]);
         return $this->$method();
     }
 }
diff --git a/module/Api/src/Entity/Traits/BundleSerializableTrait.php b/module/Api/src/Entity/Traits/BundleSerializableTrait.php
index d51232ab50..375d2945c2 100644
--- a/module/Api/src/Entity/Traits/BundleSerializableTrait.php
+++ b/module/Api/src/Entity/Traits/BundleSerializableTrait.php
@@ -18,10 +18,10 @@ trait BundleSerializableTrait
     /**
      * JSON serialize
      *
-     * @return array
+     * @return mixed
      * @deprecated
      */
-    public function jsonSerialize()
+    public function jsonSerialize(): mixed
     {
         $output = [];
 
diff --git a/module/Api/src/Entity/Traits/ProcessDateTrait.php b/module/Api/src/Entity/Traits/ProcessDateTrait.php
index fcfba8c471..4123a10d68 100644
--- a/module/Api/src/Entity/Traits/ProcessDateTrait.php
+++ b/module/Api/src/Entity/Traits/ProcessDateTrait.php
@@ -18,6 +18,10 @@ trait ProcessDateTrait
      */
     public static function processDate($date, $format = 'Y-m-d', $zeroTime = true)
     {
+        if (empty($date)) {
+            return null;
+        }
+
         $dateTime = \DateTime::createFromFormat($format, $date);
 
         if (!$dateTime instanceof \DateTime) {
diff --git a/module/Api/src/Module.php b/module/Api/src/Module.php
index 00eb2e8027..bde715bb5a 100644
--- a/module/Api/src/Module.php
+++ b/module/Api/src/Module.php
@@ -79,8 +79,8 @@ private function setLoggerUser(\Laminas\ServiceManager\ServiceManager $serviceMa
     protected function logResponse(\Laminas\Stdlib\ResponseInterface $response)
     {
         $content = $response->getContent();
-        if (strlen($content) > 1000) {
-            $content = substr($content, 0, 1000) . '...';
+        if (strlen((string) $content) > 1000) {
+            $content = substr((string) $content, 0, 1000) . '...';
         }
 
         Logger::logResponse(
diff --git a/module/Api/src/Mvc/PayloadValidationListener.php b/module/Api/src/Mvc/PayloadValidationListener.php
index 4b79f6a0b5..9dbe4cea8b 100644
--- a/module/Api/src/Mvc/PayloadValidationListener.php
+++ b/module/Api/src/Mvc/PayloadValidationListener.php
@@ -95,7 +95,7 @@ public function onRoute(MvcEvent $e)
             $isXml = in_array($mediaType, $this->xmlMediaTypes);
 
             if ($mediaType === self::JSON_MEDIA_TYPE) {
-                $data = json_decode($request->getContent(), true);
+                $data = json_decode((string) $request->getContent(), true);
             } elseif ($isXml) {
                 $data = ['xml' => $request->getContent()];
             } else {
diff --git a/module/Api/src/Rbac/Identity.php b/module/Api/src/Rbac/Identity.php
index 64aa573327..58086fde35 100644
--- a/module/Api/src/Rbac/Identity.php
+++ b/module/Api/src/Rbac/Identity.php
@@ -15,7 +15,7 @@ class Identity implements IdentityInterface
      */
     private $roles;
 
-    public function __construct(private User $user)
+    public function __construct(private readonly User $user)
     {
     }
 
diff --git a/module/Api/src/Service/AbstractServiceManagerFactory.php b/module/Api/src/Service/AbstractServiceManagerFactory.php
index ec2802c8b3..ddb09f1a5b 100644
--- a/module/Api/src/Service/AbstractServiceManagerFactory.php
+++ b/module/Api/src/Service/AbstractServiceManagerFactory.php
@@ -11,7 +11,7 @@ abstract class AbstractServiceManagerFactory extends AbstractPluginManagerFactor
 
     public function __invoke(ContainerInterface $container, $name, array $options = null)
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         $configArray = !empty($config[static::CONFIG_KEY]) ? $config[static::CONFIG_KEY] : [];
 
         return parent::__invoke($container, static::PLUGIN_MANAGER_CLASS, $configArray);
diff --git a/module/Api/src/Service/Cpms/ApiServiceFactory.php b/module/Api/src/Service/Cpms/ApiServiceFactory.php
index 4b423e3c8f..2eec197934 100644
--- a/module/Api/src/Service/Cpms/ApiServiceFactory.php
+++ b/module/Api/src/Service/Cpms/ApiServiceFactory.php
@@ -11,7 +11,7 @@ class ApiServiceFactory implements FactoryInterface
 {
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         $authService = $container->get(AuthorizationService::class);
         $userId = $authService->getIdentity()->getUser()->getId();
         $apiService = new CpmsApiService($config, $userId);
diff --git a/module/Api/src/Service/CpmsV2HelperService.php b/module/Api/src/Service/CpmsV2HelperService.php
index e6baefb5cb..a86de09067 100644
--- a/module/Api/src/Service/CpmsV2HelperService.php
+++ b/module/Api/src/Service/CpmsV2HelperService.php
@@ -1051,7 +1051,7 @@ protected function isOverpayment($fees)
      */
     protected function send($method, $endPoint, $scope, $params, $fee = null, $schemaId = null)
     {
-        $method = strtolower($method);
+        $method = strtolower((string) $method);
 
         $this->debug(
             "CPMS $scope request",
diff --git a/module/Api/src/Service/Document/Bookmark/AbstractDiscList.php b/module/Api/src/Service/Document/Bookmark/AbstractDiscList.php
index 16a91a2ef1..859f132c3e 100644
--- a/module/Api/src/Service/Document/Bookmark/AbstractDiscList.php
+++ b/module/Api/src/Service/Document/Bookmark/AbstractDiscList.php
@@ -66,7 +66,7 @@ public function getQuery(array $data)
      */
     protected function splitString($str)
     {
-        return str_split($str, static::MAX_LINE_LENGTH);
+        return str_split((string) $str, static::MAX_LINE_LENGTH);
     }
 
     /**
diff --git a/module/Api/src/Service/Document/Bookmark/BookmarkFactory.php b/module/Api/src/Service/Document/Bookmark/BookmarkFactory.php
index e70adc14ee..abebb2838b 100644
--- a/module/Api/src/Service/Document/Bookmark/BookmarkFactory.php
+++ b/module/Api/src/Service/Document/Bookmark/BookmarkFactory.php
@@ -20,7 +20,7 @@ public function getClassNameFromToken($token)
         // 1) SomethingLike_This -> Something_Like_This
         $className = $c2u->filter($token);
         // 2) SOMETHING__Like_This -> something__like_this
-        $className = strtolower($className);
+        $className = strtolower((string) $className);
         // 3) something__like_this -> Something_LikeThis
         $className = $u2c->filter($className);
         // 4) Something_LikeThis -> SomethingLikeThis
diff --git a/module/Api/src/Service/Document/Bookmark/DateFrom.php b/module/Api/src/Service/Document/Bookmark/DateFrom.php
index 860cd9fd26..2749b4fa94 100644
--- a/module/Api/src/Service/Document/Bookmark/DateFrom.php
+++ b/module/Api/src/Service/Document/Bookmark/DateFrom.php
@@ -34,7 +34,7 @@ public function render()
                 return $this->data[1]['interimStart']->format('d/m/Y');
             }
 
-            $timeStamp = strtotime($this->data[1]['interimStart']);
+            $timeStamp = strtotime((string) $this->data[1]['interimStart']);
             return \DateTime::createFromFormat('U', $timeStamp)->format('d/m/Y');
         }
 
@@ -42,7 +42,7 @@ public function render()
             return $this->data[0]['specifiedDate']->format('d/m/Y');
         }
 
-        $timeStamp = strtotime($this->data[0]['specifiedDate']);
+        $timeStamp = strtotime((string) $this->data[0]['specifiedDate']);
         return \DateTime::createFromFormat('U', $timeStamp)->format('d/m/Y');
     }
 }
diff --git a/module/Api/src/Service/Document/Bookmark/DateTo.php b/module/Api/src/Service/Document/Bookmark/DateTo.php
index cf9343d771..c7392a357d 100644
--- a/module/Api/src/Service/Document/Bookmark/DateTo.php
+++ b/module/Api/src/Service/Document/Bookmark/DateTo.php
@@ -33,7 +33,7 @@ public function render()
             if ($this->data[1]['interimEnd'] instanceof \DateTime) {
                 return $this->data[1]['interimEnd']->format('d/m/Y');
             }
-            $timeStamp = strtotime($this->data[1]['interimEnd']);
+            $timeStamp = strtotime((string) $this->data[1]['interimEnd']);
             return \DateTime::createFromFormat('U', $timeStamp)->format('d/m/Y');
         }
 
@@ -41,7 +41,7 @@ public function render()
             return $this->data[0]['licence']['expiryDate']->format('d/m/Y');
         }
 
-        $timeStamp = strtotime($this->data[0]['licence']['expiryDate']);
+        $timeStamp = strtotime((string) $this->data[0]['licence']['expiryDate']);
         return \DateTime::createFromFormat('U', $timeStamp)->format('d/m/Y');
     }
 }
diff --git a/module/Api/src/Service/Document/Bookmark/EuropeanLicenceNumber.php b/module/Api/src/Service/Document/Bookmark/EuropeanLicenceNumber.php
index fad228e0bc..24dae81257 100644
--- a/module/Api/src/Service/Document/Bookmark/EuropeanLicenceNumber.php
+++ b/module/Api/src/Service/Document/Bookmark/EuropeanLicenceNumber.php
@@ -21,7 +21,7 @@ public function getQuery(array $data)
 
     public function render()
     {
-        $issueNo = str_pad($this->data['issueNo'], self::ISSUE_NO_PAD_LENGTH, '0', STR_PAD_LEFT);
+        $issueNo = str_pad((string) $this->data['issueNo'], self::ISSUE_NO_PAD_LENGTH, '0', STR_PAD_LEFT);
 
         return $this->data['licence']['licNo'] . '/' . $issueNo;
     }
diff --git a/module/Api/src/Service/Document/Bookmark/Formatter/Date.php b/module/Api/src/Service/Document/Bookmark/Formatter/Date.php
index 195e0e7e36..459896d035 100644
--- a/module/Api/src/Service/Document/Bookmark/Formatter/Date.php
+++ b/module/Api/src/Service/Document/Bookmark/Formatter/Date.php
@@ -11,6 +11,6 @@ class Date implements FormatterInterface
 {
     public static function format(array $data)
     {
-        return date("d/m/Y", strtotime(reset($data)));
+        return date("d/m/Y", strtotime((string) reset($data)));
     }
 }
diff --git a/module/Api/src/Service/Document/Bookmark/Formatter/DateDayMonthYear.php b/module/Api/src/Service/Document/Bookmark/Formatter/DateDayMonthYear.php
index e5196cd405..dc42a87b31 100644
--- a/module/Api/src/Service/Document/Bookmark/Formatter/DateDayMonthYear.php
+++ b/module/Api/src/Service/Document/Bookmark/Formatter/DateDayMonthYear.php
@@ -11,6 +11,6 @@ class DateDayMonthYear implements FormatterInterface
 {
     public static function format(array $data)
     {
-        return date('d F Y', strtotime(reset($data)));
+        return date('d F Y', strtotime((string) reset($data)));
     }
 }
diff --git a/module/Api/src/Service/Document/Bookmark/Formatter/OrganisationName.php b/module/Api/src/Service/Document/Bookmark/Formatter/OrganisationName.php
index 2df302486a..d853ea834d 100644
--- a/module/Api/src/Service/Document/Bookmark/Formatter/OrganisationName.php
+++ b/module/Api/src/Service/Document/Bookmark/Formatter/OrganisationName.php
@@ -57,7 +57,7 @@ private static function getFirstTradingName($tradingNames)
         $first = null;
         $name = null;
         foreach ($tradingNames as $tradingName) {
-            $current = strtotime($tradingName['createdOn']);
+            $current = strtotime((string) $tradingName['createdOn']);
             if ($name === null || $current < $first) {
                 $first = $current;
                 $name = $tradingName['name'];
diff --git a/module/Api/src/Service/Document/Bookmark/IrhpStartDate.php b/module/Api/src/Service/Document/Bookmark/IrhpStartDate.php
index e6a2c7919e..19b46b30cb 100644
--- a/module/Api/src/Service/Document/Bookmark/IrhpStartDate.php
+++ b/module/Api/src/Service/Document/Bookmark/IrhpStartDate.php
@@ -23,7 +23,7 @@ public function render()
         $now = strtotime('today midnight');
 
         if (isset($this->data['validFrom'])) {
-            if ($now > strtotime($this->data['validFrom'])) {
+            if ($now > strtotime((string) $this->data['validFrom'])) {
                 $this->setData(['validFrom' => date("d F Y", $now)]);
             }
         }
diff --git a/module/Api/src/Service/Document/Bookmark/PermitApplicationReference.php b/module/Api/src/Service/Document/Bookmark/PermitApplicationReference.php
index 84e67d7987..4092b0b954 100644
--- a/module/Api/src/Service/Document/Bookmark/PermitApplicationReference.php
+++ b/module/Api/src/Service/Document/Bookmark/PermitApplicationReference.php
@@ -38,7 +38,7 @@ public function getQuery(array $data)
     public function render()
     {
         if (isset($this->data['irhpPermitApplication']['relatedApplication']['applicationRef'])) {
-            return trim($this->data['irhpPermitApplication']['relatedApplication']['applicationRef']);
+            return trim((string) $this->data['irhpPermitApplication']['relatedApplication']['applicationRef']);
         }
 
         return '';
diff --git a/module/Api/src/Service/Document/Bookmark/Stlstandardlicparagraph.php b/module/Api/src/Service/Document/Bookmark/Stlstandardlicparagraph.php
index a0e4d78fb3..d252d47585 100644
--- a/module/Api/src/Service/Document/Bookmark/Stlstandardlicparagraph.php
+++ b/module/Api/src/Service/Document/Bookmark/Stlstandardlicparagraph.php
@@ -68,10 +68,6 @@ public function render()
      */
     private function getLicenceType()
     {
-        if (isset($this->data['licenceType']['id'])) {
-            return $this->data['licenceType']['id'];
-        }
-
-        return $this->data['application']['licenceType']['id'] ?? $this->data['licence']['licenceType']['id'] ?? null;
+        return $this->data['licenceType']['id'] ?? $this->data['application']['licenceType']['id'] ?? $this->data['licence']['licenceType']['id'] ?? null;
     }
 }
diff --git a/module/Api/src/Service/Document/Bookmark/TextBlock.php b/module/Api/src/Service/Document/Bookmark/TextBlock.php
index 986b735742..f1d6f2eac2 100644
--- a/module/Api/src/Service/Document/Bookmark/TextBlock.php
+++ b/module/Api/src/Service/Document/Bookmark/TextBlock.php
@@ -61,7 +61,7 @@ public function render()
         $result = "";
         foreach ($this->data as $paragraph) {
             // Data from DB is unicode, but the templates arent
-            $result .= utf8_decode($paragraph['paraText']) . "\n";
+            $result .= mb_convert_encoding($paragraph['paraText'], 'ISO-8859-1') . "\n";
         }
         return substr($result, 0, -1);
     }
diff --git a/module/Api/src/Service/Document/Bookmark/VehicleRow.php b/module/Api/src/Service/Document/Bookmark/VehicleRow.php
index 1c3ae15cdb..4337c362c6 100644
--- a/module/Api/src/Service/Document/Bookmark/VehicleRow.php
+++ b/module/Api/src/Service/Document/Bookmark/VehicleRow.php
@@ -53,7 +53,7 @@ public function render()
             }
 
             $tokens = [
-                'SPEC_DATE'     => date('d-M-Y', strtotime($vehicle['specifiedDate'])),
+                'SPEC_DATE'     => date('d-M-Y', strtotime((string) $vehicle['specifiedDate'])),
                 'PLATED_WEIGHT' => $vehicle['vehicle']['platedWeight'],
                 'REG_MARK'      => $vehicle['vehicle']['vrm']
             ];
diff --git a/module/Api/src/Service/Document/Document.php b/module/Api/src/Service/Document/Document.php
index dd33b18075..914c9f55a3 100644
--- a/module/Api/src/Service/Document/Document.php
+++ b/module/Api/src/Service/Document/Document.php
@@ -25,7 +25,7 @@ class Document
      *
      * @return Document
      */
-    public function __construct(private DateService $dateSrvHlpr, private DocumentStoreInterface $documentStore, private TranslatorInterface $translator)
+    public function __construct(private readonly DateService $dateSrvHlpr, private readonly DocumentStoreInterface $documentStore, private readonly TranslatorInterface $translator)
     {
     }
 
diff --git a/module/Api/src/Service/Document/NamingModel.php b/module/Api/src/Service/Document/NamingModel.php
index edfa03ea2d..f0e527afb4 100644
--- a/module/Api/src/Service/Document/NamingModel.php
+++ b/module/Api/src/Service/Document/NamingModel.php
@@ -23,7 +23,7 @@ class NamingModel
      * @param string $description
      * @param string $extension
      */
-    public function __construct(private DateTime $date, private $description, private $extension, private ?\Dvsa\Olcs\Api\Entity\System\Category $category = null, private ?\Dvsa\Olcs\Api\Entity\System\SubCategory $subCategory = null, private ?\Dvsa\Olcs\Api\Service\Document\ContextProviderInterface $entity = null)
+    public function __construct(private readonly DateTime $date, private $description, private $extension, private readonly ?\Dvsa\Olcs\Api\Entity\System\Category $category = null, private readonly ?\Dvsa\Olcs\Api\Entity\System\SubCategory $subCategory = null, private readonly ?\Dvsa\Olcs\Api\Service\Document\ContextProviderInterface $entity = null)
     {
     }
 
@@ -36,7 +36,7 @@ public function getDate($flag)
         /*
          * DateTime return zeros as a microseconds so we need to do the trick
          */
-        if (!empty($flag) && str_contains($flag, 'u')) {
+        if (!empty($flag) && str_contains((string) $flag, 'u')) {
             [$usec, $sec] = explode(' ', microtime());
             $usec = substr($usec, 2, 6);
             $date = $this->date->format($flag);
diff --git a/module/Api/src/Service/Document/NamingService.php b/module/Api/src/Service/Document/NamingService.php
index 989277428f..09351c36d1 100644
--- a/module/Api/src/Service/Document/NamingService.php
+++ b/module/Api/src/Service/Document/NamingService.php
@@ -81,7 +81,7 @@ private function formatDescription($input)
     }
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (!isset($config['document_share']['path'])) {
             throw new \RuntimeException('document_share/path has not been defined in config');
         }
diff --git a/module/Api/src/Service/DvlaSearch/DvlaSearchService.php b/module/Api/src/Service/DvlaSearch/DvlaSearchService.php
index 2f88ddde3d..08f665d7e3 100644
--- a/module/Api/src/Service/DvlaSearch/DvlaSearchService.php
+++ b/module/Api/src/Service/DvlaSearch/DvlaSearchService.php
@@ -37,9 +37,8 @@ class DvlaSearchService
 
     /**
      * Client constructor.
-     * @param Logger|null $logger
      */
-    public function __construct(HttpClient $httpClient, private ?Logger $logger = null)
+    public function __construct(HttpClient $httpClient, private readonly ?Logger $logger = null)
     {
         $this->httpClient = $httpClient;
     }
diff --git a/module/Api/src/Service/DvlaSearch/DvlaSearchServiceFactory.php b/module/Api/src/Service/DvlaSearch/DvlaSearchServiceFactory.php
index f1026f7001..ff9fe34ff8 100644
--- a/module/Api/src/Service/DvlaSearch/DvlaSearchServiceFactory.php
+++ b/module/Api/src/Service/DvlaSearch/DvlaSearchServiceFactory.php
@@ -21,7 +21,7 @@ class DvlaSearchServiceFactory implements FactoryInterface
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): DvlaSearchService
     {
         $logger = new LaminasLogPsr3Adapter($container->get('Logger'));
-        $config = $container->get('Config');
+        $config = $container->get('config');
         $this->options = $config['dvla_search'];
         $stack = HandlerStack::create();
         $stack->push(GuzzleRetryMiddleware::factory());
diff --git a/module/Api/src/Service/DvlaSearch/Model/DvlaVehicle.php b/module/Api/src/Service/DvlaSearch/Model/DvlaVehicle.php
index 70dbc4a783..cda9223b8e 100644
--- a/module/Api/src/Service/DvlaSearch/Model/DvlaVehicle.php
+++ b/module/Api/src/Service/DvlaSearch/Model/DvlaVehicle.php
@@ -15,7 +15,7 @@ public function __construct(
         /**
          * Registration number of the vehicle
          */
-        private string $registrationNumber,
+        private readonly string $registrationNumber,
         /**
          * Tax status of the vehicle
          * Enum:
@@ -24,15 +24,15 @@ public function __construct(
          *      Taxed
          *      Untaxed
          */
-        private ?string $taxStatus,
+        private readonly ?string $taxStatus,
         /**
          * Date of tax liability, used in calculating licence information presented to user
          */
-        private ?\DateTime $taxDueDate,
+        private readonly ?\DateTime $taxDueDate,
         /**
          * Additional Rate of Tax End Date
          */
-        private ?\DateTime $artEndDate,
+        private readonly ?\DateTime $artEndDate,
         /**
          * MOT Status of the vehicle
          * Enum:
@@ -41,71 +41,71 @@ public function __construct(
          *      Not valid
          *      Valid
          */
-        private ?string $motStatus,
+        private readonly ?string $motStatus,
         /**
          * Mot Expiry Date
          */
-        private ?\DateTime $motExpiryDate,
+        private readonly ?\DateTime $motExpiryDate,
         /**
          * Vehicle make
          */
-        private ?string $make,
+        private readonly ?string $make,
         /**
          * Month of First DVLA Registration
          */
-        private ?\DateTime $monthOfFirstDvlaRegistration,
+        private readonly ?\DateTime $monthOfFirstDvlaRegistration,
         /**
          * Month of First Registration
          */
-        private ?\DateTime $monthOfFirstRegistration,
+        private readonly ?\DateTime $monthOfFirstRegistration,
         /**
          * Year of Manufacture
          */
-        private ?int $yearOfManufacture,
+        private readonly ?int $yearOfManufacture,
         /**
          * Engine capacity in cubic centimetres
          */
-        private ?int $engineCapacity,
+        private readonly ?int $engineCapacity,
         /**
          * Carbon Dioxide emissions in grams per kilometre
          */
-        private ?int $co2Emissions,
+        private readonly ?int $co2Emissions,
         /**
          * Fuel type (Method of Propulsion)
          */
-        private ?string $fuelType,
+        private readonly ?string $fuelType,
         /**
          * True only if vehicle has been export marked
          */
-        private ?bool $markedForExport,
+        private readonly ?bool $markedForExport,
         /**
          * Vehicle colour
          */
-        private ?string $colour,
+        private readonly ?string $colour,
         /**
          * Vehicle Type Approval Category
          */
-        private ?string $typeApproval,
+        private readonly ?string $typeApproval,
         /**
          * Vehicle wheel plan
          */
-        private ?string $wheelplan,
+        private readonly ?string $wheelplan,
         /**
          * Revenue weight in kilograms
          */
-        private ?int $revenueWeight,
+        private readonly ?int $revenueWeight,
         /**
          * Real Driving Emissions value
          */
-        private ?string $realDrivingEmissions,
+        private readonly ?string $realDrivingEmissions,
         /**
          * Date of last V5C issued
          */
-        private ?\DateTime $dateOfLastV5CIssued,
+        private readonly ?\DateTime $dateOfLastV5CIssued,
         /**
          * Euro Status (Dealer / Customer Provided (new vehicles))
          */
-        private ?string $euroStatus
+        private readonly ?string $euroStatus
     ) {
     }
 
diff --git a/module/Api/src/Service/Ebsr/FileProcessor.php b/module/Api/src/Service/Ebsr/FileProcessor.php
index e246ed14d8..eef8deeba2 100644
--- a/module/Api/src/Service/Ebsr/FileProcessor.php
+++ b/module/Api/src/Service/Ebsr/FileProcessor.php
@@ -29,7 +29,7 @@ class FileProcessor implements FileProcessorInterface
      * @param Decompress            $decompressFilter decompression filter
      * @param string                $tmpDir           the temporary directory
      */
-    public function __construct(private FileUploaderInterface $fileUploader, private Filesystem $fileSystem, private Decompress $decompressFilter, private $tmpDir)
+    public function __construct(private readonly FileUploaderInterface $fileUploader, private readonly Filesystem $fileSystem, private readonly Decompress $decompressFilter, private $tmpDir)
     {
     }
 
diff --git a/module/Api/src/Service/Ebsr/FileProcessorFactory.php b/module/Api/src/Service/Ebsr/FileProcessorFactory.php
index 8085db9f30..5150332e89 100644
--- a/module/Api/src/Service/Ebsr/FileProcessorFactory.php
+++ b/module/Api/src/Service/Ebsr/FileProcessorFactory.php
@@ -24,7 +24,7 @@ class FileProcessorFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): FileProcessor
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         $tmpDir = ($config['tmpDirectory'] ?? sys_get_temp_dir());
         $decompressFilter = $container->get('FilterManager')->get('Decompress');
         $decompressFilter->setAdapter('zip');
diff --git a/module/Api/src/Service/Ebsr/Filter/InjectNaptanCodes.php b/module/Api/src/Service/Ebsr/Filter/InjectNaptanCodes.php
index 782f36b523..2613f94b41 100644
--- a/module/Api/src/Service/Ebsr/Filter/InjectNaptanCodes.php
+++ b/module/Api/src/Service/Ebsr/Filter/InjectNaptanCodes.php
@@ -24,7 +24,7 @@ public function filter($value)
         $naptan = [];
 
         foreach ($value['stops'] as $stop) {
-            $extractedCode = substr($stop, 0, 3);
+            $extractedCode = substr((string) $stop, 0, 3);
             $naptan[$extractedCode] = $extractedCode;
         }
 
diff --git a/module/Api/src/Service/Ebsr/InputFilter/BusRegistrationInputFactory.php b/module/Api/src/Service/Ebsr/InputFilter/BusRegistrationInputFactory.php
index 7c71b01d8f..cc6f91767e 100644
--- a/module/Api/src/Service/Ebsr/InputFilter/BusRegistrationInputFactory.php
+++ b/module/Api/src/Service/Ebsr/InputFilter/BusRegistrationInputFactory.php
@@ -40,7 +40,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
     {
         $inputName = 'bus_registration';
         $service = new Input($inputName);
-        $config = $container->get('Config');
+        $config = $container->get('config');
         /** @var ContainerInterface $filterManager */
         $filterManager = $container->get('FilterManager');
         /** @var MapXmlFile $mapXmlFile */
diff --git a/module/Api/src/Service/Ebsr/InputFilter/ProcessedDataInputFactory.php b/module/Api/src/Service/Ebsr/InputFilter/ProcessedDataInputFactory.php
index 49277afb74..83e0430707 100644
--- a/module/Api/src/Service/Ebsr/InputFilter/ProcessedDataInputFactory.php
+++ b/module/Api/src/Service/Ebsr/InputFilter/ProcessedDataInputFactory.php
@@ -32,7 +32,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
     {
         $inputName = 'processed_data';
         $service = new Input($inputName);
-        $config = $container->get('Config');
+        $config = $container->get('config');
         $validatorChain = $service->getValidatorChain();
         //allows validators to be switched off (debug only, not to be used for production)
         if (!isset($config['ebsr']['validate'][$inputName]) || $config['ebsr']['validate'][$inputName] === true) {
diff --git a/module/Api/src/Service/Ebsr/InputFilter/ShortNoticeInputFactory.php b/module/Api/src/Service/Ebsr/InputFilter/ShortNoticeInputFactory.php
index 312d54a0e4..503bce0944 100644
--- a/module/Api/src/Service/Ebsr/InputFilter/ShortNoticeInputFactory.php
+++ b/module/Api/src/Service/Ebsr/InputFilter/ShortNoticeInputFactory.php
@@ -31,7 +31,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
     {
         $inputName = 'short_notice';
         $service = new Input($inputName);
-        $config = $container->get('Config');
+        $config = $container->get('config');
         $validatorChain = $service->getValidatorChain();
         //allows validators to be switched off (debug only, not to be used for production)
         if (!isset($config['ebsr']['validate'][$inputName]) || $config['ebsr']['validate'][$inputName] === true) {
diff --git a/module/Api/src/Service/Ebsr/InputFilter/XmlStructureInputFactory.php b/module/Api/src/Service/Ebsr/InputFilter/XmlStructureInputFactory.php
index 386e5b14e0..dc3dc84bb0 100644
--- a/module/Api/src/Service/Ebsr/InputFilter/XmlStructureInputFactory.php
+++ b/module/Api/src/Service/Ebsr/InputFilter/XmlStructureInputFactory.php
@@ -37,7 +37,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
     {
         $inputName = 'xml_structure';
         $service = new Input($inputName);
-        $config = $container->get('Config');
+        $config = $container->get('config');
         $filterChain = $service->getFilterChain();
         $filterChain->attach($container->get('FilterManager')->get(ParseXml::class));
         $validatorchain = $service->getValidatorChain();
diff --git a/module/Api/src/Service/Ebsr/RulesValidator/EffectiveDate.php b/module/Api/src/Service/Ebsr/RulesValidator/EffectiveDate.php
index 41fb2824b4..a173f7fc9a 100644
--- a/module/Api/src/Service/Ebsr/RulesValidator/EffectiveDate.php
+++ b/module/Api/src/Service/Ebsr/RulesValidator/EffectiveDate.php
@@ -36,7 +36,7 @@ class EffectiveDate extends AbstractValidator
     public function isValid($value)
     {
         if ($value['txcAppType'] === BusRegEntity::TXC_APP_NEW) {
-            $date = strtotime($value['effectiveDate']);
+            $date = strtotime((string) $value['effectiveDate']);
             $today = strtotime(date('Y-m-d'));
 
             if ($date < $today) {
diff --git a/module/Api/src/Service/Ebsr/TransExchangeClient.php b/module/Api/src/Service/Ebsr/TransExchangeClient.php
index a0759fdd2b..6183243f5d 100644
--- a/module/Api/src/Service/Ebsr/TransExchangeClient.php
+++ b/module/Api/src/Service/Ebsr/TransExchangeClient.php
@@ -28,7 +28,7 @@ class TransExchangeClient implements TransExchangeClientInterface
      * @param ParseXmlString $xmlParser    olcs-xmltools xml parser
      * @param Xsd            $xsdValidator olcs-xmltools xml validator
      */
-    public function __construct(private RestClient $restClient, private MapXmlFile $xmlFilter, private ParseXmlString $xmlParser, private Xsd $xsdValidator)
+    public function __construct(private readonly RestClient $restClient, private readonly MapXmlFile $xmlFilter, private readonly ParseXmlString $xmlParser, private readonly Xsd $xsdValidator)
     {
     }
 
diff --git a/module/Api/src/Service/Ebsr/TransExchangeClientFactory.php b/module/Api/src/Service/Ebsr/TransExchangeClientFactory.php
index eafe68a891..c74bce787b 100644
--- a/module/Api/src/Service/Ebsr/TransExchangeClientFactory.php
+++ b/module/Api/src/Service/Ebsr/TransExchangeClientFactory.php
@@ -31,7 +31,7 @@ class TransExchangeClientFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): TransExchangeClient
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (!isset($config['ebsr']['transexchange_publisher'])) {
             throw new \RuntimeException('Missing transexchange_publisher config');
         }
diff --git a/module/Api/src/Service/Ebsr/XmlValidator/SupportingDocuments.php b/module/Api/src/Service/Ebsr/XmlValidator/SupportingDocuments.php
index 81e452dbe9..10b999cce7 100644
--- a/module/Api/src/Service/Ebsr/XmlValidator/SupportingDocuments.php
+++ b/module/Api/src/Service/Ebsr/XmlValidator/SupportingDocuments.php
@@ -40,7 +40,7 @@ class SupportingDocuments extends AbstractValidator
     public function isValid($value, $context = [])
     {
         $this->abstractOptions['messages'] = [];
-        $dir = dirname($context['xml_filename']) . DIRECTORY_SEPARATOR;
+        $dir = dirname((string) $context['xml_filename']) . DIRECTORY_SEPARATOR;
 
         $this->checkFileExistsByTag($dir, $value, 'DocumentUri');
         $this->checkFileExistsByTag($dir, $value, 'SchematicMap');
diff --git a/module/Api/src/Service/GovUkAccount/GovUkAccountService.php b/module/Api/src/Service/GovUkAccount/GovUkAccountService.php
index 62f5a14d7c..e81c7feb15 100644
--- a/module/Api/src/Service/GovUkAccount/GovUkAccountService.php
+++ b/module/Api/src/Service/GovUkAccount/GovUkAccountService.php
@@ -80,7 +80,7 @@ public function createStateToken(array $data, int $expireSeconds = 2419200): str
             'exp' => $currentTimestamp + $expireSeconds,
         ]);
 
-        return JWT::encode($data, base64_decode($this->config['keys']['private_key']), $this->config['keys']['algorithm']);
+        return JWT::encode($data, base64_decode((string) $this->config['keys']['private_key']), $this->config['keys']['algorithm']);
     }
 
     /**
@@ -90,7 +90,7 @@ public function createStateToken(array $data, int $expireSeconds = 2419200): str
      */
     public function getStateClaimsFromToken(string $token): array
     {
-        return (array) JWT::decode($token, new Key(base64_decode($this->config['keys']['public_key']), $this->config['keys']['algorithm']));
+        return (array) JWT::decode($token, new Key(base64_decode((string) $this->config['keys']['public_key']), $this->config['keys']['algorithm']));
     }
 
     /**
diff --git a/module/Api/src/Service/GovUkAccount/GovUkAccountServiceFactory.php b/module/Api/src/Service/GovUkAccount/GovUkAccountServiceFactory.php
index cfa15257f3..cf9e511a0e 100644
--- a/module/Api/src/Service/GovUkAccount/GovUkAccountServiceFactory.php
+++ b/module/Api/src/Service/GovUkAccount/GovUkAccountServiceFactory.php
@@ -22,7 +22,7 @@ class GovUkAccountServiceFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): GovUkAccountService
     {
-        $config = $container->get('Config')['govuk_account'];
+        $config = $container->get('config')['govuk_account'];
 
         return new GovUkAccountService($config, new GovUkAccount($config));
     }
diff --git a/module/Api/src/Service/GovUkAccount/Response/GetAuthorisationUrlResponse.php b/module/Api/src/Service/GovUkAccount/Response/GetAuthorisationUrlResponse.php
index 09ac0cc3e0..130e7fc27a 100644
--- a/module/Api/src/Service/GovUkAccount/Response/GetAuthorisationUrlResponse.php
+++ b/module/Api/src/Service/GovUkAccount/Response/GetAuthorisationUrlResponse.php
@@ -4,7 +4,7 @@
 
 class GetAuthorisationUrlResponse
 {
-    public function __construct(private string $url, private string $state, private string $nonce)
+    public function __construct(private readonly string $url, private readonly string $state, private readonly string $nonce)
     {
     }
 
diff --git a/module/Api/src/Service/Helper/FormatAddress.php b/module/Api/src/Service/Helper/FormatAddress.php
index b9c45e0ce4..df9e189a06 100644
--- a/module/Api/src/Service/Helper/FormatAddress.php
+++ b/module/Api/src/Service/Helper/FormatAddress.php
@@ -20,12 +20,12 @@ class FormatAddress
     public function format(AddressEntity $address, $separator = ', ')
     {
         $addressFields = [
-            'AddressLine1' => trim($address->getAddressLine1()),
-            'AddressLine2' => trim($address->getAddressLine2()),
-            'AddressLine3' => trim($address->getAddressLine3()),
-            'AddressLine4' => trim($address->getAddressLine4()),
-            'Town' => trim($address->getTown()),
-            'Postcode' => trim($address->getPostcode())
+            'AddressLine1' => trim($address->getAddressLine1() ?? ''),
+            'AddressLine2' => trim($address->getAddressLine2() ?? ''),
+            'AddressLine3' => trim($address->getAddressLine3() ?? ''),
+            'AddressLine4' => trim($address->getAddressLine4() ?? ''),
+            'Town' => trim($address->getTown() ?? ''),
+            'Postcode' => trim($address->getPostcode() ?? '')
         ];
 
         foreach ($addressFields as $field => $value) {
diff --git a/module/Api/src/Service/Lva/SectionConfig.php b/module/Api/src/Service/Lva/SectionConfig.php
index 4dc732653f..5b51a31933 100644
--- a/module/Api/src/Service/Lva/SectionConfig.php
+++ b/module/Api/src/Service/Lva/SectionConfig.php
@@ -304,27 +304,27 @@ protected function initSections()
         if ($this->init === false) {
             $this->sections['financial_history']['restricted'][] = [
                 'variation',
-                [$this, 'isNotUnchanged']
+                $this->isNotUnchanged(...)
             ];
 
             $this->sections['licence_history']['restricted'][] = [
                 'variation',
-                [$this, 'isNotUnchanged']
+                $this->isNotUnchanged(...)
             ];
 
             $this->sections['convictions_penalties']['restricted'][] = [
                 'variation',
-                [$this, 'isNotUnchanged']
+                $this->isNotUnchanged(...)
             ];
 
             $this->sections['financial_evidence']['restricted'][] = [
                 'variation',
-                [$this, 'isNotUnchanged']
+                $this->isNotUnchanged(...)
             ];
 
             $this->sections['vehicles_declarations']['restricted'][] = [
                 'variation',
-                [$this, 'isNotUnchanged']
+                $this->isNotUnchanged(...)
             ];
 
             // undertakings requires all sections (except itself)
@@ -339,7 +339,7 @@ public function isNotUnchanged($section)
     {
         $filter = new UnderscoreToCamelCase();
 
-        $getter = 'get' . ucfirst($filter->filter($section)) . 'Status';
+        $getter = 'get' . ucfirst((string) $filter->filter($section)) . 'Status';
 
         $status = $this->completion->$getter();
 
diff --git a/module/Api/src/Service/Nr/Filter/Format/IsExecuted.php b/module/Api/src/Service/Nr/Filter/Format/IsExecuted.php
index 9cd29f7ea5..6da378b9f8 100644
--- a/module/Api/src/Service/Nr/Filter/Format/IsExecuted.php
+++ b/module/Api/src/Service/Nr/Filter/Format/IsExecuted.php
@@ -29,7 +29,7 @@ public function filter($value)
 
         foreach ($value['imposedErrus'] as $key => $erru) {
             //lowercase the value to make sure we always get a match
-            $executed = strtolower($erru['executed']);
+            $executed = strtolower((string) $erru['executed']);
 
             $newValue = match ($executed) {
                 'yes' => self::YES_EXECUTED_KEY,
diff --git a/module/Api/src/Service/Nr/Filter/Format/MemberStateCode.php b/module/Api/src/Service/Nr/Filter/Format/MemberStateCode.php
index 57e0c3d0b8..100c17c165 100644
--- a/module/Api/src/Service/Nr/Filter/Format/MemberStateCode.php
+++ b/module/Api/src/Service/Nr/Filter/Format/MemberStateCode.php
@@ -19,7 +19,7 @@ class MemberStateCode extends AbstractFilter
      */
     public function filter($value)
     {
-        if (strtoupper($value['memberStateCode']) === 'UK') {
+        if (strtoupper((string) $value['memberStateCode']) === 'UK') {
             $value['memberStateCode'] = 'GB';
         }
 
diff --git a/module/Api/src/Service/Nr/Filter/LicenceNumber.php b/module/Api/src/Service/Nr/Filter/LicenceNumber.php
index 3cd940992a..5124a6c33d 100644
--- a/module/Api/src/Service/Nr/Filter/LicenceNumber.php
+++ b/module/Api/src/Service/Nr/Filter/LicenceNumber.php
@@ -26,7 +26,7 @@ public function filter($value)
         $value['licenceNumber'] = $value['communityLicenceNumber'];
 
         //see if we can split into three parts, as per a community licence number
-        $explodedCommunityLicence = explode('/', $value['communityLicenceNumber']);
+        $explodedCommunityLicence = explode('/', (string) $value['communityLicenceNumber']);
 
         //if we have three parts, assume a community licence and extract the middle part
         if (count($explodedCommunityLicence) === 3) {
diff --git a/module/Api/src/Service/Nr/InputFilter/XmlStructureInputFactory.php b/module/Api/src/Service/Nr/InputFilter/XmlStructureInputFactory.php
index 870b8763fb..0ea4cac1f0 100644
--- a/module/Api/src/Service/Nr/InputFilter/XmlStructureInputFactory.php
+++ b/module/Api/src/Service/Nr/InputFilter/XmlStructureInputFactory.php
@@ -30,7 +30,7 @@ class XmlStructureInputFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): Input
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (!isset($config['nr']['compliance_episode']['xmlNs'])) {
             throw new \RuntimeException(self::XML_NS_MSG);
         }
diff --git a/module/Api/src/Service/Nr/InrClientFactory.php b/module/Api/src/Service/Nr/InrClientFactory.php
index 15738da934..19e327222d 100644
--- a/module/Api/src/Service/Nr/InrClientFactory.php
+++ b/module/Api/src/Service/Nr/InrClientFactory.php
@@ -25,7 +25,7 @@ class InrClientFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): InrClient
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (!isset($config['nr']['inr_service'])) {
             throw new \RuntimeException('Missing INR service config');
         }
diff --git a/module/Api/src/Service/Nr/Mapping/ComplianceEpisodeXmlFactory.php b/module/Api/src/Service/Nr/Mapping/ComplianceEpisodeXmlFactory.php
index 287f991e3e..23a76688e4 100644
--- a/module/Api/src/Service/Nr/Mapping/ComplianceEpisodeXmlFactory.php
+++ b/module/Api/src/Service/Nr/Mapping/ComplianceEpisodeXmlFactory.php
@@ -25,7 +25,7 @@ class ComplianceEpisodeXmlFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): ComplianceEpisodeXml
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (!isset($config['nr']['compliance_episode']['xmlNs'])) {
             throw new \RuntimeException('Missing INR service config');
         }
diff --git a/module/Api/src/Service/Nr/MsiResponse.php b/module/Api/src/Service/Nr/MsiResponse.php
index 6a3869e162..3987058b65 100644
--- a/module/Api/src/Service/Nr/MsiResponse.php
+++ b/module/Api/src/Service/Nr/MsiResponse.php
@@ -43,7 +43,7 @@ class MsiResponse
      *
      * @return MsiResponse
      */
-    public function __construct(private XmlNodeBuilder $xmlBuilder)
+    public function __construct(private readonly XmlNodeBuilder $xmlBuilder)
     {
     }
 
diff --git a/module/Api/src/Service/Nr/MsiResponseFactory.php b/module/Api/src/Service/Nr/MsiResponseFactory.php
index 7a960b1622..1d71f2f421 100644
--- a/module/Api/src/Service/Nr/MsiResponseFactory.php
+++ b/module/Api/src/Service/Nr/MsiResponseFactory.php
@@ -26,7 +26,7 @@ class MsiResponseFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): MsiResponse
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (!isset($config['nr']['compliance_episode']['xmlNs'])) {
             throw new \RuntimeException(self::XML_NS_MSG);
         }
diff --git a/module/Api/src/Service/Nysiis/NysiisRestClient.php b/module/Api/src/Service/Nysiis/NysiisRestClient.php
index ccde6b8057..be767b32a0 100644
--- a/module/Api/src/Service/Nysiis/NysiisRestClient.php
+++ b/module/Api/src/Service/Nysiis/NysiisRestClient.php
@@ -24,7 +24,7 @@ class NysiisRestClient
      *
      * @return void
      */
-    public function __construct(private RestClient $restClient)
+    public function __construct(private readonly RestClient $restClient)
     {
     }
 
diff --git a/module/Api/src/Service/Nysiis/NysiisRestClientFactory.php b/module/Api/src/Service/Nysiis/NysiisRestClientFactory.php
index 24ba7e7947..b249b0e793 100644
--- a/module/Api/src/Service/Nysiis/NysiisRestClientFactory.php
+++ b/module/Api/src/Service/Nysiis/NysiisRestClientFactory.php
@@ -25,7 +25,7 @@ class NysiisRestClientFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): NysiisRestClient
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (!isset($config['nysiis']['rest']['uri'])) {
             throw new \RuntimeException('Missing nysiis rest client uri');
         }
diff --git a/module/Api/src/Service/Permits/Allocate/IrhpPermitAllocator.php b/module/Api/src/Service/Permits/Allocate/IrhpPermitAllocator.php
index b348942a61..729ef31096 100644
--- a/module/Api/src/Service/Permits/Allocate/IrhpPermitAllocator.php
+++ b/module/Api/src/Service/Permits/Allocate/IrhpPermitAllocator.php
@@ -19,7 +19,7 @@ class IrhpPermitAllocator
      *
      * @return IrhpPermitAllocator
      */
-    public function __construct(private IrhpPermitRepository $irhpPermitRepo)
+    public function __construct(private readonly IrhpPermitRepository $irhpPermitRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/AnswersSummary/AnswersSummaryGenerator.php b/module/Api/src/Service/Permits/AnswersSummary/AnswersSummaryGenerator.php
index f16cd2d5a9..25d065daa4 100644
--- a/module/Api/src/Service/Permits/AnswersSummary/AnswersSummaryGenerator.php
+++ b/module/Api/src/Service/Permits/AnswersSummary/AnswersSummaryGenerator.php
@@ -15,7 +15,7 @@ class AnswersSummaryGenerator
      *
      * @return AnswersSummaryGenerator
      */
-    public function __construct(private AnswersSummaryFactory $answersSummaryFactory, private AnswersSummaryRowsAdderInterface $headerAnswersSummaryRowsAdder, private AnswersSummaryRowsAdderInterface $defaultAnswersSummaryRowsAdder)
+    public function __construct(private readonly AnswersSummaryFactory $answersSummaryFactory, private readonly AnswersSummaryRowsAdderInterface $headerAnswersSummaryRowsAdder, private AnswersSummaryRowsAdderInterface $defaultAnswersSummaryRowsAdder)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/AnswersSummary/BilateralAnswersSummaryRowsAdder.php b/module/Api/src/Service/Permits/AnswersSummary/BilateralAnswersSummaryRowsAdder.php
index cc5e72839f..19f5011774 100644
--- a/module/Api/src/Service/Permits/AnswersSummary/BilateralAnswersSummaryRowsAdder.php
+++ b/module/Api/src/Service/Permits/AnswersSummary/BilateralAnswersSummaryRowsAdder.php
@@ -16,7 +16,7 @@ class BilateralAnswersSummaryRowsAdder implements AnswersSummaryRowsAdderInterfa
      *
      * @return BilateralAnswersSummaryRowsAdder
      */
-    public function __construct(private AnswersSummaryRowFactory $answersSummaryRowFactory, private RendererInterface $viewRenderer, private BilateralIpaAnswersSummaryRowsAdder $bilateralIpaAnswersSummaryRowsAdder)
+    public function __construct(private readonly AnswersSummaryRowFactory $answersSummaryRowFactory, private readonly RendererInterface $viewRenderer, private readonly BilateralIpaAnswersSummaryRowsAdder $bilateralIpaAnswersSummaryRowsAdder)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/AnswersSummary/BilateralIpaAnswersSummaryRowsAdder.php b/module/Api/src/Service/Permits/AnswersSummary/BilateralIpaAnswersSummaryRowsAdder.php
index 06d4134df8..e7d535822c 100644
--- a/module/Api/src/Service/Permits/AnswersSummary/BilateralIpaAnswersSummaryRowsAdder.php
+++ b/module/Api/src/Service/Permits/AnswersSummary/BilateralIpaAnswersSummaryRowsAdder.php
@@ -18,7 +18,7 @@ class BilateralIpaAnswersSummaryRowsAdder implements AnswersSummaryRowsAdderInte
      *
      * @return BilateralIpaAnswersSummaryRowsAdder
      */
-    public function __construct(private AnswersSummaryRowFactory $answersSummaryRowFactory, private RendererInterface $viewRenderer, private AnswersSummaryRowsAdderInterface $qaAnswersSummaryRowsAdder, private IrhpPermitStockRepository $irhpPermitStockRepo)
+    public function __construct(private readonly AnswersSummaryRowFactory $answersSummaryRowFactory, private readonly RendererInterface $viewRenderer, private readonly AnswersSummaryRowsAdderInterface $qaAnswersSummaryRowsAdder, private readonly IrhpPermitStockRepository $irhpPermitStockRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/AnswersSummary/HeaderAnswersSummaryRowsAdder.php b/module/Api/src/Service/Permits/AnswersSummary/HeaderAnswersSummaryRowsAdder.php
index c5117bf59b..196610d863 100644
--- a/module/Api/src/Service/Permits/AnswersSummary/HeaderAnswersSummaryRowsAdder.php
+++ b/module/Api/src/Service/Permits/AnswersSummary/HeaderAnswersSummaryRowsAdder.php
@@ -16,7 +16,7 @@ class HeaderAnswersSummaryRowsAdder implements AnswersSummaryRowsAdderInterface
      *
      * @return HeaderAnswersSummaryRowsAdder
      */
-    public function __construct(private AnswersSummaryRowFactory $answersSummaryRowFactory, private RendererInterface $viewRenderer)
+    public function __construct(private readonly AnswersSummaryRowFactory $answersSummaryRowFactory, private readonly RendererInterface $viewRenderer)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/AnswersSummary/IpaAnswersSummaryGenerator.php b/module/Api/src/Service/Permits/AnswersSummary/IpaAnswersSummaryGenerator.php
index 0729e7fbc6..30756c46e8 100644
--- a/module/Api/src/Service/Permits/AnswersSummary/IpaAnswersSummaryGenerator.php
+++ b/module/Api/src/Service/Permits/AnswersSummary/IpaAnswersSummaryGenerator.php
@@ -15,7 +15,7 @@ class IpaAnswersSummaryGenerator
      *
      * @return AnswersSummaryGenerator
      */
-    public function __construct(private AnswersSummaryFactory $answersSummaryFactory, private AnswersSummaryRowsAdderInterface $defaultAnswersSummaryRowsAdder)
+    public function __construct(private readonly AnswersSummaryFactory $answersSummaryFactory, private AnswersSummaryRowsAdderInterface $defaultAnswersSummaryRowsAdder)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/AnswersSummary/MultilateralAnswersSummaryRowsAdder.php b/module/Api/src/Service/Permits/AnswersSummary/MultilateralAnswersSummaryRowsAdder.php
index 39899ef98a..8f012faeef 100644
--- a/module/Api/src/Service/Permits/AnswersSummary/MultilateralAnswersSummaryRowsAdder.php
+++ b/module/Api/src/Service/Permits/AnswersSummary/MultilateralAnswersSummaryRowsAdder.php
@@ -15,7 +15,7 @@ class MultilateralAnswersSummaryRowsAdder implements AnswersSummaryRowsAdderInte
      *
      * @return MultilateralAnswersSummaryRowsAdder
      */
-    public function __construct(private AnswersSummaryRowFactory $answersSummaryRowFactory, private RendererInterface $viewRenderer)
+    public function __construct(private readonly AnswersSummaryRowFactory $answersSummaryRowFactory, private readonly RendererInterface $viewRenderer)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/ApplyRanges/ForCpProvider.php b/module/Api/src/Service/Permits/ApplyRanges/ForCpProvider.php
index d92add622c..6d03bf5593 100644
--- a/module/Api/src/Service/Permits/ApplyRanges/ForCpProvider.php
+++ b/module/Api/src/Service/Permits/ApplyRanges/ForCpProvider.php
@@ -14,7 +14,7 @@ class ForCpProvider
      *
      * @return ForCpProvider
      */
-    public function __construct(private ForCpWithCountriesProvider $forCpWithCountriesProvider, private ForCpWithNoCountriesProvider $forCpWithNoCountriesProvider, private EntityIdsExtractor $entityIdsExtractor, private RangeSubsetGenerator $rangeSubsetGenerator)
+    public function __construct(private readonly ForCpWithCountriesProvider $forCpWithCountriesProvider, private readonly ForCpWithNoCountriesProvider $forCpWithNoCountriesProvider, private readonly EntityIdsExtractor $entityIdsExtractor, private readonly RangeSubsetGenerator $rangeSubsetGenerator)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/ApplyRanges/ForCpWithCountriesAndMultipleMatchingRangesProvider.php b/module/Api/src/Service/Permits/ApplyRanges/ForCpWithCountriesAndMultipleMatchingRangesProvider.php
index 9491baa87a..76ae1836f8 100644
--- a/module/Api/src/Service/Permits/ApplyRanges/ForCpWithCountriesAndMultipleMatchingRangesProvider.php
+++ b/module/Api/src/Service/Permits/ApplyRanges/ForCpWithCountriesAndMultipleMatchingRangesProvider.php
@@ -12,7 +12,7 @@ class ForCpWithCountriesAndMultipleMatchingRangesProvider
      *
      * @return ForCpWithCountriesAndMultipleMatchingRangesProvider
      */
-    public function __construct(private WithFewestNonRequestedCountriesProvider $withFewestNonRequestedCountriesProvider, private HighestAvailabilityRangeSelector $highestAvailabilityRangeSelector)
+    public function __construct(private readonly WithFewestNonRequestedCountriesProvider $withFewestNonRequestedCountriesProvider, private readonly HighestAvailabilityRangeSelector $highestAvailabilityRangeSelector)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/ApplyRanges/ForCpWithCountriesAndNoMatchingRangesProvider.php b/module/Api/src/Service/Permits/ApplyRanges/ForCpWithCountriesAndNoMatchingRangesProvider.php
index f8d107011b..a464d3c86b 100644
--- a/module/Api/src/Service/Permits/ApplyRanges/ForCpWithCountriesAndNoMatchingRangesProvider.php
+++ b/module/Api/src/Service/Permits/ApplyRanges/ForCpWithCountriesAndNoMatchingRangesProvider.php
@@ -13,7 +13,7 @@ class ForCpWithCountriesAndNoMatchingRangesProvider
      *
      * @return ForCpWithCountriesAndNoMatchingRangesProvider
      */
-    public function __construct(private UnrestrictedWithLowestStartNumberProvider $unrestrictedWithLowestStartNumberProvider, private RestrictedWithFewestCountriesProvider $restrictedWithFewestCountriesProvider, private HighestAvailabilityRangeSelector $highestAvailabilityRangeSelector)
+    public function __construct(private readonly UnrestrictedWithLowestStartNumberProvider $unrestrictedWithLowestStartNumberProvider, private readonly RestrictedWithFewestCountriesProvider $restrictedWithFewestCountriesProvider, private readonly HighestAvailabilityRangeSelector $highestAvailabilityRangeSelector)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/ApplyRanges/ForCpWithCountriesProvider.php b/module/Api/src/Service/Permits/ApplyRanges/ForCpWithCountriesProvider.php
index 8afe2e33a2..0ab1f49dd9 100644
--- a/module/Api/src/Service/Permits/ApplyRanges/ForCpWithCountriesProvider.php
+++ b/module/Api/src/Service/Permits/ApplyRanges/ForCpWithCountriesProvider.php
@@ -12,7 +12,7 @@ class ForCpWithCountriesProvider
      *
      * @return ForCpWithCountriesProvider
      */
-    public function __construct(private RestrictedWithMostMatchingCountriesProvider $restrictedWithMostMatchingCountriesProvider, private ForCpWithCountriesAndNoMatchingRangesProvider $forCpWithCountriesAndNoMatchingRangesProvider, private ForCpWithCountriesAndMultipleMatchingRangesProvider $forCpWithCountriesAndMultipleMatchingRangesProvider)
+    public function __construct(private readonly RestrictedWithMostMatchingCountriesProvider $restrictedWithMostMatchingCountriesProvider, private readonly ForCpWithCountriesAndNoMatchingRangesProvider $forCpWithCountriesAndNoMatchingRangesProvider, private readonly ForCpWithCountriesAndMultipleMatchingRangesProvider $forCpWithCountriesAndMultipleMatchingRangesProvider)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/ApplyRanges/ForCpWithNoCountriesProvider.php b/module/Api/src/Service/Permits/ApplyRanges/ForCpWithNoCountriesProvider.php
index 2fc8dac239..ee11b7c2c0 100644
--- a/module/Api/src/Service/Permits/ApplyRanges/ForCpWithNoCountriesProvider.php
+++ b/module/Api/src/Service/Permits/ApplyRanges/ForCpWithNoCountriesProvider.php
@@ -13,7 +13,7 @@ class ForCpWithNoCountriesProvider
      *
      * @return ForCpWithNoCountriesProvider
      */
-    public function __construct(private UnrestrictedWithLowestStartNumberProvider $unrestrictedWithLowestStartNumberProvider, private RestrictedWithFewestCountriesProvider $restrictedWithFewestCountriesProvider, private HighestAvailabilityRangeSelector $highestAvailabilityRangeSelector)
+    public function __construct(private readonly UnrestrictedWithLowestStartNumberProvider $unrestrictedWithLowestStartNumberProvider, private readonly RestrictedWithFewestCountriesProvider $restrictedWithFewestCountriesProvider, private readonly HighestAvailabilityRangeSelector $highestAvailabilityRangeSelector)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/ApplyRanges/RestrictedCountryIdsProvider.php b/module/Api/src/Service/Permits/ApplyRanges/RestrictedCountryIdsProvider.php
index ab5be7d6c1..d7b437242d 100644
--- a/module/Api/src/Service/Permits/ApplyRanges/RestrictedCountryIdsProvider.php
+++ b/module/Api/src/Service/Permits/ApplyRanges/RestrictedCountryIdsProvider.php
@@ -10,7 +10,7 @@ class RestrictedCountryIdsProvider
      *
      * @return RestrictedCountryIdsProvider
      */
-    public function __construct(private array $restrictedCountryIds)
+    public function __construct(private readonly array $restrictedCountryIds)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/ApplyRanges/RestrictedWithFewestCountriesProvider.php b/module/Api/src/Service/Permits/ApplyRanges/RestrictedWithFewestCountriesProvider.php
index 342a56d2f7..5355bc352a 100644
--- a/module/Api/src/Service/Permits/ApplyRanges/RestrictedWithFewestCountriesProvider.php
+++ b/module/Api/src/Service/Permits/ApplyRanges/RestrictedWithFewestCountriesProvider.php
@@ -12,7 +12,7 @@ class RestrictedWithFewestCountriesProvider
      *
      * @return RestrictedWithFewestCountriesProvider
      */
-    public function __construct(private RestrictedRangesProvider $restrictedRangesProvider)
+    public function __construct(private readonly RestrictedRangesProvider $restrictedRangesProvider)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/ApplyRanges/RestrictedWithMostMatchingCountriesProvider.php b/module/Api/src/Service/Permits/ApplyRanges/RestrictedWithMostMatchingCountriesProvider.php
index 669ac374a6..383da5cddd 100644
--- a/module/Api/src/Service/Permits/ApplyRanges/RestrictedWithMostMatchingCountriesProvider.php
+++ b/module/Api/src/Service/Permits/ApplyRanges/RestrictedWithMostMatchingCountriesProvider.php
@@ -12,7 +12,7 @@ class RestrictedWithMostMatchingCountriesProvider
      *
      * @return RestrictedWithMostMatchingCountriesProvider
      */
-    public function __construct(private RestrictedRangesProvider $restrictedRangesProvider)
+    public function __construct(private readonly RestrictedRangesProvider $restrictedRangesProvider)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/ApplyRanges/StockBasedForCpProviderFactory.php b/module/Api/src/Service/Permits/ApplyRanges/StockBasedForCpProviderFactory.php
index 3fb2f54806..f9f8a30cfc 100644
--- a/module/Api/src/Service/Permits/ApplyRanges/StockBasedForCpProviderFactory.php
+++ b/module/Api/src/Service/Permits/ApplyRanges/StockBasedForCpProviderFactory.php
@@ -12,7 +12,7 @@ class StockBasedForCpProviderFactory
      *
      * @return StockBasedForCpProviderFactory
      */
-    public function __construct(private StockBasedRestrictedCountryIdsProvider $stockBasedRestrictedCountryIdsProvider, private ForCpProviderFactory $forCpProviderFactory)
+    public function __construct(private readonly StockBasedRestrictedCountryIdsProvider $stockBasedRestrictedCountryIdsProvider, private readonly ForCpProviderFactory $forCpProviderFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/ApplyRanges/WithFewestNonRequestedCountriesProvider.php b/module/Api/src/Service/Permits/ApplyRanges/WithFewestNonRequestedCountriesProvider.php
index 9e42c134ca..48a448e3bf 100644
--- a/module/Api/src/Service/Permits/ApplyRanges/WithFewestNonRequestedCountriesProvider.php
+++ b/module/Api/src/Service/Permits/ApplyRanges/WithFewestNonRequestedCountriesProvider.php
@@ -10,7 +10,7 @@ class WithFewestNonRequestedCountriesProvider
      *
      * @return WithFewestNonRequestedCountriesProvider
      */
-    public function __construct(private RestrictedCountryIdsProvider $restrictedCountryIdsProvider)
+    public function __construct(private readonly RestrictedCountryIdsProvider $restrictedCountryIdsProvider)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Availability/CandidatePermitsAvailableCountCalculator.php b/module/Api/src/Service/Permits/Availability/CandidatePermitsAvailableCountCalculator.php
index 8d6033a5a1..e263a98b7f 100644
--- a/module/Api/src/Service/Permits/Availability/CandidatePermitsAvailableCountCalculator.php
+++ b/module/Api/src/Service/Permits/Availability/CandidatePermitsAvailableCountCalculator.php
@@ -14,7 +14,7 @@ class CandidatePermitsAvailableCountCalculator
      *
      * @return CandidatePermitsAvailableCountCalculator
      */
-    public function __construct(private IrhpCandidatePermitRepository $irhpCandidatePermitRepo, private IrhpPermitRepository $irhpPermitRepo)
+    public function __construct(private readonly IrhpCandidatePermitRepository $irhpCandidatePermitRepo, private readonly IrhpPermitRepository $irhpPermitRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Availability/CandidatePermitsGrantabilityChecker.php b/module/Api/src/Service/Permits/Availability/CandidatePermitsGrantabilityChecker.php
index 9f0fb72015..3ac9dadcd6 100644
--- a/module/Api/src/Service/Permits/Availability/CandidatePermitsGrantabilityChecker.php
+++ b/module/Api/src/Service/Permits/Availability/CandidatePermitsGrantabilityChecker.php
@@ -13,7 +13,7 @@ class CandidatePermitsGrantabilityChecker
      *
      * @return CandidatePermitsGrantabilityChecker
      */
-    public function __construct(private CandidatePermitsAvailableCountCalculator $candidatePermitsAvailableCountCalculator)
+    public function __construct(private readonly CandidatePermitsAvailableCountCalculator $candidatePermitsAvailableCountCalculator)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Availability/EmissionsCategoriesGrantabilityChecker.php b/module/Api/src/Service/Permits/Availability/EmissionsCategoriesGrantabilityChecker.php
index 49f44998de..c640f8b46b 100644
--- a/module/Api/src/Service/Permits/Availability/EmissionsCategoriesGrantabilityChecker.php
+++ b/module/Api/src/Service/Permits/Availability/EmissionsCategoriesGrantabilityChecker.php
@@ -7,7 +7,7 @@
 
 class EmissionsCategoriesGrantabilityChecker
 {
-    public function __construct(private EmissionsCategoryAvailabilityCounter $emissionsCategoryAvailabilityCounter)
+    public function __construct(private readonly EmissionsCategoryAvailabilityCounter $emissionsCategoryAvailabilityCounter)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Availability/EmissionsCategoryAvailabilityChecker.php b/module/Api/src/Service/Permits/Availability/EmissionsCategoryAvailabilityChecker.php
index 7a4e82acea..23bf4f4f3b 100644
--- a/module/Api/src/Service/Permits/Availability/EmissionsCategoryAvailabilityChecker.php
+++ b/module/Api/src/Service/Permits/Availability/EmissionsCategoryAvailabilityChecker.php
@@ -10,7 +10,7 @@ class EmissionsCategoryAvailabilityChecker
      *
      * @return EmissionsCategoryAvailabilityChecker
      */
-    public function __construct(private EmissionsCategoryAvailabilityCounter $emissionsCategoryAvailabilityCounter)
+    public function __construct(private readonly EmissionsCategoryAvailabilityCounter $emissionsCategoryAvailabilityCounter)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Availability/EmissionsCategoryAvailabilityCounter.php b/module/Api/src/Service/Permits/Availability/EmissionsCategoryAvailabilityCounter.php
index 68c4967e74..3daf4d17c1 100644
--- a/module/Api/src/Service/Permits/Availability/EmissionsCategoryAvailabilityCounter.php
+++ b/module/Api/src/Service/Permits/Availability/EmissionsCategoryAvailabilityCounter.php
@@ -22,7 +22,7 @@ class EmissionsCategoryAvailabilityCounter
      *
      * @return EmissionsCategoryAvailabilityCounter
      */
-    public function __construct(private Connection $connection, private IrhpPermitRangeRepository $irhpPermitRangeRepo, private IrhpPermitApplicationRepository $irhpPermitApplicationRepo, private IrhpPermitRepository $irhpPermitRepo, private IrhpPermitStockRepository $irhpPermitStockRepo, private IrhpCandidatePermitRepository $irhpCandidatePermitRepo)
+    public function __construct(private readonly Connection $connection, private readonly IrhpPermitRangeRepository $irhpPermitRangeRepo, private readonly IrhpPermitApplicationRepository $irhpPermitApplicationRepo, private readonly IrhpPermitRepository $irhpPermitRepo, private readonly IrhpPermitStockRepository $irhpPermitStockRepo, private readonly IrhpCandidatePermitRepository $irhpCandidatePermitRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Availability/StockAvailabilityChecker.php b/module/Api/src/Service/Permits/Availability/StockAvailabilityChecker.php
index b798721ba0..d1cd253b86 100644
--- a/module/Api/src/Service/Permits/Availability/StockAvailabilityChecker.php
+++ b/module/Api/src/Service/Permits/Availability/StockAvailabilityChecker.php
@@ -10,7 +10,7 @@ class StockAvailabilityChecker
      *
      * @return StockAvailabilityChecker
      */
-    public function __construct(private StockAvailabilityCounter $stockAvailabilityCounter)
+    public function __construct(private readonly StockAvailabilityCounter $stockAvailabilityCounter)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Availability/StockAvailabilityCounter.php b/module/Api/src/Service/Permits/Availability/StockAvailabilityCounter.php
index 2a708ed10f..8ddfb261b0 100644
--- a/module/Api/src/Service/Permits/Availability/StockAvailabilityCounter.php
+++ b/module/Api/src/Service/Permits/Availability/StockAvailabilityCounter.php
@@ -12,7 +12,7 @@ class StockAvailabilityCounter
      *
      * @return StockAvailabilityCounter
      */
-    public function __construct(private EmissionsCategoryAvailabilityCounter $emissionsCategoryAvailabilityCounter)
+    public function __construct(private readonly EmissionsCategoryAvailabilityCounter $emissionsCategoryAvailabilityCounter)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Availability/StockLicenceMaxPermittedCounter.php b/module/Api/src/Service/Permits/Availability/StockLicenceMaxPermittedCounter.php
index d4e11cfeca..a0dad6fc53 100644
--- a/module/Api/src/Service/Permits/Availability/StockLicenceMaxPermittedCounter.php
+++ b/module/Api/src/Service/Permits/Availability/StockLicenceMaxPermittedCounter.php
@@ -18,7 +18,7 @@ class StockLicenceMaxPermittedCounter
      *
      * @return StockLicenceMaxPermittedCounter
      */
-    public function __construct(private IrhpPermitRepository $irhpPermitRepo)
+    public function __construct(private readonly IrhpPermitRepository $irhpPermitRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Availability/WindowAvailabilityChecker.php b/module/Api/src/Service/Permits/Availability/WindowAvailabilityChecker.php
index 56f80f282e..49e24f6be6 100644
--- a/module/Api/src/Service/Permits/Availability/WindowAvailabilityChecker.php
+++ b/module/Api/src/Service/Permits/Availability/WindowAvailabilityChecker.php
@@ -14,7 +14,7 @@ class WindowAvailabilityChecker
      *
      * @return WindowAvailabilityChecker
      */
-    public function __construct(private IrhpPermitWindowRepository $irhpPermitWindowRepo, private StockAvailabilityChecker $stockAvailabilityChecker)
+    public function __construct(private readonly IrhpPermitWindowRepository $irhpPermitWindowRepo, private readonly StockAvailabilityChecker $stockAvailabilityChecker)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/ApplicationCountryRemover.php b/module/Api/src/Service/Permits/Bilateral/ApplicationCountryRemover.php
index 5e356e7394..9af3e240da 100644
--- a/module/Api/src/Service/Permits/Bilateral/ApplicationCountryRemover.php
+++ b/module/Api/src/Service/Permits/Bilateral/ApplicationCountryRemover.php
@@ -15,7 +15,7 @@ class ApplicationCountryRemover
      *
      * @return ApplicationCountryRemover
      */
-    public function __construct(private CommandCreator $commandCreator, private CommandHandlerManager $commandHandlerManager)
+    public function __construct(private readonly CommandCreator $commandCreator, private readonly CommandHandlerManager $commandHandlerManager)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/ApplicationFeesClearer.php b/module/Api/src/Service/Permits/Bilateral/ApplicationFeesClearer.php
index f8c3e2790a..17e0a008c7 100644
--- a/module/Api/src/Service/Permits/Bilateral/ApplicationFeesClearer.php
+++ b/module/Api/src/Service/Permits/Bilateral/ApplicationFeesClearer.php
@@ -16,7 +16,7 @@ class ApplicationFeesClearer
      *
      * @return ApplicationFeesClearer
      */
-    public function __construct(private CommandCreator $commandCreator, private CommandHandlerManager $commandHandlerManager, private FeeRepository $feeRepo)
+    public function __construct(private readonly CommandCreator $commandCreator, private readonly CommandHandlerManager $commandHandlerManager, private readonly FeeRepository $feeRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Common/ModifiedAnswerUpdater.php b/module/Api/src/Service/Permits/Bilateral/Common/ModifiedAnswerUpdater.php
index b7c580483a..2798ee086d 100644
--- a/module/Api/src/Service/Permits/Bilateral/Common/ModifiedAnswerUpdater.php
+++ b/module/Api/src/Service/Permits/Bilateral/Common/ModifiedAnswerUpdater.php
@@ -14,7 +14,7 @@ class ModifiedAnswerUpdater
      *
      * @return ModifiedAnswerUpdater
      */
-    public function __construct(private GenericAnswerWriter $genericAnswerWriter, private ApplicationAnswersClearer $applicationAnswersClearer)
+    public function __construct(private readonly GenericAnswerWriter $genericAnswerWriter, private readonly ApplicationAnswersClearer $applicationAnswersClearer)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Common/NoOfPermitsConditionalUpdater.php b/module/Api/src/Service/Permits/Bilateral/Common/NoOfPermitsConditionalUpdater.php
index 3125ec7cb0..a6234e295c 100644
--- a/module/Api/src/Service/Permits/Bilateral/Common/NoOfPermitsConditionalUpdater.php
+++ b/module/Api/src/Service/Permits/Bilateral/Common/NoOfPermitsConditionalUpdater.php
@@ -12,7 +12,7 @@ class NoOfPermitsConditionalUpdater
      *
      * @return NoOfPermitsConditionalUpdater
      */
-    public function __construct(private NoOfPermitsUpdater $noOfPermitsUpdater)
+    public function __construct(private readonly NoOfPermitsUpdater $noOfPermitsUpdater)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Common/NoOfPermitsUpdater.php b/module/Api/src/Service/Permits/Bilateral/Common/NoOfPermitsUpdater.php
index 0f31790f2b..c88e4c2cdd 100644
--- a/module/Api/src/Service/Permits/Bilateral/Common/NoOfPermitsUpdater.php
+++ b/module/Api/src/Service/Permits/Bilateral/Common/NoOfPermitsUpdater.php
@@ -20,7 +20,7 @@ class NoOfPermitsUpdater
      *
      * @return NoOfPermitsUpdater
      */
-    public function __construct(private IrhpPermitApplicationRepository $irhpPermitApplicationRepo, private FeeTypeRepository $feeTypeRepo, private CommandCreator $commandCreator, private CommandHandlerManager $commandHandlerManager, private ApplicationFeesClearer $applicationFeesClearer, private CurrentDateTimeFactory $currentDateTimeFactory)
+    public function __construct(private readonly IrhpPermitApplicationRepository $irhpPermitApplicationRepo, private readonly FeeTypeRepository $feeTypeRepo, private readonly CommandCreator $commandCreator, private readonly CommandHandlerManager $commandHandlerManager, private readonly ApplicationFeesClearer $applicationFeesClearer, private readonly CurrentDateTimeFactory $currentDateTimeFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Common/PermitUsageUpdater.php b/module/Api/src/Service/Permits/Bilateral/Common/PermitUsageUpdater.php
index f1d797bfe1..108c96f196 100644
--- a/module/Api/src/Service/Permits/Bilateral/Common/PermitUsageUpdater.php
+++ b/module/Api/src/Service/Permits/Bilateral/Common/PermitUsageUpdater.php
@@ -12,7 +12,7 @@ class PermitUsageUpdater
      *
      * @return PermitUsageUpdater
      */
-    public function __construct(private ModifiedAnswerUpdater $modifiedAnswerUpdater)
+    public function __construct(private readonly ModifiedAnswerUpdater $modifiedAnswerUpdater)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Common/StandardAndCabotageUpdater.php b/module/Api/src/Service/Permits/Bilateral/Common/StandardAndCabotageUpdater.php
index 16ebed2bc1..c3ce865f2f 100644
--- a/module/Api/src/Service/Permits/Bilateral/Common/StandardAndCabotageUpdater.php
+++ b/module/Api/src/Service/Permits/Bilateral/Common/StandardAndCabotageUpdater.php
@@ -12,7 +12,7 @@ class StandardAndCabotageUpdater
      *
      * @return StandardAndCabotageUpdater
      */
-    public function __construct(private ModifiedAnswerUpdater $modifiedAnswerUpdater)
+    public function __construct(private readonly ModifiedAnswerUpdater $modifiedAnswerUpdater)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Internal/ApplicationCountryUpdater.php b/module/Api/src/Service/Permits/Bilateral/Internal/ApplicationCountryUpdater.php
index 34b4d6677d..33808ffaf3 100644
--- a/module/Api/src/Service/Permits/Bilateral/Internal/ApplicationCountryUpdater.php
+++ b/module/Api/src/Service/Permits/Bilateral/Internal/ApplicationCountryUpdater.php
@@ -12,7 +12,7 @@ class ApplicationCountryUpdater
      *
      * @return ApplicationCountryUpdater
      */
-    public function __construct(private IrhpPermitApplicationCreator $irhpPermitApplicationCreator, private ExistingIrhpPermitApplicationHandler $existingIrhpPermitApplicationHandler)
+    public function __construct(private readonly IrhpPermitApplicationCreator $irhpPermitApplicationCreator, private readonly ExistingIrhpPermitApplicationHandler $existingIrhpPermitApplicationHandler)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Internal/ApplicationUpdater.php b/module/Api/src/Service/Permits/Bilateral/Internal/ApplicationUpdater.php
index 7b6cdb0403..79a7908fa2 100644
--- a/module/Api/src/Service/Permits/Bilateral/Internal/ApplicationUpdater.php
+++ b/module/Api/src/Service/Permits/Bilateral/Internal/ApplicationUpdater.php
@@ -12,7 +12,7 @@ class ApplicationUpdater
      *
      * @return ApplicationUpdater
      */
-    public function __construct(private ApplicationCountryUpdater $applicationCountryUpdater)
+    public function __construct(private readonly ApplicationCountryUpdater $applicationCountryUpdater)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Internal/ExistingIrhpPermitApplicationHandler.php b/module/Api/src/Service/Permits/Bilateral/Internal/ExistingIrhpPermitApplicationHandler.php
index f17a229e0d..08c539cb89 100644
--- a/module/Api/src/Service/Permits/Bilateral/Internal/ExistingIrhpPermitApplicationHandler.php
+++ b/module/Api/src/Service/Permits/Bilateral/Internal/ExistingIrhpPermitApplicationHandler.php
@@ -18,7 +18,7 @@ class ExistingIrhpPermitApplicationHandler
      *
      * @return ExistingIrhpPermitApplicationHandler
      */
-    public function __construct(private IrhpPermitApplicationRepository $irhpPermitApplicationRepo, private IrhpPermitStockRepository $irhpPermitStockRepo, private ApplicationAnswersClearer $applicationAnswersClearer, private QuestionHandlerDelegator $questionHandlerDelegator)
+    public function __construct(private readonly IrhpPermitApplicationRepository $irhpPermitApplicationRepo, private readonly IrhpPermitStockRepository $irhpPermitStockRepo, private readonly ApplicationAnswersClearer $applicationAnswersClearer, private readonly QuestionHandlerDelegator $questionHandlerDelegator)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Internal/FixedAnswerQuestionHandler.php b/module/Api/src/Service/Permits/Bilateral/Internal/FixedAnswerQuestionHandler.php
index 953d84c450..a6510108ae 100644
--- a/module/Api/src/Service/Permits/Bilateral/Internal/FixedAnswerQuestionHandler.php
+++ b/module/Api/src/Service/Permits/Bilateral/Internal/FixedAnswerQuestionHandler.php
@@ -13,7 +13,7 @@ class FixedAnswerQuestionHandler implements QuestionHandlerInterface
      * @param string $answer
      * @return FixedAnswerQuestionHandler
      */
-    public function __construct(private GenericAnswerWriter $genericAnswerWriter, private $answer)
+    public function __construct(private readonly GenericAnswerWriter $genericAnswerWriter, private $answer)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Internal/IrhpPermitApplicationCreator.php b/module/Api/src/Service/Permits/Bilateral/Internal/IrhpPermitApplicationCreator.php
index 5d0afb1d39..17be0de0dc 100644
--- a/module/Api/src/Service/Permits/Bilateral/Internal/IrhpPermitApplicationCreator.php
+++ b/module/Api/src/Service/Permits/Bilateral/Internal/IrhpPermitApplicationCreator.php
@@ -14,7 +14,7 @@ class IrhpPermitApplicationCreator
      *
      * @return IrhpPermitApplicationCreator
      */
-    public function __construct(private IrhpPermitStockRepository $irhpPermitStockRepo, private IrhpPermitApplicationRepository $irhpPermitApplicationRepo, private IrhpPermitApplicationFactory $irhpPermitApplicationFactory)
+    public function __construct(private readonly IrhpPermitStockRepository $irhpPermitStockRepo, private readonly IrhpPermitApplicationRepository $irhpPermitApplicationRepo, private readonly IrhpPermitApplicationFactory $irhpPermitApplicationFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Internal/NumberOfPermitsMoroccoQuestionHandler.php b/module/Api/src/Service/Permits/Bilateral/Internal/NumberOfPermitsMoroccoQuestionHandler.php
index 6471b79f10..2aac4b41de 100644
--- a/module/Api/src/Service/Permits/Bilateral/Internal/NumberOfPermitsMoroccoQuestionHandler.php
+++ b/module/Api/src/Service/Permits/Bilateral/Internal/NumberOfPermitsMoroccoQuestionHandler.php
@@ -14,7 +14,7 @@ class NumberOfPermitsMoroccoQuestionHandler implements QuestionHandlerInterface
      *
      * @return NumberOfPermitsMoroccoQuestionHandler
      */
-    public function __construct(private NoOfPermitsConditionalUpdater $noOfPermitsConditionalUpdater)
+    public function __construct(private readonly NoOfPermitsConditionalUpdater $noOfPermitsConditionalUpdater)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Internal/NumberOfPermitsQuestionHandler.php b/module/Api/src/Service/Permits/Bilateral/Internal/NumberOfPermitsQuestionHandler.php
index b8fce607bc..77334055e0 100644
--- a/module/Api/src/Service/Permits/Bilateral/Internal/NumberOfPermitsQuestionHandler.php
+++ b/module/Api/src/Service/Permits/Bilateral/Internal/NumberOfPermitsQuestionHandler.php
@@ -13,7 +13,7 @@ class NumberOfPermitsQuestionHandler implements QuestionHandlerInterface
      *
      * @return NumberOfPermitsQuestionHandler
      */
-    public function __construct(private PermitUsageSelectionGenerator $permitUsageSelectionGenerator, private BilateralRequiredGenerator $bilateralRequiredGenerator, private NoOfPermitsConditionalUpdater $noOfPermitsConditionalUpdater)
+    public function __construct(private readonly PermitUsageSelectionGenerator $permitUsageSelectionGenerator, private readonly BilateralRequiredGenerator $bilateralRequiredGenerator, private readonly NoOfPermitsConditionalUpdater $noOfPermitsConditionalUpdater)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Internal/PermitUsageQuestionHandler.php b/module/Api/src/Service/Permits/Bilateral/Internal/PermitUsageQuestionHandler.php
index 7bbc6a1eed..72f6027bbc 100644
--- a/module/Api/src/Service/Permits/Bilateral/Internal/PermitUsageQuestionHandler.php
+++ b/module/Api/src/Service/Permits/Bilateral/Internal/PermitUsageQuestionHandler.php
@@ -13,7 +13,7 @@ class PermitUsageQuestionHandler implements QuestionHandlerInterface
      *
      * @return PermitUsageQuestionHandler
      */
-    public function __construct(private PermitUsageSelectionGenerator $permitUsageSelectionGenerator, private PermitUsageUpdater $permitUsageUpdater)
+    public function __construct(private readonly PermitUsageSelectionGenerator $permitUsageSelectionGenerator, private readonly PermitUsageUpdater $permitUsageUpdater)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Internal/QuestionHandlerDelegator.php b/module/Api/src/Service/Permits/Bilateral/Internal/QuestionHandlerDelegator.php
index 1a328c5a6c..417c124278 100644
--- a/module/Api/src/Service/Permits/Bilateral/Internal/QuestionHandlerDelegator.php
+++ b/module/Api/src/Service/Permits/Bilateral/Internal/QuestionHandlerDelegator.php
@@ -15,7 +15,7 @@ class QuestionHandlerDelegator
     /**
      * Create service instance
      */
-    public function __construct(private QaContextFactory $qaContextFactory)
+    public function __construct(private readonly QaContextFactory $qaContextFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Internal/StandardAndCabotageQuestionHandler.php b/module/Api/src/Service/Permits/Bilateral/Internal/StandardAndCabotageQuestionHandler.php
index ea2ea7c8a6..0b1ae57e7c 100644
--- a/module/Api/src/Service/Permits/Bilateral/Internal/StandardAndCabotageQuestionHandler.php
+++ b/module/Api/src/Service/Permits/Bilateral/Internal/StandardAndCabotageQuestionHandler.php
@@ -15,7 +15,7 @@ class StandardAndCabotageQuestionHandler implements QuestionHandlerInterface
      *
      * @return StandardAndCabotageQuestionHandler
      */
-    public function __construct(private PermitUsageSelectionGenerator $permitUsageSelectionGenerator, private BilateralRequiredGenerator $bilateralRequiredGenerator, private StandardAndCabotageUpdater $standardAndCabotageUpdater)
+    public function __construct(private readonly PermitUsageSelectionGenerator $permitUsageSelectionGenerator, private readonly BilateralRequiredGenerator $bilateralRequiredGenerator, private readonly StandardAndCabotageUpdater $standardAndCabotageUpdater)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Metadata/CountryGenerator.php b/module/Api/src/Service/Permits/Bilateral/Metadata/CountryGenerator.php
index fe3e015607..1ed5b4d471 100644
--- a/module/Api/src/Service/Permits/Bilateral/Metadata/CountryGenerator.php
+++ b/module/Api/src/Service/Permits/Bilateral/Metadata/CountryGenerator.php
@@ -18,7 +18,7 @@ class CountryGenerator
      *
      * @return CountryGenerator
      */
-    public function __construct(private PeriodArrayGenerator $periodArrayGenerator)
+    public function __construct(private readonly PeriodArrayGenerator $periodArrayGenerator)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Metadata/PeriodArrayGenerator.php b/module/Api/src/Service/Permits/Bilateral/Metadata/PeriodArrayGenerator.php
index 42a0a50ae3..30c9867f5a 100644
--- a/module/Api/src/Service/Permits/Bilateral/Metadata/PeriodArrayGenerator.php
+++ b/module/Api/src/Service/Permits/Bilateral/Metadata/PeriodArrayGenerator.php
@@ -15,7 +15,7 @@ class PeriodArrayGenerator
      *
      * @return PeriodArrayGenerator
      */
-    public function __construct(private IrhpPermitStockRepository $irhpPermitStockRepo, private PeriodGenerator $periodGenerator, private CurrentDateTimeFactory $currentDateTimeFactory)
+    public function __construct(private readonly IrhpPermitStockRepository $irhpPermitStockRepo, private readonly PeriodGenerator $periodGenerator, private readonly CurrentDateTimeFactory $currentDateTimeFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Metadata/PeriodGenerator.php b/module/Api/src/Service/Permits/Bilateral/Metadata/PeriodGenerator.php
index 4a39bea91e..c065603f58 100644
--- a/module/Api/src/Service/Permits/Bilateral/Metadata/PeriodGenerator.php
+++ b/module/Api/src/Service/Permits/Bilateral/Metadata/PeriodGenerator.php
@@ -17,7 +17,7 @@ class PeriodGenerator
      *
      * @return PeriodGenerator
      */
-    public function __construct(private IrhpPermitStockRepository $irhpPermitStockRepo)
+    public function __construct(private readonly IrhpPermitStockRepository $irhpPermitStockRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Bilateral/Metadata/StandardFieldsGenerator.php b/module/Api/src/Service/Permits/Bilateral/Metadata/StandardFieldsGenerator.php
index 2774bcda98..66a1311b01 100644
--- a/module/Api/src/Service/Permits/Bilateral/Metadata/StandardFieldsGenerator.php
+++ b/module/Api/src/Service/Permits/Bilateral/Metadata/StandardFieldsGenerator.php
@@ -15,7 +15,7 @@ class StandardFieldsGenerator implements FieldsGeneratorInterface
      *
      * @return StandardFieldsGenerator
      */
-    public function __construct(private CurrentFieldValuesGenerator $currentFieldValuesGenerator)
+    public function __construct(private readonly CurrentFieldValuesGenerator $currentFieldValuesGenerator)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/CandidatePermits/ApggCandidatePermitsCreator.php b/module/Api/src/Service/Permits/CandidatePermits/ApggCandidatePermitsCreator.php
index 811bd6a840..d37276dcc1 100644
--- a/module/Api/src/Service/Permits/CandidatePermits/ApggCandidatePermitsCreator.php
+++ b/module/Api/src/Service/Permits/CandidatePermits/ApggCandidatePermitsCreator.php
@@ -13,7 +13,7 @@ class ApggCandidatePermitsCreator
      *
      * @return ApggCandidatePermitsCreator
      */
-    public function __construct(private ApggEmissionsCatCandidatePermitsCreator $apggEmissionsCatCandidatePermitsCreator)
+    public function __construct(private readonly ApggEmissionsCatCandidatePermitsCreator $apggEmissionsCatCandidatePermitsCreator)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/CandidatePermits/ApggEmissionsCatCandidatePermitsCreator.php b/module/Api/src/Service/Permits/CandidatePermits/ApggEmissionsCatCandidatePermitsCreator.php
index f733225362..460c565c95 100644
--- a/module/Api/src/Service/Permits/CandidatePermits/ApggEmissionsCatCandidatePermitsCreator.php
+++ b/module/Api/src/Service/Permits/CandidatePermits/ApggEmissionsCatCandidatePermitsCreator.php
@@ -14,7 +14,7 @@ class ApggEmissionsCatCandidatePermitsCreator
      *
      * @return ApggEmissionsCatCandidatePermitsCreator
      */
-    public function __construct(private ApggCandidatePermitFactory $apggCandidatePermitFactory, private IrhpCandidatePermitRepository $irhpCandidatePermitRepo, private EmissionsStandardCriteriaFactory $emissionsStandardCriteriaFactory)
+    public function __construct(private readonly ApggCandidatePermitFactory $apggCandidatePermitFactory, private readonly IrhpCandidatePermitRepository $irhpCandidatePermitRepo, private readonly EmissionsStandardCriteriaFactory $emissionsStandardCriteriaFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/CandidatePermits/IrhpCandidatePermitsCreator.php b/module/Api/src/Service/Permits/CandidatePermits/IrhpCandidatePermitsCreator.php
index 9fabc536bb..31f8b9c985 100644
--- a/module/Api/src/Service/Permits/CandidatePermits/IrhpCandidatePermitsCreator.php
+++ b/module/Api/src/Service/Permits/CandidatePermits/IrhpCandidatePermitsCreator.php
@@ -14,7 +14,7 @@ class IrhpCandidatePermitsCreator
      *
      * @return IrhpCandidatePermitsCreator
      */
-    public function __construct(private ScoringCandidatePermitsCreator $scoringCandidatePermitsCreator, private ApggCandidatePermitsCreator $apggCandidatePermitsCreator)
+    public function __construct(private readonly ScoringCandidatePermitsCreator $scoringCandidatePermitsCreator, private readonly ApggCandidatePermitsCreator $apggCandidatePermitsCreator)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Checkable/CheckedValueUpdater.php b/module/Api/src/Service/Permits/Checkable/CheckedValueUpdater.php
index c5d118eb21..8cefdba82c 100644
--- a/module/Api/src/Service/Permits/Checkable/CheckedValueUpdater.php
+++ b/module/Api/src/Service/Permits/Checkable/CheckedValueUpdater.php
@@ -13,7 +13,7 @@ class CheckedValueUpdater
      *
      * @return CheckedValueUpdater
      */
-    public function __construct(private TaskRepository $taskRepo)
+    public function __construct(private readonly TaskRepository $taskRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Checkable/CreateTaskCommandGenerator.php b/module/Api/src/Service/Permits/Checkable/CreateTaskCommandGenerator.php
index 48dfaf23f7..0d975e6ffe 100644
--- a/module/Api/src/Service/Permits/Checkable/CreateTaskCommandGenerator.php
+++ b/module/Api/src/Service/Permits/Checkable/CreateTaskCommandGenerator.php
@@ -12,7 +12,7 @@ class CreateTaskCommandGenerator
      *
      * @return CreateTaskCommandGenerator
      */
-    public function __construct(private CreateTaskCommandFactory $createTaskCommandFactory)
+    public function __construct(private readonly CreateTaskCommandFactory $createTaskCommandFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Common/PermitTypeConfig.php b/module/Api/src/Service/Permits/Common/PermitTypeConfig.php
index 51a5d676ad..2367dc4d65 100644
--- a/module/Api/src/Service/Permits/Common/PermitTypeConfig.php
+++ b/module/Api/src/Service/Permits/Common/PermitTypeConfig.php
@@ -11,7 +11,7 @@ class PermitTypeConfig
      *
      * @return PermitTypeConfig
      */
-    public function __construct(private $restrictedCountriesQuestionKey, private array $restrictedCountryIds)
+    public function __construct(private $restrictedCountriesQuestionKey, private readonly array $restrictedCountryIds)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Common/RangeBasedRestrictedCountriesProvider.php b/module/Api/src/Service/Permits/Common/RangeBasedRestrictedCountriesProvider.php
index 2e74ffb458..aec6efd6cd 100644
--- a/module/Api/src/Service/Permits/Common/RangeBasedRestrictedCountriesProvider.php
+++ b/module/Api/src/Service/Permits/Common/RangeBasedRestrictedCountriesProvider.php
@@ -18,7 +18,7 @@ class RangeBasedRestrictedCountriesProvider
      *
      * @return RangeBasedRestrictedCountriesProvider
      */
-    public function __construct(private IrhpPermitRangeRepo $irhpPermitRangeRepo, private TypeBasedPermitTypeConfigProvider $typeBasedPermitTypeConfigProvider, private CountryRepo $countryRepo)
+    public function __construct(private readonly IrhpPermitRangeRepo $irhpPermitRangeRepo, private readonly TypeBasedPermitTypeConfigProvider $typeBasedPermitTypeConfigProvider, private readonly CountryRepo $countryRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Common/StockBasedPermitTypeConfigProvider.php b/module/Api/src/Service/Permits/Common/StockBasedPermitTypeConfigProvider.php
index 494bd4332a..f7d0c6f1f3 100644
--- a/module/Api/src/Service/Permits/Common/StockBasedPermitTypeConfigProvider.php
+++ b/module/Api/src/Service/Permits/Common/StockBasedPermitTypeConfigProvider.php
@@ -12,7 +12,7 @@ class StockBasedPermitTypeConfigProvider
      *
      * @return StockBasedPermitTypeConfigProvider
      */
-    public function __construct(private IrhpPermitStockRepository $irhpPermitStockRepo, private TypeBasedPermitTypeConfigProvider $typeBasedPermitTypeConfigProvider)
+    public function __construct(private readonly IrhpPermitStockRepository $irhpPermitStockRepo, private readonly TypeBasedPermitTypeConfigProvider $typeBasedPermitTypeConfigProvider)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Common/StockBasedRestrictedCountryIdsProvider.php b/module/Api/src/Service/Permits/Common/StockBasedRestrictedCountryIdsProvider.php
index 80b68a5709..5b4446d5db 100644
--- a/module/Api/src/Service/Permits/Common/StockBasedRestrictedCountryIdsProvider.php
+++ b/module/Api/src/Service/Permits/Common/StockBasedRestrictedCountryIdsProvider.php
@@ -10,7 +10,7 @@ class StockBasedRestrictedCountryIdsProvider
      *
      * @return StockBasedRestrictedCountryIdsProvider
      */
-    public function __construct(private StockBasedPermitTypeConfigProvider $stockBasedPermitTypeConfigProvider)
+    public function __construct(private readonly StockBasedPermitTypeConfigProvider $stockBasedPermitTypeConfigProvider)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Common/TypeBasedPermitTypeConfigProviderFactory.php b/module/Api/src/Service/Permits/Common/TypeBasedPermitTypeConfigProviderFactory.php
index db8300ad23..8c747a53ad 100644
--- a/module/Api/src/Service/Permits/Common/TypeBasedPermitTypeConfigProviderFactory.php
+++ b/module/Api/src/Service/Permits/Common/TypeBasedPermitTypeConfigProviderFactory.php
@@ -20,7 +20,7 @@ class TypeBasedPermitTypeConfigProviderFactory implements FactoryInterface
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): TypeBasedPermitTypeConfigProvider
     {
         return new TypeBasedPermitTypeConfigProvider(
-            $container->get('Config')
+            $container->get('config')
         );
     }
 }
diff --git a/module/Api/src/Service/Permits/FeeBreakdown/BilateralFeeBreakdownGenerator.php b/module/Api/src/Service/Permits/FeeBreakdown/BilateralFeeBreakdownGenerator.php
index e3a589e9ce..87ddb241a9 100644
--- a/module/Api/src/Service/Permits/FeeBreakdown/BilateralFeeBreakdownGenerator.php
+++ b/module/Api/src/Service/Permits/FeeBreakdown/BilateralFeeBreakdownGenerator.php
@@ -25,7 +25,7 @@ class BilateralFeeBreakdownGenerator implements FeeBreakdownGeneratorInterface
      *
      * @return BilateralFeeBreakdownGenerator
      */
-    public function __construct(private FeeTypeRepository $feeTypeRepo)
+    public function __construct(private readonly FeeTypeRepository $feeTypeRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Fees/DaysToPayIssueFeeProvider.php b/module/Api/src/Service/Permits/Fees/DaysToPayIssueFeeProvider.php
index 1b99071efa..245aedfd76 100644
--- a/module/Api/src/Service/Permits/Fees/DaysToPayIssueFeeProvider.php
+++ b/module/Api/src/Service/Permits/Fees/DaysToPayIssueFeeProvider.php
@@ -13,7 +13,7 @@ class DaysToPayIssueFeeProvider
      *
      * @return DaysToPayIssueFeeProvider
      */
-    public function __construct(private SystemParameterRepository $systemParameterRepo)
+    public function __construct(private readonly SystemParameterRepository $systemParameterRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Fees/EcmtApplicationFeeCommandCreator.php b/module/Api/src/Service/Permits/Fees/EcmtApplicationFeeCommandCreator.php
index 3da330c713..ea1d6434c6 100644
--- a/module/Api/src/Service/Permits/Fees/EcmtApplicationFeeCommandCreator.php
+++ b/module/Api/src/Service/Permits/Fees/EcmtApplicationFeeCommandCreator.php
@@ -17,7 +17,7 @@ class EcmtApplicationFeeCommandCreator
      *
      * @return CreateFee
      */
-    public function __construct(private FeeTypeRepository $feeTypeRepo, private CommandCreator $commandCreator, private CurrentDateTimeFactory $currentDateTimeFactory)
+    public function __construct(private readonly FeeTypeRepository $feeTypeRepo, private readonly CommandCreator $commandCreator, private readonly CurrentDateTimeFactory $currentDateTimeFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/GrantabilityChecker.php b/module/Api/src/Service/Permits/GrantabilityChecker.php
index d94e4352a7..7b984072a3 100644
--- a/module/Api/src/Service/Permits/GrantabilityChecker.php
+++ b/module/Api/src/Service/Permits/GrantabilityChecker.php
@@ -17,7 +17,7 @@ class GrantabilityChecker
      *
      * @return GrantabilityChecker
      */
-    public function __construct(private EmissionsCategoriesGrantabilityChecker $emissionsCategoriesGrantabilityChecker, private CandidatePermitsGrantabilityChecker $candidatePermitsGrantabilityChecker)
+    public function __construct(private readonly EmissionsCategoriesGrantabilityChecker $emissionsCategoriesGrantabilityChecker, private readonly CandidatePermitsGrantabilityChecker $candidatePermitsGrantabilityChecker)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Scoring/CandidatePermitsCreator.php b/module/Api/src/Service/Permits/Scoring/CandidatePermitsCreator.php
index 87625014d7..50a98ff96c 100644
--- a/module/Api/src/Service/Permits/Scoring/CandidatePermitsCreator.php
+++ b/module/Api/src/Service/Permits/Scoring/CandidatePermitsCreator.php
@@ -17,7 +17,7 @@ class CandidatePermitsCreator
      *
      * @return CandidatePermitsCreator
      */
-    public function __construct(private IrhpCandidatePermitRepository $irhpCandidatePermitRepo, private SystemParameterRepository $systemParameterRepo, private IrhpCandidatePermitFactory $irhpCandidatePermitFactory)
+    public function __construct(private readonly IrhpCandidatePermitRepository $irhpCandidatePermitRepo, private readonly SystemParameterRepository $systemParameterRepo, private readonly IrhpCandidatePermitFactory $irhpCandidatePermitFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Scoring/EmissionsCategoryAvailabilityCounter.php b/module/Api/src/Service/Permits/Scoring/EmissionsCategoryAvailabilityCounter.php
index 5d1eff25b8..6e398b38f1 100644
--- a/module/Api/src/Service/Permits/Scoring/EmissionsCategoryAvailabilityCounter.php
+++ b/module/Api/src/Service/Permits/Scoring/EmissionsCategoryAvailabilityCounter.php
@@ -14,7 +14,7 @@ class EmissionsCategoryAvailabilityCounter
      *
      * @return EmissionsCategoryAvailabilityCounter
      */
-    public function __construct(private IrhpPermitRangeRepository $irhpPermitRangeRepo, private IrhpPermitRepository $irhpPermitRepo, private IrhpApplicationRepository $irhpApplicationRepo)
+    public function __construct(private readonly IrhpPermitRangeRepository $irhpPermitRangeRepo, private readonly IrhpPermitRepository $irhpPermitRepo, private readonly IrhpApplicationRepository $irhpApplicationRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Scoring/SuccessfulCandidatePermitsFacade.php b/module/Api/src/Service/Permits/Scoring/SuccessfulCandidatePermitsFacade.php
index f590ef6cf4..ad38f8f5c3 100644
--- a/module/Api/src/Service/Permits/Scoring/SuccessfulCandidatePermitsFacade.php
+++ b/module/Api/src/Service/Permits/Scoring/SuccessfulCandidatePermitsFacade.php
@@ -12,7 +12,7 @@ class SuccessfulCandidatePermitsFacade
      *
      * @return SuccessfulCandidatePermitsFacade
      */
-    public function __construct(private SuccessfulCandidatePermitsGenerator $successfulCandidatePermitsGenerator, private SuccessfulCandidatePermitsWriter $successfulCandidatePermitsWriter, private SuccessfulCandidatePermitsLogger $successfulCandidatePermitsLogger)
+    public function __construct(private readonly SuccessfulCandidatePermitsGenerator $successfulCandidatePermitsGenerator, private readonly SuccessfulCandidatePermitsWriter $successfulCandidatePermitsWriter, private readonly SuccessfulCandidatePermitsLogger $successfulCandidatePermitsLogger)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Scoring/SuccessfulCandidatePermitsGenerator.php b/module/Api/src/Service/Permits/Scoring/SuccessfulCandidatePermitsGenerator.php
index 53ec153a18..0a642b80d9 100644
--- a/module/Api/src/Service/Permits/Scoring/SuccessfulCandidatePermitsGenerator.php
+++ b/module/Api/src/Service/Permits/Scoring/SuccessfulCandidatePermitsGenerator.php
@@ -16,7 +16,7 @@ class SuccessfulCandidatePermitsGenerator
      *
      * @return SuccessfulCandidatePermitsGenerator
      */
-    public function __construct(private EmissionsCategoryAvailabilityCounter $emissionsCategoryAvailabilityCounter)
+    public function __construct(private readonly EmissionsCategoryAvailabilityCounter $emissionsCategoryAvailabilityCounter)
     {
     }
 
diff --git a/module/Api/src/Service/Permits/Scoring/SuccessfulCandidatePermitsWriter.php b/module/Api/src/Service/Permits/Scoring/SuccessfulCandidatePermitsWriter.php
index 2b77924f93..46c6caf84e 100644
--- a/module/Api/src/Service/Permits/Scoring/SuccessfulCandidatePermitsWriter.php
+++ b/module/Api/src/Service/Permits/Scoring/SuccessfulCandidatePermitsWriter.php
@@ -12,7 +12,7 @@ class SuccessfulCandidatePermitsWriter
      *
      * @return SuccessfulCandidatePermitsWriter
      */
-    public function __construct(private IrhpCandidatePermitRepository $irhpCandidatePermitRepo)
+    public function __construct(private readonly IrhpCandidatePermitRepository $irhpCandidatePermitRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Publication/Context/AbstractContext.php b/module/Api/src/Service/Publication/Context/AbstractContext.php
index f4500798fe..9dc6b3c5cb 100644
--- a/module/Api/src/Service/Publication/Context/AbstractContext.php
+++ b/module/Api/src/Service/Publication/Context/AbstractContext.php
@@ -10,7 +10,7 @@
  */
 abstract class AbstractContext implements ContextInterface
 {
-    public function __construct(private QueryHandlerManager $queryHandler)
+    public function __construct(private readonly QueryHandlerManager $queryHandler)
     {
     }
 
diff --git a/module/Api/src/Service/Publication/Formatter/Address.php b/module/Api/src/Service/Publication/Formatter/Address.php
index e3f9457202..ca6eae691c 100644
--- a/module/Api/src/Service/Publication/Formatter/Address.php
+++ b/module/Api/src/Service/Publication/Formatter/Address.php
@@ -20,12 +20,12 @@ class Address
     public static function format(AddressEntity $address, $separator = ', ')
     {
         $addressFields = [
-            'AddressLine1' => trim($address->getAddressLine1()),
-            'AddressLine2' => trim($address->getAddressLine2()),
-            'AddressLine3' => trim($address->getAddressLine3()),
-            'AddressLine4' => trim($address->getAddressLine4()),
-            'Town' => trim($address->getTown()),
-            'Postcode' => trim($address->getPostcode())
+            'AddressLine1' => trim($address->getAddressLine1() ?? ''),
+            'AddressLine2' => trim($address->getAddressLine2() ?? ''),
+            'AddressLine3' => trim($address->getAddressLine3() ?? ''),
+            'AddressLine4' => trim($address->getAddressLine4() ?? ''),
+            'Town' => trim($address->getTown() ?? ''),
+            'Postcode' => trim($address->getPostcode() ?? '')
         ];
 
         foreach ($addressFields as $field => $value) {
diff --git a/module/Api/src/Service/Publication/ImmutableArrayObject.php b/module/Api/src/Service/Publication/ImmutableArrayObject.php
index eacc14d3b9..941b84f487 100644
--- a/module/Api/src/Service/Publication/ImmutableArrayObject.php
+++ b/module/Api/src/Service/Publication/ImmutableArrayObject.php
@@ -7,15 +7,15 @@
  */
 class ImmutableArrayObject extends \ArrayObject
 {
-    public function offsetSet($index, $newval)
+    public function offsetSet($index, $newval): void
     {
     }
 
-    public function offsetUnset($index)
+    public function offsetUnset($index): void
     {
     }
 
-    public function exchangeArray($input)
+    public function exchangeArray($input): array
     {
         return [];
     }
diff --git a/module/Api/src/Service/Publication/Process/Text1.php b/module/Api/src/Service/Publication/Process/Text1.php
index c65a92308b..4a0afbb146 100644
--- a/module/Api/src/Service/Publication/Process/Text1.php
+++ b/module/Api/src/Service/Publication/Process/Text1.php
@@ -51,7 +51,7 @@ public function process(PublicationLink $publication, ImmutableArrayObject $cont
 
         //licence address
         if ($context->offsetExists('licenceAddress')) {
-            $hearingText[] = "\n" . strtoupper($context->offsetGet('licenceAddress'));
+            $hearingText[] = "\n" . strtoupper((string) $context->offsetGet('licenceAddress'));
         }
 
         $publication->setText1(implode(' ', $hearingText));
diff --git a/module/Api/src/Service/Publication/PublicationGenerator.php b/module/Api/src/Service/Publication/PublicationGenerator.php
index 628f6abd0b..4140234eb1 100644
--- a/module/Api/src/Service/Publication/PublicationGenerator.php
+++ b/module/Api/src/Service/Publication/PublicationGenerator.php
@@ -11,7 +11,7 @@
  */
 class PublicationGenerator
 {
-    public function __construct(private $publicationConfig, private ServiceLocatorInterface $publicationContextManager, private ServiceLocatorInterface $publicationProcessManager)
+    public function __construct(private $publicationConfig, private readonly ServiceLocatorInterface $publicationContextManager, private readonly ServiceLocatorInterface $publicationProcessManager)
     {
     }
 
diff --git a/module/Api/src/Service/Publication/PublicationGeneratorFactory.php b/module/Api/src/Service/Publication/PublicationGeneratorFactory.php
index 9195dc40c7..268ca02d46 100644
--- a/module/Api/src/Service/Publication/PublicationGeneratorFactory.php
+++ b/module/Api/src/Service/Publication/PublicationGeneratorFactory.php
@@ -26,7 +26,7 @@ class PublicationGeneratorFactory implements FactoryInterface
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): PublicationGenerator
     {
         return new PublicationGenerator(
-            $container->get('Config')['publications'],
+            $container->get('config')['publications'],
             $container->get(ContextPluginManager::class),
             $container->get(ProcessPluginManager::class)
         );
diff --git a/module/Api/src/Service/Qa/AnswerSaver/ApplicationAnswersClearer.php b/module/Api/src/Service/Qa/AnswerSaver/ApplicationAnswersClearer.php
index ae687748c4..c6135bbf67 100644
--- a/module/Api/src/Service/Qa/AnswerSaver/ApplicationAnswersClearer.php
+++ b/module/Api/src/Service/Qa/AnswerSaver/ApplicationAnswersClearer.php
@@ -18,7 +18,7 @@ class ApplicationAnswersClearer
      *
      * @return ApplicationAnswersClearer
      */
-    public function __construct(private SupplementedApplicationStepsProvider $supplementedApplicationStepsProvider, private QaContextFactory $qaContextFactory)
+    public function __construct(private readonly SupplementedApplicationStepsProvider $supplementedApplicationStepsProvider, private readonly QaContextFactory $qaContextFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/AnswerSaver/GenericAnswerProvider.php b/module/Api/src/Service/Qa/AnswerSaver/GenericAnswerProvider.php
index 6a7ebf293e..6b7e68d30d 100644
--- a/module/Api/src/Service/Qa/AnswerSaver/GenericAnswerProvider.php
+++ b/module/Api/src/Service/Qa/AnswerSaver/GenericAnswerProvider.php
@@ -13,7 +13,7 @@ class GenericAnswerProvider
      *
      * @return GenericAnswerProvider
      */
-    public function __construct(private AnswerRepository $answerRepo)
+    public function __construct(private readonly AnswerRepository $answerRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/AnswerSaver/GenericAnswerWriter.php b/module/Api/src/Service/Qa/AnswerSaver/GenericAnswerWriter.php
index e2fff064d0..e7625cfd7d 100644
--- a/module/Api/src/Service/Qa/AnswerSaver/GenericAnswerWriter.php
+++ b/module/Api/src/Service/Qa/AnswerSaver/GenericAnswerWriter.php
@@ -14,7 +14,7 @@ class GenericAnswerWriter
      *
      * @return GenericAnswerWriter
      */
-    public function __construct(private GenericAnswerProvider $genericAnswerProvider, private AnswerFactory $answerFactory, private AnswerRepository $answerRepo)
+    public function __construct(private readonly GenericAnswerProvider $genericAnswerProvider, private readonly AnswerFactory $answerFactory, private readonly AnswerRepository $answerRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/AnswersSummary/AnswersSummaryRowGenerator.php b/module/Api/src/Service/Qa/AnswersSummary/AnswersSummaryRowGenerator.php
index 3eee746fe8..8c8f63475e 100644
--- a/module/Api/src/Service/Qa/AnswersSummary/AnswersSummaryRowGenerator.php
+++ b/module/Api/src/Service/Qa/AnswersSummary/AnswersSummaryRowGenerator.php
@@ -22,7 +22,7 @@ class AnswersSummaryRowGenerator
      *
      * @return AnswersSummaryRowGenerator
      */
-    public function __construct(private AnswersSummaryRowFactory $answersSummaryRowFactory, private RendererInterface $viewRenderer, private QaContextFactory $qaContextFactory, private ElementGeneratorContextGenerator $elementGeneratorContextGenerator)
+    public function __construct(private readonly AnswersSummaryRowFactory $answersSummaryRowFactory, private readonly RendererInterface $viewRenderer, private readonly QaContextFactory $qaContextFactory, private readonly ElementGeneratorContextGenerator $elementGeneratorContextGenerator)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/AnswersSummary/AnswersSummaryRowsAdder.php b/module/Api/src/Service/Qa/AnswersSummary/AnswersSummaryRowsAdder.php
index 0b47e375cc..378962ef75 100644
--- a/module/Api/src/Service/Qa/AnswersSummary/AnswersSummaryRowsAdder.php
+++ b/module/Api/src/Service/Qa/AnswersSummary/AnswersSummaryRowsAdder.php
@@ -15,7 +15,7 @@ class AnswersSummaryRowsAdder implements AnswersSummaryRowsAdderInterface
      *
      * @return AnswersSummaryRowsAdder
      */
-    public function __construct(private SupplementedApplicationStepsProvider $supplementedApplicationStepsProvider, private AnswersSummaryRowGenerator $answersSummaryRowGenerator)
+    public function __construct(private readonly SupplementedApplicationStepsProvider $supplementedApplicationStepsProvider, private readonly AnswersSummaryRowGenerator $answersSummaryRowGenerator)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Facade/SupplementedApplicationSteps/SupplementedApplicationStep.php b/module/Api/src/Service/Qa/Facade/SupplementedApplicationSteps/SupplementedApplicationStep.php
index bbcb6fd729..8dc80e481a 100644
--- a/module/Api/src/Service/Qa/Facade/SupplementedApplicationSteps/SupplementedApplicationStep.php
+++ b/module/Api/src/Service/Qa/Facade/SupplementedApplicationSteps/SupplementedApplicationStep.php
@@ -13,7 +13,7 @@ class SupplementedApplicationStep
      *
      * @return SupplementedApplicationStep
      */
-    public function __construct(private ApplicationStep $applicationStep, private FormControlStrategyInterface $formControlStrategy)
+    public function __construct(private readonly ApplicationStep $applicationStep, private readonly FormControlStrategyInterface $formControlStrategy)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Facade/SupplementedApplicationSteps/SupplementedApplicationStepsProvider.php b/module/Api/src/Service/Qa/Facade/SupplementedApplicationSteps/SupplementedApplicationStepsProvider.php
index 9290ad0a1d..f14c2b3a8b 100644
--- a/module/Api/src/Service/Qa/Facade/SupplementedApplicationSteps/SupplementedApplicationStepsProvider.php
+++ b/module/Api/src/Service/Qa/Facade/SupplementedApplicationSteps/SupplementedApplicationStepsProvider.php
@@ -13,7 +13,7 @@ class SupplementedApplicationStepsProvider
      *
      * @return SupplementedApplicationStepsProvider
      */
-    public function __construct(private FormControlServiceManager $formControlServiceManager, private SupplementedApplicationStepFactory $supplementedApplicationStepFactory)
+    public function __construct(private readonly FormControlServiceManager $formControlServiceManager, private readonly SupplementedApplicationStepFactory $supplementedApplicationStepFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/PostSubmit/IrhpApplicationPostSubmitHandler.php b/module/Api/src/Service/Qa/PostSubmit/IrhpApplicationPostSubmitHandler.php
index ed019a68c3..d68a37e6e3 100644
--- a/module/Api/src/Service/Qa/PostSubmit/IrhpApplicationPostSubmitHandler.php
+++ b/module/Api/src/Service/Qa/PostSubmit/IrhpApplicationPostSubmitHandler.php
@@ -13,7 +13,7 @@ class IrhpApplicationPostSubmitHandler
      *
      * @return IrhpApplicationPostSubmitHandler
      */
-    public function __construct(private IrhpPermitRepository $irhpPermitRepo)
+    public function __construct(private readonly IrhpPermitRepository $irhpPermitRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/QaContext.php b/module/Api/src/Service/Qa/QaContext.php
index 5679ffec74..92107e56e1 100644
--- a/module/Api/src/Service/Qa/QaContext.php
+++ b/module/Api/src/Service/Qa/QaContext.php
@@ -12,7 +12,7 @@ class QaContext
      *
      * @return QaContext
      */
-    public function __construct(private ApplicationStepEntity $applicationStepEntity, private QaEntityInterface $qaEntity)
+    public function __construct(private readonly ApplicationStepEntity $applicationStepEntity, private readonly QaEntityInterface $qaEntity)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/QaContextGenerator.php b/module/Api/src/Service/Qa/QaContextGenerator.php
index be8de6c26d..9baea4f9d6 100644
--- a/module/Api/src/Service/Qa/QaContextGenerator.php
+++ b/module/Api/src/Service/Qa/QaContextGenerator.php
@@ -18,7 +18,7 @@ class QaContextGenerator
      *
      * @return QaContextGenerator
      */
-    public function __construct(private ApplicationStepRepository $applicationStepRepo, private QaEntityProvider $qaEntityProvider, private QaContextFactory $qaContextFactory)
+    public function __construct(private readonly ApplicationStepRepository $applicationStepRepo, private readonly QaEntityProvider $qaEntityProvider, private readonly QaContextFactory $qaContextFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/QaEntityProvider.php b/module/Api/src/Service/Qa/QaEntityProvider.php
index 9ba9314edf..2a1c151c51 100644
--- a/module/Api/src/Service/Qa/QaEntityProvider.php
+++ b/module/Api/src/Service/Qa/QaEntityProvider.php
@@ -14,7 +14,7 @@ class QaEntityProvider
      *
      * @return QaEntityProvider
      */
-    public function __construct(private IrhpApplicationRepository $irhpApplicationRepo, private IrhpPermitApplicationRepository $irhpPermitApplicationRepo)
+    public function __construct(private readonly IrhpApplicationRepository $irhpApplicationRepo, private readonly IrhpPermitApplicationRepository $irhpPermitApplicationRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Strategy/BaseFormControlStrategy.php b/module/Api/src/Service/Qa/Strategy/BaseFormControlStrategy.php
index 38b9302a79..ff9d86ba04 100644
--- a/module/Api/src/Service/Qa/Strategy/BaseFormControlStrategy.php
+++ b/module/Api/src/Service/Qa/Strategy/BaseFormControlStrategy.php
@@ -23,7 +23,7 @@ class BaseFormControlStrategy implements FormControlStrategyInterface
      *
      * @return BaseFormControlStrategy
      */
-    public function __construct(private $frontendType, private ElementGeneratorInterface $elementGenerator, private AnswerSaverInterface $answerSaver, private AnswerClearerInterface $answerClearer, private QuestionTextGeneratorInterface $questionTextGenerator, private AnswerSummaryProviderInterface $answerSummaryProvider)
+    public function __construct(private $frontendType, private readonly ElementGeneratorInterface $elementGenerator, private readonly AnswerSaverInterface $answerSaver, private readonly AnswerClearerInterface $answerClearer, private readonly QuestionTextGeneratorInterface $questionTextGenerator, private readonly AnswerSummaryProviderInterface $answerSummaryProvider)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/ApplicationStep.php b/module/Api/src/Service/Qa/Structure/ApplicationStep.php
index c360140db6..e01f4c65d7 100644
--- a/module/Api/src/Service/Qa/Structure/ApplicationStep.php
+++ b/module/Api/src/Service/Qa/Structure/ApplicationStep.php
@@ -17,7 +17,7 @@ class ApplicationStep
      *
      * @return ApplicationStep
      */
-    public function __construct(private $type, private $fieldsetName, private $shortName, private $slug, private $enabled, private ElementInterface $element, private ValidatorList $validatorList)
+    public function __construct(private $type, private $fieldsetName, private $shortName, private $slug, private $enabled, private readonly ElementInterface $element, private readonly ValidatorList $validatorList)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/ApplicationStepGenerator.php b/module/Api/src/Service/Qa/Structure/ApplicationStepGenerator.php
index 76d4c4a501..7e79baf9f3 100644
--- a/module/Api/src/Service/Qa/Structure/ApplicationStepGenerator.php
+++ b/module/Api/src/Service/Qa/Structure/ApplicationStepGenerator.php
@@ -14,7 +14,7 @@ class ApplicationStepGenerator
      *
      * @return ApplicationStepGenerator
      */
-    public function __construct(private FormControlServiceManager $formControlServiceManager, private ApplicationStepFactory $applicationStepFactory, private ElementGeneratorContextGenerator $elementGeneratorContextGenerator)
+    public function __construct(private readonly FormControlServiceManager $formControlServiceManager, private readonly ApplicationStepFactory $applicationStepFactory, private readonly ElementGeneratorContextGenerator $elementGeneratorContextGenerator)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/BaseAnswerSaver.php b/module/Api/src/Service/Qa/Structure/Element/BaseAnswerSaver.php
index ef602c009d..05444d4033 100644
--- a/module/Api/src/Service/Qa/Structure/Element/BaseAnswerSaver.php
+++ b/module/Api/src/Service/Qa/Structure/Element/BaseAnswerSaver.php
@@ -13,7 +13,7 @@ class BaseAnswerSaver
      *
      * @return BaseAnswerSaver
      */
-    public function __construct(private GenericAnswerWriter $genericAnswerWriter, private GenericAnswerFetcher $genericAnswerFetcher)
+    public function __construct(private readonly GenericAnswerWriter $genericAnswerWriter, private readonly GenericAnswerFetcher $genericAnswerFetcher)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Checkbox/Checkbox.php b/module/Api/src/Service/Qa/Structure/Element/Checkbox/Checkbox.php
index cbbe61b498..67aea2e5bf 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Checkbox/Checkbox.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Checkbox/Checkbox.php
@@ -16,7 +16,7 @@ class Checkbox implements ElementInterface
      *
      * @return Checkbox
      */
-    public function __construct(private TranslateableText $label, private TranslateableText $notCheckedMessage, private $checked)
+    public function __construct(private readonly TranslateableText $label, private readonly TranslateableText $notCheckedMessage, private $checked)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Custom/Bilateral/ClientReturnCodeHandler.php b/module/Api/src/Service/Qa/Structure/Element/Custom/Bilateral/ClientReturnCodeHandler.php
index 5a88843548..1c9b8b6333 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Custom/Bilateral/ClientReturnCodeHandler.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Custom/Bilateral/ClientReturnCodeHandler.php
@@ -16,7 +16,7 @@ class ClientReturnCodeHandler
      *
      * @return ClientReturnCodeHandler
      */
-    public function __construct(private ApplicationCountryRemover $applicationCountryRemover)
+    public function __construct(private readonly ApplicationCountryRemover $applicationCountryRemover)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Custom/Bilateral/CountryDeletingAnswerSaver.php b/module/Api/src/Service/Qa/Structure/Element/Custom/Bilateral/CountryDeletingAnswerSaver.php
index fdef0118ad..3fa9d06764 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Custom/Bilateral/CountryDeletingAnswerSaver.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Custom/Bilateral/CountryDeletingAnswerSaver.php
@@ -15,7 +15,7 @@ class CountryDeletingAnswerSaver
      *
      * @return CountryDeletingAnswerSaver
      */
-    public function __construct(private GenericAnswerFetcher $genericAnswerFetcher, private GenericAnswerWriter $genericAnswerWriter, private ClientReturnCodeHandler $clientReturnCodeHandler)
+    public function __construct(private readonly GenericAnswerFetcher $genericAnswerFetcher, private readonly GenericAnswerWriter $genericAnswerWriter, private readonly ClientReturnCodeHandler $clientReturnCodeHandler)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Custom/CertRoadworthiness/MotExpiryDate.php b/module/Api/src/Service/Qa/Structure/Element/Custom/CertRoadworthiness/MotExpiryDate.php
index 3f538e7182..59556851fe 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Custom/CertRoadworthiness/MotExpiryDate.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Custom/CertRoadworthiness/MotExpiryDate.php
@@ -14,7 +14,7 @@ class MotExpiryDate implements ElementInterface
      *
      * @return MotExpiryDate
      */
-    public function __construct(private $enableFileUploads, private DateWithThreshold $dateWithThreshold)
+    public function __construct(private $enableFileUploads, private readonly DateWithThreshold $dateWithThreshold)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Custom/Common/DateWithThreshold.php b/module/Api/src/Service/Qa/Structure/Element/Custom/Common/DateWithThreshold.php
index deb513c037..dc56977ca7 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Custom/Common/DateWithThreshold.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Custom/Common/DateWithThreshold.php
@@ -16,7 +16,7 @@ class DateWithThreshold implements ElementInterface
      *
      * @return DateWithThreshold
      */
-    public function __construct(private DateTime $dateThreshold, private DateElement $date)
+    public function __construct(private readonly DateTime $dateThreshold, private readonly DateElement $date)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Custom/Common/DateWithThresholdGenerator.php b/module/Api/src/Service/Qa/Structure/Element/Custom/Common/DateWithThresholdGenerator.php
index ef10404118..dd598a3cea 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Custom/Common/DateWithThresholdGenerator.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Custom/Common/DateWithThresholdGenerator.php
@@ -15,7 +15,7 @@ class DateWithThresholdGenerator
      *
      * @return DateWithThresholdGenerator
      */
-    public function __construct(private DateWithThresholdFactory $dateWithThresholdFactory, private CurrentDateTimeFactory $currentDateTimeFactory, private DateIntervalFactory $dateIntervalFactory, private DateGenerator $dateGenerator)
+    public function __construct(private readonly DateWithThresholdFactory $dateWithThresholdFactory, private readonly CurrentDateTimeFactory $currentDateTimeFactory, private readonly DateIntervalFactory $dateIntervalFactory, private readonly DateGenerator $dateGenerator)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/AnnualTripsAbroad.php b/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/AnnualTripsAbroad.php
index d4568c0644..f5d2ea6b42 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/AnnualTripsAbroad.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/AnnualTripsAbroad.php
@@ -15,7 +15,7 @@ class AnnualTripsAbroad implements ElementInterface
      *
      * @return AnnualTripsAbroad
      */
-    public function __construct(private $intensityWarningThreshold, private $showNiWarning, private Text $text)
+    public function __construct(private $intensityWarningThreshold, private $showNiWarning, private readonly Text $text)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/ConditionalFeeUpdater.php b/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/ConditionalFeeUpdater.php
index 8405b350d4..78ec63e8ed 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/ConditionalFeeUpdater.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/ConditionalFeeUpdater.php
@@ -12,7 +12,7 @@ class ConditionalFeeUpdater
      *
      * @return ConditionalFeeUpdater
      */
-    public function __construct(private FeeUpdater $feeUpdater)
+    public function __construct(private readonly FeeUpdater $feeUpdater)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/EmissionsCategoryConditionalAdder.php b/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/EmissionsCategoryConditionalAdder.php
index e6f1a21a05..099e27e9a2 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/EmissionsCategoryConditionalAdder.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/EmissionsCategoryConditionalAdder.php
@@ -12,7 +12,7 @@ class EmissionsCategoryConditionalAdder
      *
      * @return EmissionsCategoryConditionalAdder
      */
-    public function __construct(private EmissionsCategoryFactory $emissionsCategoryFactory, private EmissionsCategoryAvailabilityCounter $emissionsCategoryAvailabilityCounter)
+    public function __construct(private readonly EmissionsCategoryFactory $emissionsCategoryFactory, private readonly EmissionsCategoryAvailabilityCounter $emissionsCategoryAvailabilityCounter)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/FeeUpdater.php b/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/FeeUpdater.php
index 164cba4455..013dfae2eb 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/FeeUpdater.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/FeeUpdater.php
@@ -16,7 +16,7 @@ class FeeUpdater
      *
      * @return FeeUpdater
      */
-    public function __construct(private CommandCreator $commandCreator, private CommandHandlerManager $commandHandlerManager, private EcmtApplicationFeeCommandCreator $ecmtApplicationFeeCommandCreator)
+    public function __construct(private readonly CommandCreator $commandCreator, private readonly CommandHandlerManager $commandHandlerManager, private readonly EcmtApplicationFeeCommandCreator $ecmtApplicationFeeCommandCreator)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/IntJourneys.php b/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/IntJourneys.php
index 83b135dba3..95687084dc 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/IntJourneys.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/IntJourneys.php
@@ -14,7 +14,7 @@ class IntJourneys implements ElementInterface
      *
      * @return IntJourneys
      */
-    public function __construct(private $showNiWarning, private Radio $radio)
+    public function __construct(private $showNiWarning, private readonly Radio $radio)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/NoOfPermits.php b/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/NoOfPermits.php
index 46e50f9cfb..932cafd0a9 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/NoOfPermits.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/NoOfPermits.php
@@ -19,7 +19,7 @@ class NoOfPermits implements ElementInterface
      *
      * @return NoOfPermits
      */
-    public function __construct(private $maxCanApplyFor, private $maxPermitted, private $applicationFee, private $issueFee, private bool $skipAvailabilityValidation)
+    public function __construct(private $maxCanApplyFor, private $maxPermitted, private $applicationFee, private $issueFee, private readonly bool $skipAvailabilityValidation)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/NoOfPermitsAnswerFetcher.php b/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/NoOfPermitsAnswerFetcher.php
index ba9708ff7f..8981c8e89a 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/NoOfPermitsAnswerFetcher.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Custom/Ecmt/NoOfPermitsAnswerFetcher.php
@@ -14,7 +14,7 @@ class NoOfPermitsAnswerFetcher
      *
      * @return NoOfPermitsAnswerFetcher
      */
-    public function __construct(private NamedAnswerFetcher $namedAnswerFetcher)
+    public function __construct(private readonly NamedAnswerFetcher $namedAnswerFetcher)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/ElementGeneratorContext.php b/module/Api/src/Service/Qa/Structure/Element/ElementGeneratorContext.php
index 272d5dd246..df2e0ad52f 100644
--- a/module/Api/src/Service/Qa/Structure/Element/ElementGeneratorContext.php
+++ b/module/Api/src/Service/Qa/Structure/Element/ElementGeneratorContext.php
@@ -17,7 +17,7 @@ class ElementGeneratorContext
      *
      * @return ElementGeneratorContext
      */
-    public function __construct(private ValidatorList $validatorList, private QaContext $qaContext, private $elementContainer)
+    public function __construct(private readonly ValidatorList $validatorList, private readonly QaContext $qaContext, private $elementContainer)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/ElementGeneratorContextGenerator.php b/module/Api/src/Service/Qa/Structure/Element/ElementGeneratorContextGenerator.php
index 8f4c4c8096..73cbc82b09 100644
--- a/module/Api/src/Service/Qa/Structure/Element/ElementGeneratorContextGenerator.php
+++ b/module/Api/src/Service/Qa/Structure/Element/ElementGeneratorContextGenerator.php
@@ -10,7 +10,7 @@ class ElementGeneratorContextGenerator
     /**
      * Create service instance
      */
-    public function __construct(private ValidatorListGenerator $validatorListGenerator, private ElementGeneratorContextFactory $elementGeneratorContextFactory)
+    public function __construct(private readonly ValidatorListGenerator $validatorListGenerator, private readonly ElementGeneratorContextFactory $elementGeneratorContextFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/GenericAnswerFetcher.php b/module/Api/src/Service/Qa/Structure/Element/GenericAnswerFetcher.php
index c0962d9b44..66860e8224 100644
--- a/module/Api/src/Service/Qa/Structure/Element/GenericAnswerFetcher.php
+++ b/module/Api/src/Service/Qa/Structure/Element/GenericAnswerFetcher.php
@@ -6,7 +6,7 @@
 
 class GenericAnswerFetcher
 {
-    public function __construct(private NamedAnswerFetcher $namedAnswerFetcher)
+    public function __construct(private readonly NamedAnswerFetcher $namedAnswerFetcher)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Options/EcmtPermitUsageRefDataSource.php b/module/Api/src/Service/Qa/Structure/Element/Options/EcmtPermitUsageRefDataSource.php
index 10da27366b..c8fca1dd6e 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Options/EcmtPermitUsageRefDataSource.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Options/EcmtPermitUsageRefDataSource.php
@@ -15,7 +15,7 @@ class EcmtPermitUsageRefDataSource implements SourceInterface
      *
      * @return EcmtPermitUsageRefDataSource
      */
-    public function __construct(private RefDataSource $refDataSource, private array $transformations)
+    public function __construct(private readonly RefDataSource $refDataSource, private array $transformations)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Options/OptionList.php b/module/Api/src/Service/Qa/Structure/Element/Options/OptionList.php
index 0386ee7c98..0a111b2899 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Options/OptionList.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Options/OptionList.php
@@ -13,7 +13,7 @@ class OptionList
      *
      * @return OptionList
      */
-    public function __construct(private OptionFactory $optionFactory)
+    public function __construct(private readonly OptionFactory $optionFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Options/OptionListGenerator.php b/module/Api/src/Service/Qa/Structure/Element/Options/OptionListGenerator.php
index 34ef0b8c46..77f403980e 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Options/OptionListGenerator.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Options/OptionListGenerator.php
@@ -15,7 +15,7 @@ class OptionListGenerator
      *
      * @return OptionListGenerator
      */
-    public function __construct(private OptionListFactory $optionListFactory, private OptionFactory $optionFactory)
+    public function __construct(private readonly OptionListFactory $optionListFactory, private readonly OptionFactory $optionFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Options/RefDataSource.php b/module/Api/src/Service/Qa/Structure/Element/Options/RefDataSource.php
index 07047851c6..c933da20c0 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Options/RefDataSource.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Options/RefDataSource.php
@@ -12,7 +12,7 @@ class RefDataSource implements SourceInterface
      *
      * @return RefDataSource
      */
-    public function __construct(private RefDataRepository $refDataRepo)
+    public function __construct(private readonly RefDataRepository $refDataRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Options/RepoQuerySource.php b/module/Api/src/Service/Qa/Structure/Element/Options/RepoQuerySource.php
index 8169f7db78..58c0d11b11 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Options/RepoQuerySource.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Options/RepoQuerySource.php
@@ -12,7 +12,7 @@ class RepoQuerySource implements SourceInterface
      *
      * @return RepoQuerySource
      */
-    public function __construct(private RepositoryServiceManager $repoServiceManager)
+    public function __construct(private readonly RepositoryServiceManager $repoServiceManager)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Radio/Radio.php b/module/Api/src/Service/Qa/Structure/Element/Radio/Radio.php
index d6ede61f48..9a8eab85aa 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Radio/Radio.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Radio/Radio.php
@@ -14,7 +14,7 @@ class Radio implements ElementInterface
      *
      * @return Radio
      */
-    public function __construct(private OptionList $optionList, private TranslateableText $notSelectedMessage, private mixed $value)
+    public function __construct(private readonly OptionList $optionList, private readonly TranslateableText $notSelectedMessage, private readonly mixed $value)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Text/Custom/EcmtRemoval/NoOfPermits/AnswerWriter.php b/module/Api/src/Service/Qa/Structure/Element/Text/Custom/EcmtRemoval/NoOfPermits/AnswerWriter.php
index 80c8122341..fbd94bf88e 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Text/Custom/EcmtRemoval/NoOfPermits/AnswerWriter.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Text/Custom/EcmtRemoval/NoOfPermits/AnswerWriter.php
@@ -13,7 +13,7 @@ class AnswerWriter
      *
      * @return AnswerWriter
      */
-    public function __construct(private IrhpPermitApplicationRepository $irhpPermitApplicationRepo)
+    public function __construct(private readonly IrhpPermitApplicationRepository $irhpPermitApplicationRepo)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Text/Custom/EcmtRemoval/NoOfPermits/FeeCreator.php b/module/Api/src/Service/Qa/Structure/Element/Text/Custom/EcmtRemoval/NoOfPermits/FeeCreator.php
index be143c9cdc..a95503e3a2 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Text/Custom/EcmtRemoval/NoOfPermits/FeeCreator.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Text/Custom/EcmtRemoval/NoOfPermits/FeeCreator.php
@@ -20,7 +20,7 @@ class FeeCreator
      *
      * @return FeeCreator
      */
-    public function __construct(private FeeTypeRepository $feeTypeRepo, private CommandCreator $commandCreator, private CommandHandlerManager $commandHandlerManager, private CurrentDateTimeFactory $currentDateTimeFactory)
+    public function __construct(private readonly FeeTypeRepository $feeTypeRepo, private readonly CommandCreator $commandCreator, private readonly CommandHandlerManager $commandHandlerManager, private readonly CurrentDateTimeFactory $currentDateTimeFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Element/Text/Text.php b/module/Api/src/Service/Qa/Structure/Element/Text/Text.php
index a2754cc16f..68c7530260 100644
--- a/module/Api/src/Service/Qa/Structure/Element/Text/Text.php
+++ b/module/Api/src/Service/Qa/Structure/Element/Text/Text.php
@@ -16,7 +16,7 @@ class Text implements ElementInterface
      *
      * @return Text
      */
-    public function __construct(private $value, private ?TranslateableText $label = null, private ?TranslateableText $hint = null)
+    public function __construct(private $value, private readonly ?TranslateableText $label = null, private readonly ?TranslateableText $hint = null)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/FilteredTranslateableText.php b/module/Api/src/Service/Qa/Structure/FilteredTranslateableText.php
index 4338dbd547..46675036e2 100644
--- a/module/Api/src/Service/Qa/Structure/FilteredTranslateableText.php
+++ b/module/Api/src/Service/Qa/Structure/FilteredTranslateableText.php
@@ -11,7 +11,7 @@ class FilteredTranslateableText
      *
      * @return FilteredTranslateableText
      */
-    public function __construct(private $filter, private TranslateableText $translateableText)
+    public function __construct(private $filter, private readonly TranslateableText $translateableText)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/FilteredTranslateableTextGenerator.php b/module/Api/src/Service/Qa/Structure/FilteredTranslateableTextGenerator.php
index a9ac392051..2c3464661a 100644
--- a/module/Api/src/Service/Qa/Structure/FilteredTranslateableTextGenerator.php
+++ b/module/Api/src/Service/Qa/Structure/FilteredTranslateableTextGenerator.php
@@ -10,7 +10,7 @@ class FilteredTranslateableTextGenerator
      *
      * @return FilteredTranslateableText
      */
-    public function __construct(private FilteredTranslateableTextFactory $filteredTranslateableTextFactory, private TranslateableTextGenerator $translateableTextGenerator)
+    public function __construct(private readonly FilteredTranslateableTextFactory $filteredTranslateableTextFactory, private readonly TranslateableTextGenerator $translateableTextGenerator)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/FormFragmentGenerator.php b/module/Api/src/Service/Qa/Structure/FormFragmentGenerator.php
index f95b36e94c..008e95cf65 100644
--- a/module/Api/src/Service/Qa/Structure/FormFragmentGenerator.php
+++ b/module/Api/src/Service/Qa/Structure/FormFragmentGenerator.php
@@ -14,7 +14,7 @@ class FormFragmentGenerator
      *
      * @return FormFragmentGenerator
      */
-    public function __construct(private FormFragmentFactory $formFragmentFactory, private ApplicationStepGenerator $applicationStepGenerator, private QaContextFactory $qaContextFactory)
+    public function __construct(private readonly FormFragmentFactory $formFragmentFactory, private readonly ApplicationStepGenerator $applicationStepGenerator, private readonly QaContextFactory $qaContextFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/JsonDecodingFilteredTranslateableTextGenerator.php b/module/Api/src/Service/Qa/Structure/JsonDecodingFilteredTranslateableTextGenerator.php
index d1772b65c6..eeec436269 100644
--- a/module/Api/src/Service/Qa/Structure/JsonDecodingFilteredTranslateableTextGenerator.php
+++ b/module/Api/src/Service/Qa/Structure/JsonDecodingFilteredTranslateableTextGenerator.php
@@ -10,7 +10,7 @@ class JsonDecodingFilteredTranslateableTextGenerator
      *
      * @return JsonDecodingFilteredTranslateableTextGenerator
      */
-    public function __construct(private FilteredTranslateableTextGenerator $filteredTranslateableTextGenerator)
+    public function __construct(private readonly FilteredTranslateableTextGenerator $filteredTranslateableTextGenerator)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/QuestionText/Custom/Bilateral/CabotageGenerator.php b/module/Api/src/Service/Qa/Structure/QuestionText/Custom/Bilateral/CabotageGenerator.php
index 993a974fb7..80e1fe95a4 100644
--- a/module/Api/src/Service/Qa/Structure/QuestionText/Custom/Bilateral/CabotageGenerator.php
+++ b/module/Api/src/Service/Qa/Structure/QuestionText/Custom/Bilateral/CabotageGenerator.php
@@ -38,7 +38,7 @@ public function generate(QaContext $qaContext)
 
         $key = sprintf(
             $additionalGuidanceTranslateableText->getKey(),
-            strtolower($countryCode)
+            strtolower((string) $countryCode)
         );
 
         $additionalGuidanceTranslateableText->setKey($key);
diff --git a/module/Api/src/Service/Qa/Structure/QuestionText/QuestionText.php b/module/Api/src/Service/Qa/Structure/QuestionText/QuestionText.php
index fe47daefea..8a04e26176 100644
--- a/module/Api/src/Service/Qa/Structure/QuestionText/QuestionText.php
+++ b/module/Api/src/Service/Qa/Structure/QuestionText/QuestionText.php
@@ -17,7 +17,7 @@ class QuestionText
      *
      * @return QuestionText
      */
-    public function __construct(private ?FilteredTranslateableText $question = null, private ?FilteredTranslateableText $questionSummary = null, private ?FilteredTranslateableText $details = null, private ?FilteredTranslateableText $guidance = null, private ?FilteredTranslateableText $additionalGuidance = null)
+    public function __construct(private readonly ?FilteredTranslateableText $question = null, private readonly ?FilteredTranslateableText $questionSummary = null, private readonly ?FilteredTranslateableText $details = null, private readonly ?FilteredTranslateableText $guidance = null, private readonly ?FilteredTranslateableText $additionalGuidance = null)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/SelfservePage.php b/module/Api/src/Service/Qa/Structure/SelfservePage.php
index 37c4ab5e5b..9fe32c9817 100644
--- a/module/Api/src/Service/Qa/Structure/SelfservePage.php
+++ b/module/Api/src/Service/Qa/Structure/SelfservePage.php
@@ -15,7 +15,7 @@ class SelfservePage
      *
      * @return SelfservePage
      */
-    public function __construct(private $title, private array $additionalViewData, private ApplicationStep $applicationStep, private QuestionText $questionText, private $submitOptionsName, private $nextStepSlug)
+    public function __construct(private $title, private readonly array $additionalViewData, private readonly ApplicationStep $applicationStep, private readonly QuestionText $questionText, private $submitOptionsName, private $nextStepSlug)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/SelfservePageGenerator.php b/module/Api/src/Service/Qa/Structure/SelfservePageGenerator.php
index 73fe011a3f..b4b9eb30f1 100644
--- a/module/Api/src/Service/Qa/Structure/SelfservePageGenerator.php
+++ b/module/Api/src/Service/Qa/Structure/SelfservePageGenerator.php
@@ -13,7 +13,7 @@ class SelfservePageGenerator
      *
      * @return SelfservePageGenerator
      */
-    public function __construct(private SelfservePageFactory $selfservePageFactory, private ApplicationStepGenerator $applicationStepGenerator, private FormControlServiceManager $formControlServiceManager)
+    public function __construct(private readonly SelfservePageFactory $selfservePageFactory, private readonly ApplicationStepGenerator $applicationStepGenerator, private readonly FormControlServiceManager $formControlServiceManager)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/TranslateableTextGenerator.php b/module/Api/src/Service/Qa/Structure/TranslateableTextGenerator.php
index 7ebb33424e..6833d9a1c3 100644
--- a/module/Api/src/Service/Qa/Structure/TranslateableTextGenerator.php
+++ b/module/Api/src/Service/Qa/Structure/TranslateableTextGenerator.php
@@ -10,7 +10,7 @@ class TranslateableTextGenerator
      *
      * @return TranslateableTextGenerator
      */
-    public function __construct(private TranslateableTextFactory $translateableTextFactory, private TranslateableTextParameterGenerator $translateableTextParameterGenerator)
+    public function __construct(private readonly TranslateableTextFactory $translateableTextFactory, private readonly TranslateableTextParameterGenerator $translateableTextParameterGenerator)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/TranslateableTextParameterGenerator.php b/module/Api/src/Service/Qa/Structure/TranslateableTextParameterGenerator.php
index 912619a79b..630fcf9e2a 100644
--- a/module/Api/src/Service/Qa/Structure/TranslateableTextParameterGenerator.php
+++ b/module/Api/src/Service/Qa/Structure/TranslateableTextParameterGenerator.php
@@ -11,7 +11,7 @@ class TranslateableTextParameterGenerator
      *
      * @return TranslateableTextParameterGenerator
      */
-    public function __construct(private TranslateableTextParameterFactory $translateableTextParameterFactory)
+    public function __construct(private readonly TranslateableTextParameterFactory $translateableTextParameterFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/Validator.php b/module/Api/src/Service/Qa/Structure/Validator.php
index 69da603a65..ea6b3d4db3 100644
--- a/module/Api/src/Service/Qa/Structure/Validator.php
+++ b/module/Api/src/Service/Qa/Structure/Validator.php
@@ -12,7 +12,7 @@ class Validator
      *
      * @return Validator
      */
-    public function __construct(private string $rule, private array $params)
+    public function __construct(private readonly string $rule, private array $params)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/ValidatorGenerator.php b/module/Api/src/Service/Qa/Structure/ValidatorGenerator.php
index 554aca8c95..aba69ad732 100644
--- a/module/Api/src/Service/Qa/Structure/ValidatorGenerator.php
+++ b/module/Api/src/Service/Qa/Structure/ValidatorGenerator.php
@@ -12,7 +12,7 @@ class ValidatorGenerator
      *
      * @return ValidatorGenerator
      */
-    public function __construct(private ValidatorFactory $validatorFactory)
+    public function __construct(private readonly ValidatorFactory $validatorFactory)
     {
     }
 
diff --git a/module/Api/src/Service/Qa/Structure/ValidatorListGenerator.php b/module/Api/src/Service/Qa/Structure/ValidatorListGenerator.php
index d1edea8333..4b10727a23 100644
--- a/module/Api/src/Service/Qa/Structure/ValidatorListGenerator.php
+++ b/module/Api/src/Service/Qa/Structure/ValidatorListGenerator.php
@@ -12,7 +12,7 @@ class ValidatorListGenerator
      *
      * @return ValidatorListGenerator
      */
-    public function __construct(private ValidatorListFactory $validatorListFactory, private ValidatorGenerator $validatorGenerator)
+    public function __construct(private readonly ValidatorListFactory $validatorListFactory, private readonly ValidatorGenerator $validatorGenerator)
     {
     }
 
diff --git a/module/Api/src/Service/Submission/Sections/AbstractSection.php b/module/Api/src/Service/Submission/Sections/AbstractSection.php
index 8a52d16feb..ac0a440871 100644
--- a/module/Api/src/Service/Submission/Sections/AbstractSection.php
+++ b/module/Api/src/Service/Submission/Sections/AbstractSection.php
@@ -44,8 +44,8 @@ public function getRepo($name)
     }
 
     public function __construct(
-        private QueryHandlerManager $queryHandler,
-        private PhpRenderer $viewRenderer
+        private readonly QueryHandlerManager $queryHandler,
+        private readonly PhpRenderer $viewRenderer
     ) {
     }
 
diff --git a/module/Api/src/Service/Submission/Sections/Oppositions.php b/module/Api/src/Service/Submission/Sections/Oppositions.php
index 787a54dc78..97f08d9918 100644
--- a/module/Api/src/Service/Submission/Sections/Oppositions.php
+++ b/module/Api/src/Service/Submission/Sections/Oppositions.php
@@ -30,8 +30,8 @@ public function generateSection(CasesEntity $case)
                 /** @var Opposition $a */
                 /** @var Opposition $b */
                 strnatcmp(
-                    $b->getOppositionType()->getDescription(),
-                    $a->getOppositionType()->getDescription()
+                    (string) $b->getOppositionType()->getDescription(),
+                    (string) $a->getOppositionType()->getDescription()
                 )
         );
 
diff --git a/module/Api/src/Service/Submission/SubmissionGenerator.php b/module/Api/src/Service/Submission/SubmissionGenerator.php
index e810e4d136..1c6a5e00e9 100644
--- a/module/Api/src/Service/Submission/SubmissionGenerator.php
+++ b/module/Api/src/Service/Submission/SubmissionGenerator.php
@@ -24,7 +24,7 @@ class SubmissionGenerator
      *
      * @return void
      */
-    public function __construct(private array $submissionConfig, private SectionGeneratorPluginManager $sectionGeneratorPluginManager)
+    public function __construct(private array $submissionConfig, private readonly SectionGeneratorPluginManager $sectionGeneratorPluginManager)
     {
     }
 
@@ -49,7 +49,8 @@ public function generateSubmission(SubmissionEntity $submissionEntity, $sections
 
         $requiredSections = $this->getRequiredSections($sectionTypeId, $sections, $isTm);
 
-        $snapshot = json_decode($submissionEntity->getDataSnapshot(), true);
+        $snapshotData = $submissionEntity->getDataSnapshot();
+        $snapshot = json_decode($snapshotData ?? '[]', true);
 
         //  store and set new limit of execution time
         $timeLimit = ini_get('MAX_EXECUTION_TIME');
diff --git a/module/Api/src/Service/Submission/SubmissionGeneratorFactory.php b/module/Api/src/Service/Submission/SubmissionGeneratorFactory.php
index 3ff1d6a017..dedcd9ba20 100644
--- a/module/Api/src/Service/Submission/SubmissionGeneratorFactory.php
+++ b/module/Api/src/Service/Submission/SubmissionGeneratorFactory.php
@@ -25,7 +25,7 @@ class SubmissionGeneratorFactory implements FactoryInterface
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): SubmissionGenerator
     {
         return new SubmissionGenerator(
-            $container->get('Config')['submissions'],
+            $container->get('config')['submissions'],
             $container->get(SectionGeneratorPluginManager::class)
         );
     }
diff --git a/module/Api/src/Service/Template/DatabaseTemplateFetcher.php b/module/Api/src/Service/Template/DatabaseTemplateFetcher.php
index 9efe592e3a..3d9aa857ec 100644
--- a/module/Api/src/Service/Template/DatabaseTemplateFetcher.php
+++ b/module/Api/src/Service/Template/DatabaseTemplateFetcher.php
@@ -18,7 +18,7 @@ class DatabaseTemplateFetcher
      *
      * @return DatabaseTemplateFetcher
      */
-    public function __construct(private TemplateRepo $repo)
+    public function __construct(private readonly TemplateRepo $repo)
     {
     }
 
diff --git a/module/Api/src/Service/Template/DatabaseTwigLoader.php b/module/Api/src/Service/Template/DatabaseTwigLoader.php
index 6a7c55a181..b58d6aeca4 100644
--- a/module/Api/src/Service/Template/DatabaseTwigLoader.php
+++ b/module/Api/src/Service/Template/DatabaseTwigLoader.php
@@ -15,7 +15,7 @@ class DatabaseTwigLoader implements LoaderInterface
      *
      * @return DatabaseTwigLoader
      */
-    public function __construct(private DatabaseTemplateFetcher $templateFetcher)
+    public function __construct(private readonly DatabaseTemplateFetcher $templateFetcher)
     {
     }
 
diff --git a/module/Api/src/Service/Template/StrategySelectingViewRenderer.php b/module/Api/src/Service/Template/StrategySelectingViewRenderer.php
index 5b1921e896..5e46a66286 100644
--- a/module/Api/src/Service/Template/StrategySelectingViewRenderer.php
+++ b/module/Api/src/Service/Template/StrategySelectingViewRenderer.php
@@ -14,7 +14,7 @@ class StrategySelectingViewRenderer
      *
      * @return StrategySelectingViewRenderer
      */
-    public function __construct(private RendererInterface $legacyViewRenderer, private TwigRenderer $twigRenderer, private TwigLoader $twigLoader)
+    public function __construct(private readonly RendererInterface $legacyViewRenderer, private readonly TwigRenderer $twigRenderer, private readonly TwigLoader $twigLoader)
     {
     }
 
diff --git a/module/Api/src/Service/Template/TwigRenderer.php b/module/Api/src/Service/Template/TwigRenderer.php
index f30717cc94..ceb104c706 100644
--- a/module/Api/src/Service/Template/TwigRenderer.php
+++ b/module/Api/src/Service/Template/TwigRenderer.php
@@ -12,7 +12,7 @@ class TwigRenderer
      *
      * @return TwigRenderer
      */
-    public function __construct(private Environment $twig)
+    public function __construct(private readonly Environment $twig)
     {
     }
 
diff --git a/module/Api/src/Service/Toggle/ToggleService.php b/module/Api/src/Service/Toggle/ToggleService.php
index 72299c6446..544fea2e7d 100644
--- a/module/Api/src/Service/Toggle/ToggleService.php
+++ b/module/Api/src/Service/Toggle/ToggleService.php
@@ -11,7 +11,7 @@
  */
 class ToggleService
 {
-    public function __construct(private ToggleManager $toggleManager)
+    public function __construct(private readonly ToggleManager $toggleManager)
     {
     }
 
diff --git a/module/Api/src/Service/Translator/TranslationLoader.php b/module/Api/src/Service/Translator/TranslationLoader.php
index 7f35d5b304..39eee1ac84 100644
--- a/module/Api/src/Service/Translator/TranslationLoader.php
+++ b/module/Api/src/Service/Translator/TranslationLoader.php
@@ -24,7 +24,7 @@ class TranslationLoader implements RemoteLoaderInterface
     /**
      * TranslationLoader constructor.
      */
-    public function __construct(private CacheEncryption $cache, private TranslationKeyTextRepo $translationKeyRepo, private ReplacementRepo $replacementRepo)
+    public function __construct(private readonly CacheEncryption $cache, private readonly TranslationKeyTextRepo $translationKeyRepo, private readonly ReplacementRepo $replacementRepo)
     {
     }
 
diff --git a/module/Auth/src/Client/CognitoClientFactory.php b/module/Auth/src/Client/CognitoClientFactory.php
index bca6f37a7d..a06f8f8c0a 100644
--- a/module/Auth/src/Client/CognitoClientFactory.php
+++ b/module/Auth/src/Client/CognitoClientFactory.php
@@ -38,7 +38,7 @@ class CognitoClientFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): Client
     {
-        $config = $container->get('Config')[static::CONFIG_NAMESPACE][static::CONFIG_ADAPTERS][static::CONFIG_ADAPTER];
+        $config = $container->get('config')[static::CONFIG_NAMESPACE][static::CONFIG_ADAPTERS][static::CONFIG_ADAPTER];
 
         $this->validateConfig($config);
 
diff --git a/module/Auth/test/Adapter/CognitoAdapterFactoryTest.php b/module/Auth/test/Adapter/CognitoAdapterFactoryTest.php
index 86de7ca481..6e5f7a3959 100644
--- a/module/Auth/test/Adapter/CognitoAdapterFactoryTest.php
+++ b/module/Auth/test/Adapter/CognitoAdapterFactoryTest.php
@@ -35,7 +35,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
diff --git a/module/Auth/test/Adapter/ValidatableAdapterFactoryTest.php b/module/Auth/test/Adapter/ValidatableAdapterFactoryTest.php
index 5e3e317d46..09eded0d21 100644
--- a/module/Auth/test/Adapter/ValidatableAdapterFactoryTest.php
+++ b/module/Auth/test/Adapter/ValidatableAdapterFactoryTest.php
@@ -64,7 +64,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
diff --git a/module/Auth/test/Client/CognitoClientFactoryTest.php b/module/Auth/test/Client/CognitoClientFactoryTest.php
index 328f33b571..59159c0e12 100644
--- a/module/Auth/test/Client/CognitoClientFactoryTest.php
+++ b/module/Auth/test/Client/CognitoClientFactoryTest.php
@@ -41,7 +41,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
@@ -163,6 +163,6 @@ protected function configService(array $config = null)
             ]
         ];
 
-        $this->serviceManager->setService('Config', $config);
+        $this->serviceManager->setService('config', $config);
     }
 }
diff --git a/module/Auth/test/Service/AuthenticationServiceFactoryTest.php b/module/Auth/test/Service/AuthenticationServiceFactoryTest.php
index 36d74e1207..516441051d 100644
--- a/module/Auth/test/Service/AuthenticationServiceFactoryTest.php
+++ b/module/Auth/test/Service/AuthenticationServiceFactoryTest.php
@@ -32,7 +32,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
diff --git a/module/Auth/test/Service/PasswordServiceFactoryTest.php b/module/Auth/test/Service/PasswordServiceFactoryTest.php
index 1a5c8ff58d..86b1b8951d 100644
--- a/module/Auth/test/Service/PasswordServiceFactoryTest.php
+++ b/module/Auth/test/Service/PasswordServiceFactoryTest.php
@@ -28,7 +28,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
diff --git a/module/AwsSdk/src/Factories/CognitoIdentityProviderClientFactory.php b/module/AwsSdk/src/Factories/CognitoIdentityProviderClientFactory.php
index e915527531..a9c8654095 100644
--- a/module/AwsSdk/src/Factories/CognitoIdentityProviderClientFactory.php
+++ b/module/AwsSdk/src/Factories/CognitoIdentityProviderClientFactory.php
@@ -22,7 +22,7 @@ class CognitoIdentityProviderClientFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): CognitoIdentityProviderClient
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         return  new CognitoIdentityProviderClient([
             'version' => '2016-04-18',
             'region' => $config['awsOptions']['cognito']['region'],
diff --git a/module/AwsSdk/src/Factories/S3ClientFactory.php b/module/AwsSdk/src/Factories/S3ClientFactory.php
index cc81e7e3b9..41779ae939 100644
--- a/module/AwsSdk/src/Factories/S3ClientFactory.php
+++ b/module/AwsSdk/src/Factories/S3ClientFactory.php
@@ -25,7 +25,7 @@ class S3ClientFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): S3Client
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         $s3Client = new S3Client([
             'region' => $config['awsOptions']['region'],
             'version' => $config['awsOptions']['version'],
diff --git a/module/AwsSdk/src/Factories/SqsClientFactory.php b/module/AwsSdk/src/Factories/SqsClientFactory.php
index a208ad2feb..29cb547e39 100644
--- a/module/AwsSdk/src/Factories/SqsClientFactory.php
+++ b/module/AwsSdk/src/Factories/SqsClientFactory.php
@@ -25,7 +25,7 @@ class SqsClientFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): SqsClient
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         $sqsClient = new SqsClient([
             'region' => $config['awsOptions']['region'],
             'version' => $config['awsOptions']['version'],
diff --git a/module/Cli/src/Command/Queue/ProcessQueueCommand.php b/module/Cli/src/Command/Queue/ProcessQueueCommand.php
index 491e06cc26..7e72f7f903 100644
--- a/module/Cli/src/Command/Queue/ProcessQueueCommand.php
+++ b/module/Cli/src/Command/Queue/ProcessQueueCommand.php
@@ -20,7 +20,7 @@ class ProcessQueueCommand extends AbstractOlcsCommand
     public function __construct(
         CommandHandlerManager $commandHandlerManager,
         private array $config,
-        private QueueProcessor $queueProcessor
+        private readonly QueueProcessor $queueProcessor
     ) {
         parent::__construct(
             $commandHandlerManager
@@ -53,8 +53,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $this->initializeOutputInterface($output);
 
-        $includeTypes = array_filter(explode(',', $input->getOption('type')));
-        $excludeTypes = array_filter(explode(',', $input->getOption('exclude')));
+        $includeTypes = array_filter(explode(',', (string) $input->getOption('type')));
+        $excludeTypes = array_filter(explode(',', (string) $input->getOption('exclude')));
         $queueDuration = (int) $input->getOption('queue-duration') ?: $this->config['queue']['runFor'] ?? self::DEFAULT_RUN_FOR;
 
         $this->logAndWriteVerboseMessage("Processing queue items...");
diff --git a/module/Cli/src/Domain/CommandHandler/CleanUpAbandonedVariations.php b/module/Cli/src/Domain/CommandHandler/CleanUpAbandonedVariations.php
index db4f9f6ff9..41884e5bb6 100644
--- a/module/Cli/src/Domain/CommandHandler/CleanUpAbandonedVariations.php
+++ b/module/Cli/src/Domain/CommandHandler/CleanUpAbandonedVariations.php
@@ -52,7 +52,7 @@ public function handleCommand(CommandInterface $command)
     }
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (isset($config['batch_config']['clean-abandoned-variations']['older-than'])) {
             $this->olderThan = $config['batch_config']['clean-abandoned-variations']['older-than'];
         }
diff --git a/module/Cli/src/Domain/CommandHandler/CompaniesHouseVsOlcsDiffsExport.php b/module/Cli/src/Domain/CommandHandler/CompaniesHouseVsOlcsDiffsExport.php
index 63f9ce0d2e..e1ba3d68d8 100644
--- a/module/Cli/src/Domain/CommandHandler/CompaniesHouseVsOlcsDiffsExport.php
+++ b/module/Cli/src/Domain/CommandHandler/CompaniesHouseVsOlcsDiffsExport.php
@@ -132,7 +132,7 @@ private function makeCsvsFromDbalResult(Result $dbalResult, string $fileName): v
 
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         $exportCfg = (!empty($config['ch-vs-olcs-export']) ? $config['ch-vs-olcs-export'] : []);
         if (isset($exportCfg['path'])) {
             $this->path = $exportCfg['path'];
diff --git a/module/Cli/src/Domain/CommandHandler/CreateViExtractFiles.php b/module/Cli/src/Domain/CommandHandler/CreateViExtractFiles.php
index 512aed5519..0ef72209b8 100644
--- a/module/Cli/src/Domain/CommandHandler/CreateViExtractFiles.php
+++ b/module/Cli/src/Domain/CommandHandler/CreateViExtractFiles.php
@@ -79,7 +79,7 @@ public function handleCommand(CommandInterface $command)
             $this->exportPath = $command->getPath();
         }
         foreach ($this->paramMap as $key => $settings) {
-            $method = 'get' . ucfirst($key);
+            $method = 'get' . ucfirst((string) $key);
             $commandParam = $command->$method();
             $repo = $this->getRepo($settings['repo']);
             $fileName = $this->getFilename($settings['prefix']);
@@ -97,7 +97,7 @@ public function handleCommand(CommandInterface $command)
                 $this->result->addMessage('Found ' . $total . ' record(s) for ' . $settings['name']);
                 if ($total) {
                     foreach ($results as &$result) {
-                        $result['line'] = strtoupper($result['line']);
+                        $result['line'] = strtoupper((string) $result['line']);
                     }
                     $content = implode(self::PHP_EOL_WIN, array_column($results, 'line')) . self::PHP_EOL_WIN;
                     if (file_put_contents($fileName, $content) === false) {
@@ -181,7 +181,7 @@ protected function getBackupFilename($prefix = '')
     }
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (isset($config['vi_extract_files']['export_path'])) {
             $this->exportPath = $config['vi_extract_files']['export_path'];
         }
diff --git a/module/Cli/src/Domain/CommandHandler/DataDvaNiExport.php b/module/Cli/src/Domain/CommandHandler/DataDvaNiExport.php
index 6dd74e78fa..1363ff332d 100644
--- a/module/Cli/src/Domain/CommandHandler/DataDvaNiExport.php
+++ b/module/Cli/src/Domain/CommandHandler/DataDvaNiExport.php
@@ -80,7 +80,7 @@ private function processNiOperatorLicences()
 
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         $exportCfg = (!empty($config['data-dva-ni-export']) ? $config['data-dva-ni-export'] : []);
         if (isset($exportCfg['path'])) {
             $this->path = $exportCfg['path'];
diff --git a/module/Cli/src/Domain/CommandHandler/DataGovUkExport.php b/module/Cli/src/Domain/CommandHandler/DataGovUkExport.php
index 5efc0b6486..5939ea5fff 100644
--- a/module/Cli/src/Domain/CommandHandler/DataGovUkExport.php
+++ b/module/Cli/src/Domain/CommandHandler/DataGovUkExport.php
@@ -66,7 +66,7 @@ final class DataGovUkExport extends AbstractDataExport
      */
     public function handleCommand(CommandInterface $command)
     {
-        $this->path = (trim($command->getPath()) ?: $this->path);
+        $this->path = trim($command->getPath() ?? '') ?: $this->path;
         $this->reportName = $command->getReportName();
 
         $this->dataGovUkRepo = $this->getRepo();
@@ -247,7 +247,7 @@ private function processBusVariation()
 
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         $exportCfg = (!empty($config['data-gov-uk-export']) ? $config['data-gov-uk-export'] : []);
         if (isset($exportCfg['path'])) {
             $this->path = $exportCfg['path'];
diff --git a/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/TransXChange/TransXChangeConsumer.php b/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/TransXChange/TransXChangeConsumer.php
index 70bd098e63..87abb43ba0 100644
--- a/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/TransXChange/TransXChangeConsumer.php
+++ b/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/TransXChange/TransXChangeConsumer.php
@@ -142,7 +142,7 @@ protected function processMessage(array $message): array
     {
         $inputDocumentName = $this->getQueueAttribute($message, 'InputDocumentName');
 
-        $ebsrId = explode(".", $inputDocumentName, -1)[0];
+        $ebsrId = explode(".", (string) $inputDocumentName, -1)[0];
 
         /**
          * @var $ebsrSubmission EbsrSubmission
@@ -349,7 +349,7 @@ protected function generateDocumentCmd(array $documents, BusRegEntity $busRegist
                 'licence' => $busRegistration->getLicence()->getId(),
                 'category' => CategoryEntity::CATEGORY_BUS_REGISTRATION,
                 'subCategory' => CategoryEntity::BUS_SUB_CATEGORY_TRANSXCHANGE_PDF,
-                'filename' => basename($document),
+                'filename' => basename((string) $document),
                 'description' => $description,
                 'user' => $busRegistration->getCreatedBy()->getId(),
             ];
@@ -386,7 +386,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
             'http://naptan.dft.gov.uk/transxchange/publisher/schema/3.1.2/TransXChangePublisherService.xsd'
         );
 
-        $this->config = $config = $container->get('Config');
+        $this->config = $config = $container->get('config');
 
         $stsClient = new StsClient([
             'region' => $config['awsOptions']['region'],
diff --git a/module/Cli/src/Domain/CommandHandler/RemoveReadAudit.php b/module/Cli/src/Domain/CommandHandler/RemoveReadAudit.php
index 037a85d0ab..524e5b0d1a 100644
--- a/module/Cli/src/Domain/CommandHandler/RemoveReadAudit.php
+++ b/module/Cli/src/Domain/CommandHandler/RemoveReadAudit.php
@@ -49,7 +49,7 @@ public function handleCommand(CommandInterface $command)
     }
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (isset($config['batch_config']['remove-read-audit']['max-age'])) {
             $this->maxAge = $config['batch_config']['remove-read-audit']['max-age'];
         }
diff --git a/module/Cli/src/Service/Queue/Consumer/AbstractConsumerServices.php b/module/Cli/src/Service/Queue/Consumer/AbstractConsumerServices.php
index 2028f151de..5bba540b58 100644
--- a/module/Cli/src/Service/Queue/Consumer/AbstractConsumerServices.php
+++ b/module/Cli/src/Service/Queue/Consumer/AbstractConsumerServices.php
@@ -17,7 +17,7 @@ class AbstractConsumerServices
      *
      * @return AbstractConsumerServices
      */
-    public function __construct(private CommandHandlerManager $commandHandlerManager)
+    public function __construct(private readonly CommandHandlerManager $commandHandlerManager)
     {
     }
 
diff --git a/module/Cli/src/Service/Queue/Consumer/CpidOrganisationExport.php b/module/Cli/src/Service/Queue/Consumer/CpidOrganisationExport.php
index ebe02071bf..23b3b083b8 100644
--- a/module/Cli/src/Service/Queue/Consumer/CpidOrganisationExport.php
+++ b/module/Cli/src/Service/Queue/Consumer/CpidOrganisationExport.php
@@ -27,7 +27,7 @@ class CpidOrganisationExport extends AbstractConsumer
      */
     public function __construct(
         AbstractConsumerServices $abstractConsumerServices,
-        private Repository\Organisation $organisationRepo
+        private readonly Repository\Organisation $organisationRepo
     ) {
         parent::__construct($abstractConsumerServices);
     }
diff --git a/module/Cli/src/Service/Queue/QueueProcessor.php b/module/Cli/src/Service/Queue/QueueProcessor.php
index 1b9cf6557d..20f3f8ba38 100644
--- a/module/Cli/src/Service/Queue/QueueProcessor.php
+++ b/module/Cli/src/Service/Queue/QueueProcessor.php
@@ -31,7 +31,7 @@ class QueueProcessor
      *
      * @return QueueProcessor
      */
-    public function __construct(private QueryHandlerManager $queryHandlerManager, private MessageConsumerManager $messageConsumerManager)
+    public function __construct(private readonly QueryHandlerManager $queryHandlerManager, private readonly MessageConsumerManager $messageConsumerManager)
     {
     }
 
diff --git a/module/Cli/src/Session/NullSaveHandler.php b/module/Cli/src/Session/NullSaveHandler.php
index 23f36da68e..a229ec73a4 100644
--- a/module/Cli/src/Session/NullSaveHandler.php
+++ b/module/Cli/src/Session/NullSaveHandler.php
@@ -15,7 +15,7 @@ class NullSaveHandler implements \Laminas\Session\SaveHandler\SaveHandlerInterfa
      * @param string $savePath
      * @param string $name
      */
-    public function open($savePath, $name)
+    public function open($savePath, $name): bool
     {
         return true;
     }
@@ -24,7 +24,7 @@ public function open($savePath, $name)
      * Close Session - free resources
      *
      */
-    public function close()
+    public function close(): bool
     {
         return true;
     }
@@ -34,7 +34,7 @@ public function close()
      *
      * @param string $id
      */
-    public function read($id)
+    public function read($id): string
     {
         // PHP 7.1 session handlers returning a bool or null value causes errors in logs. Empty string does not.
         return '';
@@ -45,7 +45,7 @@ public function read($id)
      *
      * @param string $id
      */
-    public function write($id, mixed $data)
+    public function write($id, mixed $data): bool
     {
         return true;
     }
@@ -56,7 +56,7 @@ public function write($id, mixed $data)
      *
      * @param string $id
      */
-    public function destroy($id)
+    public function destroy($id): bool
     {
         return true;
     }
@@ -67,8 +67,8 @@ public function destroy($id)
      *
      * @param int $maxlifetime
      */
-    public function gc($maxlifetime)
+    public function gc($maxlifetime): false
     {
-        return true;
+        return false;
     }
 }
diff --git a/module/Cpms/src/Authenticate/CpmsIdentityProviderFactory.php b/module/Cpms/src/Authenticate/CpmsIdentityProviderFactory.php
index e470abc7dc..c11d1a67f1 100644
--- a/module/Cpms/src/Authenticate/CpmsIdentityProviderFactory.php
+++ b/module/Cpms/src/Authenticate/CpmsIdentityProviderFactory.php
@@ -6,7 +6,7 @@
 
 class CpmsIdentityProviderFactory
 {
-    public function __construct(private string $clientId, private string $clientSecret, private string $userId)
+    public function __construct(private readonly string $clientId, private readonly string $clientSecret, private readonly string $userId)
     {
     }
 
diff --git a/module/Cpms/src/Client/HttpClientFactory.php b/module/Cpms/src/Client/HttpClientFactory.php
index 415794c0ff..5ea253a047 100644
--- a/module/Cpms/src/Client/HttpClientFactory.php
+++ b/module/Cpms/src/Client/HttpClientFactory.php
@@ -9,7 +9,7 @@
 
 class HttpClientFactory
 {
-    public function __construct(private ClientOptions $options, private Logger $logger)
+    public function __construct(private readonly ClientOptions $options, private readonly Logger $logger)
     {
     }
 
diff --git a/module/Cpms/src/Logger/LoggerFactory.php b/module/Cpms/src/Logger/LoggerFactory.php
index 1fc4c127d1..0d5bf2dd8b 100644
--- a/module/Cpms/src/Logger/LoggerFactory.php
+++ b/module/Cpms/src/Logger/LoggerFactory.php
@@ -14,7 +14,7 @@
  */
 class LoggerFactory
 {
-    public function __construct(private string $logPath, private int $zendLogLevel)
+    public function __construct(private readonly string $logPath, private readonly int $zendLogLevel)
     {
     }
 
diff --git a/module/Cpms/src/Service/ApiServiceFactory.php b/module/Cpms/src/Service/ApiServiceFactory.php
index 122c5c4163..a6f24e2e08 100644
--- a/module/Cpms/src/Service/ApiServiceFactory.php
+++ b/module/Cpms/src/Service/ApiServiceFactory.php
@@ -15,7 +15,7 @@
 
 class ApiServiceFactory
 {
-    public function __construct(private array $config, private string $userId)
+    public function __construct(private array $config, private readonly string $userId)
     {
     }
 
diff --git a/module/DocumentShare/src/Data/Object/File.php b/module/DocumentShare/src/Data/Object/File.php
index c462557600..d1acfeba40 100644
--- a/module/DocumentShare/src/Data/Object/File.php
+++ b/module/DocumentShare/src/Data/Object/File.php
@@ -42,7 +42,7 @@ public function __construct()
      */
     public function __destruct()
     {
-        if (is_file($this->file)) {
+        if ($this->file !== null && is_file($this->file)) {
             unlink($this->file);
         }
     }
diff --git a/module/Email/src/Data/Message.php b/module/Email/src/Data/Message.php
index 42fa118649..76a463fa39 100644
--- a/module/Email/src/Data/Message.php
+++ b/module/Email/src/Data/Message.php
@@ -291,7 +291,7 @@ public function setCcFromString(?string $listString): Message
     public function setCc(array $cc)
     {
         foreach ($cc as &$email) {
-            $email = trim($email);
+            $email = trim((string) $email);
         }
         $this->cc = $cc;
         return $this;
@@ -315,7 +315,7 @@ public function getBcc()
     public function setBcc(array $bcc)
     {
         foreach ($bcc as &$email) {
-            $email = trim($email);
+            $email = trim((string) $email);
         }
         $this->bcc = $bcc;
         return $this;
diff --git a/module/Email/src/Domain/CommandHandler/SendEmail.php b/module/Email/src/Domain/CommandHandler/SendEmail.php
index 4d5a85a0af..7ddf6377ce 100644
--- a/module/Email/src/Domain/CommandHandler/SendEmail.php
+++ b/module/Email/src/Domain/CommandHandler/SendEmail.php
@@ -243,7 +243,7 @@ public function handleCommand(CommandInterface $command)
                 throw new \RuntimeException('Unable to process attachment (empty document downloaded)');
             }
             $downloadedDocs[] = [
-                'fileName' => basename($doc->getFilename()),
+                'fileName' => basename((string) $doc->getFilename()),
                 'content' => $file->getContent()
             ];
         }
@@ -304,7 +304,7 @@ protected function replaceUris($text)
     }
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (isset($config['email']['from_name'])) {
             $this->setFromName($config['email']['from_name']);
         }
diff --git a/module/Email/src/Service/Email.php b/module/Email/src/Service/Email.php
index ffa3ea1103..2cf2016644 100644
--- a/module/Email/src/Service/Email.php
+++ b/module/Email/src/Service/Email.php
@@ -229,7 +229,7 @@ private function setHighPriority(LaminasMail\Message $mail): void
     }
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (!isset($config['mail'])) {
             throw new LaminasMailRuntimeException('No mail config found');
         }
diff --git a/module/Email/src/Service/Imap.php b/module/Email/src/Service/Imap.php
index 0448a8bfe4..0e0d3ca649 100644
--- a/module/Email/src/Service/Imap.php
+++ b/module/Email/src/Service/Imap.php
@@ -145,7 +145,7 @@ public function connect($mailbox)
     }
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null)
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (!isset($config['mailboxes'])) {
             throw new LaminasMailRuntimeException('No mailbox config found');
         }
diff --git a/module/Email/src/Transport/MultiTransportOptions.php b/module/Email/src/Transport/MultiTransportOptions.php
index f401747f40..f08e2c55da 100644
--- a/module/Email/src/Transport/MultiTransportOptions.php
+++ b/module/Email/src/Transport/MultiTransportOptions.php
@@ -6,7 +6,8 @@
 use Laminas\Stdlib\AbstractOptions;
 
 /**
- * MultiTransport Options
+ * @template TValue
+ * @extends AbstractOptions<TValue>
  */
 class MultiTransportOptions extends AbstractOptions
 {
diff --git a/module/Email/src/Transport/S3FileOptions.php b/module/Email/src/Transport/S3FileOptions.php
index a6f238d897..aa4702dfe7 100644
--- a/module/Email/src/Transport/S3FileOptions.php
+++ b/module/Email/src/Transport/S3FileOptions.php
@@ -9,6 +9,8 @@
  * Class S3FileOptions
  *
  * @codeCoverageIgnore
+ * @template TValue
+ * @extends AbstractOptions<TValue>
  */
 class S3FileOptions extends AbstractOptions
 {
diff --git a/module/Email/src/Transport/S3FileOptionsFactory.php b/module/Email/src/Transport/S3FileOptionsFactory.php
index 5aee2bff16..b09697ab34 100644
--- a/module/Email/src/Transport/S3FileOptionsFactory.php
+++ b/module/Email/src/Transport/S3FileOptionsFactory.php
@@ -35,7 +35,7 @@ private function extractConfig(array $config): array
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): S3FileOptions
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         $s3Client = $container->get('S3Client');
         [$awsOptions, $s3Options, $bucket, $key] = $this->extractConfig($config);
         $s3fileOptions = new S3FileOptions([
diff --git a/module/GdsVerify/src/Data/Container.php b/module/GdsVerify/src/Data/Container.php
index a12470216f..73001c0e9f 100644
--- a/module/GdsVerify/src/Data/Container.php
+++ b/module/GdsVerify/src/Data/Container.php
@@ -21,7 +21,7 @@ class Container extends \SAML2\Compat\AbstractContainer
      *
      * @param LoggerInterface $logger Logger
      */
-    public function __construct(private LoggerInterface $logger)
+    public function __construct(private readonly LoggerInterface $logger)
     {
     }
 
diff --git a/module/GdsVerify/src/Data/Metadata/Federation.php b/module/GdsVerify/src/Data/Metadata/Federation.php
index 05b4b585de..b551faa797 100644
--- a/module/GdsVerify/src/Data/Metadata/Federation.php
+++ b/module/GdsVerify/src/Data/Metadata/Federation.php
@@ -73,7 +73,7 @@ public function getSigningCertificate()
     private function formatCertificate(string $certificateString): string
     {
         return "-----BEGIN CERTIFICATE-----\n"
-            . trim(wordwrap(preg_replace("/\r|\n|\t|\s/", "", $certificateString), 64, PHP_EOL, true))
+            . trim(wordwrap((string) preg_replace("/\r|\n|\t|\s/", "", $certificateString), 64, PHP_EOL, true))
             . "\n-----END CERTIFICATE-----";
     }
 }
diff --git a/module/GdsVerify/src/Data/Metadata/MatchingServiceAdapter.php b/module/GdsVerify/src/Data/Metadata/MatchingServiceAdapter.php
index 3d160db249..391006043b 100644
--- a/module/GdsVerify/src/Data/Metadata/MatchingServiceAdapter.php
+++ b/module/GdsVerify/src/Data/Metadata/MatchingServiceAdapter.php
@@ -72,7 +72,7 @@ public function getSigningCertificate()
     private function formatCertificate(string $certificateString): string
     {
         return "-----BEGIN CERTIFICATE-----\n"
-            . trim(wordwrap(preg_replace("/\r|\n|\t|\s/", "", $certificateString), 64, PHP_EOL, true))
+            . trim(wordwrap((string) preg_replace("/\r|\n|\t|\s/", "", $certificateString), 64, PHP_EOL, true))
             . "\n-----END CERTIFICATE-----";
     }
 
diff --git a/module/Olcs/Db/src/Controller/SearchController.php b/module/Olcs/Db/src/Controller/SearchController.php
index e9fe66d985..064634cc2a 100644
--- a/module/Olcs/Db/src/Controller/SearchController.php
+++ b/module/Olcs/Db/src/Controller/SearchController.php
@@ -13,7 +13,7 @@
  */
 class SearchController extends AbstractController
 {
-    public function __construct(private Search $elasticSearchService)
+    public function __construct(private readonly Search $elasticSearchService)
     {
     }
     /**
@@ -25,7 +25,7 @@ public function getList()
     {
         $params = array_merge((array)$this->params()->fromRoute(), (array)$this->params()->fromQuery());
 
-        $indices = explode('|', $params['index']);
+        $indices = explode('|', (string) $params['index']);
 
         if (isset($params['filters']) && !empty($params['filters']) && is_array($params['filters'])) {
             $this->elasticSearchService->setFilters($params['filters'], $params['filterTypes'] ?? []);
diff --git a/module/Olcs/Db/src/Service/Search/ClientFactory.php b/module/Olcs/Db/src/Service/Search/ClientFactory.php
index d049323d84..8bbc13f1e1 100644
--- a/module/Olcs/Db/src/Service/Search/ClientFactory.php
+++ b/module/Olcs/Db/src/Service/Search/ClientFactory.php
@@ -28,7 +28,7 @@ class ClientFactory implements FactoryInterface
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null): Client
     {
-        $config = $container->get('Config');
+        $config = $container->get('config');
         if (!isset($config['elastic_search'])) {
             throw new Exception\InvalidServiceException('Elastic search config not found');
         }
diff --git a/module/Olcs/Db/src/Service/Search/QueryTemplate.php b/module/Olcs/Db/src/Service/Search/QueryTemplate.php
index a73c733d09..13ca4b61c0 100644
--- a/module/Olcs/Db/src/Service/Search/QueryTemplate.php
+++ b/module/Olcs/Db/src/Service/Search/QueryTemplate.php
@@ -96,7 +96,7 @@ private function applyFilters(array $filters, array $filterTypes): self
                     foreach ($fields as $subField) {
                         $this->_params['query']['bool']['must']['bool']['must']['bool']['should'][] = [
                             'terms' => [
-                                $subField => explode('|', $value),
+                                $subField => explode('|', (string) $value),
                             ],
                         ];
                     }
diff --git a/module/Olcs/Db/src/Service/Search/Search.php b/module/Olcs/Db/src/Service/Search/Search.php
index b26b1dae3a..d9369d3a32 100644
--- a/module/Olcs/Db/src/Service/Search/Search.php
+++ b/module/Olcs/Db/src/Service/Search/Search.php
@@ -150,7 +150,7 @@ public function search($query, $indexes = [], $page = 1, $limit = 10)
         }
 
         if (!$this->isAnonymousUser() && $this->isInternalUser() && $indexes[0] !== 'irfo') {
-            $exemptTeams = str_getcsv($this->sysParamRepo->fetchValue(SysParamEntity::DATA_SEPARATION_TEAMS_EXEMPT));
+            $exemptTeams = str_getcsv((string) $this->sysParamRepo->fetchValue(SysParamEntity::DATA_SEPARATION_TEAMS_EXEMPT));
             if (!in_array($this->getCurrentUser()->getTeam()->getId(), $exemptTeams)) {
                 $elasticaQuery->setPostFilter($this->getInternalUserTAPostFilter($indexes[0]));
             }
@@ -235,7 +235,7 @@ protected function processResults(ResultSet $resultSet)
             $raw = $result->getSource();
             $refined = [];
             foreach ($raw as $key => $value) {
-                $refined[lcfirst($f->filter($key))] = $value;
+                $refined[lcfirst((string) $f->filter($key))] = $value;
             }
 
             $response[] = $refined;
@@ -258,7 +258,7 @@ protected function processFilters(array $aggregations)
         $f = new UnderscoreToCamelCase();
 
         foreach ($aggregations as $aggregation => $value) {
-            $return[lcfirst($f->filter($aggregation))] = $value['buckets'];
+            $return[lcfirst((string) $f->filter($aggregation))] = $value['buckets'];
         }
 
         return $return;
@@ -284,8 +284,8 @@ public function setFilters(array $filters, array $filterTypes = []): self
         $f = new CamelCaseToUnderscore();
 
         foreach ($filters as $filterName => $value) {
-            $this->filters[strtolower($f->filter($filterName))] = $value;
-            $this->filterTypes[strtolower($f->filter($filterName))] = $filterTypes[$filterName] ?? QueryTemplate::FILTER_TYPE_DYNAMIC;
+            $this->filters[strtolower((string) $f->filter($filterName))] = $value;
+            $this->filterTypes[strtolower((string) $f->filter($filterName))] = $filterTypes[$filterName] ?? QueryTemplate::FILTER_TYPE_DYNAMIC;
         }
 
         return $this;
@@ -340,7 +340,7 @@ public function setDateRanges(array $dateRanges)
             }
 
             if (!empty($value)) {
-                $this->dateRanges[strtolower($f->filter($filterName))] = $value;
+                $this->dateRanges[strtolower((string) $f->filter($filterName))] = $value;
             }
         }
         return $this;
diff --git a/module/Queue/src/Service/Message/MessageBuilder.php b/module/Queue/src/Service/Message/MessageBuilder.php
index 28465df340..2007ab10cd 100644
--- a/module/Queue/src/Service/Message/MessageBuilder.php
+++ b/module/Queue/src/Service/Message/MessageBuilder.php
@@ -32,7 +32,7 @@ public function buildMessage(array $messageData, string $messageType, array $que
 
     private function getQueueUrl($messageType): string
     {
-        $path = explode('\\', $messageType);
+        $path = explode('\\', (string) $messageType);
         $path = array_pop($path);
 
         return $path . '_URL';
diff --git a/module/Queue/src/Service/QueueServiceTrait.php b/module/Queue/src/Service/QueueServiceTrait.php
index e194ab6b47..5b5844d9b1 100644
--- a/module/Queue/src/Service/QueueServiceTrait.php
+++ b/module/Queue/src/Service/QueueServiceTrait.php
@@ -41,7 +41,7 @@ public function setQueueConfig(array $config): void
 
     protected function getQueueUrlKey($messageType): string
     {
-        $path = explode('\\', $messageType);
+        $path = explode('\\', (string) $messageType);
         $path = array_pop($path);
 
         return $path . '_URL';
diff --git a/module/Snapshot/src/Service/Snapshots/AbstractGeneratorServices.php b/module/Snapshot/src/Service/Snapshots/AbstractGeneratorServices.php
index 18a83d9427..b0eaeff921 100644
--- a/module/Snapshot/src/Service/Snapshots/AbstractGeneratorServices.php
+++ b/module/Snapshot/src/Service/Snapshots/AbstractGeneratorServices.php
@@ -18,7 +18,7 @@ class AbstractGeneratorServices
      *
      * @return AbstractGeneratorServices
      */
-    public function __construct(private RendererInterface $renderer)
+    public function __construct(private readonly RendererInterface $renderer)
     {
     }
 
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Generator.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Generator.php
index 3e94e8a8df..608622dab2 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Generator.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Generator.php
@@ -238,10 +238,10 @@ class Generator extends AbstractGenerator
      */
     public function __construct(
         AbstractGeneratorServices $abstractGeneratorServices,
-        private SectionAccessService $sectionAccessService,
-        private NiTextTranslation $niTextTranslation,
-        private SignatureReviewService $signatureReviewService,
-        private ContainerInterface $services
+        private readonly SectionAccessService $sectionAccessService,
+        private readonly NiTextTranslation $niTextTranslation,
+        private readonly SignatureReviewService $signatureReviewService,
+        private readonly ContainerInterface $services
     ) {
         parent::__construct($abstractGeneratorServices);
 
@@ -322,14 +322,14 @@ protected function mapSections($sections)
 
     protected function buildReadonlyConfigForSections($sections, $reviewData)
     {
-        $entity = ucfirst($this->lva);
+        $entity = ucfirst((string) $this->lva);
 
         $filter = new UnderscoreToCamelCase();
 
         $sectionConfig = [];
 
         foreach ($sections as $section) {
-            $serviceName = 'Review\\' . $entity . ucfirst($filter->filter($section));
+            $serviceName = 'Review\\' . $entity . ucfirst((string) $filter->filter($section));
 
             $config = null;
             $header = 'review-' . $section;
@@ -382,7 +382,7 @@ protected function filterVariationSections($sections, ApplicationCompletion $com
         $filter = new UnderscoreToCamelCase();
 
         foreach ($sections as $key => $section) {
-            $getter = 'get' . ucfirst($filter->filter($section)) . 'Status';
+            $getter = 'get' . ucfirst((string) $filter->filter($section)) . 'Status';
 
             if (
                 array_search($section, $this->displayedAlwaysVariationSections) === false &&
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/AbstractReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/AbstractReviewService.php
index e5a5975fbd..fefec584f3 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/AbstractReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/AbstractReviewService.php
@@ -39,7 +39,7 @@ public function __construct(AbstractReviewServiceServices $abstractReviewService
 
     protected function formatText($text)
     {
-        return nl2br($text);
+        return nl2br((string) $text);
     }
 
     protected function findFiles($files, $category, $subCategory)
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/AbstractReviewServiceServices.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/AbstractReviewServiceServices.php
index b0d7eb5c40..42bdbf0952 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/AbstractReviewServiceServices.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/AbstractReviewServiceServices.php
@@ -17,7 +17,7 @@ class AbstractReviewServiceServices
      *
      * @return AbstractReviewServiceServices
      */
-    public function __construct(private TranslatorInterface $translator)
+    public function __construct(private readonly TranslatorInterface $translator)
     {
     }
 
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationFinancialEvidenceReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationFinancialEvidenceReviewService.php
index 2ebaff1bca..53cf7b7736 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationFinancialEvidenceReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationFinancialEvidenceReviewService.php
@@ -29,7 +29,7 @@ class ApplicationFinancialEvidenceReviewService extends AbstractReviewService
      */
     public function __construct(
         AbstractReviewServiceServices $abstractReviewServiceServices,
-        private QueryHandlerManager $queryHandlerManager
+        private readonly QueryHandlerManager $queryHandlerManager
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationOperatingCentresReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationOperatingCentresReviewService.php
index 9e6834db7a..8cafec1a54 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationOperatingCentresReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationOperatingCentresReviewService.php
@@ -33,7 +33,7 @@ public function __construct(
         private ApplicationPsvOcTotalAuthReviewService $applicationPsvOcTotalAuthReviewService,
         private GoodsOperatingCentreReviewService $goodsOperatingCentreReviewService,
         private ApplicationGoodsOcTotalAuthReviewService $applicationGoodsOcTotalAuthReviewService,
-        private TrafficAreaReviewService $trafficAreaReviewService
+        private readonly TrafficAreaReviewService $trafficAreaReviewService
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationPeopleReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationPeopleReviewService.php
index a82b7dcd91..2276ac69a8 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationPeopleReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationPeopleReviewService.php
@@ -25,7 +25,7 @@ class ApplicationPeopleReviewService extends AbstractReviewService
      */
     public function __construct(
         AbstractReviewServiceServices $abstractReviewServiceServices,
-        private PeopleReviewService $peopleReviewService
+        private readonly PeopleReviewService $peopleReviewService
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationTransportManagersReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationTransportManagersReviewService.php
index 0e5ac7ef5c..3d9e41b519 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationTransportManagersReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationTransportManagersReviewService.php
@@ -25,7 +25,7 @@ class ApplicationTransportManagersReviewService extends AbstractReviewService
      */
     public function __construct(
         AbstractReviewServiceServices $abstractReviewServiceServices,
-        private TransportManagersReviewService $transportManagersReviewService
+        private readonly TransportManagersReviewService $transportManagersReviewService
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationVehiclesPsvReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationVehiclesPsvReviewService.php
index fa1dffa3df..ab42cf50d6 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationVehiclesPsvReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/ApplicationVehiclesPsvReviewService.php
@@ -25,7 +25,7 @@ class ApplicationVehiclesPsvReviewService extends AbstractReviewService
      */
     public function __construct(
         AbstractReviewServiceServices $abstractReviewServiceServices,
-        private VehiclesPsvReviewService $vehiclesPsvReviewService
+        private readonly VehiclesPsvReviewService $vehiclesPsvReviewService
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/GoodsOperatingCentreReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/GoodsOperatingCentreReviewService.php
index 8761eeae19..38e37db1d2 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/GoodsOperatingCentreReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/GoodsOperatingCentreReviewService.php
@@ -21,7 +21,7 @@ class GoodsOperatingCentreReviewService extends AbstractReviewService
      */
     public function __construct(
         AbstractReviewServiceServices $abstractReviewServiceServices,
-        private PsvOperatingCentreReviewService $psvOperatingCentreReviewService
+        private readonly PsvOperatingCentreReviewService $psvOperatingCentreReviewService
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationConvictionsPenaltiesReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationConvictionsPenaltiesReviewService.php
index ef7f4e41b1..c1d3a756e3 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationConvictionsPenaltiesReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationConvictionsPenaltiesReviewService.php
@@ -25,7 +25,7 @@ class VariationConvictionsPenaltiesReviewService extends AbstractReviewService
      */
     public function __construct(
         AbstractReviewServiceServices $abstractReviewServiceServices,
-        private ApplicationConvictionsPenaltiesReviewService $applicationConvictionsPenaltiesReviewService
+        private readonly ApplicationConvictionsPenaltiesReviewService $applicationConvictionsPenaltiesReviewService
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationFinancialEvidenceReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationFinancialEvidenceReviewService.php
index 5b598dc62c..3db27ea15e 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationFinancialEvidenceReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationFinancialEvidenceReviewService.php
@@ -25,7 +25,7 @@ class VariationFinancialEvidenceReviewService extends AbstractReviewService
      */
     public function __construct(
         AbstractReviewServiceServices $abstractReviewServiceServices,
-        private ApplicationFinancialEvidenceReviewService $applicationFinancialEvidenceReviewService
+        private readonly ApplicationFinancialEvidenceReviewService $applicationFinancialEvidenceReviewService
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationFinancialHistoryReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationFinancialHistoryReviewService.php
index f2e6a53996..e246249671 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationFinancialHistoryReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationFinancialHistoryReviewService.php
@@ -25,7 +25,7 @@ class VariationFinancialHistoryReviewService extends AbstractReviewService
      */
     public function __construct(
         AbstractReviewServiceServices $abstractReviewServiceServices,
-        private ApplicationFinancialHistoryReviewService $applicationFinancialHistoryReviewService
+        private readonly ApplicationFinancialHistoryReviewService $applicationFinancialHistoryReviewService
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationLicenceHistoryReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationLicenceHistoryReviewService.php
index 2d281ad00c..a0607cc59e 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationLicenceHistoryReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationLicenceHistoryReviewService.php
@@ -25,7 +25,7 @@ class VariationLicenceHistoryReviewService extends AbstractReviewService
      */
     public function __construct(
         AbstractReviewServiceServices $abstractReviewServiceServices,
-        private ApplicationLicenceHistoryReviewService $applicationLicenceHistoryReviewService
+        private readonly ApplicationLicenceHistoryReviewService $applicationLicenceHistoryReviewService
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationPeopleReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationPeopleReviewService.php
index fbe3e50183..93bd08fcf7 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationPeopleReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationPeopleReviewService.php
@@ -27,7 +27,7 @@ class VariationPeopleReviewService extends AbstractReviewService
      */
     public function __construct(
         AbstractReviewServiceServices $abstractReviewServiceServices,
-        private PeopleReviewService $peopleReviewService
+        private readonly PeopleReviewService $peopleReviewService
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationTransportManagersReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationTransportManagersReviewService.php
index 66c88df029..18dea9234a 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationTransportManagersReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationTransportManagersReviewService.php
@@ -25,7 +25,7 @@ class VariationTransportManagersReviewService extends AbstractReviewService
      */
     public function __construct(
         AbstractReviewServiceServices $abstractReviewServiceServices,
-        private TransportManagersReviewService $transportManagersReviewService
+        private readonly TransportManagersReviewService $transportManagersReviewService
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationVehiclesDeclarationsReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationVehiclesDeclarationsReviewService.php
index b61334f749..3c3ea3c2a5 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationVehiclesDeclarationsReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationVehiclesDeclarationsReviewService.php
@@ -25,7 +25,7 @@ class VariationVehiclesDeclarationsReviewService extends AbstractReviewService
      */
     public function __construct(
         AbstractReviewServiceServices $abstractReviewServiceServices,
-        private ApplicationVehiclesDeclarationsReviewService $applicationVehiclesDeclarationsReviewService
+        private readonly ApplicationVehiclesDeclarationsReviewService $applicationVehiclesDeclarationsReviewService
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationVehiclesPsvReviewService.php b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationVehiclesPsvReviewService.php
index bff968d65c..dd313a26e8 100644
--- a/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationVehiclesPsvReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationVehiclesPsvReviewService.php
@@ -25,7 +25,7 @@ class VariationVehiclesPsvReviewService extends AbstractReviewService
      */
     public function __construct(
         AbstractReviewServiceServices $abstractReviewServiceServices,
-        private VehiclesPsvReviewService $vehiclesPsvReviewService
+        private readonly VehiclesPsvReviewService $vehiclesPsvReviewService
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/ContinuationReview/Generator.php b/module/Snapshot/src/Service/Snapshots/ContinuationReview/Generator.php
index 9d2a5239b7..18197e9dae 100644
--- a/module/Snapshot/src/Service/Snapshots/ContinuationReview/Generator.php
+++ b/module/Snapshot/src/Service/Snapshots/ContinuationReview/Generator.php
@@ -43,9 +43,9 @@ class Generator extends AbstractGenerator
      */
     public function __construct(
         AbstractGeneratorServices $abstractGeneratorServices,
-        private SectionAccessService $sectionAccessService,
-        private NiTextTranslation $niTextTranslation,
-        private ContainerInterface $services
+        private readonly SectionAccessService $sectionAccessService,
+        private readonly NiTextTranslation $niTextTranslation,
+        private readonly ContainerInterface $services
     ) {
         parent::__construct($abstractGeneratorServices);
     }
@@ -86,7 +86,7 @@ protected function buildReadonlyConfigForSections(array $sections, ContinuationD
         $sectionConfig = [];
 
         foreach ($sections as $section) {
-            $serviceName = 'ContinuationReview\\' . ucfirst($filter->filter($section));
+            $serviceName = 'ContinuationReview\\' . ucfirst((string) $filter->filter($section));
             $config = null;
             $summary = null;
             $summaryHeader = null;
diff --git a/module/Snapshot/src/Service/Snapshots/ContinuationReview/Section/AbstractReviewServiceServices.php b/module/Snapshot/src/Service/Snapshots/ContinuationReview/Section/AbstractReviewServiceServices.php
index 24d1bc9ceb..e3d51ba73c 100644
--- a/module/Snapshot/src/Service/Snapshots/ContinuationReview/Section/AbstractReviewServiceServices.php
+++ b/module/Snapshot/src/Service/Snapshots/ContinuationReview/Section/AbstractReviewServiceServices.php
@@ -17,7 +17,7 @@ class AbstractReviewServiceServices
      *
      * @return AbstractReviewServiceServices
      */
-    public function __construct(private TranslatorInterface $translator)
+    public function __construct(private readonly TranslatorInterface $translator)
     {
     }
 
diff --git a/module/Snapshot/src/Service/Snapshots/ContinuationReview/Section/FinanceReviewService.php b/module/Snapshot/src/Service/Snapshots/ContinuationReview/Section/FinanceReviewService.php
index deaae2bcb1..71e8ce679d 100644
--- a/module/Snapshot/src/Service/Snapshots/ContinuationReview/Section/FinanceReviewService.php
+++ b/module/Snapshot/src/Service/Snapshots/ContinuationReview/Section/FinanceReviewService.php
@@ -22,8 +22,8 @@ class FinanceReviewService extends AbstractReviewService
      */
     public function __construct(
         AbstractReviewServiceServices $abstractReviewServiceServices,
-        private FinancialStandingHelperService $financialStandingHelperService,
-        private DocumentRepository $documentRepo
+        private readonly FinancialStandingHelperService $financialStandingHelperService,
+        private readonly DocumentRepository $documentRepo
     ) {
         parent::__construct($abstractReviewServiceServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/Permits/IrhpGenerator.php b/module/Snapshot/src/Service/Snapshots/Permits/IrhpGenerator.php
index 0261ce2e8f..f8b9479c95 100644
--- a/module/Snapshot/src/Service/Snapshots/Permits/IrhpGenerator.php
+++ b/module/Snapshot/src/Service/Snapshots/Permits/IrhpGenerator.php
@@ -28,7 +28,7 @@ class IrhpGenerator extends AbstractGenerator implements SnapshotGeneratorInterf
      */
     public function __construct(
         AbstractGeneratorServices $abstractGeneratorServices,
-        private AnswersSummaryGenerator $answersSummaryGenerator
+        private readonly AnswersSummaryGenerator $answersSummaryGenerator
     ) {
         parent::__construct($abstractGeneratorServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/Surrender/Generator.php b/module/Snapshot/src/Service/Snapshots/Surrender/Generator.php
index bfabf3aaf7..347dbee752 100644
--- a/module/Snapshot/src/Service/Snapshots/Surrender/Generator.php
+++ b/module/Snapshot/src/Service/Snapshots/Surrender/Generator.php
@@ -30,12 +30,12 @@ class Generator extends AbstractGenerator
      */
     public function __construct(
         AbstractGeneratorServices $abstractGeneratorServices,
-        private LicenceDetailsService $licenceDetailsService,
-        private CurrentDiscsReviewService $currentDiscsReviewService,
-        private OperatorLicenceReviewService $operatorLicenceReviewService,
-        private CommunityLicenceReviewService $communityLicenceReviewService,
-        private DeclarationReviewService $declarationReviewService,
-        private SignatureReviewService $signatureReviewService
+        private readonly LicenceDetailsService $licenceDetailsService,
+        private readonly CurrentDiscsReviewService $currentDiscsReviewService,
+        private readonly OperatorLicenceReviewService $operatorLicenceReviewService,
+        private readonly CommunityLicenceReviewService $communityLicenceReviewService,
+        private readonly DeclarationReviewService $declarationReviewService,
+        private readonly SignatureReviewService $signatureReviewService
     ) {
         parent::__construct($abstractGeneratorServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/Surrender/Section/AbstractReviewServiceServices.php b/module/Snapshot/src/Service/Snapshots/Surrender/Section/AbstractReviewServiceServices.php
index ca585f5c2f..06717f0628 100644
--- a/module/Snapshot/src/Service/Snapshots/Surrender/Section/AbstractReviewServiceServices.php
+++ b/module/Snapshot/src/Service/Snapshots/Surrender/Section/AbstractReviewServiceServices.php
@@ -17,7 +17,7 @@ class AbstractReviewServiceServices
      *
      * @return AbstractReviewServiceServices
      */
-    public function __construct(private TranslatorInterface $translator)
+    public function __construct(private readonly TranslatorInterface $translator)
     {
     }
 
diff --git a/module/Snapshot/src/Service/Snapshots/TransportManagerApplication/Generator.php b/module/Snapshot/src/Service/Snapshots/TransportManagerApplication/Generator.php
index 3a6d6b2c77..d7e8b0ee8f 100644
--- a/module/Snapshot/src/Service/Snapshots/TransportManagerApplication/Generator.php
+++ b/module/Snapshot/src/Service/Snapshots/TransportManagerApplication/Generator.php
@@ -47,14 +47,14 @@ class Generator extends AbstractGenerator
      */
     public function __construct(
         AbstractGeneratorServices $abstractGeneratorServices,
-        private NiTextTranslation $niTextTranslation,
-        private TransportManagerMainReviewService $transportManagerMainReviewService,
-        private TransportManagerResponsibilityReviewService $transportManagerResponsibilityReviewService,
-        private TransportManagerOtherEmploymentReviewService $transportManagerOtherEmploymentReviewService,
-        private TransportManagerPreviousConvictionReviewService $transportManagerPreviousConvictionReviewService,
-        private TransportManagerPreviousLicenceReviewService $transportManagerPreviousLicenceReviewService,
-        private TransportManagerDeclarationReviewService $transportManagerDeclarationReviewService,
-        private TransportManagerSignatureReviewService $transportManagerSignatureReviewService
+        private readonly NiTextTranslation $niTextTranslation,
+        private readonly TransportManagerMainReviewService $transportManagerMainReviewService,
+        private readonly TransportManagerResponsibilityReviewService $transportManagerResponsibilityReviewService,
+        private readonly TransportManagerOtherEmploymentReviewService $transportManagerOtherEmploymentReviewService,
+        private readonly TransportManagerPreviousConvictionReviewService $transportManagerPreviousConvictionReviewService,
+        private readonly TransportManagerPreviousLicenceReviewService $transportManagerPreviousLicenceReviewService,
+        private readonly TransportManagerDeclarationReviewService $transportManagerDeclarationReviewService,
+        private readonly TransportManagerSignatureReviewService $transportManagerSignatureReviewService
     ) {
         parent::__construct($abstractGeneratorServices);
     }
diff --git a/module/Snapshot/src/Service/Snapshots/TransportManagerApplication/Section/AbstractReviewServiceServices.php b/module/Snapshot/src/Service/Snapshots/TransportManagerApplication/Section/AbstractReviewServiceServices.php
index f98ae3254e..2ab13b3bdb 100644
--- a/module/Snapshot/src/Service/Snapshots/TransportManagerApplication/Section/AbstractReviewServiceServices.php
+++ b/module/Snapshot/src/Service/Snapshots/TransportManagerApplication/Section/AbstractReviewServiceServices.php
@@ -17,7 +17,7 @@ class AbstractReviewServiceServices
      *
      * @return AbstractReviewServiceServices
      */
-    public function __construct(private TranslatorInterface $translator)
+    public function __construct(private readonly TranslatorInterface $translator)
     {
     }
 
diff --git a/psalm.xml.dist b/psalm.xml.dist
index f0fdde4178..f0756c423e 100644
--- a/psalm.xml.dist
+++ b/psalm.xml.dist
@@ -12,6 +12,7 @@
     <directory name="public"/>
     <directory name="config"/>
     <ignoreFiles allowMissingFiles="true">
+      <directory name="vendor" />
       <directory name=".phpstorm.meta" />
       <file name=".phpstorm.meta.php" />
     </ignoreFiles>
diff --git a/test/module/Address/src/Service/AddressFactoryTest.php b/test/module/Address/src/Service/AddressFactoryTest.php
index 635289c08f..e5b26486dd 100644
--- a/test/module/Address/src/Service/AddressFactoryTest.php
+++ b/test/module/Address/src/Service/AddressFactoryTest.php
@@ -28,7 +28,7 @@ public function testInvokeWithoutConfig()
 
         $sm = m::mock(ContainerInterface::class);
         $sm->shouldReceive('get')
-            ->with('Config')
+            ->with('config')
             ->andReturn($config);
 
         $this->sut->__invoke($sm, Address::class);
@@ -46,7 +46,7 @@ public function testInvoke()
 
         $sm = m::mock(ContainerInterface::class);
         $sm->shouldReceive('get')
-            ->with('Config')
+            ->with('config')
             ->andReturn($config);
 
         $address = $this->sut->__invoke($sm, Address::class);
diff --git a/test/module/Address/src/Service/AddressTest.php b/test/module/Address/src/Service/AddressTest.php
index a5aa5daf12..7e7c9e2f05 100644
--- a/test/module/Address/src/Service/AddressTest.php
+++ b/test/module/Address/src/Service/AddressTest.php
@@ -204,7 +204,7 @@ protected function mockClientLookup($postcode, $content = null, $statusCode = 20
 
         $this->client->shouldReceive('setUri')
             ->once()
-            ->with('address/' . urlencode($postcode))
+            ->with('address/' . urlencode((string) $postcode))
             ->shouldReceive('send')
             ->once()
             ->andReturn($response);
diff --git a/test/module/Api/src/Domain/CommandHandler/AbstractCommandHandlerTestCase.php b/test/module/Api/src/Domain/CommandHandler/AbstractCommandHandlerTestCase.php
index ec52dfd8b8..79fdb19286 100644
--- a/test/module/Api/src/Domain/CommandHandler/AbstractCommandHandlerTestCase.php
+++ b/test/module/Api/src/Domain/CommandHandler/AbstractCommandHandlerTestCase.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Dvsa\OlcsTest\Api\Domain\CommandHandler;
 
 use Doctrine\Common\Collections\ArrayCollection;
@@ -34,15 +36,13 @@
 use LmcRbacMvc\Service\AuthorizationService;
 use Olcs\Logging\Log\Logger;
 
-/**
- * Command Handler Test Case
- *
- * @author Rob Caiger <rob@clocal.co.uk>
- */
 abstract class AbstractCommandHandlerTestCase extends MockeryTestCase
 {
     use ValidateMockRepoTypeTrait;
 
+    public $submissionConfig;
+
+
     /** @var \Dvsa\Olcs\Api\Domain\CommandHandler\AbstractCommandHandler */
     protected $sut;
 
@@ -107,9 +107,7 @@ public function setUp(): void
         $sm->expects('get')->with('CommandHandlerManager')->andReturn($this->commandHandler);
         $sm->shouldReceive('get')->with('QueryHandlerManager')->andReturn($this->queryHandler);
         $sm->shouldReceive('get')->with(IdentityProviderInterface::class)->andReturn($this->identityProvider);
-        if (property_exists($this, 'submissionConfig')) {
-            $sm->shouldReceive('get')->with('Config')->andReturn($this->submissionConfig);
-        }
+
         foreach ($this->mockedSmServices as $serviceName => $service) {
             $sm->shouldReceive('get')->with($serviceName)->andReturn($service);
         }
@@ -172,10 +170,10 @@ protected function mockRepo($name, $class)
         $this->validateMockRepoType($name, $class);
 
         $class
-            ->shouldReceive('getRefdataReference')->andReturnUsing([$this, 'mapRefData'])
-            ->shouldReceive('getReference')->andReturnUsing([$this, 'mapReference'])
-            ->shouldReceive('getCategoryReference')->andReturnUsing([$this, 'mapCategoryReference'])
-            ->shouldReceive('getSubCategoryReference')->andReturnUsing([$this, 'mapSubCategoryReference']);
+            ->shouldReceive('getRefdataReference')->andReturnUsing($this->mapRefData(...))
+            ->shouldReceive('getReference')->andReturnUsing($this->mapReference(...))
+            ->shouldReceive('getCategoryReference')->andReturnUsing($this->mapCategoryReference(...))
+            ->shouldReceive('getSubCategoryReference')->andReturnUsing($this->mapSubCategoryReference(...));
 
         $this->repoMap[$name] = $class;
 
@@ -343,7 +341,7 @@ public function expectedSideEffectThrowsException($class, $data, $exception)
             ->once()
             ->with(m::type($class), false)
             ->andReturnUsing(
-                function (CommandInterface $command) use ($class, $data, $exception) {
+                function (CommandInterface $command) use ($class, $data, $exception): never {
                     $this->commands[] = [$command, $data];
                     throw $exception;
                 }
diff --git a/test/module/Api/src/Domain/CommandHandler/AbstractCreateSnapshotHandlerTest.php b/test/module/Api/src/Domain/CommandHandler/AbstractCreateSnapshotHandlerTest.php
index db709b42ea..202f97b799 100644
--- a/test/module/Api/src/Domain/CommandHandler/AbstractCreateSnapshotHandlerTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/AbstractCreateSnapshotHandlerTest.php
@@ -16,6 +16,7 @@
  */
 abstract class AbstractCreateSnapshotHandlerTest extends AbstractCommandHandlerTestCase
 {
+    public $documentLinkValue;
     protected $cmdClass = 'changeMe';
     protected $sutClass = 'changeMe';
     protected $repoServiceName = 'changeMe';
diff --git a/test/module/Api/src/Domain/CommandHandler/Application/GrantTest.php b/test/module/Api/src/Domain/CommandHandler/Application/GrantTest.php
index 44b792b306..07102b9153 100644
--- a/test/module/Api/src/Domain/CommandHandler/Application/GrantTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Application/GrantTest.php
@@ -52,7 +52,7 @@ public function setUp(): void
     public function testHandleCommandIsDefined()
     {
         $command = new GrantApplicationCommandHandler();
-        $this->assertIsCallable([$command, 'handleCommand']);
+        $this->assertIsCallable($command->handleCommand(...));
     }
 
     public function testHandleCommandWithException()
diff --git a/test/module/Api/src/Domain/CommandHandler/Application/UpdateApplicationCompletionTest.php b/test/module/Api/src/Domain/CommandHandler/Application/UpdateApplicationCompletionTest.php
index 2e591b3447..89da4fc11e 100644
--- a/test/module/Api/src/Domain/CommandHandler/Application/UpdateApplicationCompletionTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Application/UpdateApplicationCompletionTest.php
@@ -149,7 +149,7 @@ public function testHandleCommandResetSignature($expectResetSignature, $section,
         $result1 = new Result();
         $result1->addMessage('Tol updated');
         $this->expectedSideEffect(
-            'Dvsa\\Olcs\\Api\\Domain\\Command\\ApplicationCompletion\\Update' . ucfirst($section) . 'Status',
+            'Dvsa\\Olcs\\Api\\Domain\\Command\\ApplicationCompletion\\Update' . ucfirst((string) $section) . 'Status',
             ['id' => 111],
             $result1
         );
diff --git a/test/module/Api/src/Domain/CommandHandler/Application/UpdateOperatingCentresTest.php b/test/module/Api/src/Domain/CommandHandler/Application/UpdateOperatingCentresTest.php
index 4cc2023d5c..e2006e27eb 100644
--- a/test/module/Api/src/Domain/CommandHandler/Application/UpdateOperatingCentresTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Application/UpdateOperatingCentresTest.php
@@ -66,7 +66,7 @@ public function handleCommandIsCallable()
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, 'handleCommand']);
+        $this->assertIsCallable($this->sut->handleCommand(...));
     }
 
     /**
diff --git a/test/module/Api/src/Domain/CommandHandler/Application/UpdateTypeOfLicenceTest.php b/test/module/Api/src/Domain/CommandHandler/Application/UpdateTypeOfLicenceTest.php
index f43034f537..706e1206c0 100644
--- a/test/module/Api/src/Domain/CommandHandler/Application/UpdateTypeOfLicenceTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Application/UpdateTypeOfLicenceTest.php
@@ -102,7 +102,7 @@ public function testHandleCommandWithReset($command, $applicationData, $resetDat
         // Calling getApplication needs to be deferred to here rather than in the dataProvider to avoid initialising
         // references twice and creating duplicate refdata entries in the process
         $application = call_user_func_array(
-            [$this, 'getApplication'],
+            $this->getApplication(...),
             $applicationData
         );
 
@@ -601,7 +601,7 @@ public function testHandleCommandWithAllowedUpdateGb(
         // Calling getApplication needs to be deferred to here rather than in the dataProvider to avoid initialising
         // references twice and creating duplicate refdata entries in the process
         $application = call_user_func_array(
-            [$this, 'getApplication'],
+            $this->getApplication(...),
             $applicationData
         );
 
diff --git a/test/module/Api/src/Domain/CommandHandler/Application/UpdateVariationCompletionTest.php b/test/module/Api/src/Domain/CommandHandler/Application/UpdateVariationCompletionTest.php
index 2724363e30..e9b4822f0c 100644
--- a/test/module/Api/src/Domain/CommandHandler/Application/UpdateVariationCompletionTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Application/UpdateVariationCompletionTest.php
@@ -83,7 +83,7 @@ public function handleCommandIsCallable()
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, 'handleCommand']);
+        $this->assertIsCallable($this->sut->handleCommand(...));
     }
 
     public function handleCommandProvider()
diff --git a/test/module/Api/src/Domain/CommandHandler/Auth/ChangeExpiredPasswordFactoryTest.php b/test/module/Api/src/Domain/CommandHandler/Auth/ChangeExpiredPasswordFactoryTest.php
index 0a3ad00349..84257541b6 100644
--- a/test/module/Api/src/Domain/CommandHandler/Auth/ChangeExpiredPasswordFactoryTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Auth/ChangeExpiredPasswordFactoryTest.php
@@ -39,7 +39,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
diff --git a/test/module/Api/src/Domain/CommandHandler/Auth/ForgotPasswordFactoryTest.php b/test/module/Api/src/Domain/CommandHandler/Auth/ForgotPasswordFactoryTest.php
index b6922b694f..41625422d6 100644
--- a/test/module/Api/src/Domain/CommandHandler/Auth/ForgotPasswordFactoryTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Auth/ForgotPasswordFactoryTest.php
@@ -36,7 +36,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
@@ -108,13 +108,13 @@ protected function adapter(): m\MockInterface
      */
     protected function config(): array
     {
-        if (! $this->serviceManager->has('Config')) {
+        if (! $this->serviceManager->has('config')) {
             $this->serviceManager->setService(
-                'Config',
+                'config',
                 []
             );
         }
 
-        return $this->serviceManager->get('Config');
+        return $this->serviceManager->get('config');
     }
 }
diff --git a/test/module/Api/src/Domain/CommandHandler/Auth/ForgotPasswordTest.php b/test/module/Api/src/Domain/CommandHandler/Auth/ForgotPasswordTest.php
index 5e168eed0d..25d6ecba0f 100644
--- a/test/module/Api/src/Domain/CommandHandler/Auth/ForgotPasswordTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Auth/ForgotPasswordTest.php
@@ -33,7 +33,7 @@ public function setUp(): void
         $this->mockRepo('UserPasswordReset', UserPasswordResetRepo::class);
 
         $this->mockedSmServices = [
-            'Config' => $this->getConfig('not openam'),
+            'config' => $this->getConfig('not openam'),
         ];
 
         $this->command = $this->getCommand();
diff --git a/test/module/Api/src/Domain/CommandHandler/Auth/LoginFactoryTest.php b/test/module/Api/src/Domain/CommandHandler/Auth/LoginFactoryTest.php
index cb7e6fd8a8..a8257e657b 100644
--- a/test/module/Api/src/Domain/CommandHandler/Auth/LoginFactoryTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Auth/LoginFactoryTest.php
@@ -37,7 +37,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
diff --git a/test/module/Api/src/Domain/CommandHandler/Auth/LoginTest.php b/test/module/Api/src/Domain/CommandHandler/Auth/LoginTest.php
index b082056656..d5618d3762 100644
--- a/test/module/Api/src/Domain/CommandHandler/Auth/LoginTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Auth/LoginTest.php
@@ -42,7 +42,7 @@ class LoginTest extends AbstractCommandHandlerTestCase
     public function handleCommandIsCallable()
     {
         // Assert
-        $this->assertIsCallable([$this->sut, 'handleCommand']);
+        $this->assertIsCallable($this->sut->handleCommand(...));
     }
 
     /**
diff --git a/test/module/Api/src/Domain/CommandHandler/Auth/RefreshTokenFactoryTest.php b/test/module/Api/src/Domain/CommandHandler/Auth/RefreshTokenFactoryTest.php
index 0d01e50a67..995b2345cf 100644
--- a/test/module/Api/src/Domain/CommandHandler/Auth/RefreshTokenFactoryTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Auth/RefreshTokenFactoryTest.php
@@ -41,7 +41,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
diff --git a/test/module/Api/src/Domain/CommandHandler/Auth/RefreshTokenTest.php b/test/module/Api/src/Domain/CommandHandler/Auth/RefreshTokenTest.php
index 56d384aebf..5beaeefde3 100644
--- a/test/module/Api/src/Domain/CommandHandler/Auth/RefreshTokenTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Auth/RefreshTokenTest.php
@@ -55,7 +55,7 @@ public function handleCommandIsCallable()
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, 'handleCommand']);
+        $this->assertIsCallable($this->sut->handleCommand(...));
     }
 
     /**
diff --git a/test/module/Api/src/Domain/CommandHandler/Bus/Ebsr/ProcessPackTestCase.php b/test/module/Api/src/Domain/CommandHandler/Bus/Ebsr/ProcessPackTestCase.php
index a5dadc9520..d0b8a936b9 100644
--- a/test/module/Api/src/Domain/CommandHandler/Bus/Ebsr/ProcessPackTestCase.php
+++ b/test/module/Api/src/Domain/CommandHandler/Bus/Ebsr/ProcessPackTestCase.php
@@ -30,6 +30,12 @@
 
 class ProcessPackTestCase extends AbstractCommandHandlerTestCase
 {
+    public $config = [
+        'ebsr' => [
+            'tmp_extra_path' => 'root'
+        ]
+    ];
+
     public function setUp(): void
     {
         $this->mockRepo('Bus', BusRepo::class);
@@ -70,7 +76,7 @@ public function setUp(): void
             BusRegistrationInputFactory::class => $busRegInput,
             ProcessedDataInputFactory::class => $processedDataInput,
             ShortNoticeInputFactory::class => $shortNoticeInput,
-            'Config' => $config,
+            'config' => $config,
             'FileUploader' => m::mock(ContentStoreFileUploader::class),
             'FilterManager' => $filterManager,
             FileProcessorInterface::class => $fileProcessor
diff --git a/test/module/Api/src/Domain/CommandHandler/Bus/Ebsr/ProcessPackTransactionTest.php b/test/module/Api/src/Domain/CommandHandler/Bus/Ebsr/ProcessPackTransactionTest.php
index 3fa8440780..1f1290aa38 100644
--- a/test/module/Api/src/Domain/CommandHandler/Bus/Ebsr/ProcessPackTransactionTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Bus/Ebsr/ProcessPackTransactionTest.php
@@ -274,6 +274,8 @@ public function testHandleCommandDataRefresh($busShortNotice, $shortNoticeSetTim
 
         $this->successSideEffects($variationBusRegId, $licenceId, $documentId, false);
 
+        $this->sut->setConfig($this->config);
+
         $this->sut->handleCommand($command);
     }
 
@@ -513,6 +515,8 @@ public function testHandleCommandVariation($txcAppType, $busRegStatus, $fee): vo
 
         $this->successSideEffects($variationBusRegId, $licenceId, $documentId, $fee);
 
+        $this->sut->setConfig($this->config);
+
         $this->sut->handleCommand($command);
     }
 
@@ -761,7 +765,6 @@ public function testFailedDocumentRetrieval(): void
             ->andThrow(EbsrPackException::class, 'message');
 
         $this->expectedEmailQueueSideEffect(SendEbsrErrorsCmd::class, ['id' => $ebsrSubId], $ebsrSubId, new Result());
-
         $this->sut->handleCommand($command);
     }
 
@@ -797,7 +800,6 @@ public function testFailedXmlStructure(): void
         $this->fileProcessor($docIdentifier, $xmlName);
 
         $this->expectedEmailQueueSideEffect(SendEbsrErrorsCmd::class, ['id' => $ebsrSubId], $ebsrSubId, new Result());
-
         $this->sut->handleCommand($command);
     }
 
@@ -843,7 +845,6 @@ public function testFailedBusRegInput(): void
         $this->fileProcessor($docIdentifier, $xmlName);
 
         $this->expectedEmailQueueSideEffect(SendEbsrErrorsCmd::class, ['id' => $ebsrSubId], $ebsrSubId, new Result());
-
         $this->sut->handleCommand($command);
     }
 
@@ -962,7 +963,6 @@ public function testFailedProcessDataInput(): void
         $this->fileProcessor($docIdentifier, $xmlName);
 
         $this->expectedEmailQueueSideEffect(SendEbsrErrorsCmd::class, ['id' => $ebsrSubId], $ebsrSubId, new Result());
-
         $this->sut->handleCommand($command);
     }
 
@@ -1087,7 +1087,6 @@ public function testFailedShortNoticeInput(): void
         $this->mockInputFailure(ShortNoticeInputFactory::class, $processedDataOutput, m::type('array'), ['messages']);
 
         $this->expectedEmailQueueSideEffect(SendEbsrErrorsCmd::class, ['id' => $ebsrSubId], $ebsrSubId, new Result());
-
         $this->sut->handleCommand($command);
     }
 
diff --git a/test/module/Api/src/Domain/CommandHandler/Bus/Ebsr/ProcessRequestMapTest.php b/test/module/Api/src/Domain/CommandHandler/Bus/Ebsr/ProcessRequestMapTest.php
index eba0917c5f..d34702a21b 100644
--- a/test/module/Api/src/Domain/CommandHandler/Bus/Ebsr/ProcessRequestMapTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Bus/Ebsr/ProcessRequestMapTest.php
@@ -59,7 +59,7 @@ public function setUp(): void
             TemplateBuilder::class => m::mock(TemplateBuilder::class),
             FileProcessorInterface::class => m::mock(FileProcessor::class)->makePartial(),
             TransExchangeClient::class => m::mock(TransExchangeClient::class),
-            'Config' => $config,
+            'config' => $config,
             'FileUploader' => m::mock(ContentStoreFileUploader::class)
         ];
 
@@ -575,7 +575,7 @@ private function documentSideEffect($transxchangeFilename, $busRegId, $licenceId
             'licence' => $licenceId,
             'category' => CategoryEntity::CATEGORY_BUS_REGISTRATION,
             'subCategory' => CategoryEntity::BUS_SUB_CATEGORY_TRANSXCHANGE_PDF,
-            'filename' => basename($transxchangeFilename),
+            'filename' => basename((string) $transxchangeFilename),
             'description' => $documentDesc,
             'user' => 1
         ];
diff --git a/test/module/Api/src/Domain/CommandHandler/CommunityLic/ReportingBulkReprintTest.php b/test/module/Api/src/Domain/CommandHandler/CommunityLic/ReportingBulkReprintTest.php
index e0d1a12814..006db03cc2 100644
--- a/test/module/Api/src/Domain/CommandHandler/CommunityLic/ReportingBulkReprintTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/CommunityLic/ReportingBulkReprintTest.php
@@ -13,6 +13,7 @@
 
 class ReportingBulkReprintTest extends AbstractCommandHandlerTestCase
 {
+    public $mockFileUploader;
     public function setUp(): void
     {
         $this->sut = new ReportingBulkReprint();
diff --git a/test/module/Api/src/Domain/CommandHandler/Cpms/DownloadReportTest.php b/test/module/Api/src/Domain/CommandHandler/Cpms/DownloadReportTest.php
index ab89cd8096..a0c1ada55b 100644
--- a/test/module/Api/src/Domain/CommandHandler/Cpms/DownloadReportTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Cpms/DownloadReportTest.php
@@ -25,6 +25,7 @@
  */
 class DownloadReportTest extends AbstractCommandHandlerTestCase
 {
+    public $mockCpmsService;
     protected $mockApi;
 
     public function setUp(): void
diff --git a/test/module/Api/src/Domain/CommandHandler/Cpms/RequestReportTest.php b/test/module/Api/src/Domain/CommandHandler/Cpms/RequestReportTest.php
index 0b1451ad66..ddb26a0da1 100644
--- a/test/module/Api/src/Domain/CommandHandler/Cpms/RequestReportTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Cpms/RequestReportTest.php
@@ -25,6 +25,7 @@
  */
 class RequestReportTest extends AbstractCommandHandlerTestCase
 {
+    public $mockCpmsService;
     protected $mockApi;
 
     public function setUp(): void
diff --git a/test/module/Api/src/Domain/CommandHandler/DataRetention/PrecheckTest.php b/test/module/Api/src/Domain/CommandHandler/DataRetention/PrecheckTest.php
index e017361105..93a9d3bbba 100644
--- a/test/module/Api/src/Domain/CommandHandler/DataRetention/PrecheckTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/DataRetention/PrecheckTest.php
@@ -4,12 +4,12 @@
 
 namespace Dvsa\OlcsTest\Api\Domain\CommandHandler\DataRetention;
 
-use Doctrine\DBAL\Driver\Statement;
 use Doctrine\ORM\EntityManager;
 use Dvsa\Olcs\Api\Domain\CommandHandler\DataRetention\Precheck;
 use Dvsa\Olcs\Transfer\Command\CommandInterface;
 use Mockery as m;
 use Dvsa\OlcsTest\Api\Domain\CommandHandler\AbstractCommandHandlerTestCase;
+use PDOStatement;
 
 class PrecheckTest extends AbstractCommandHandlerTestCase
 {
@@ -33,12 +33,14 @@ public function testHandleCommand(): void
             ->withNoArgs()
             ->andReturn(10);
 
-        $mockStatement = m::mock(Statement::class);
-        $mockStatement
-            ->expects('execute')
-            ->withNoArgs();
+        $mockStatement = m::mock(PDOStatement::class);
+        $mockStatement->expects('execute')->withNoArgs();
+
+        $this->mockedConnection->shouldReceive('prepare')
+            ->with("CALL sp_dr_precheck(10);")
+            ->once()
+            ->andReturn($mockStatement);
 
-        $this->mockedConnection->shouldReceive('prepare')->with("CALL sp_dr_precheck(10);")->once()->andReturn($mockStatement);
         $result = $this->sut->handleCommand($command);
 
         $expected = [
diff --git a/test/module/Api/src/Domain/CommandHandler/Discs/BatchVehicleListGeneratorForPsvDiscsTest.php b/test/module/Api/src/Domain/CommandHandler/Discs/BatchVehicleListGeneratorForPsvDiscsTest.php
index a74242da71..40b544262b 100644
--- a/test/module/Api/src/Domain/CommandHandler/Discs/BatchVehicleListGeneratorForPsvDiscsTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Discs/BatchVehicleListGeneratorForPsvDiscsTest.php
@@ -27,7 +27,7 @@ public function setUp(): void
         $this->sut = new Batch();
 
         $this->mockedSmServices = [
-            'Config' => [
+            'config' => [
                 'disc_printing' => ['psv_vehicle_list_batch_size' => $this->batchSize]
             ]
         ];
diff --git a/test/module/Api/src/Domain/CommandHandler/Discs/PrintDiscsTest.php b/test/module/Api/src/Domain/CommandHandler/Discs/PrintDiscsTest.php
index 49d2a502f4..b3b34a773a 100644
--- a/test/module/Api/src/Domain/CommandHandler/Discs/PrintDiscsTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Discs/PrintDiscsTest.php
@@ -31,7 +31,7 @@ public function setUp(): void
         $this->mockRepo('GoodsDisc', GoodsDiscRepo::class);
 
         $this->mockedSmServices = [
-            'Config' => [
+            'config' => [
                 'disc_printing' => ['disc_batch_size' => $this->batchSize]
             ]
         ];
diff --git a/test/module/Api/src/Domain/CommandHandler/Document/RemoveDeletedDocumentsTest.php b/test/module/Api/src/Domain/CommandHandler/Document/RemoveDeletedDocumentsTest.php
index 78e9753b0d..c0e56b0f6b 100644
--- a/test/module/Api/src/Domain/CommandHandler/Document/RemoveDeletedDocumentsTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Document/RemoveDeletedDocumentsTest.php
@@ -19,6 +19,7 @@
  */
 class RemoveDeletedDocumentsTest extends AbstractCommandHandlerTestCase
 {
+    public $mockUploader;
     public function setUp(): void
     {
         $this->sut = new RemoveDeletedDocuments();
diff --git a/test/module/Api/src/Domain/CommandHandler/DvsaReports/GetRedirectTest.php b/test/module/Api/src/Domain/CommandHandler/DvsaReports/GetRedirectTest.php
index 6eb9acbdac..a91df15ddc 100644
--- a/test/module/Api/src/Domain/CommandHandler/DvsaReports/GetRedirectTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/DvsaReports/GetRedirectTest.php
@@ -28,6 +28,14 @@ class GetRedirectTest extends AbstractCommandHandlerTestCase
      */
     protected $mockHttpClient;
 
+    protected $config = [
+        'top-report-link' => [
+            'targetUrl' => 'apiurl',
+            'apiKey' => '123',
+            'proxy' => 'http://proxy:123'
+        ]
+    ];
+
     /**
      * @return void
      */
@@ -39,7 +47,7 @@ public function setUp(): void
             AuthorizationService::class => m::mock(AuthorizationService::class),
         ];
 
-        $this->mockedSmServices['Config'] = [
+        $this->mockedSmServices['config'] = [
             'top-report-link' => [
                 'targetUrl' => 'apiurl',
                 'apiKey' => '123',
diff --git a/test/module/Api/src/Domain/CommandHandler/Email/AbstractEcmtAnnualPermitTest.php b/test/module/Api/src/Domain/CommandHandler/Email/AbstractEcmtAnnualPermitTest.php
index 945af62ab3..10ae659326 100644
--- a/test/module/Api/src/Domain/CommandHandler/Email/AbstractEcmtAnnualPermitTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Email/AbstractEcmtAnnualPermitTest.php
@@ -21,6 +21,11 @@
  */
 abstract class AbstractEcmtAnnualPermitTest extends AbstractPermitTest
 {
+    public $orgEmails;
+    public $contactDetails;
+    public $userEmail;
+    public $orgEmail1;
+    public $orgEmail2;
     /**
      * test handle command
      *
diff --git a/test/module/Api/src/Domain/CommandHandler/Email/AbstractPermitTest.php b/test/module/Api/src/Domain/CommandHandler/Email/AbstractPermitTest.php
index 0e6259a773..6c35070c87 100644
--- a/test/module/Api/src/Domain/CommandHandler/Email/AbstractPermitTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Email/AbstractPermitTest.php
@@ -21,6 +21,26 @@
  */
 abstract class AbstractPermitTest extends AbstractCommandHandlerTestCase
 {
+    /**
+     * @var string
+     */
+    public $userEmail;
+    /**
+     * @var string
+     */
+    public $orgEmail1;
+    /**
+     * @var string
+     */
+    public $orgEmail2;
+    /**
+     * @var string[]
+     */
+    public $orgEmails;
+    /**
+     * @var (\Dvsa\Olcs\Api\Entity\ContactDetails\ContactDetails & \Mockery\MockInterface)
+     */
+    public $contactDetails;
     /** @var string */
     protected $commandClass = 'changeMe';
 
diff --git a/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtApsgPostScoringTest.php b/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtApsgPostScoringTest.php
index 433e312bc4..ab59ee668e 100644
--- a/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtApsgPostScoringTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtApsgPostScoringTest.php
@@ -18,6 +18,11 @@
  */
 class SendEcmtApsgPostScoringTest extends AbstractPermitTest
 {
+    public $orgEmails;
+    public $contactDetails;
+    public $userEmail;
+    public $orgEmail1;
+    public $orgEmail2;
     protected $commandClass = SendEcmtApsgPostScoringCmd::class;
     protected $commandHandlerClass = SendEcmtApsgPostScoringHandler::class;
     protected $template = 'ecmt-apsg-post-scoring-notification';
diff --git a/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermAppSubmittedTest.php b/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermAppSubmittedTest.php
index 881df967d7..40b6a31b5e 100644
--- a/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermAppSubmittedTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermAppSubmittedTest.php
@@ -15,6 +15,11 @@
  */
 class SendEcmtShortTermAppSubmittedTest extends AbstractPermitTest
 {
+    public $orgEmails;
+    public $contactDetails;
+    public $userEmail;
+    public $orgEmail1;
+    public $orgEmail2;
     protected $commandClass = SendEcmtShortTermAppSubmittedCmd::class;
     protected $commandHandlerClass = SendEcmtShortTermAppSubmittedHandler::class;
     protected $template = 'ecmt-short-term-app-submitted';
diff --git a/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermApsgPartSuccessfulTest.php b/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermApsgPartSuccessfulTest.php
index b183f72be8..8489996a8b 100644
--- a/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermApsgPartSuccessfulTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermApsgPartSuccessfulTest.php
@@ -20,6 +20,11 @@
  */
 class SendEcmtShortTermApsgPartSuccessfulTest extends AbstractPermitTest
 {
+    public $orgEmails;
+    public $contactDetails;
+    public $userEmail;
+    public $orgEmail1;
+    public $orgEmail2;
     protected $commandClass = SendEcmtShortTermApsgPartSuccessfulCmd::class;
     protected $commandHandlerClass = SendEcmtShortTermApsgPartSuccessfulHandler::class;
     protected $template = 'ecmt-short-term-app-part-successful';
diff --git a/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermAutomaticallyWithdrawnTest.php b/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermAutomaticallyWithdrawnTest.php
index c61aeb8a9f..8de4437e13 100644
--- a/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermAutomaticallyWithdrawnTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermAutomaticallyWithdrawnTest.php
@@ -17,6 +17,11 @@
  */
 class SendEcmtShortTermAutomaticallyWithdrawnTest extends AbstractPermitTest
 {
+    public $orgEmails;
+    public $contactDetails;
+    public $userEmail;
+    public $orgEmail1;
+    public $orgEmail2;
     protected $commandClass = SendEcmtShortTermAutomaticallyWithdrawnCmd::class;
     protected $commandHandlerClass = SendEcmtShortTermAutomaticallyWithdrawnHandler::class;
     protected $template = 'ecmt-short-term-automatically-withdrawn';
diff --git a/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermSuccessfulTest.php b/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermSuccessfulTest.php
index 1de38c2d42..d9aaa2d6bd 100644
--- a/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermSuccessfulTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermSuccessfulTest.php
@@ -20,6 +20,11 @@
  */
 class SendEcmtShortTermSuccessfulTest extends AbstractPermitTest
 {
+    public $orgEmails;
+    public $contactDetails;
+    public $userEmail;
+    public $orgEmail1;
+    public $orgEmail2;
     protected $commandClass = SendEcmtShortTermSuccessfulCmd::class;
     protected $commandHandlerClass = SendEcmtShortTermSuccessfulHandler::class;
     protected $template = 'ecmt-short-term-app-successful';
diff --git a/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermUnsuccessfulTest.php b/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermUnsuccessfulTest.php
index 517efd6066..370eb94e8f 100644
--- a/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermUnsuccessfulTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Email/SendEcmtShortTermUnsuccessfulTest.php
@@ -15,6 +15,11 @@
  */
 class SendEcmtShortTermUnsuccessfulTest extends AbstractPermitTest
 {
+    public $orgEmails;
+    public $contactDetails;
+    public $userEmail;
+    public $orgEmail1;
+    public $orgEmail2;
     protected $commandClass = SendEcmtShortTermUnsuccessfulCmd::class;
     protected $commandHandlerClass = SendEcmtShortTermUnsuccessfulHandler::class;
     protected $template = 'ecmt-short-term-app-unsuccessful';
diff --git a/test/module/Api/src/Domain/CommandHandler/Email/SendForgotPasswordTest.php b/test/module/Api/src/Domain/CommandHandler/Email/SendForgotPasswordTest.php
index 64adf132e0..a275d7b3ad 100644
--- a/test/module/Api/src/Domain/CommandHandler/Email/SendForgotPasswordTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Email/SendForgotPasswordTest.php
@@ -20,6 +20,7 @@
 
 class SendForgotPasswordTest extends AbstractCommandHandlerTestCase
 {
+    public $translationLoader;
     public function setUp(): void
     {
         $this->sut = new SendForgotPassword();
diff --git a/test/module/Api/src/Domain/CommandHandler/Fee/RefundFeeTest.php b/test/module/Api/src/Domain/CommandHandler/Fee/RefundFeeTest.php
index 4a0ffa42d6..9db3391823 100644
--- a/test/module/Api/src/Domain/CommandHandler/Fee/RefundFeeTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Fee/RefundFeeTest.php
@@ -40,7 +40,7 @@ public function setUp(): void
         $this->mockedSmServices = [
             'CpmsHelperService' => $this->mockCpmsService,
             AuthorizationService::class => m::mock(AuthorizationService::class)->makePartial(),
-            'Config' => [],
+            'config' => [],
         ];
 
         $this->sut = new RefundFee();
diff --git a/test/module/Api/src/Domain/CommandHandler/Fee/ResetFeesTest.php b/test/module/Api/src/Domain/CommandHandler/Fee/ResetFeesTest.php
index ee0543a0b8..4bd7304f03 100644
--- a/test/module/Api/src/Domain/CommandHandler/Fee/ResetFeesTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Fee/ResetFeesTest.php
@@ -26,6 +26,10 @@
  */
 class ResetFeesTest extends AbstractCommandHandlerTestCase
 {
+    /**
+     * @var (\Dvsa\OlcsTest\Api\Domain\CommandHandler\Fee\FeesHelper & \Mockery\MockInterface)
+     */
+    public $mockFeesHelperService;
     public function setUp(): void
     {
         $this->mockFeesHelperService = m::mock(FeesHelper::class);
diff --git a/test/module/Api/src/Domain/CommandHandler/Irfo/ApproveIrfoPsvAuthTest.php b/test/module/Api/src/Domain/CommandHandler/Irfo/ApproveIrfoPsvAuthTest.php
index 86bcc0ead1..d9721958e8 100644
--- a/test/module/Api/src/Domain/CommandHandler/Irfo/ApproveIrfoPsvAuthTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Irfo/ApproveIrfoPsvAuthTest.php
@@ -60,6 +60,7 @@ public function testHandleCommand()
             'irfoPsvAuthType' => 22,
             'journeyFrequency' => IrfoPsvAuthEntity::JOURNEY_FREQ_DAILY,
             'irfoPsvAuthNumbers' => [],
+            'inForceDate' => '2015-01-01',
         ];
 
         $command = Cmd::create($data);
diff --git a/test/module/Api/src/Domain/CommandHandler/IrhpApplication/StoreSnapshotTest.php b/test/module/Api/src/Domain/CommandHandler/IrhpApplication/StoreSnapshotTest.php
index abfe2d7e6a..a7498d80e3 100644
--- a/test/module/Api/src/Domain/CommandHandler/IrhpApplication/StoreSnapshotTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/IrhpApplication/StoreSnapshotTest.php
@@ -28,7 +28,7 @@ class StoreSnapshotTest extends AbstractCreateSnapshotHandlerTest
     protected $documentSubCategory = SubCategory::DOC_SUB_CATEGORY_PERMIT_APPLICATION;
     protected $documentDescription = 'Annual Irhp (EU and EEA) Application OG9654321/3 Snapshot (app submitted)';
     protected $documentLinkId = 'irhpApplication';
-    protected $documentLinkValue = 999;
+    public $documentLinkValue = 999;
     protected $generatorClass = IrhpGenerator::class;
 
     /**
diff --git a/test/module/Api/src/Domain/CommandHandler/IrhpPermitWindow/CreateTest.php b/test/module/Api/src/Domain/CommandHandler/IrhpPermitWindow/CreateTest.php
index bce21f26b2..2fa21c5211 100644
--- a/test/module/Api/src/Domain/CommandHandler/IrhpPermitWindow/CreateTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/IrhpPermitWindow/CreateTest.php
@@ -19,6 +19,12 @@
  */
 class CreateTest extends AbstractCommandHandlerTestCase
 {
+    public $today;
+    public $tomorrow;
+    /**
+     * @var string
+     */
+    public $yesterday;
     public function setUp(): void
     {
         $this->sut = m::mock(CreateHandler::class)->makePartial();
diff --git a/test/module/Api/src/Domain/CommandHandler/Licence/BatchVehicleListGeneratorForGoodsDiscsTest.php b/test/module/Api/src/Domain/CommandHandler/Licence/BatchVehicleListGeneratorForGoodsDiscsTest.php
index 989cbfefdc..5c3506d69a 100644
--- a/test/module/Api/src/Domain/CommandHandler/Licence/BatchVehicleListGeneratorForGoodsDiscsTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Licence/BatchVehicleListGeneratorForGoodsDiscsTest.php
@@ -25,7 +25,7 @@ public function setUp(): void
         $this->sut = new Batch();
 
         $this->mockedSmServices = [
-            'Config' => [
+            'config' => [
                 'disc_printing' => ['gv_vehicle_list_batch_size' => $this->batchSize]
             ]
         ];
diff --git a/test/module/Api/src/Domain/CommandHandler/Licence/ContinueLicenceTest.php b/test/module/Api/src/Domain/CommandHandler/Licence/ContinueLicenceTest.php
index 2972c3bf81..10433dae0e 100644
--- a/test/module/Api/src/Domain/CommandHandler/Licence/ContinueLicenceTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Licence/ContinueLicenceTest.php
@@ -53,7 +53,7 @@ public function handleCommandIsCallable()
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, 'handleCommand']);
+        $this->assertIsCallable($this->sut->handleCommand(...));
     }
 
     /**
@@ -876,7 +876,7 @@ protected function injectEntities(object ...$entities)
         foreach ($entities as $entity) {
             switch ($entity::class) {
                 case Licence::class:
-                    assert(is_callable([$entity, 'getId']));
+                    assert(is_callable($entity->getId(...)));
                     $this->licenceRepository()
                         ->allows('fetchById')
                         ->withArgs(fn($licenceId) => $licenceId === $entity->getId())
@@ -884,9 +884,9 @@ protected function injectEntities(object ...$entities)
                         ->byDefault();
                     break;
                 case ContinuationDetail::class:
-                    assert(is_callable([$entity, 'getLicence']));
+                    assert(is_callable($entity->getLicence(...)));
                     if (null !== ($licence = $entity->getLicence())) {
-                        assert(is_callable([$licence, 'getId']));
+                        assert(is_callable($licence->getId(...)));
                         $this->continuationDetailRepository()
                             ->allows('fetchForLicence')
                             ->withArgs(fn($licenceId) => $licenceId === $licence->getId())
diff --git a/test/module/Api/src/Domain/CommandHandler/Licence/UpdateOperatingCentresTest.php b/test/module/Api/src/Domain/CommandHandler/Licence/UpdateOperatingCentresTest.php
index 645531b742..525a8e5623 100644
--- a/test/module/Api/src/Domain/CommandHandler/Licence/UpdateOperatingCentresTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Licence/UpdateOperatingCentresTest.php
@@ -55,7 +55,7 @@ public function handleCommandIsCallable()
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, 'handleCommand']);
+        $this->assertIsCallable($this->sut->handleCommand(...));
     }
 
     /**
diff --git a/test/module/Api/src/Domain/CommandHandler/Messaging/Conversation/StoreEnhancedSnapshotTest.php b/test/module/Api/src/Domain/CommandHandler/Messaging/Conversation/StoreEnhancedSnapshotTest.php
index 3a05aca984..169ca83f3f 100644
--- a/test/module/Api/src/Domain/CommandHandler/Messaging/Conversation/StoreEnhancedSnapshotTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Messaging/Conversation/StoreEnhancedSnapshotTest.php
@@ -24,6 +24,6 @@ class StoreEnhancedSnapshotTest extends AbstractCreateSnapshotHandlerTest
     protected $documentSubCategory = SubCategory::DOC_SUB_CATEGORY_LICENCING_OTHER_DOCUMENTS;
     protected $documentDescription = 'Enhanced Conversation Snapshot';
     protected $documentLinkId = 'messagingConversation';
-    protected $documentLinkValue = 999;
+    public $documentLinkValue = 999;
     protected $generatorClass = EnhancedGenerator::class;
 }
diff --git a/test/module/Api/src/Domain/CommandHandler/Messaging/Conversation/StoreSnapshotTest.php b/test/module/Api/src/Domain/CommandHandler/Messaging/Conversation/StoreSnapshotTest.php
index d2b6c03a1b..33b493b38a 100644
--- a/test/module/Api/src/Domain/CommandHandler/Messaging/Conversation/StoreSnapshotTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Messaging/Conversation/StoreSnapshotTest.php
@@ -24,6 +24,6 @@ class StoreSnapshotTest extends AbstractCreateSnapshotHandlerTest
     protected $documentSubCategory = SubCategory::DOC_SUB_CATEGORY_LICENCING_OTHER_DOCUMENTS;
     protected $documentDescription = 'Conversation Snapshot';
     protected $documentLinkId = 'messagingConversation';
-    protected $documentLinkValue = 999;
+    public $documentLinkValue = 999;
     protected $generatorClass = Generator::class;
 }
diff --git a/test/module/Api/src/Domain/CommandHandler/MyAccount/UpdateMyAccountCognitoTest.php b/test/module/Api/src/Domain/CommandHandler/MyAccount/UpdateMyAccountCognitoTest.php
index 9fb99efe88..7b23953353 100644
--- a/test/module/Api/src/Domain/CommandHandler/MyAccount/UpdateMyAccountCognitoTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/MyAccount/UpdateMyAccountCognitoTest.php
@@ -51,7 +51,7 @@ public function setUp(): void
             CacheEncryption::class => m::mock(CacheEncryption::class),
             AuthorizationService::class => m::mock(AuthorizationService::class),
             ValidatableAdapterInterface::class => m::mock(ValidatableAdapterInterface::class),
-            'Config' => $mockConfig
+            'config' => $mockConfig
         ];
 
         parent::setUp();
diff --git a/test/module/Api/src/Domain/CommandHandler/MyAccount/UpdateMyAccountTest.php b/test/module/Api/src/Domain/CommandHandler/MyAccount/UpdateMyAccountTest.php
index d1dd963e76..370577ec13 100644
--- a/test/module/Api/src/Domain/CommandHandler/MyAccount/UpdateMyAccountTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/MyAccount/UpdateMyAccountTest.php
@@ -50,7 +50,7 @@ public function setUp(): void
             CacheEncryption::class => m::mock(CacheEncryption::class),
             AuthorizationService::class => m::mock(AuthorizationService::class),
             ValidatableAdapterInterface::class => m::mock(ValidatableAdapterInterface::class),
-            'Config' => $mockConfig
+            'config' => $mockConfig
         ];
 
         parent::setUp();
diff --git a/test/module/Api/src/Domain/CommandHandler/Organisation/TransferToTest.php b/test/module/Api/src/Domain/CommandHandler/Organisation/TransferToTest.php
index ee8f919713..68c0c90f74 100644
--- a/test/module/Api/src/Domain/CommandHandler/Organisation/TransferToTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Organisation/TransferToTest.php
@@ -999,10 +999,12 @@ public function testHandleCommandLicencesPartial()
         $licence1 = new Licence($fromOrganisation, new RefData());
         $licence1->setId(1);
         $licence1->setLicNo('UA123');
-        $fromOrganisation->addLicences($licence1);
+
         $licence2 = new Licence($fromOrganisation, new RefData());
         $licence2->setId(2);
-        $fromOrganisation->addLicences($licence2);
+        $licence2->setLicNo('UA124');
+
+        $fromOrganisation->addLicences(new ArrayCollection([$licence1, $licence2]));
 
         $this->repoMap['Organisation']->shouldReceive('fetchUsingId')->with($command)->once()
             ->andReturn($fromOrganisation);
diff --git a/test/module/Api/src/Domain/CommandHandler/Permits/PrintPermitsTest.php b/test/module/Api/src/Domain/CommandHandler/Permits/PrintPermitsTest.php
index ad8bc89b5c..61bf171d45 100644
--- a/test/module/Api/src/Domain/CommandHandler/Permits/PrintPermitsTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Permits/PrintPermitsTest.php
@@ -28,7 +28,7 @@ public function setUp(): void
 
         $this->mockedSmServices = [
             AuthorizationService::class => m::mock(AuthorizationService::class),
-            'Config' => [
+            'config' => [
                 'permit_printing' => ['max_batch_size' => null]
             ],
         ];
@@ -57,11 +57,7 @@ public function testHandleMaxBatchSizeReachedConfig()
 
         $maxBatchSize = 10000;
 
-        $this->sut->setConfig(
-            [
-                'permit_printing' => ['max_batch_size' => $maxBatchSize],
-            ]
-        );
+        $this->mockedSmServices['config'] = ['permit_printing' => ['max_batch_size' => $maxBatchSize]];
 
         $cmdData = [
             'ids' => range(1, $maxBatchSize + 1),
diff --git a/test/module/Api/src/Domain/CommandHandler/PrintScheduler/PrintJobTest.php b/test/module/Api/src/Domain/CommandHandler/PrintScheduler/PrintJobTest.php
index 349247c5f9..01486581dc 100644
--- a/test/module/Api/src/Domain/CommandHandler/PrintScheduler/PrintJobTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/PrintScheduler/PrintJobTest.php
@@ -20,6 +20,8 @@
 
 class PrintJobTest extends AbstractCommandHandlerTestCase
 {
+    public $mockFileUploader;
+    public $config;
     /** @var  CommandHandler | m\MockInterface */
     protected $sut;
 
diff --git a/test/module/Api/src/Domain/CommandHandler/Scan/CreateDocumentTest.php b/test/module/Api/src/Domain/CommandHandler/Scan/CreateDocumentTest.php
index 92715d64c2..81b266da04 100644
--- a/test/module/Api/src/Domain/CommandHandler/Scan/CreateDocumentTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Scan/CreateDocumentTest.php
@@ -52,7 +52,7 @@ public function testHandleCommandWithoutScan()
         $this->expectException(ValidationException::class);
 
         $data = [
-            'content' => base64_encode($this->validPdf),
+            'content' => base64_encode((string) $this->validPdf),
             'scanId' => 111
         ];
 
@@ -69,7 +69,7 @@ public function testHandleCommandWithoutScan()
     public function testHandleCommand()
     {
         $data = [
-            'content' => base64_encode($this->validPdf),
+            'content' => base64_encode((string) $this->validPdf),
             'scanId' => 111,
             'filename' => 'foo.pdf'
         ];
@@ -100,7 +100,7 @@ public function testHandleCommand()
         $result = new Result();
         $result->addMessage('Upload');
         $data = [
-            'content'          => base64_encode($this->validPdf),
+            'content'          => base64_encode((string) $this->validPdf),
             'filename'         => 'foo.pdf',
             'description'      => 'DESCRIPTION',
             'isExternal'       => false,
@@ -150,7 +150,7 @@ public function testHandleCommand()
     public function testHandleCommandBackScan()
     {
         $data = [
-            'content' => base64_encode($this->validPdf),
+            'content' => base64_encode((string) $this->validPdf),
             'scanId' => 111,
             'filename' => 'foo.pdf'
         ];
@@ -183,7 +183,7 @@ public function testHandleCommandBackScan()
         $result = new Result();
         $result->addMessage('Upload');
         $data = [
-            'content'          => base64_encode($this->validPdf),
+            'content'          => base64_encode((string) $this->validPdf),
             'filename'         => 'foo.pdf',
             'description'      => 'DESCRIPTION (Back scan)',
             'isExternal'       => false,
diff --git a/test/module/Api/src/Domain/CommandHandler/Submission/AssignSubmissionTest.php b/test/module/Api/src/Domain/CommandHandler/Submission/AssignSubmissionTest.php
index edb498ec02..c153dd442f 100644
--- a/test/module/Api/src/Domain/CommandHandler/Submission/AssignSubmissionTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Submission/AssignSubmissionTest.php
@@ -40,7 +40,7 @@
  */
 class AssignSubmissionTest extends AbstractCommandHandlerTestCase
 {
-    protected $submissionConfig = [
+    public $submissionConfig = [
         'submissions' => [
             'sections' => [
                 'configuration' => [
@@ -86,7 +86,7 @@ public function setUp(): void
         $sm->shouldReceive('get')->with('TransactionManager')->andReturn(m::mock(TransactionManagerInterface::class));
         $sm->expects('get')->with('CommandHandlerManager')->andReturn($this->commandHandler);
         $sm->shouldReceive('get')->with('QueryHandlerManager')->andReturn($this->queryHandler);
-        $sm->shouldReceive('get')->with('Config')->andReturn($this->submissionConfig);
+        $sm->shouldReceive('get')->with('config')->andReturn($this->submissionConfig);
 
         foreach ($this->mockedSmServices as $serviceName => $service) {
             $sm->shouldReceive('get')->with($serviceName)->andReturn($service);
diff --git a/test/module/Api/src/Domain/CommandHandler/Submission/CreateSubmissionTest.php b/test/module/Api/src/Domain/CommandHandler/Submission/CreateSubmissionTest.php
index ccc13f0701..e646fe49fc 100644
--- a/test/module/Api/src/Domain/CommandHandler/Submission/CreateSubmissionTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Submission/CreateSubmissionTest.php
@@ -1,8 +1,6 @@
 <?php
 
-/**
- * Create SubmissionSectionComment Test
- */
+declare(strict_types=1);
 
 namespace Dvsa\OlcsTest\Api\Domain\CommandHandler\Submission;
 
@@ -22,12 +20,9 @@
 use Dvsa\Olcs\Api\Domain\Repository\TransportManagerApplication as TmApplicationRepo;
 use Dvsa\Olcs\Api\Domain\Repository\TransportManagerLicence as TmLicenceRepo;
 
-/**
- * Create Submission Test
- */
 class CreateSubmissionTest extends AbstractCommandHandlerTestCase
 {
-    protected $submissionConfig = [
+    public $submissionConfig = [
         'submissions' => [
             'sections' => [
                 'configuration' => [
@@ -52,6 +47,7 @@ public function setUp(): void
         $this->mockRepo('User', \Dvsa\Olcs\Api\Domain\Repository\User::class);
 
         $this->mockedSmServices = [
+            'config' => $this->submissionConfig,
             SubmissionGenerator::class => m::mock(SubmissionGenerator::class),
             AuthorizationService::class => m::mock(AuthorizationService::class)->makePartial(),
             IdentityProviderInterface::class => m::mock(IdentityProviderInterface::class)
diff --git a/test/module/Api/src/Domain/CommandHandler/Submission/FilterSubmissionSectionsTest.php b/test/module/Api/src/Domain/CommandHandler/Submission/FilterSubmissionSectionsTest.php
index a967bf0cdc..ce5a81a020 100644
--- a/test/module/Api/src/Domain/CommandHandler/Submission/FilterSubmissionSectionsTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Submission/FilterSubmissionSectionsTest.php
@@ -20,7 +20,7 @@
 
 class FilterSubmissionSectionsTest extends AbstractCommandHandlerTestCase
 {
-    protected $submissionConfig = [
+    public $submissionConfig = [
         'submissions' => [
             'sections' => [
                 'configuration' => [
@@ -63,7 +63,7 @@ public function setUp(): void
         $sm->shouldReceive('get')->with('TransactionManager')->andReturn(m::mock(TransactionManagerInterface::class));
         $sm->expects('get')->with('CommandHandlerManager')->andReturn($this->commandHandler);
         $sm->shouldReceive('get')->with('QueryHandlerManager')->andReturn($this->queryHandler);
-        $sm->shouldReceive('get')->with('Config')->andReturn($this->submissionConfig);
+        $sm->shouldReceive('get')->with('config')->andReturn($this->submissionConfig);
 
         foreach ($this->mockedSmServices as $serviceName => $service) {
             $sm->shouldReceive('get')->with($serviceName)->andReturn($service);
diff --git a/test/module/Api/src/Domain/CommandHandler/Submission/RefreshSubmissionSectionsTest.php b/test/module/Api/src/Domain/CommandHandler/Submission/RefreshSubmissionSectionsTest.php
index 5c5d5107c1..5852655008 100644
--- a/test/module/Api/src/Domain/CommandHandler/Submission/RefreshSubmissionSectionsTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Submission/RefreshSubmissionSectionsTest.php
@@ -22,7 +22,7 @@
 
 class RefreshSubmissionSectionsTest extends AbstractCommandHandlerTestCase
 {
-    protected $submissionConfig = [
+    public $submissionConfig = [
         'submissions' => [
             'sections' => [
                 'configuration' => [
@@ -67,7 +67,7 @@ public function setUp(): void
         $sm->shouldReceive('get')->with('TransactionManager')->andReturn(m::mock(TransactionManagerInterface::class));
         $sm->expects('get')->with('CommandHandlerManager')->andReturn($this->commandHandler);
         $sm->shouldReceive('get')->with('QueryHandlerManager')->andReturn($this->queryHandler);
-        $sm->shouldReceive('get')->with('Config')->andReturn($this->submissionConfig);
+        $sm->shouldReceive('get')->with('config')->andReturn($this->submissionConfig);
 
         foreach ($this->mockedSmServices as $serviceName => $service) {
             $sm->shouldReceive('get')->with($serviceName)->andReturn($service);
diff --git a/test/module/Api/src/Domain/CommandHandler/Submission/UpdateSubmissionTest.php b/test/module/Api/src/Domain/CommandHandler/Submission/UpdateSubmissionTest.php
index a3f484ea77..b50dc1ad81 100644
--- a/test/module/Api/src/Domain/CommandHandler/Submission/UpdateSubmissionTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Submission/UpdateSubmissionTest.php
@@ -1,12 +1,9 @@
 <?php
 
-/**
- * Create SubmissionSectionComment Test
- */
+declare(strict_types=1);
 
 namespace Dvsa\OlcsTest\Api\Domain\CommandHandler\Submission;
 
-use Doctrine\ORM\Query;
 use Mockery as m;
 use Dvsa\Olcs\Api\Domain\CommandHandler\Submission\UpdateSubmission;
 use Dvsa\Olcs\Api\Domain\Repository\Submission as SubmissionRepo;
@@ -15,20 +12,15 @@
 use Dvsa\Olcs\Transfer\Command\Submission\UpdateSubmission as Cmd;
 use Dvsa\OlcsTest\Api\Domain\CommandHandler\AbstractCommandHandlerTestCase;
 use Dvsa\Olcs\Api\Service\Submission\SubmissionGenerator;
-use Dvsa\Olcs\Api\Domain\Command\Result;
-use Dvsa\Olcs\Transfer\Command\Submission\CreateSubmissionSectionComment as CommentCommand;
 use LmcRbacMvc\Service\AuthorizationService;
 use Dvsa\Olcs\Api\Entity\User\User as UserEntity;
 use Dvsa\Olcs\Api\Rbac\IdentityProviderInterface;
 use Dvsa\Olcs\Api\Domain\Repository\TransportManagerApplication as TmApplicationRepo;
 use Dvsa\Olcs\Api\Domain\Repository\TransportManagerLicence as TmLicenceRepo;
 
-/**
- * Create Submission Test
- */
 class UpdateSubmissionTest extends AbstractCommandHandlerTestCase
 {
-    protected $submissionConfig = [
+    public $submissionConfig = [
         'submissions' => [
             'sections' => [
                 'configuration' => [
@@ -58,6 +50,7 @@ public function setUp(): void
             ->andReturn(m::mock(SubmissionEntity::class)->shouldReceive('getId')->andReturn(111)->getMock());
 
         $this->mockedSmServices = [
+            'config' => $this->submissionConfig,
             SubmissionGenerator::class => $mockSubmissionGenerator,
             AuthorizationService::class => m::mock(AuthorizationService::class)->makePartial(),
             IdentityProviderInterface::class => m::mock(IdentityProviderInterface::class)
diff --git a/test/module/Api/src/Domain/CommandHandler/Tm/CreateNewUserFactoryTest.php b/test/module/Api/src/Domain/CommandHandler/Tm/CreateNewUserFactoryTest.php
index 9d1a78a83b..c286a35220 100644
--- a/test/module/Api/src/Domain/CommandHandler/Tm/CreateNewUserFactoryTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Tm/CreateNewUserFactoryTest.php
@@ -40,7 +40,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
 
diff --git a/test/module/Api/src/Domain/CommandHandler/Tm/UpdateTest.php b/test/module/Api/src/Domain/CommandHandler/Tm/UpdateTest.php
index 12d3f343ad..d6cc425849 100644
--- a/test/module/Api/src/Domain/CommandHandler/Tm/UpdateTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Tm/UpdateTest.php
@@ -35,7 +35,7 @@ class UpdateTest extends AbstractCommandHandlerTestCase
      */
     public function handleCommandIsCallable()
     {
-        $this->assertIsCallable([$this->sut, 'handleCommand']);
+        $this->assertIsCallable($this->sut->handleCommand(...));
     }
 
     /**
diff --git a/test/module/Api/src/Domain/CommandHandler/Transaction/CompleteTransactionTest.php b/test/module/Api/src/Domain/CommandHandler/Transaction/CompleteTransactionTest.php
index 74e1f228bb..5e9883f61d 100644
--- a/test/module/Api/src/Domain/CommandHandler/Transaction/CompleteTransactionTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Transaction/CompleteTransactionTest.php
@@ -39,7 +39,7 @@ public function setUp(): void
         $this->mockCpmsService = m::mock(CpmsHelper::class);
         $this->mockedSmServices = [
             'CpmsHelperService' => $this->mockCpmsService,
-            'Config' => [],
+            'config' => [],
         ];
 
         $this->sut = new CompleteTransaction();
diff --git a/test/module/Api/src/Domain/CommandHandler/Transaction/PayOutstandingFeesTest.php b/test/module/Api/src/Domain/CommandHandler/Transaction/PayOutstandingFeesTest.php
index 1c4a0fba87..4bffdd1c45 100644
--- a/test/module/Api/src/Domain/CommandHandler/Transaction/PayOutstandingFeesTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Transaction/PayOutstandingFeesTest.php
@@ -69,7 +69,7 @@ public function setUp(): void
             'CpmsHelperService' => $this->mockCpmsService,
             'FeesHelperService' => $this->mockFeesHelperService,
             AuthorizationService::class => m::mock(AuthorizationService::class)->makePartial(),
-            'Config' => [],
+            'config' => [],
         ];
 
         $this->sut = new PayOutstandingFees();
@@ -1152,7 +1152,7 @@ public function testHandleCommandAmountMismatch()
             $this->sut->handleCommand($command);
         } catch (ValidationException $e) {
             $messages = $e->getMessages();
-            $this->assertTrue(str_contains(reset($messages), 'Amount must be at least 99.00'));
+            $this->assertTrue(str_contains((string) reset($messages), 'Amount must be at least 99.00'));
         }
     }
 
@@ -1213,7 +1213,7 @@ public function testHandleCommandAllocationError()
             $this->sut->handleCommand($command);
         } catch (RuntimeException $e) {
             $messages = $e->getMessages();
-            $this->assertTrue(str_contains(reset($messages), 'ohnoes'));
+            $this->assertTrue(str_contains((string) reset($messages), 'ohnoes'));
         }
     }
 
diff --git a/test/module/Api/src/Domain/CommandHandler/Transaction/ResolvePaymentTest.php b/test/module/Api/src/Domain/CommandHandler/Transaction/ResolvePaymentTest.php
index acb0c24a55..64294ee7f8 100644
--- a/test/module/Api/src/Domain/CommandHandler/Transaction/ResolvePaymentTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Transaction/ResolvePaymentTest.php
@@ -37,7 +37,7 @@ public function setUp(): void
         $this->mockedSmServices = [
             'CpmsHelperService' => $this->mockCpmsService,
             AuthorizationService::class => m::mock(AuthorizationService::class)->makePartial(),
-            'Config' => [],
+            'config' => [],
         ];
 
         $this->sut = new ResolvePayment();
diff --git a/test/module/Api/src/Domain/CommandHandler/Transaction/ReverseTransactionTest.php b/test/module/Api/src/Domain/CommandHandler/Transaction/ReverseTransactionTest.php
index edc67c5de1..e4bef5c08c 100644
--- a/test/module/Api/src/Domain/CommandHandler/Transaction/ReverseTransactionTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/Transaction/ReverseTransactionTest.php
@@ -40,7 +40,7 @@ public function setUp(): void
         $this->mockedSmServices = [
             'CpmsHelperService' => $this->mockCpmsService,
             AuthorizationService::class => m::mock(AuthorizationService::class)->makePartial(),
-            'Config' => [],
+            'config' => [],
         ];
 
         $this->sut = new ReverseTransaction();
diff --git a/test/module/Api/src/Domain/CommandHandler/User/CreateUserFactoryTest.php b/test/module/Api/src/Domain/CommandHandler/User/CreateUserFactoryTest.php
index b8d93a9849..2d635ba6a4 100644
--- a/test/module/Api/src/Domain/CommandHandler/User/CreateUserFactoryTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/User/CreateUserFactoryTest.php
@@ -43,7 +43,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
 
diff --git a/test/module/Api/src/Domain/CommandHandler/User/CreateUserSelfserveFactoryTest.php b/test/module/Api/src/Domain/CommandHandler/User/CreateUserSelfserveFactoryTest.php
index 270d9c7965..7a1703691b 100644
--- a/test/module/Api/src/Domain/CommandHandler/User/CreateUserSelfserveFactoryTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/User/CreateUserSelfserveFactoryTest.php
@@ -40,7 +40,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
diff --git a/test/module/Api/src/Domain/CommandHandler/User/RegisterUserSelfserveFactoryTest.php b/test/module/Api/src/Domain/CommandHandler/User/RegisterUserSelfserveFactoryTest.php
index de137ec711..1c5670222d 100644
--- a/test/module/Api/src/Domain/CommandHandler/User/RegisterUserSelfserveFactoryTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/User/RegisterUserSelfserveFactoryTest.php
@@ -40,7 +40,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
diff --git a/test/module/Api/src/Domain/CommandHandler/User/UpdateUserSelfserveFactoryTest.php b/test/module/Api/src/Domain/CommandHandler/User/UpdateUserSelfserveFactoryTest.php
index 7ca33f6110..b82545899e 100644
--- a/test/module/Api/src/Domain/CommandHandler/User/UpdateUserSelfserveFactoryTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/User/UpdateUserSelfserveFactoryTest.php
@@ -42,7 +42,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
@@ -151,14 +151,14 @@ protected function adapter(): m\MockInterface
      */
     protected function config(): array
     {
-        if (! $this->serviceManager->has('Config')) {
+        if (! $this->serviceManager->has('config')) {
             $this->serviceManager->setService(
-                'Config',
+                'config',
                 []
             );
         }
 
-        return $this->serviceManager->get('Config');
+        return $this->serviceManager->get('config');
     }
 
 
diff --git a/test/module/Api/src/Domain/CommandHandler/User/UpdateUserSelfserveTest.php b/test/module/Api/src/Domain/CommandHandler/User/UpdateUserSelfserveTest.php
index 590a1f6fdf..bd82a3b964 100644
--- a/test/module/Api/src/Domain/CommandHandler/User/UpdateUserSelfserveTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/User/UpdateUserSelfserveTest.php
@@ -36,6 +36,12 @@ class UpdateUserSelfserveTest extends AbstractCommandHandlerTestCase
      */
     private $mockAuthAdapter;
 
+    public $config = [
+        'auth' => [
+            'identity_provider' => JWTIdentityProvider::class
+        ]
+    ];
+
     public function setUp(): void
     {
         $this->mockRepo('User', User::class);
@@ -58,7 +64,7 @@ public function setUp(): void
             CacheEncryption::class => m::mock(CacheEncryption::class),
             AuthorizationService::class => m::mock(AuthorizationService::class),
             'EventHistoryCreator' => m::mock(EventHistoryCreator::class),
-            'Config' => $mockConfig
+            'config' => $mockConfig
         ];
 
         $this->sut = new Sut(
diff --git a/test/module/Api/src/Domain/CommandHandler/User/UpdateUserTest.php b/test/module/Api/src/Domain/CommandHandler/User/UpdateUserTest.php
index 69ce4561aa..acc80b6d90 100644
--- a/test/module/Api/src/Domain/CommandHandler/User/UpdateUserTest.php
+++ b/test/module/Api/src/Domain/CommandHandler/User/UpdateUserTest.php
@@ -52,6 +52,12 @@
  */
 class UpdateUserTest extends AbstractCommandHandlerTestCase
 {
+    public $config = [
+        'auth' => [
+            'identity_provider' => JWTIdentityProvider::class
+        ]
+    ];
+
     public function setUp(): void
     {
         $this->sut = new Sut();
@@ -82,7 +88,7 @@ public function setUp(): void
             AuthorizationService::class => m::mock(AuthorizationService::class),
             ValidatableAdapterInterface::class => $mockAuthAdapter,
             PasswordService::class => $mockPasswordService,
-            'Config' => $mockConfig
+            'config' => $mockConfig
         ];
 
         parent::setUp();
@@ -926,7 +932,6 @@ public function testHandleCommandThrowsRolesPermissionErrorWhenAttemptingToUpdat
             ->never();
 
         $this->expectException(ValidationException::class);
-
         $this->sut->handleCommand($command);
     }
 
@@ -987,7 +992,6 @@ public function testHandleCommandThrowsRolesPermissionLastUserException()
             ->never();
 
         $this->expectException(ValidationException::class);
-
         $this->sut->handleCommand($command);
     }
 
diff --git a/test/module/Api/src/Domain/Logger/EntityAccessLoggerFactoryTest.php b/test/module/Api/src/Domain/Logger/EntityAccessLoggerFactoryTest.php
index 4da2077887..05517e371d 100644
--- a/test/module/Api/src/Domain/Logger/EntityAccessLoggerFactoryTest.php
+++ b/test/module/Api/src/Domain/Logger/EntityAccessLoggerFactoryTest.php
@@ -34,7 +34,7 @@ public function invokeIsCallable()
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
diff --git a/test/module/Api/src/Domain/Logger/EntityAccessLoggerTest.php b/test/module/Api/src/Domain/Logger/EntityAccessLoggerTest.php
index e9478a430d..979e4c310d 100644
--- a/test/module/Api/src/Domain/Logger/EntityAccessLoggerTest.php
+++ b/test/module/Api/src/Domain/Logger/EntityAccessLoggerTest.php
@@ -65,7 +65,7 @@ public function logAccessToEntityIsCallable()
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, 'logAccessToEntity']);
+        $this->assertIsCallable($this->sut->logAccessToEntity(...));
     }
 
     /**
diff --git a/test/module/Api/src/Domain/QueryHandler/Application/SummaryTest.php b/test/module/Api/src/Domain/QueryHandler/Application/SummaryTest.php
index 0d5d5fde48..ba39536867 100644
--- a/test/module/Api/src/Domain/QueryHandler/Application/SummaryTest.php
+++ b/test/module/Api/src/Domain/QueryHandler/Application/SummaryTest.php
@@ -15,6 +15,7 @@
  */
 class SummaryTest extends QueryHandlerTestCase
 {
+    public $mockCaseRepo;
     /** @var  Summary */
     protected $sut;
 
diff --git a/test/module/Api/src/Domain/QueryHandler/CommunityLic/CommunityLicencesTest.php b/test/module/Api/src/Domain/QueryHandler/CommunityLic/CommunityLicencesTest.php
index 0dad64c6ea..706b851ae6 100644
--- a/test/module/Api/src/Domain/QueryHandler/CommunityLic/CommunityLicencesTest.php
+++ b/test/module/Api/src/Domain/QueryHandler/CommunityLic/CommunityLicencesTest.php
@@ -31,7 +31,7 @@ class CommunityLicencesTest extends QueryHandlerTestCase
     public function testHandleQueryIsDefined()
     {
         // Assert
-        $this->assertIsCallable([$this->sut, 'handleQuery']);
+        $this->assertIsCallable($this->sut->handleQuery(...));
     }
 
     /**
diff --git a/test/module/Api/src/Domain/QueryHandler/Document/PrintLetterTest.php b/test/module/Api/src/Domain/QueryHandler/Document/PrintLetterTest.php
index b594dd323d..51809b39d8 100644
--- a/test/module/Api/src/Domain/QueryHandler/Document/PrintLetterTest.php
+++ b/test/module/Api/src/Domain/QueryHandler/Document/PrintLetterTest.php
@@ -16,6 +16,7 @@
  */
 class PrintLetterTest extends QueryHandlerTestCase
 {
+    public $container;
     public const DOC_ID = 9999;
 
     /** @var  m\MockInterface */
diff --git a/test/module/Api/src/Domain/QueryHandler/Nr/ReputeUrlTest.php b/test/module/Api/src/Domain/QueryHandler/Nr/ReputeUrlTest.php
index beae506790..f949d224e5 100644
--- a/test/module/Api/src/Domain/QueryHandler/Nr/ReputeUrlTest.php
+++ b/test/module/Api/src/Domain/QueryHandler/Nr/ReputeUrlTest.php
@@ -38,7 +38,7 @@ public function setUp(): void
         $this->mockRepo('TransportManager', TransportManagerRepo::class);
 
         $this->mockedSmServices = [
-            'Config' => $this->nationalRegisterConfig,
+            'config' => $this->nationalRegisterConfig,
         ];
 
         parent::setUp();
diff --git a/test/module/Api/src/Domain/QueryHandler/Permits/Report/ReportListTest.php b/test/module/Api/src/Domain/QueryHandler/Permits/Report/ReportListTest.php
index 8702be9c3d..4e13f995bf 100644
--- a/test/module/Api/src/Domain/QueryHandler/Permits/Report/ReportListTest.php
+++ b/test/module/Api/src/Domain/QueryHandler/Permits/Report/ReportListTest.php
@@ -14,7 +14,7 @@ class ReportListTest extends QueryHandlerTestCase
      */
     public function handleQueryIsCallable()
     {
-        $this->assertIsCallable([$this->sut, 'handleQuery']);
+        $this->assertIsCallable($this->sut->handleQuery(...));
     }
 
     /**
diff --git a/test/module/Api/src/Domain/QueryHandler/QueryHandlerTestCase.php b/test/module/Api/src/Domain/QueryHandler/QueryHandlerTestCase.php
index b8d6daf134..ffa3402c18 100644
--- a/test/module/Api/src/Domain/QueryHandler/QueryHandlerTestCase.php
+++ b/test/module/Api/src/Domain/QueryHandler/QueryHandlerTestCase.php
@@ -1,15 +1,10 @@
 <?php
 
-/**
- * Query Handler Test Case
- *
- * @author Rob Caiger <rob@clocal.co.uk>
- */
+declare(strict_types=1);
 
 namespace Dvsa\OlcsTest\Api\Domain\QueryHandler;
 
 use Dvsa\Olcs\Api\Domain\QueryHandler\AbstractQueryHandler;
-use Dvsa\Olcs\Api\Domain\QueryHandler\QueryHandlerInterface;
 use Dvsa\Olcs\Api\Domain\QueryHandler\Result;
 use Dvsa\Olcs\Api\Domain\QueryHandlerManager;
 use Dvsa\Olcs\Api\Domain\RepositoryServiceManager;
@@ -29,15 +24,17 @@
 use Dvsa\OlcsTest\Api\Domain\Repository\ValidateMockRepoTypeTrait;
 use Dvsa\Olcs\Api\Domain\Logger\EntityAccessLogger;
 
-/**
- * Query Handler Test Case
- *
- * @author Rob Caiger <rob@clocal.co.uk>
- */
 class QueryHandlerTestCase extends MockeryTestCase
 {
     use ValidateMockRepoTypeTrait;
 
+    public $entityAccessLogger;
+
+    /**
+     * @var (\Mockery\MockInterface & \Psr\Container\ContainerInterface)
+     */
+    public $container;
+
     /**
      * @var AbstractQueryHandler
      */
@@ -206,19 +203,19 @@ protected function mockRepo($name, $class)
 
         //if statements here are for BC. We have some existing tests which implement this themselves
         if (!empty($this->refData)) {
-            $class->shouldReceive('getRefdataReference')->andReturnUsing([$this, 'mapRefData']);
+            $class->shouldReceive('getRefdataReference')->andReturnUsing($this->mapRefData(...));
         }
 
         if (!empty($this->references)) {
-            $class->shouldReceive('getReference')->andReturnUsing([$this, 'mapReference']);
+            $class->shouldReceive('getReference')->andReturnUsing($this->mapReference(...));
         }
 
         if (!empty($this->categoryReferences)) {
-            $class->shouldReceive('getCategoryReference')->andReturnUsing([$this, 'mapCategoryReference']);
+            $class->shouldReceive('getCategoryReference')->andReturnUsing($this->mapCategoryReference(...));
         }
 
         if (!empty($this->subCategoryReferences)) {
-            $class->shouldReceive('getSubCategoryReference')->andReturnUsing([$this, 'mapSubCategoryReference']);
+            $class->shouldReceive('getSubCategoryReference')->andReturnUsing($this->mapSubCategoryReference(...));
         }
 
         $this->repoMap[$name] = $class;
diff --git a/test/module/Api/src/Domain/QueryHandler/Search/LicenceTest.php b/test/module/Api/src/Domain/QueryHandler/Search/LicenceTest.php
index ec3d929017..912df2d604 100644
--- a/test/module/Api/src/Domain/QueryHandler/Search/LicenceTest.php
+++ b/test/module/Api/src/Domain/QueryHandler/Search/LicenceTest.php
@@ -27,6 +27,8 @@
  */
 class LicenceTest extends QueryHandlerTestCase
 {
+    public $entityAccessLogger;
+    public $authorizationService;
     /**
      * @var LicenceQueryHandler
      */
diff --git a/test/module/Api/src/Domain/QueryHandler/User/UserTest.php b/test/module/Api/src/Domain/QueryHandler/User/UserTest.php
index 25c5a18b0e..d55e4072ef 100644
--- a/test/module/Api/src/Domain/QueryHandler/User/UserTest.php
+++ b/test/module/Api/src/Domain/QueryHandler/User/UserTest.php
@@ -42,7 +42,7 @@ public function setUp(): void
 
         $this->mockedSmServices = [
             AuthorizationService::class => m::mock(AuthorizationService::class),
-            'Config' => $mockedConfig
+            'config' => $mockedConfig
         ];
 
         parent::setUp();
diff --git a/test/module/Api/src/Domain/QueryPartial/WithContactDetailsTest.php b/test/module/Api/src/Domain/QueryPartial/WithContactDetailsTest.php
index 64691dcb6c..58b7e10859 100644
--- a/test/module/Api/src/Domain/QueryPartial/WithContactDetailsTest.php
+++ b/test/module/Api/src/Domain/QueryPartial/WithContactDetailsTest.php
@@ -14,6 +14,10 @@
  */
 class WithContactDetailsTest extends QueryPartialTestCase
 {
+    /**
+     * @var \Dvsa\Olcs\Api\Domain\QueryPartial\WithRefdata
+     */
+    public $withRefdata;
     /** @var m\Mock */
     private $em;
 
diff --git a/test/module/Api/src/Domain/Repository/DataDvaNiTest.php b/test/module/Api/src/Domain/Repository/DataDvaNiTest.php
index 8426df313d..cf38f7dd2d 100644
--- a/test/module/Api/src/Domain/Repository/DataDvaNiTest.php
+++ b/test/module/Api/src/Domain/Repository/DataDvaNiTest.php
@@ -14,6 +14,7 @@
  */
 class DataDvaNiTest extends MockeryTestCase
 {
+    public $mockResult;
     /** @var  m\MockInterface */
     private $mockStmt;
     /** @var  m\MockInterface */
diff --git a/test/module/Api/src/Domain/Repository/DataGovUkTest.php b/test/module/Api/src/Domain/Repository/DataGovUkTest.php
index 1cb9e0fc8d..0eb41e81ed 100644
--- a/test/module/Api/src/Domain/Repository/DataGovUkTest.php
+++ b/test/module/Api/src/Domain/Repository/DataGovUkTest.php
@@ -14,6 +14,7 @@
  */
 class DataGovUkTest extends MockeryTestCase
 {
+    public $mockResult;
     /** @var  m\MockInterface */
     private $mockStmt;
     /** @var  m\MockInterface */
diff --git a/test/module/Api/src/Domain/Repository/DocumentToDeleteTest.php b/test/module/Api/src/Domain/Repository/DocumentToDeleteTest.php
index 0489512141..784ecf3713 100644
--- a/test/module/Api/src/Domain/Repository/DocumentToDeleteTest.php
+++ b/test/module/Api/src/Domain/Repository/DocumentToDeleteTest.php
@@ -15,6 +15,14 @@
  */
 class DocumentToDeleteTest extends RepositoryTestCase
 {
+    /**
+     * @var (\Doctrine\ORM\QueryBuilder & \Mockery\MockInterface)
+     */
+    public $mockDqb;
+    /**
+     * @var (\Dvsa\Olcs\Transfer\Query\QueryInterface & \Mockery\MockInterface)
+     */
+    public $mockQi;
     /**
      * @var DocumentToDelete
      */
diff --git a/test/module/Api/src/Domain/Repository/PsvDiscTest.php b/test/module/Api/src/Domain/Repository/PsvDiscTest.php
index 90f7a3dca8..e4277d1541 100644
--- a/test/module/Api/src/Domain/Repository/PsvDiscTest.php
+++ b/test/module/Api/src/Domain/Repository/PsvDiscTest.php
@@ -24,6 +24,7 @@
  */
 class PsvDiscTest extends RepositoryTestCase
 {
+    public $activeStatuses;
     public function setUp(): void
     {
         $this->activeStatuses = [
diff --git a/test/module/Api/src/Domain/Repository/Query/BaseAbstractDbQueryTestCase.php b/test/module/Api/src/Domain/Repository/Query/BaseAbstractDbQueryTestCase.php
index 4230e29611..f8bc9dd8ff 100644
--- a/test/module/Api/src/Domain/Repository/Query/BaseAbstractDbQueryTestCase.php
+++ b/test/module/Api/src/Domain/Repository/Query/BaseAbstractDbQueryTestCase.php
@@ -50,7 +50,7 @@ public function setUp(): void
         $this->em->shouldReceive('getConnection')->andReturn($this->connection);
 
         $this->em->shouldReceive('getClassMetadata')
-            ->andReturnUsing([$this, 'getClassMetadata']);
+            ->andReturnUsing($this->getClassMetadata(...));
 
         $user = m::mock(UserEntity::class)->makePartial();
         $user->setId(1);
diff --git a/test/module/Api/src/Domain/Repository/RepositoryTestCase.php b/test/module/Api/src/Domain/Repository/RepositoryTestCase.php
index 5c8eeb173b..be87e4b1bc 100644
--- a/test/module/Api/src/Domain/Repository/RepositoryTestCase.php
+++ b/test/module/Api/src/Domain/Repository/RepositoryTestCase.php
@@ -80,97 +80,97 @@ protected function createMockQb($query = '')
         $this->qb = m::mock(QueryBuilder::class);
 
         $this->qb->shouldReceive('expr->eq')
-            ->andReturnUsing([$this, 'mockExprEq']);
+            ->andReturnUsing($this->mockExprEq(...));
 
         $this->qb->shouldReceive('expr->neq')
-            ->andReturnUsing([$this, 'mockExprNeq']);
+            ->andReturnUsing($this->mockExprNeq(...));
 
         $this->qb->shouldReceive('expr->lte')
-            ->andReturnUsing([$this, 'mockExprLte']);
+            ->andReturnUsing($this->mockExprLte(...));
 
         $this->qb->shouldReceive('expr->lt')
-            ->andReturnUsing([$this, 'mockExprLt']);
+            ->andReturnUsing($this->mockExprLt(...));
 
         $this->qb->shouldReceive('expr->gte')
-            ->andReturnUsing([$this, 'mockExprGte']);
+            ->andReturnUsing($this->mockExprGte(...));
 
         $this->qb->shouldReceive('expr->gt')
-            ->andReturnUsing([$this, 'mockExprGt']);
+            ->andReturnUsing($this->mockExprGt(...));
 
         $this->qb->shouldReceive('expr->isNull')
-            ->andReturnUsing([$this, 'mockExprIsNull']);
+            ->andReturnUsing($this->mockExprIsNull(...));
 
         $this->qb->shouldReceive('expr->between')
-            ->andReturnUsing([$this, 'mockExprBetween']);
+            ->andReturnUsing($this->mockExprBetween(...));
 
         $this->qb->shouldReceive('expr->in')
-            ->andReturnUsing([$this, 'mockExprIn']);
+            ->andReturnUsing($this->mockExprIn(...));
 
         $this->qb->shouldReceive('expr->notIn')
-            ->andReturnUsing([$this, 'mockExprNotIn']);
+            ->andReturnUsing($this->mockExprNotIn(...));
 
         $this->qb->shouldReceive('expr->isNotNull')
-            ->andReturnUsing([$this, 'mockExprIsNotNull']);
+            ->andReturnUsing($this->mockExprIsNotNull(...));
 
         $this->qb->shouldReceive('expr->like')
-            ->andReturnUsing([$this, 'mockExprLike']);
+            ->andReturnUsing($this->mockExprLike(...));
 
         $this->qb->shouldReceive('expr->orX')
-            ->andReturnUsing([$this, 'mockOrX']);
+            ->andReturnUsing($this->mockOrX(...));
 
         $this->qb->shouldReceive('expr->andX')
-            ->andReturnUsing([$this, 'mockAndX']);
+            ->andReturnUsing($this->mockAndX(...));
 
         $this->qb->shouldReceive('expr->count')
-            ->andReturnUsing([$this, 'mockCount']);
+            ->andReturnUsing($this->mockCount(...));
 
         $this->qb->shouldReceive('select')
-            ->andReturnUsing([$this, 'mockAddSelect']);
+            ->andReturnUsing($this->mockAddSelect(...));
 
         $this->qb->shouldReceive('distinct')
-            ->andReturnUsing([$this, 'mockDistinct']);
+            ->andReturnUsing($this->mockDistinct(...));
 
         $this->qb->shouldReceive('addSelect')
-            ->andReturnUsing([$this, 'mockAddSelect']);
+            ->andReturnUsing($this->mockAddSelect(...));
 
         $this->qb->shouldReceive('select')
-            ->andReturnUsing([$this, 'mockAddSelect']);
+            ->andReturnUsing($this->mockAddSelect(...));
 
         $this->qb->shouldReceive('where')
-            ->andReturnUsing([$this, 'mockAndWhere']);
+            ->andReturnUsing($this->mockAndWhere(...));
 
         $this->qb->shouldReceive('andWhere')
-            ->andReturnUsing([$this, 'mockAndWhere']);
+            ->andReturnUsing($this->mockAndWhere(...));
 
         $this->qb->shouldReceive('orWhere')
-            ->andReturnUsing([$this, 'mockOrWhere']);
+            ->andReturnUsing($this->mockOrWhere(...));
 
         $this->qb->shouldReceive('join')
-            ->andReturnUsing([$this, 'mockInnerJoin']);
+            ->andReturnUsing($this->mockInnerJoin(...));
 
         $this->qb->shouldReceive('innerJoin')
-            ->andReturnUsing([$this, 'mockInnerJoin']);
+            ->andReturnUsing($this->mockInnerJoin(...));
 
         $this->qb->shouldReceive('leftJoin')
-            ->andReturnUsing([$this, 'mockLeftJoin']);
+            ->andReturnUsing($this->mockLeftJoin(...));
 
         $this->qb->shouldReceive('orderBy')
-            ->andReturnUsing([$this, 'mockOrderBy']);
+            ->andReturnUsing($this->mockOrderBy(...));
 
         $this->qb->shouldReceive('addOrderBy')
-            ->andReturnUsing([$this, 'mockOrderBy']);
+            ->andReturnUsing($this->mockOrderBy(...));
 
         $this->qb->shouldReceive('groupBy')
-            ->andReturnUsing([$this, 'mockGroupBy']);
+            ->andReturnUsing($this->mockGroupBy(...));
 
         $this->qb->shouldReceive('setParameter')
-            ->andReturnUsing([$this, 'mockSetParameter']);
+            ->andReturnUsing($this->mockSetParameter(...));
 
         $this->qb->shouldReceive('setMaxResults')
-            ->andReturnUsing([$this, 'mockSetMaxResults']);
+            ->andReturnUsing($this->mockSetMaxResults(...));
 
         $this->qb->shouldReceive('distinct')
-            ->andReturnUsing([$this, 'mockDistinct']);
+            ->andReturnUsing($this->mockDistinct(...));
 
         return $this->qb;
     }
@@ -412,7 +412,7 @@ protected function expectQueryWithData($queryName, $data = [], $types = [], $que
      */
     protected function setUpServiceManager(): ServiceManager
     {
-        return (new ServiceManagerBuilder([$this, 'setUpDefaultServices']))->build();
+        return (new ServiceManagerBuilder($this->setUpDefaultServices(...)))->build();
     }
 
     /**
diff --git a/test/module/Api/src/Domain/Util/SlaCalculatorTest.php b/test/module/Api/src/Domain/Util/SlaCalculatorTest.php
index 8abe5c49f0..1a6c79df52 100644
--- a/test/module/Api/src/Domain/Util/SlaCalculatorTest.php
+++ b/test/module/Api/src/Domain/Util/SlaCalculatorTest.php
@@ -24,6 +24,8 @@
  */
 class SlaCalculatorTest extends MockeryTestCase
 {
+    public $publicHolidayRepo;
+    public $dateTimeProcessor;
     public function setUp(): void
     {
         $logWriter = new \Laminas\Log\Writer\Mock();
diff --git a/test/module/Api/src/Domain/Validation/ValidationHelperTestCaseTrait.php b/test/module/Api/src/Domain/Validation/ValidationHelperTestCaseTrait.php
index fbdc177c08..e47f968019 100644
--- a/test/module/Api/src/Domain/Validation/ValidationHelperTestCaseTrait.php
+++ b/test/module/Api/src/Domain/Validation/ValidationHelperTestCaseTrait.php
@@ -41,6 +41,8 @@ trait ValidationHelperTestCaseTrait
      */
     protected $auth;
 
+    protected $cache;
+
     public function setUp(): void
     {
         $this->repoManager = m::mock(RepositoryServiceManager::class);
diff --git a/test/module/Api/src/Domain/Validation/Validators/CanAccessCorrelatedDocumentsTest.php b/test/module/Api/src/Domain/Validation/Validators/CanAccessCorrelatedDocumentsTest.php
index 0cefd1f3b3..09e4b7802c 100644
--- a/test/module/Api/src/Domain/Validation/Validators/CanAccessCorrelatedDocumentsTest.php
+++ b/test/module/Api/src/Domain/Validation/Validators/CanAccessCorrelatedDocumentsTest.php
@@ -16,6 +16,7 @@
  */
 class CanAccessCorrelatedDocumentsTest extends AbstractValidatorsTestCase
 {
+    public $cache;
     /**
      * @var CanAccessCorrelatedDocuments|m\MockInterface
      */
diff --git a/test/module/Api/src/Entity/Abstracts/EntityTester.php b/test/module/Api/src/Entity/Abstracts/EntityTester.php
index 84ce2f8cfc..c29a4ead28 100644
--- a/test/module/Api/src/Entity/Abstracts/EntityTester.php
+++ b/test/module/Api/src/Entity/Abstracts/EntityTester.php
@@ -160,7 +160,7 @@ public function getGettersAndSetters()
     {
         $classToTestName = $this->getClassToTestName();
 
-        $parts = explode('\\', $classToTestName);
+        $parts = explode('\\', (string) $classToTestName);
 
         $class = array_pop($parts);
         $class = 'Abstract' . $class;
@@ -213,7 +213,7 @@ public function getAddMethods()
     {
         $classToTestName = $this->getClassToTestName();
 
-        $parts = explode('\\', $classToTestName);
+        $parts = explode('\\', (string) $classToTestName);
 
         $class = array_pop($parts);
         $class = 'Abstract' . $class;
diff --git a/test/module/Api/src/Entity/Fee/FeeEntityTest.php b/test/module/Api/src/Entity/Fee/FeeEntityTest.php
index a20e5762ef..57de8f558b 100644
--- a/test/module/Api/src/Entity/Fee/FeeEntityTest.php
+++ b/test/module/Api/src/Entity/Fee/FeeEntityTest.php
@@ -724,7 +724,7 @@ public function testGetLatestFeeTransactionNull()
             ->shouldReceive('getTransaction')->never()
             ->getMock();
 
-        $feeTr1 = $this->getStubFeeTransaction(5, '2017-06-05', null, null, null, '', 9001);
+        $feeTr1 = $this->getStubFeeTransaction(5, '2017-06-05', '2015-09-02', null, null, '', 9001);
         $sut->setFeeTransactions(new ArrayCollection([$feeTr1]));
 
         //  call
diff --git a/test/module/Api/src/Entity/Permits/IrhpPermitEntityTest.php b/test/module/Api/src/Entity/Permits/IrhpPermitEntityTest.php
index 516c6f2a43..f203e9595f 100644
--- a/test/module/Api/src/Entity/Permits/IrhpPermitEntityTest.php
+++ b/test/module/Api/src/Entity/Permits/IrhpPermitEntityTest.php
@@ -20,6 +20,10 @@
  */
 class IrhpPermitEntityTest extends EntityTester
 {
+    /**
+     * @var (\DateTime & \Mockery\MockInterface)
+     */
+    public $expiryDate;
     /**
      * Define the entity to test
      *
diff --git a/test/module/Api/src/Entity/Traits/StubClearPropertiesWithCollectionsTrait.php b/test/module/Api/src/Entity/Traits/StubClearPropertiesWithCollectionsTrait.php
index 5c81ee0c24..6d5503b4c8 100644
--- a/test/module/Api/src/Entity/Traits/StubClearPropertiesWithCollectionsTrait.php
+++ b/test/module/Api/src/Entity/Traits/StubClearPropertiesWithCollectionsTrait.php
@@ -8,6 +8,8 @@ class StubClearPropertiesWithCollectionsTrait
 {
     use ClearPropertiesWithCollectionsTrait;
 
+    public $property;
+
     public function setProperty($property)
     {
         $this->property = $property;
diff --git a/test/module/Api/src/Mvc/PayloadValidationListenerTest.php b/test/module/Api/src/Mvc/PayloadValidationListenerTest.php
index 009bd3971b..ed21157b86 100644
--- a/test/module/Api/src/Mvc/PayloadValidationListenerTest.php
+++ b/test/module/Api/src/Mvc/PayloadValidationListenerTest.php
@@ -18,6 +18,8 @@
 
 class PayloadValidationListenerTest extends MockeryTestCase
 {
+    public $annotationBuilder;
+    public $sut;
     public function setUp(): void
     {
         $this->annotationBuilder = m::mock(AnnotationBuilder::class);
diff --git a/test/module/Api/src/Rbac/IdentityProviderFactoryTest.php b/test/module/Api/src/Rbac/IdentityProviderFactoryTest.php
index 5f63e1907b..81f6a4691e 100644
--- a/test/module/Api/src/Rbac/IdentityProviderFactoryTest.php
+++ b/test/module/Api/src/Rbac/IdentityProviderFactoryTest.php
@@ -32,7 +32,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
diff --git a/test/module/Api/src/Rbac/JWTIdentityProviderFactoryTest.php b/test/module/Api/src/Rbac/JWTIdentityProviderFactoryTest.php
index ae68945b32..9165c16dbd 100644
--- a/test/module/Api/src/Rbac/JWTIdentityProviderFactoryTest.php
+++ b/test/module/Api/src/Rbac/JWTIdentityProviderFactoryTest.php
@@ -41,7 +41,7 @@ public function invokeIsCallable(): void
         $this->setUpSut();
 
         // Assert
-        $this->assertIsCallable([$this->sut, '__invoke']);
+        $this->assertIsCallable($this->sut->__invoke(...));
     }
 
     /**
diff --git a/test/module/Api/src/Service/AbstractServiceManagerFactoryTest.php b/test/module/Api/src/Service/AbstractServiceManagerFactoryTest.php
index c590e8c7e5..c211254993 100644
--- a/test/module/Api/src/Service/AbstractServiceManagerFactoryTest.php
+++ b/test/module/Api/src/Service/AbstractServiceManagerFactoryTest.php
@@ -20,7 +20,7 @@ public function testInvoke()
             ->andReturnUsing(
                 function ($class) {
                     $map = [
-                        'Config' => [
+                        'config' => [
                             AbstractServiceManagerFactoryStub::CONFIG_KEY => ['cfg_data'],
                         ]
                     ];
diff --git a/test/module/Api/src/Service/Cpms/ApiServiceFactoryTest.php b/test/module/Api/src/Service/Cpms/ApiServiceFactoryTest.php
index a1f9273048..fc2cbbadc8 100644
--- a/test/module/Api/src/Service/Cpms/ApiServiceFactoryTest.php
+++ b/test/module/Api/src/Service/Cpms/ApiServiceFactoryTest.php
@@ -64,7 +64,7 @@ public function testInvoke()
 
             $mockSl
                 ->shouldReceive('get')
-                ->with('Config')
+                ->with('config')
                 ->andReturn($config)
                 ->shouldReceive('get')
                 ->with(AuthorizationService::class)
diff --git a/test/module/Api/src/Service/Document/NamingServiceTest.php b/test/module/Api/src/Service/Document/NamingServiceTest.php
index b62823b684..4fd2cef913 100644
--- a/test/module/Api/src/Service/Document/NamingServiceTest.php
+++ b/test/module/Api/src/Service/Document/NamingServiceTest.php
@@ -50,7 +50,7 @@ function ($alias, $service) use ($sm) {
                 }
             );
 
-        $sm->setService('Config', $config);
+        $sm->setService('config', $config);
 
         $this->sut = new NamingService();
         $this->sut->__invoke($sm, NamingService::class);
@@ -73,7 +73,7 @@ function ($alias, $service) use ($sm) {
                 }
             );
 
-        $sm->setService('Config', $config);
+        $sm->setService('config', $config);
 
         $this->sut = new NamingService();
         $this->sut->__invoke($sm, NamingService::class);
diff --git a/test/module/Api/src/Service/DvlaSearch/DvlaSearchServiceFactoryTest.php b/test/module/Api/src/Service/DvlaSearch/DvlaSearchServiceFactoryTest.php
index 61c020f70c..5152800a70 100644
--- a/test/module/Api/src/Service/DvlaSearch/DvlaSearchServiceFactoryTest.php
+++ b/test/module/Api/src/Service/DvlaSearch/DvlaSearchServiceFactoryTest.php
@@ -23,7 +23,7 @@ public function testInvoke()
         $logger = new \Laminas\Log\Logger();
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->andReturn($config);
         $mockSl->shouldReceive('get')->with('Logger')->andReturn($logger);
 
         $sut = new DvlaSearchServiceFactory();
diff --git a/test/module/Api/src/Service/Ebsr/FileProcessorFactoryTest.php b/test/module/Api/src/Service/Ebsr/FileProcessorFactoryTest.php
index 5c1c248599..b74a739e7d 100644
--- a/test/module/Api/src/Service/Ebsr/FileProcessorFactoryTest.php
+++ b/test/module/Api/src/Service/Ebsr/FileProcessorFactoryTest.php
@@ -24,7 +24,7 @@ public function testInvoke()
         $mockFilter->shouldReceive('setAdapter')->with('zip');
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn([]);
+        $mockSl->shouldReceive('get')->with('config')->andReturn([]);
 
         $mockSl->shouldReceive('get')->with('FilterManager')->andReturnSelf();
         $mockSl->shouldReceive('get')->with('Decompress')->andReturn($mockFilter);
diff --git a/test/module/Api/src/Service/Ebsr/InputFilter/BusRegistrationInputFactoryTest.php b/test/module/Api/src/Service/Ebsr/InputFilter/BusRegistrationInputFactoryTest.php
index ecc613a24f..97c05e9758 100644
--- a/test/module/Api/src/Service/Ebsr/InputFilter/BusRegistrationInputFactoryTest.php
+++ b/test/module/Api/src/Service/Ebsr/InputFilter/BusRegistrationInputFactoryTest.php
@@ -37,7 +37,7 @@ public function testInvoke()
         $mockMapFilter->shouldReceive('setMapping')->with($mockMappings);
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn([]);
+        $mockSl->shouldReceive('get')->with('config')->andReturn([]);
         $mockSl->shouldReceive('get')->with('FilterManager')->andReturnSelf();
         $mockSl->shouldReceive('get')->with('ValidatorManager')->andReturnSelf();
 
@@ -96,7 +96,7 @@ public function testInvokeDisabledValidators()
         $mockMapFilter->shouldReceive('setMapping')->with($mockMappings);
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->andReturn($config);
         $mockSl->shouldReceive('get')->with('FilterManager')->andReturnSelf();
 
         $mockSl->shouldReceive('get')->with('TransExchangeXmlMapping')->andReturn($mockMappings);
diff --git a/test/module/Api/src/Service/Ebsr/InputFilter/ProcessedDataInputFactoryTest.php b/test/module/Api/src/Service/Ebsr/InputFilter/ProcessedDataInputFactoryTest.php
index f3aedb38c1..d7abd4ce4d 100644
--- a/test/module/Api/src/Service/Ebsr/InputFilter/ProcessedDataInputFactoryTest.php
+++ b/test/module/Api/src/Service/Ebsr/InputFilter/ProcessedDataInputFactoryTest.php
@@ -23,7 +23,7 @@ public function testInvoke()
         $mockValidator = m::mock(\Laminas\Validator\AbstractValidator::class);
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn([]);
+        $mockSl->shouldReceive('get')->with('config')->andReturn([]);
         $mockSl->shouldReceive('get')->with('ValidatorManager')->andReturnSelf();
 
         $mockSl->shouldReceive('get')->with(BusRegNotFound::class)->once()->andReturn($mockValidator);
@@ -53,7 +53,7 @@ public function testInvokeDisabledValidators()
         ];
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->andReturn($config);
 
         $sut = new ProcessedDataInputFactory();
         $service = $sut->__invoke($mockSl, Input::class);
diff --git a/test/module/Api/src/Service/Ebsr/InputFilter/ShortNoticeInputFactoryTest.php b/test/module/Api/src/Service/Ebsr/InputFilter/ShortNoticeInputFactoryTest.php
index 63fe7804fc..ef5cd764f6 100644
--- a/test/module/Api/src/Service/Ebsr/InputFilter/ShortNoticeInputFactoryTest.php
+++ b/test/module/Api/src/Service/Ebsr/InputFilter/ShortNoticeInputFactoryTest.php
@@ -17,7 +17,7 @@ public function testInvoke()
         $mockValidator = m::mock(\Laminas\Validator\AbstractValidator::class);
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn([]);
+        $mockSl->shouldReceive('get')->with('config')->andReturn([]);
         $mockSl->shouldReceive('get')->with('ValidatorManager')->andReturnSelf();
 
         $mockSl->shouldReceive('get')->with(MissingSection::class)->once()->andReturn($mockValidator);
@@ -44,7 +44,7 @@ public function testInvokeDisabledValidators()
         ];
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->andReturn($config);
 
         $sut = new ShortNoticeInputFactory();
         $service = $sut->__invoke($mockSl, Input::class);
diff --git a/test/module/Api/src/Service/Ebsr/InputFilter/XmlStructureInputFactoryTest.php b/test/module/Api/src/Service/Ebsr/InputFilter/XmlStructureInputFactoryTest.php
index 75d4fc2295..0fcc9981b5 100644
--- a/test/module/Api/src/Service/Ebsr/InputFilter/XmlStructureInputFactoryTest.php
+++ b/test/module/Api/src/Service/Ebsr/InputFilter/XmlStructureInputFactoryTest.php
@@ -43,7 +43,7 @@ public function testInvoke()
         $mockValidator = m::mock(\Laminas\Validator\AbstractValidator::class);
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->andReturn($config);
         $mockSl->shouldReceive('get')->with('FilterManager')->andReturnSelf();
         $mockSl->shouldReceive('get')->with('ValidatorManager')->andReturnSelf();
 
@@ -78,7 +78,7 @@ public function testInvokeDisabledValidators()
         $mockFilter = m::mock(\Laminas\Filter\AbstractFilter::class);
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->andReturn($config);
         $mockSl->shouldReceive('get')->with('FilterManager')->andReturnSelf();
         $mockSl->shouldReceive('get')->with(ParseXml::class)->andReturn($mockFilter);
 
@@ -109,7 +109,7 @@ public function testInvokeMissingMaxErrorsConfig()
         $mockFilter = m::mock(\Laminas\Filter\AbstractFilter::class);
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->once()->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->once()->andReturn($config);
         $mockSl->shouldReceive('get')->with('FilterManager')->once()->andReturnSelf();
         $mockSl->shouldReceive('get')->with(ParseXml::class)->once()->andReturn($mockFilter);
 
@@ -137,7 +137,7 @@ public function testInvokeMissingSchemaVersionConfig()
         $mockFilter = m::mock(\Laminas\Filter\AbstractFilter::class);
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->once()->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->once()->andReturn($config);
         $mockSl->shouldReceive('get')->with('FilterManager')->once()->andReturnSelf();
         $mockSl->shouldReceive('get')->with(ParseXml::class)->once()->andReturn($mockFilter);
 
@@ -166,7 +166,7 @@ public function testInvokeMissingXmlMessageExclude()
         $mockFilter = m::mock(\Laminas\Filter\AbstractFilter::class);
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->once()->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->once()->andReturn($config);
         $mockSl->shouldReceive('get')->with('FilterManager')->once()->andReturnSelf();
         $mockSl->shouldReceive('get')->with(ParseXml::class)->once()->andReturn($mockFilter);
 
diff --git a/test/module/Api/src/Service/Ebsr/TransExchangeClientFactoryTest.php b/test/module/Api/src/Service/Ebsr/TransExchangeClientFactoryTest.php
index 4918975622..d9e3fcfb3d 100644
--- a/test/module/Api/src/Service/Ebsr/TransExchangeClientFactoryTest.php
+++ b/test/module/Api/src/Service/Ebsr/TransExchangeClientFactoryTest.php
@@ -19,7 +19,7 @@ public function testInvokeNoConfig()
         $this->expectException(\RuntimeException::class);
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn([]);
+        $mockSl->shouldReceive('get')->with('config')->andReturn([]);
 
         $sut = new TransExchangeClientFactory();
         $sut->__invoke($mockSl, TransExchangeClient::class);
@@ -49,7 +49,7 @@ public function testInvoke()
             ->with(TransExchangeClientFactory::PUBLISH_XSD);
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn(['ebsr' => $config]);
+        $mockSl->shouldReceive('get')->with('config')->andReturn(['ebsr' => $config]);
         $mockSl->shouldReceive('get')->with('FilterManager')->andReturnSelf();
         $mockSl->shouldReceive('get')->with('ValidatorManager')->andReturnSelf();
         $mockSl->shouldReceive('get')->with('TransExchangePublisherXmlMapping')->andReturn($mockSpec);
diff --git a/test/module/Api/src/Service/EventHistory/CreatorTest.php b/test/module/Api/src/Service/EventHistory/CreatorTest.php
index d2831bdffa..01e554af48 100644
--- a/test/module/Api/src/Service/EventHistory/CreatorTest.php
+++ b/test/module/Api/src/Service/EventHistory/CreatorTest.php
@@ -21,6 +21,7 @@
  */
 class CreatorTest extends MockeryTestCase
 {
+    public $sut;
     private $authService;
 
     private $eventHistoryRepo;
diff --git a/test/module/Api/src/Service/FinancialStandingHelperServiceTest.php b/test/module/Api/src/Service/FinancialStandingHelperServiceTest.php
index 90c621a253..726de5efce 100644
--- a/test/module/Api/src/Service/FinancialStandingHelperServiceTest.php
+++ b/test/module/Api/src/Service/FinancialStandingHelperServiceTest.php
@@ -42,7 +42,7 @@ public function setUp(): void
 
         $this->repoMap['FinancialStandingRate']
             ->shouldReceive('fetchRatesInEffect')
-            ->andReturnUsing([$this, 'getStubRates']);
+            ->andReturnUsing($this->getStubRates(...));
 
         // Create service with mocked dependencies
         $this->sut = $this->createService();
diff --git a/test/module/Api/src/Service/Lva/Application/GrantValidationServiceTest.php b/test/module/Api/src/Service/Lva/Application/GrantValidationServiceTest.php
index 0c4ac38c00..6a85a4d87d 100644
--- a/test/module/Api/src/Service/Lva/Application/GrantValidationServiceTest.php
+++ b/test/module/Api/src/Service/Lva/Application/GrantValidationServiceTest.php
@@ -17,6 +17,7 @@
  */
 class GrantValidationServiceTest extends \Mockery\Adapter\Phpunit\MockeryTestCase
 {
+    public $sectionAccessService;
     protected $sut;
 
     /**
diff --git a/test/module/Api/src/Service/Nr/InputFilter/XmlStructureInputFactoryTest.php b/test/module/Api/src/Service/Nr/InputFilter/XmlStructureInputFactoryTest.php
index d663c2f762..231c0b334f 100644
--- a/test/module/Api/src/Service/Nr/InputFilter/XmlStructureInputFactoryTest.php
+++ b/test/module/Api/src/Service/Nr/InputFilter/XmlStructureInputFactoryTest.php
@@ -41,7 +41,7 @@ public function testInvoke()
         $mockSl = m::mock(ContainerInterface::class);
         $mockSl->shouldReceive('get')->with('FilterManager')->andReturnSelf();
         $mockSl->shouldReceive('get')->with('ValidatorManager')->andReturnSelf();
-        $mockSl->shouldReceive('get')->with('Config')->once()->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->once()->andReturn($config);
         $mockSl->shouldReceive('get')->with(ParseXmlString::class)->andReturn($mockFilter);
         $mockSl->shouldReceive('get')->with(Xsd::class)->andReturn($mockXsdValidator);
 
@@ -67,7 +67,7 @@ public function testInvokeMissingConfig($config, $exceptionName, $exceptionMessa
         $this->expectException($exceptionName);
         $this->expectExceptionMessage($exceptionMessage);
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->once()->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->once()->andReturn($config);
 
         $sut = new XmlStructureInputFactory();
         $sut->__invoke($mockSl, Input::class);
diff --git a/test/module/Api/src/Service/Nr/InrClientFactoryTest.php b/test/module/Api/src/Service/Nr/InrClientFactoryTest.php
index a90fe734e4..c92109dff0 100644
--- a/test/module/Api/src/Service/Nr/InrClientFactoryTest.php
+++ b/test/module/Api/src/Service/Nr/InrClientFactoryTest.php
@@ -19,7 +19,7 @@ public function testCreateServiceNoConfig()
         $this->expectException(\RuntimeException::class);
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn([]);
+        $mockSl->shouldReceive('get')->with('config')->andReturn([]);
 
         $sut = new InrClientFactory();
         $sut->__invoke($mockSl, InrClient::class);
@@ -38,7 +38,7 @@ public function testCreateService()
         ];
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->andReturn($config);
 
         $sut = new InrClientFactory();
 
diff --git a/test/module/Api/src/Service/Nr/Mapping/ComplianceEpisodeXmlFactoryTest.php b/test/module/Api/src/Service/Nr/Mapping/ComplianceEpisodeXmlFactoryTest.php
index 73190913c7..886dae8b88 100644
--- a/test/module/Api/src/Service/Nr/Mapping/ComplianceEpisodeXmlFactoryTest.php
+++ b/test/module/Api/src/Service/Nr/Mapping/ComplianceEpisodeXmlFactoryTest.php
@@ -26,7 +26,7 @@ public function testInvoke()
         $mockSl = m::mock(ContainerInterface::class);
         $mockSl->shouldReceive('get')->once()->with('FilterManager')->andReturnSelf();
         $mockSl->shouldReceive('get')->once()->with(MapXmlFile::class)->andReturn($mockMapXmlFile);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->andReturn($config);
 
         $sut = new ComplianceEpisodeXmlFactory();
 
@@ -41,7 +41,7 @@ public function testInvokeMissingConfig()
         $this->expectExceptionMessage('Missing INR service config');
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn([]);
+        $mockSl->shouldReceive('get')->with('config')->andReturn([]);
 
         $sut = new ComplianceEpisodeXmlFactory();
         $sut->__invoke($mockSl, ComplianceEpisodeXml::class);
diff --git a/test/module/Api/src/Service/Nr/MsiResponseFactoryTest.php b/test/module/Api/src/Service/Nr/MsiResponseFactoryTest.php
index 3900a1a725..3d38f24c4f 100644
--- a/test/module/Api/src/Service/Nr/MsiResponseFactoryTest.php
+++ b/test/module/Api/src/Service/Nr/MsiResponseFactoryTest.php
@@ -27,7 +27,7 @@ public function testInvoke()
         ];
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->once()->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->once()->andReturn($config);
 
         $sut = new MsiResponseFactory();
         $service = $sut->__invoke($mockSl, MsiResponse::class);
@@ -42,7 +42,7 @@ public function testInvokeMissingConfig()
         $this->expectExceptionMessage('No config specified for xml ns');
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->once()->andReturn([]);
+        $mockSl->shouldReceive('get')->with('config')->once()->andReturn([]);
         $sut = new MsiResponseFactory();
         $sut->__invoke($mockSl, MsiResponse::class);
     }
diff --git a/test/module/Api/src/Service/Nysiis/NysiisRestClientFactoryTest.php b/test/module/Api/src/Service/Nysiis/NysiisRestClientFactoryTest.php
index eb63ff13b7..af2ef1aad5 100644
--- a/test/module/Api/src/Service/Nysiis/NysiisRestClientFactoryTest.php
+++ b/test/module/Api/src/Service/Nysiis/NysiisRestClientFactoryTest.php
@@ -25,7 +25,7 @@ public function testInvokeValid()
         ];
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->andReturn($config);
         $sut = new NysiisRestClientFactory();
         $this->assertInstanceOf(NysiisRestClient::class, $sut->__invoke($mockSl, NysiisRestClient::class));
     }
@@ -50,7 +50,7 @@ public function testInvokeMissingConfig($config, $errorMsg)
         ];
 
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn($config);
+        $mockSl->shouldReceive('get')->with('config')->andReturn($config);
         $sut = new NysiisRestClientFactory();
         $sut->__invoke($mockSl, NysiisRestClient::class);
     }
diff --git a/test/module/Api/src/Service/Permits/Availability/WindowAvailabilityCheckerTest.php b/test/module/Api/src/Service/Permits/Availability/WindowAvailabilityCheckerTest.php
index f7a4b5e572..723cfd421e 100644
--- a/test/module/Api/src/Service/Permits/Availability/WindowAvailabilityCheckerTest.php
+++ b/test/module/Api/src/Service/Permits/Availability/WindowAvailabilityCheckerTest.php
@@ -17,6 +17,7 @@
  */
 class WindowAvailabilityCheckerTest extends MockeryTestCase
 {
+    public $windowAvailabilityChecker;
     private $now;
 
     private $irhpPermitStock1Id;
diff --git a/test/module/Api/src/Service/Publication/PublicationGeneratorFactoryTest.php b/test/module/Api/src/Service/Publication/PublicationGeneratorFactoryTest.php
index 1c89e654e7..65612bf36b 100644
--- a/test/module/Api/src/Service/Publication/PublicationGeneratorFactoryTest.php
+++ b/test/module/Api/src/Service/Publication/PublicationGeneratorFactoryTest.php
@@ -25,7 +25,7 @@ function ($class) {
                     $map = [
                         ContextPluginManager::class => m::mock(ContextPluginManager::class),
                         ProcessPluginManager::class => m::mock(ProcessPluginManager::class),
-                        'Config' => [
+                        'config' => [
                             'publications' => [],
                         ]
                     ];
diff --git a/test/module/Api/src/Service/Qa/AnswerSaver/GenericAnswerWriterTest.php b/test/module/Api/src/Service/Qa/AnswerSaver/GenericAnswerWriterTest.php
index da6208d9f6..1122850f54 100644
--- a/test/module/Api/src/Service/Qa/AnswerSaver/GenericAnswerWriterTest.php
+++ b/test/module/Api/src/Service/Qa/AnswerSaver/GenericAnswerWriterTest.php
@@ -22,6 +22,10 @@
  */
 class GenericAnswerWriterTest extends MockeryTestCase
 {
+    /**
+     * @var string
+     */
+    public $questionType;
     private $questionId;
 
     private $qaEntityId;
diff --git a/test/module/Api/src/Service/Qa/Structure/Element/Custom/Bilateral/PermitUsageGeneratorTest.php b/test/module/Api/src/Service/Qa/Structure/Element/Custom/Bilateral/PermitUsageGeneratorTest.php
index 4a1bf0b3c1..fa9f2cb77f 100644
--- a/test/module/Api/src/Service/Qa/Structure/Element/Custom/Bilateral/PermitUsageGeneratorTest.php
+++ b/test/module/Api/src/Service/Qa/Structure/Element/Custom/Bilateral/PermitUsageGeneratorTest.php
@@ -22,6 +22,16 @@
  */
 class PermitUsageGeneratorTest extends MockeryTestCase
 {
+    public $answerValue;
+    public $options;
+    public $applicationStepEntity;
+    public $irhpPermitApplication;
+    public $elementGeneratorContext;
+    public $radioFactory;
+    public $translateableTextGenerator;
+    public $optionFactory;
+    public $optionListFactory;
+    public $sut;
     public function setUp(): void
     {
         $this->answerValue = RefData::JOURNEY_SINGLE;
diff --git a/test/module/Api/src/Service/Submission/Sections/AbstractSubmissionSectionTest.php b/test/module/Api/src/Service/Submission/Sections/AbstractSubmissionSectionTest.php
index 1fb13fff10..cbddd7a2a3 100644
--- a/test/module/Api/src/Service/Submission/Sections/AbstractSubmissionSectionTest.php
+++ b/test/module/Api/src/Service/Submission/Sections/AbstractSubmissionSectionTest.php
@@ -674,7 +674,7 @@ protected function generateComplaint(
             $case,
             (bool) $isCompliance,
             $this->generateRefDataEntity(Complaint::COMPLAIN_STATUS_OPEN),
-            new \DateTime($complaintDate),
+            new \DateTime($complaintDate ?? 'now'),
             $contactDetails
         );
 
@@ -881,7 +881,7 @@ protected function generateSeriousInfringement($id)
     protected function generateArrayCollection($entity, $count = 1)
     {
         $ac = new ArrayCollection();
-        $method = 'generate' . ucfirst($entity);
+        $method = 'generate' . ucfirst((string) $entity);
         for ($i = 1; $i <= $count; $i++) {
             $ac->add(
                 $this->$method($i)
diff --git a/test/module/Api/src/Service/Submission/Sections/SectionGeneratorPluginManagerFactoryTest.php b/test/module/Api/src/Service/Submission/Sections/SectionGeneratorPluginManagerFactoryTest.php
index 57ddcf630c..f9bea38cac 100644
--- a/test/module/Api/src/Service/Submission/Sections/SectionGeneratorPluginManagerFactoryTest.php
+++ b/test/module/Api/src/Service/Submission/Sections/SectionGeneratorPluginManagerFactoryTest.php
@@ -18,7 +18,7 @@ public function testCanCreateServiceWithName()
         /** @var  \Laminas\ServiceManager\ServiceLocatorInterface $mockSl */
         $mockSl = m::mock(ContainerInterface::class)
             ->shouldReceive('get')
-            ->with('Config')
+            ->with('config')
             ->andReturn(
                 [
                     'submissions' => [
diff --git a/test/module/Api/src/Service/Submission/SubmissionGeneratorFactoryTest.php b/test/module/Api/src/Service/Submission/SubmissionGeneratorFactoryTest.php
index 71fc3fbd8b..a2025d5f3c 100644
--- a/test/module/Api/src/Service/Submission/SubmissionGeneratorFactoryTest.php
+++ b/test/module/Api/src/Service/Submission/SubmissionGeneratorFactoryTest.php
@@ -23,7 +23,7 @@ public function testInvoke()
                 function ($class) {
                     $map = [
                         SectionGeneratorPluginManager::class => m::mock(SectionGeneratorPluginManager::class),
-                        'Config' => [
+                        'config' => [
                             'submissions' => [],
                         ]
                     ];
diff --git a/test/module/AwsSdk/src/Factories/S3ClientFactoryTest.php b/test/module/AwsSdk/src/Factories/S3ClientFactoryTest.php
index 17d9e3021c..b8b9f7adb0 100644
--- a/test/module/AwsSdk/src/Factories/S3ClientFactoryTest.php
+++ b/test/module/AwsSdk/src/Factories/S3ClientFactoryTest.php
@@ -49,7 +49,7 @@ public function testInvoke()
         ];
         $provider = \Mockery::mock(CredentialsInterface::class);
         // Mocks
-        $this->sm->setService('Config', $config);
+        $this->sm->setService('config', $config);
         $this->sm->setService('S3Client', new S3Client([
             'region' => $config['awsOptions']['region'],
             'version' => $config['awsOptions']['version'],
diff --git a/test/module/AwsSdk/src/Factories/SqsClientFactoryTest.php b/test/module/AwsSdk/src/Factories/SqsClientFactoryTest.php
index bcd376c4f4..c419ed8483 100644
--- a/test/module/AwsSdk/src/Factories/SqsClientFactoryTest.php
+++ b/test/module/AwsSdk/src/Factories/SqsClientFactoryTest.php
@@ -49,7 +49,7 @@ public function testInvoke($sqsOptions)
         ];
         $provider = \Mockery::mock(CredentialsInterface::class);
         // Mocks
-        $this->sm->setService('Config', $config);
+        $this->sm->setService('config', $config);
 
         /**
          * @var SqsClient $sqsClient
diff --git a/test/module/Cli/src/Command/Batch/DataRetentionCommandTest.php b/test/module/Cli/src/Command/Batch/DataRetentionCommandTest.php
index 87caa93f01..edd978bb44 100644
--- a/test/module/Cli/src/Command/Batch/DataRetentionCommandTest.php
+++ b/test/module/Cli/src/Command/Batch/DataRetentionCommandTest.php
@@ -20,6 +20,7 @@
 
 class DataRetentionCommandTest extends TestCase
 {
+    public $mockQueryHandlerManager;
     private $command;
     private $commandTester;
     private $mockCommandHandlerManager;
diff --git a/test/module/Cli/src/Domain/CommandHandler/CleanUpAbandonedVariationsTest.php b/test/module/Cli/src/Domain/CommandHandler/CleanUpAbandonedVariationsTest.php
index 1eb1e7394c..091ab74031 100644
--- a/test/module/Cli/src/Domain/CommandHandler/CleanUpAbandonedVariationsTest.php
+++ b/test/module/Cli/src/Domain/CommandHandler/CleanUpAbandonedVariationsTest.php
@@ -25,7 +25,7 @@ public function setUp(): void
         $this->sut = new CommandHandler();
         $this->mockRepo('Application', Application::class);
 
-        $this->mockedSmServices['Config'] = [
+        $this->mockedSmServices['config'] = [
             'batch_config' => [
                 'clean-abandoned-variations' => [
                     'older-than' => '4 hours'
diff --git a/test/module/Cli/src/Domain/CommandHandler/CompaniesHouseVsOlcsDiffsExportTest.php b/test/module/Cli/src/Domain/CommandHandler/CompaniesHouseVsOlcsDiffsExportTest.php
index 1d45eef933..79102041fc 100644
--- a/test/module/Cli/src/Domain/CommandHandler/CompaniesHouseVsOlcsDiffsExportTest.php
+++ b/test/module/Cli/src/Domain/CommandHandler/CompaniesHouseVsOlcsDiffsExportTest.php
@@ -31,7 +31,7 @@ public function setUp(): void
         //  mock config
         $this->tmpPath = vfsStream::setup('root')->url() . '/unit';
 
-        $this->mockedSmServices['Config'] = [
+        $this->mockedSmServices['config'] = [
             'ch-vs-olcs-export' => [
                 'path' => 'unit_CfgPath',
             ],
diff --git a/test/module/Cli/src/Domain/CommandHandler/CreateViExtractFilesTest.php b/test/module/Cli/src/Domain/CommandHandler/CreateViExtractFilesTest.php
index adde33c0f8..ca9a65ec98 100644
--- a/test/module/Cli/src/Domain/CommandHandler/CreateViExtractFilesTest.php
+++ b/test/module/Cli/src/Domain/CommandHandler/CreateViExtractFilesTest.php
@@ -22,7 +22,7 @@ public function setUp(): void
         $this->mockRepo('ViTnmView', Repository\ViTnmView::class);
         $this->mockRepo('ViVhlView', Repository\ViVhlView::class);
 
-        $this->mockedSmServices['Config'] = [
+        $this->mockedSmServices['config'] = [
             'vi_extract_files' => [
                 'export_path' => '/tmp/ViExtract'
             ]
diff --git a/test/module/Cli/src/Domain/CommandHandler/DataDvaNiExportTest.php b/test/module/Cli/src/Domain/CommandHandler/DataDvaNiExportTest.php
index 749b6618be..4a51d98ff9 100644
--- a/test/module/Cli/src/Domain/CommandHandler/DataDvaNiExportTest.php
+++ b/test/module/Cli/src/Domain/CommandHandler/DataDvaNiExportTest.php
@@ -16,6 +16,7 @@
  */
 class DataDvaNiExportTest extends AbstractCommandHandlerTestCase
 {
+    public $mockDbalResult;
     /**
      * @var DataDvaNiExport
      */
@@ -49,7 +50,7 @@ public function setUp(): void
         $this->mockDbalResult = m::mock(Result::class);
 
         //  mock config
-        $this->mockedSmServices['Config'] = [
+        $this->mockedSmServices['config'] = [
             'data-dva-ni-export' => [
                 'path' => 'unit_CfgPath',
             ],
diff --git a/test/module/Cli/src/Domain/CommandHandler/DataGovUkExportTest.php b/test/module/Cli/src/Domain/CommandHandler/DataGovUkExportTest.php
index f765b36bf9..defdc1951b 100644
--- a/test/module/Cli/src/Domain/CommandHandler/DataGovUkExportTest.php
+++ b/test/module/Cli/src/Domain/CommandHandler/DataGovUkExportTest.php
@@ -62,7 +62,7 @@ public function setUp(): void
         $this->mockDbalResult = m::mock(\Doctrine\DBAL\Result::class);
 
         //  mock config
-        $this->mockedSmServices['Config'] = [
+        $this->mockedSmServices['config'] = [
             'data-gov-uk-export' => [
                 'path' => 'unit_CfgPath',
             ],
diff --git a/test/module/Cli/src/Domain/CommandHandler/LastTmLetterTest.php b/test/module/Cli/src/Domain/CommandHandler/LastTmLetterTest.php
index e88e1ebcd4..71d55ac1fa 100644
--- a/test/module/Cli/src/Domain/CommandHandler/LastTmLetterTest.php
+++ b/test/module/Cli/src/Domain/CommandHandler/LastTmLetterTest.php
@@ -500,7 +500,7 @@ private function caseLicenceWithRemovedTmTest($dataProvider, $eligibleLicences):
             $printLetterResult = $this->getPrintLetterResult($id);
             $this->expectedSideEffect(PrintLetter::class, [], $printLetterResult);
 
-            $metadata = json_decode($data['metadata'], true);
+            $metadata = json_decode((string) $data['metadata'], true);
             if (
                 $metadata['details']['sendToAddress'] === 'correspondenceAddress' &&
                 $metadata['details']['allowEmail'] === 'Y'
diff --git a/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/CompanyProfileDlqTest.php b/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/CompanyProfileDlqTest.php
index 4d95a778dd..5c6a870f36 100644
--- a/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/CompanyProfileDlqTest.php
+++ b/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/CompanyProfileDlqTest.php
@@ -175,7 +175,7 @@ protected function setUpServices()
         $this->mockedSmServices = [
             Queue::class => $this->getMockQueueService(),
             MessageBuilder::class => m::mock(MessageBuilder::class),
-            'Config' => $this->config
+            'config' => $this->config
         ];
         $this->setupService();
     }
@@ -197,7 +197,7 @@ protected function setupServicesWithEmptyQueue()
         $this->mockedSmServices = [
             Queue::class => $this->getEmptyQueueService(),
             MessageBuilder::class => m::mock(MessageBuilder::class),
-            'Config' => $this->config
+            'config' => $this->config
         ];
         $this->setupService();
     }
@@ -207,7 +207,7 @@ protected function setUpServicesWithDuplicateQueueEntries()
         $this->mockedSmServices = [
             Queue::class => $this->getMockQueueServiceWithDuplicateEntries(),
             MessageBuilder::class => m::mock(MessageBuilder::class),
-            'Config' => $this->config
+            'config' => $this->config
         ];
         $this->setupService();
     }
diff --git a/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/CompanyProfileTest.php b/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/CompanyProfileTest.php
index 298531a941..a647a6e6df 100644
--- a/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/CompanyProfileTest.php
+++ b/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/CompanyProfileTest.php
@@ -133,7 +133,7 @@ public function testHandleCommandNoMessages()
         $this->mockedSmServices = [
             Queue::class => $queueService,
             MessageBuilder::class => m::mock(MessageBuilder::class),
-            'Config' => $this->config
+            'config' => $this->config
         ];
         $this->setupService();
 
@@ -169,7 +169,7 @@ protected function setupStandardService()
         $this->mockedSmServices = [
             Queue::class => $this->getMockQueueService(),
             MessageBuilder::class => m::mock(MessageBuilder::class),
-            'Config' => $this->config,
+            'config' => $this->config,
         ];
         $this->setupService();
     }
diff --git a/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/ProcessInsolvencyDlqTest.php b/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/ProcessInsolvencyDlqTest.php
index d7584d3e87..d29c777279 100644
--- a/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/ProcessInsolvencyDlqTest.php
+++ b/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/ProcessInsolvencyDlqTest.php
@@ -175,7 +175,7 @@ protected function setUpServices()
         $this->mockedSmServices = [
             Queue::class => $this->getMockQueueService(),
             MessageBuilder::class => m::mock(MessageBuilder::class),
-            'Config' => $this->config
+            'config' => $this->config
         ];
         $this->setupService();
     }
@@ -197,7 +197,7 @@ protected function setupServicesWithEmptyQueue()
         $this->mockedSmServices = [
             Queue::class => $this->getEmptyQueueService(),
             MessageBuilder::class => m::mock(MessageBuilder::class),
-            'Config' => $this->config
+            'config' => $this->config
         ];
         $this->setupService();
     }
@@ -207,7 +207,7 @@ protected function setUpServicesWithDuplicateQueueEntries()
         $this->mockedSmServices = [
             Queue::class => $this->getMockQueueServiceWithDuplicateEntries(),
             MessageBuilder::class => m::mock(MessageBuilder::class),
-            'Config' => $this->config
+            'config' => $this->config
         ];
         $this->setupService();
     }
diff --git a/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/ProcessInsolvencyTest.php b/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/ProcessInsolvencyTest.php
index 2849363ddf..a8dac081e0 100644
--- a/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/ProcessInsolvencyTest.php
+++ b/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/CompaniesHouse/ProcessInsolvencyTest.php
@@ -245,7 +245,7 @@ public function testHandleCommandNoMessages()
             CompaniesHouseClient::class => m::mock(CompaniesHouseClient::class),
             Queue::class => $queueService,
             MessageBuilder::class => m::mock(MessageBuilder::class),
-            'Config' => $this->config
+            'config' => $this->config
         ];
 
         $this->setupService();
@@ -541,7 +541,7 @@ protected function setupStandardService()
             CompaniesHouseClient::class => $this->getMockCompaniesHouseClient(),
             Queue::class => $this->getMockQueueService(),
             MessageBuilder::class => m::mock(MessageBuilder::class),
-            'Config' => $this->config
+            'config' => $this->config
         ];
         $this->setupService();
     }
diff --git a/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/TransXChange/TransXChangeConsumerTest.php b/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/TransXChange/TransXChangeConsumerTest.php
index 69cd6eeda1..4856554405 100644
--- a/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/TransXChange/TransXChangeConsumerTest.php
+++ b/test/module/Cli/src/Domain/CommandHandler/MessageQueue/Consumer/TransXChange/TransXChangeConsumerTest.php
@@ -400,7 +400,7 @@ protected function setupMocks()
         $this->mockedSmServices = [
             Queue::class => m::mock(Queue::class),
             MessageBuilder::class => m::mock(MessageBuilder::class),
-            'Config' => $this->config
+            'config' => $this->config
         ];
 
         $this->repoManager = m::mock(RepositoryServiceManager::class);
diff --git a/test/module/Cli/src/Domain/CommandHandler/MessageQueue/EnqueueTest.php b/test/module/Cli/src/Domain/CommandHandler/MessageQueue/EnqueueTest.php
index e591eb28ea..0e2f9ee8c0 100644
--- a/test/module/Cli/src/Domain/CommandHandler/MessageQueue/EnqueueTest.php
+++ b/test/module/Cli/src/Domain/CommandHandler/MessageQueue/EnqueueTest.php
@@ -32,7 +32,7 @@ public function setUp(): void
         $this->mockedSmServices = [
             MessageBuilder::class => m::mock(MessageBuilder::class),
             Queue::class => m::mock(Queue::class),
-            'Config' => [
+            'config' => [
                 'message_queue' => ['companies_house_initial_queue_url' => '_URL_']
             ]
         ];
@@ -69,7 +69,7 @@ public function testHandleCommand()
                 [456]
             ],
             'messageType' => 'CompanyProfile',
-            $this->mockedSmServices['Config']
+            $this->mockedSmServices['config']
         ]);
 
         /**
@@ -109,7 +109,7 @@ public function testExceptionHandling()
                 [456]
             ],
             'messageType' => 'CompanyProfile',
-            $this->mockedSmServices['Config']
+            $this->mockedSmServices['config']
         ]);
 
         $result = $this->sut->handleCommand($command);
diff --git a/test/module/Cli/src/Domain/CommandHandler/RemoveReadAuditTest.php b/test/module/Cli/src/Domain/CommandHandler/RemoveReadAuditTest.php
index 94d7d11bfa..215d893aa6 100644
--- a/test/module/Cli/src/Domain/CommandHandler/RemoveReadAuditTest.php
+++ b/test/module/Cli/src/Domain/CommandHandler/RemoveReadAuditTest.php
@@ -29,7 +29,7 @@ public function setUp(): void
         $this->mockRepo('TransportManagerReadAudit', Repository\TransportManagerReadAudit::class);
         $this->mockRepo('OrganisationReadAudit', Repository\OrganisationReadAudit::class);
 
-        $this->mockedSmServices['Config'] = [
+        $this->mockedSmServices['config'] = [
             'batch_config' => [
                 'remove-read-audit' => [
                     'max-age' => '1 year'
diff --git a/test/module/Cli/src/Service/Queue/MessageConsumerManagerFactoryTest.php b/test/module/Cli/src/Service/Queue/MessageConsumerManagerFactoryTest.php
index ea4f8c8642..273fd6ef78 100644
--- a/test/module/Cli/src/Service/Queue/MessageConsumerManagerFactoryTest.php
+++ b/test/module/Cli/src/Service/Queue/MessageConsumerManagerFactoryTest.php
@@ -30,7 +30,7 @@ public function testInvoke()
 
         // Mocks
         $container = m::mock(ContainerInterface::class);
-        $container->expects('get')->with('Config')->andReturn($config);
+        $container->expects('get')->with('config')->andReturn($config);
 
         $mcm = $this->sut->__invoke($container, MessageConsumerManager::class);
 
diff --git a/test/module/DocumentShare/src/Object/DocmanFileTest.php b/test/module/DocumentShare/src/Object/DocmanFileTest.php
index 7c68cbe49e..3ba48f37d1 100644
--- a/test/module/DocumentShare/src/Object/DocmanFileTest.php
+++ b/test/module/DocumentShare/src/Object/DocmanFileTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Dvsa\OlcsTest\DocumentShare\Data\object;
+namespace Dvsa\OlcsTest\DocumentShare\Data\Object;
 
 use Dvsa\Olcs\DocumentShare\Data\Object\File;
 use org\bovigo\vfs\vfsStream;
@@ -23,7 +23,7 @@ public function testSetContentFromDsStream()
 
         $streamContent = 'UNIT_expect_content' . str_repeat('E', File::CHUNK_SIZE);
         $streamBody =
-            str_repeat('x', File::CHUNK_SIZE - strlen('content') / 2) .
+            str_repeat('x', intval(File::CHUNK_SIZE - strlen('content') / 2)) .
             '"content":"' . base64_encode($streamContent) . '"' .
             str_repeat('aftercontent', 3);
 
diff --git a/test/module/DocumentShare/src/Service/DocManClientTest.php b/test/module/DocumentShare/src/Service/DocManClientTest.php
index 8f23d1ddaa..a026fc0ee8 100644
--- a/test/module/DocumentShare/src/Service/DocManClientTest.php
+++ b/test/module/DocumentShare/src/Service/DocManClientTest.php
@@ -110,8 +110,6 @@ function ($arg) use (&$filePath) {
             );
         $this->mockClient->expects(static::once())->method('send')->willThrowException(new \Exception('simulate_err'));
 
-        static::assertFalse(is_file($filePath));
-
         //  expect
         $this->expectException(\Exception::class);
 
diff --git a/test/module/Email/src/Domain/CommandHandler/SendEmailTest.php b/test/module/Email/src/Domain/CommandHandler/SendEmailTest.php
index 5aaf66e07c..ba2f01b28c 100644
--- a/test/module/Email/src/Domain/CommandHandler/SendEmailTest.php
+++ b/test/module/Email/src/Domain/CommandHandler/SendEmailTest.php
@@ -30,7 +30,7 @@ public function setUp(): void
         $this->sut = new SendEmail();
         $this->mockRepo('Document', DocumentRepo::class);
 
-        $this->mockedSmServices['Config'] = [
+        $this->mockedSmServices['config'] = [
             'email' => [
                 'from_name' => 'Terry',
                 'from_email' => 'terry.valtech@gmail.com',
diff --git a/test/module/Email/src/Service/EmailTest.php b/test/module/Email/src/Service/EmailTest.php
index e0c6202847..439cdb49e8 100644
--- a/test/module/Email/src/Service/EmailTest.php
+++ b/test/module/Email/src/Service/EmailTest.php
@@ -39,7 +39,7 @@ public function testCreateServiceMissingConfig()
         $config = [];
 
         $sm = m::mock(ContainerInterface::class);
-        $sm->shouldReceive('get')->with('Config')->andReturn($config);
+        $sm->shouldReceive('get')->with('config')->andReturn($config);
 
         $this->sut->__invoke($sm, Email::class);
     }
@@ -54,7 +54,7 @@ public function testCreateService()
         ];
 
         $sm = m::mock(ContainerInterface::class);
-        $sm->shouldReceive('get')->with('Config')->andReturn($config);
+        $sm->shouldReceive('get')->with('config')->andReturn($config);
 
         $service = $this->sut->__invoke($sm, Email::class);
 
diff --git a/test/module/Email/src/Service/ImapTest.php b/test/module/Email/src/Service/ImapTest.php
index 4c2800532b..064be563d9 100644
--- a/test/module/Email/src/Service/ImapTest.php
+++ b/test/module/Email/src/Service/ImapTest.php
@@ -30,7 +30,7 @@ public function testInvoke()
         ];
 
         $sl = new ServiceManager();
-        $sl->setService('Config', $config);
+        $sl->setService('config', $config);
 
         $this->assertSame(
             $this->imapService,
@@ -50,7 +50,7 @@ public function testInvoke()
     public function testInvokeThrowsException()
     {
         $sl = new ServiceManager();
-        $sl->setService('Config', []);
+        $sl->setService('config', []);
 
         $this->expectException(\Laminas\Mail\Exception\RuntimeException::class);
 
@@ -68,7 +68,7 @@ public function testConnectThrowsException()
         ];
 
         $sl = new ServiceManager();
-        $sl->setService('Config', $config);
+        $sl->setService('config', $config);
 
         $this->assertSame(
             $this->imapService,
diff --git a/test/module/Email/src/Transport/S3FileOptionsFactoryTest.php b/test/module/Email/src/Transport/S3FileOptionsFactoryTest.php
index 539d2defb6..14a6e53510 100644
--- a/test/module/Email/src/Transport/S3FileOptionsFactoryTest.php
+++ b/test/module/Email/src/Transport/S3FileOptionsFactoryTest.php
@@ -68,7 +68,7 @@ public function testInvoke()
         ];
         $provider = \Mockery::mock(CredentialsInterface::class);
         // Mocks
-        $this->sm->setService('Config', $config);
+        $this->sm->setService('config', $config);
         $this->sm->setService('S3Client', new S3Client([
             'region' => $config['awsOptions']['region'],
             'version' => $config['awsOptions']['version'],
diff --git a/test/module/Olcs/Db/src/Service/Search/ClientFactoryTest.php b/test/module/Olcs/Db/src/Service/Search/ClientFactoryTest.php
index 78cbef3dbd..371f3ee000 100644
--- a/test/module/Olcs/Db/src/Service/Search/ClientFactoryTest.php
+++ b/test/module/Olcs/Db/src/Service/Search/ClientFactoryTest.php
@@ -13,7 +13,7 @@ class ClientFactoryTest extends m\Adapter\Phpunit\MockeryTestCase
     public function testInvoke(): void
     {
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn(
+        $mockSl->shouldReceive('get')->with('config')->andReturn(
             ['elastic_search' => ['host' => 'google.com', 'port' => 4034]]
         );
 
@@ -26,7 +26,7 @@ public function testInvoke(): void
     public function testInvokeWithException(): void
     {
         $mockSl = m::mock(ContainerInterface::class);
-        $mockSl->shouldReceive('get')->with('Config')->andReturn([]);
+        $mockSl->shouldReceive('get')->with('config')->andReturn([]);
 
         $sut = new ClientFactory();
         $passed = false;
diff --git a/test/module/Olcs/Db/src/Service/Search/SearchTest.php b/test/module/Olcs/Db/src/Service/Search/SearchTest.php
index 932a12222d..361a7aa0f6 100644
--- a/test/module/Olcs/Db/src/Service/Search/SearchTest.php
+++ b/test/module/Olcs/Db/src/Service/Search/SearchTest.php
@@ -16,6 +16,10 @@
  */
 class SearchTest extends MockeryTestCase
 {
+    /**
+     * @var array<string, (\LmcRbacMvc\Service\AuthorizationService & \Mockery\MockInterface)>
+     */
+    public $mockedSmServices;
     /** @var  SearchService */
     private $sut;
 
diff --git a/test/module/Scanning/src/Controller/DocumentControllerTest.php b/test/module/Scanning/src/Controller/DocumentControllerTest.php
index 02a10d0f2a..2e4b427a3d 100644
--- a/test/module/Scanning/src/Controller/DocumentControllerTest.php
+++ b/test/module/Scanning/src/Controller/DocumentControllerTest.php
@@ -11,6 +11,10 @@
  */
 class DocumentControllerTest extends MockeryTestCase
 {
+    /**
+     * @var \Mockery\LegacyMockInterface
+     */
+    public $response;
     /**
      * @var \Dvsa\Olcs\Scanning\Controller\DocumentController|m\Mock
      */
diff --git a/test/module/Snapshot/src/Service/Snapshots/ApplicationReview/GeneratorTest.php b/test/module/Snapshot/src/Service/Snapshots/ApplicationReview/GeneratorTest.php
index 7e61428934..d3d364130a 100644
--- a/test/module/Snapshot/src/Service/Snapshots/ApplicationReview/GeneratorTest.php
+++ b/test/module/Snapshot/src/Service/Snapshots/ApplicationReview/GeneratorTest.php
@@ -31,6 +31,7 @@
  */
 class GeneratorTest extends MockeryTestCase
 {
+    public $sm;
     /**
      * @var Generator
      */
diff --git a/test/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationVehiclesDeclarationsReviewServiceTest.php b/test/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationVehiclesDeclarationsReviewServiceTest.php
index f2cc47a13e..25b345d2aa 100644
--- a/test/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationVehiclesDeclarationsReviewServiceTest.php
+++ b/test/module/Snapshot/src/Service/Snapshots/ApplicationReview/Section/VariationVehiclesDeclarationsReviewServiceTest.php
@@ -22,6 +22,7 @@
  */
 class VariationVehiclesDeclarationsReviewServiceTest extends MockeryTestCase
 {
+    public $mockTranslator;
     protected $sut;
 
     /** @var ApplicationVehiclesDeclarationsReviewService */