Merge pull request #172 from mezzio/renovate/lock-file-maintenance

Upgrade Psalm to 5.21.x

composer.json

@@ -57,9 +57,9 @@
         "mezzio/mezzio-aurarouter": "^3.7",
         "mezzio/mezzio-fastroute": "^3.11",
         "mezzio/mezzio-laminasrouter": "^3.9",
-        "phpunit/phpunit": "^10.5.2",
+        "phpunit/phpunit": "^10.5.9",
         "psalm/plugin-phpunit": "^0.18.4",
-        "vimeo/psalm": "^5.17.0"
+        "vimeo/psalm": "^5.21.1"
     },
     "conflict": {
         "container-interop/container-interop": "<1.2.0",

docs/book/v1/why-mezzio.md

@@ -27,7 +27,7 @@ about how things work, yet they're very broad and general. What’s more, it
 also has several pre-wired structures in place that may either aid you —
 or get in your way.
 
-As a result, you are required to know a lot of what those things are — *if* you
+As a result, you are required to know a lot of what those things are — _if_ you
 want to use it optimally. And to acquire that depth of knowledge, you’re going
 to need to spend a lot of time digging deep into laminas-mvc’s internals before
 you begin to get the most out of it.

docs/book/v2/why-mezzio.md

@@ -27,7 +27,7 @@ about how things work, yet they're very broad and general. What’s more, it
 also has several pre-wired structures in place that may either aid you —
 or get in your way.
 
-As a result, you are required to know a lot of what those things are — *if* you
+As a result, you are required to know a lot of what those things are — _if_ you
 want to use it optimally. And to acquire that depth of knowledge, you’re going
 to need to spend a lot of time digging deep into laminas-mvc’s internals before
 you begin to get the most out of it.

docs/book/v3/why-mezzio.md

@@ -27,7 +27,7 @@ about how things work, yet they're very broad and general. What’s more, it
 also has several pre-wired structures in place that may either aid you —
 or get in your way.
 
-As a result, you are required to know a lot of what those things are — *if* you
+As a result, you are required to know a lot of what those things are — _if_ you
 want to use it optimally. And to acquire that depth of knowledge, you’re going
 to need to spend a lot of time digging deep into laminas-mvc’s internals before
 you begin to get the most out of it.

psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="5.17.0@c620f6e80d0abfca532b00bda366062aaedf6e5d">
+<files psalm-version="5.21.1@8c473e2437be8b6a8fd8f630f0f11a16b114c494">
   <file src="src/Application.php">
     <MixedArgumentTypeCoercion>
       <code>$middleware</code>
@@ -11,6 +11,7 @@
   <file src="src/Container/ApplicationConfigInjectionDelegator.php">
     <DocblockTypeContradiction>
       <code>! is_array($item)</code>
+      <code>! is_array($routes)</code>
       <code>1</code>
       <code>is_array($methods)</code>
     </DocblockTypeContradiction>
@@ -28,9 +29,6 @@
       <code><![CDATA[is_int($item['priority'])]]></code>
       <code><![CDATA[isset($item['priority']) && is_int($item['priority'])]]></code>
     </RedundantConditionGivenDocblockType>
-    <TypeDoesNotContainType>
-      <code><![CDATA[! is_array($config['routes'])]]></code>
-    </TypeDoesNotContainType>
   </file>
   <file src="src/Container/ApplicationFactory.php">
     <MixedArgument>
@@ -201,7 +199,6 @@
   </file>
   <file src="test/Container/ApplicationConfigInjectionDelegatorTest.php">
     <MixedAssignment>
-      <code>$middleware</code>
       <code>$pipeline</code>
     </MixedAssignment>
   </file>

src/Application.php

@@ -75,7 +75,7 @@ public function run(): void
      */
     public function pipe($middlewareOrPath, $middleware = null): void
     {
-        $middleware = $middleware ?: $middlewareOrPath;
+        $middleware = $middleware ?? $middlewareOrPath;
         $path       = $middleware === $middlewareOrPath ? '/' : $middlewareOrPath;
 
         $middleware = $path !== '/'