Merge branch '4.0.x' into 3.5.x-merge-up-into-4.0.x_28zUTsCU

.gitignore

@@ -6,3 +6,5 @@
 /phpunit.xml
 /vendor/
 /.phpunit.result.cache
+/.phpcs-cache
+/psalm.xml

.laminas-ci.json

@@ -1,7 +1 @@
-{
-    "ignore_php_platform_requirements": {
-        "8.0": true,
-        "8.1": true,
-        "8.2": true
-    }
-}
+{}

composer.json

@@ -28,38 +28,31 @@
     "extra": {
     },
     "require": {
-        "php": "~8.0.0 || ~8.1.0 || ~8.2.0",
-        "container-interop/container-interop": "^1.2",
+        "php": "~8.0.0 || ~8.1.0",
+        "ext-json": "*",
         "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-servicemanager": "^3.16.0",
         "laminas/laminas-stdlib": "^3.6",
-        "laminas/laminas-view": "^2.14"
+        "laminas/laminas-view": "^2.14",
+        "psr/container": "^1.1 || ^2.0"
     },
     "require-dev": {
-        "http-interop/http-middleware": "^0.4.1",
-        "laminas/laminas-coding-standard": "^2.4.0",
-        "laminas/laminas-json": "^3.3",
-        "laminas/laminas-psr7bridge": "^1.8",
-        "laminas/laminas-stratigility": ">=2.0.1 <2.2",
-        "phpspec/prophecy" : "^1.15.0",
-        "phpspec/prophecy-phpunit": "^2.0.1",
-        "phpunit/phpunit": "^9.5.25"
+        "laminas/laminas-coding-standard": "2.4.0",
+        "phpspec/prophecy-phpunit": "^2.0",
+        "phpunit/phpunit": "^9.5.24",
+        "psalm/plugin-phpunit": "^0.17.0",
+        "vimeo/psalm": "^4.27.0"
     },
     "suggest": {
-        "laminas/laminas-json": "(^2.6.1 || ^3.0) To auto-deserialize JSON body content in AbstractRestfulController extensions, when json_decode is unavailable",
-        "laminas/laminas-log": "^2.9.1  To provide log functionality via LogFilterManager, LogFormatterManager, and LogProcessorManager",
-        "laminas/laminas-mvc-console": "laminas-mvc-console provides the ability to expose laminas-mvc as a console application",
         "laminas/laminas-mvc-i18n": "laminas-mvc-i18n provides integration with laminas-i18n, including a translation bridge and translatable route segments",
         "laminas/laminas-mvc-middleware": "To dispatch middleware in your laminas-mvc application",
         "laminas/laminas-mvc-plugin-fileprg": "To provide Post/Redirect/Get functionality around forms that container file uploads",
         "laminas/laminas-mvc-plugin-flashmessenger": "To provide flash messaging capabilities between requests",
         "laminas/laminas-mvc-plugin-identity": "To access the authenticated identity (per laminas-authentication) in controllers",
         "laminas/laminas-mvc-plugin-prg": "To provide Post/Redirect/Get functionality within controllers",
-        "laminas/laminas-paginator": "^2.7 To provide pagination functionality via PaginatorPluginManager",
-        "laminas/laminas-servicemanager-di": "laminas-servicemanager-di provides utilities for integrating laminas-di and laminas-servicemanager in your laminas-mvc application"
+        "laminas/laminas-paginator": "^2.7 To provide pagination functionality via PaginatorPluginManager"
     },
     "autoload": {
         "psr-4": {
@@ -69,10 +62,7 @@
     "autoload-dev": {
         "psr-4": {
             "LaminasTest\\Mvc\\": "test/"
-        },
-        "files": [
-            "test/_autoload.php"
-        ]
+        }
     },
     "scripts": {
         "check": [
@@ -81,10 +71,8 @@
         ],
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
+        "static-analysis": "psalm --shepherd --stats",
         "test": "phpunit --colors=always",
         "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
-    },
-    "conflict": {
-        "zendframework/zend-mvc": "*"
     }
 }