Update routing, requests and dependencies

This commit updates various modules and request classes in the application's global configuration, changes route match error status, and introduces more explicit version constraints in composer.json. Also, a new psalm.xml.dist file and new entries in .gitignore are added for the static analysis tool Psalm.

.gitignore

@@ -7,3 +7,8 @@ composer.phar
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
 # composer.lock
 /composer.lock
+
+# Maintenance
+phpcs.xml
+phpunit.xml
+psalm.xml

composer.json

@@ -10,15 +10,16 @@
   ],
   "require": {
     "php": "~8.1.0 || ~8.2.0 || ~8.3.0",
-    "symfony/config": "*",
-    "symfony/routing": "*",
-    "symfony/http-foundation": "*",
-    "laminas/laminas-router": "*"
+    "symfony/config": "^6.4 || ^7.0",
+    "symfony/routing": "^6.4 || ^7.0",
+    "symfony/http-foundation": "^6.4 || ^7.0",
+    "laminas/laminas-router": "^3.0"
   },
   "require-dev": {
     "laminas/laminas-coding-standard": "~2.5.0",
-    "laminas/laminas-test": "*",
-    "symfony/expression-language": "*"
+    "laminas/laminas-test": "^4.0",
+    "symfony/expression-language": "^6.4 || ^7.0",
+    "vimeo/psalm": "^5.18"
   },
   "suggest": {
     "symfony/expression-language": "to use symfony conditonal routes"
@@ -46,6 +47,7 @@
     "cs-check": "phpcs",
     "cs-fix": "phpcbf",
     "static-analysis": "psalm --shepherd --stats",
+    "static-analysis-all": "psalm --show-info=true",
     "test": "phpunit --colors=always"
   }
 }

config/test/application.global.php

@@ -6,7 +6,7 @@
     // Retrieve list of modules used in this application.
     'modules' => [
         'Laminas\Router',
-        'Laminas\Router\Attributes',
+        Laminas\Router\Attributes\Module::class,
     ],
 
     // These are various options for the listeners attached to the ModuleManager

psalm.xml.dist

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="7"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="true"
+>
+    <projectFiles>
+        <directory name="config" />
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

src/Listener/RoutingAttributesListener.php

@@ -7,7 +7,7 @@
 use Laminas\EventManager\EventManagerInterface;
 use Laminas\EventManager\ListenerAggregateInterface;
 use Laminas\EventManager\ListenerAggregateTrait;
-use Laminas\Http\Request;
+use Laminas\Http\PhpEnvironment\Request;
 use Laminas\Mvc\MvcEvent;
 use Laminas\Router\Attributes\Loader\AttributesClassLoader;
 use Laminas\Router\RouteMatch;
@@ -20,7 +20,7 @@
 
 use function array_keys;
 
-class RoutingAttributesListener implements ListenerAggregateInterface
+final class RoutingAttributesListener implements ListenerAggregateInterface
 {
     use ListenerAggregateTrait;
 
@@ -57,7 +57,7 @@ private function onNoLaminasRouteFound(MvcEvent $event): ?RouteMatch
 
                 $event->setRouteMatch($routeMatch);
                 $event->stopPropagation();
-                $event->setError(null);
+                $event->setError('');
 
                 return $routeMatch;
             } catch (ResourceNotFoundException | MethodNotAllowedException) {