Merge pull request #177 from mezzio/3.19.x-merge-up-into-4.0.x_CKtmHqxE

Merge release 3.19.0 into 4.0.x

composer.json

@@ -54,12 +54,12 @@
         "laminas/laminas-coding-standard": "~2.5.0",
         "laminas/laminas-diactoros": "^3.3.0",
         "laminas/laminas-servicemanager": "^3.22.1",
-        "mezzio/mezzio-aurarouter": "^3.6",
+        "mezzio/mezzio-aurarouter": "^3.7",
         "mezzio/mezzio-fastroute": "^3.11",
-        "mezzio/mezzio-laminasrouter": "^3.8",
-        "phpunit/phpunit": "^10.4.2",
+        "mezzio/mezzio-laminasrouter": "^3.9",
+        "phpunit/phpunit": "^10.5.9",
         "psalm/plugin-phpunit": "^0.18.4",
-        "vimeo/psalm": "^5.15.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.15.0@5c774aca4746caf3d239d9c8cadb9f882ca29352">
+<files psalm-version="5.21.1@8c473e2437be8b6a8fd8f630f0f11a16b114c494">
   <file src="src/Application.php">
     <MixedArgumentTypeCoercion>
       <code>$middleware</code>
@@ -11,32 +11,24 @@
   <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>
-      <code>is_object($item)</code>
     </DocblockTypeContradiction>
     <MixedArgument>
       <code>$name</code>
     </MixedArgument>
     <MixedAssignment>
       <code>$name</code>
-      <code>$serial</code>
     </MixedAssignment>
-    <MixedOperand>
-      <code>$serial</code>
-    </MixedOperand>
     <RedundantCastGivenDocblockType>
       <code>(array) $config</code>
       <code>(array) $config</code>
     </RedundantCastGivenDocblockType>
     <RedundantConditionGivenDocblockType>
-      <code>gettype($item)</code>
       <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>
@@ -195,7 +187,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 !== '/'

src/Container/ApplicationConfigInjectionDelegator.php

@@ -14,6 +14,7 @@
 use function array_key_exists;
 use function array_map;
 use function array_reduce;
+use function get_debug_type;
 use function gettype;
 use function is_array;
 use function is_int;
@@ -76,10 +77,13 @@ public function __invoke(ContainerInterface $container, string $serviceName, cal
          */
         $config = $container->get('config');
 
-        if (! empty($config['middleware_pipeline'])) {
+        $config['middleware_pipeline'] ??= [];
+        $config['routes']              ??= [];
+
+        if ($config['middleware_pipeline'] !== []) {
             self::injectPipelineFromConfig($application, (array) $config);
         }
-        if (! empty($config['routes'])) {
+        if ($config['routes'] !== []) {
             self::injectRoutesFromConfig($application, (array) $config);
         }
 
@@ -142,7 +146,8 @@ public function __invoke(ContainerInterface $container, string $serviceName, cal
      */
     public static function injectPipelineFromConfig(Application $application, array $config): void
     {
-        if (empty($config['middleware_pipeline'])) {
+        $middlewarePipeline = $config['middleware_pipeline'] ?? [];
+        if ($middlewarePipeline === []) {
             return;
         }
 
@@ -152,7 +157,7 @@ public static function injectPipelineFromConfig(Application $application, array
          * @psalm-var SplPriorityQueue<int, MiddlewareSpec> $queue
          */
         $queue = array_reduce(
-            array_map(self::createCollectionMapper(), $config['middleware_pipeline']),
+            array_map(self::createCollectionMapper(), $middlewarePipeline),
             self::createPriorityQueueReducer(),
             new SplPriorityQueue()
         );
@@ -204,11 +209,12 @@ public static function injectPipelineFromConfig(Application $application, array
      */
     public static function injectRoutesFromConfig(Application $application, array $config): void
     {
-        if (empty($config['routes']) || ! is_array($config['routes'])) {
+        $routes = $config['routes'] ?? [];
+        if (! is_array($routes) || $routes === []) {
             return;
         }
 
-        foreach ($config['routes'] as $key => $spec) {
+        foreach ($routes as $key => $spec) {
             if (! isset($spec['path']) || ! isset($spec['middleware'])) {
                 continue;
             }
@@ -268,7 +274,7 @@ private static function createCollectionMapper(): callable
                 throw new InvalidArgumentException(sprintf(
                     'Invalid pipeline specification received; must be an array'
                     . ' containing a middleware key; received %s',
-                    is_object($item) ? $item::class : gettype($item)
+                    get_debug_type($item),
                 ));
             }
             return $item;

test/Container/ApplicationConfigInjectionDelegatorTest.php

@@ -117,12 +117,16 @@ public static function assertRoute(array $spec, array $routes): void
         );
     }
 
+    /**
+     * @param class-string<MiddlewareInterface> $class
+     * @param iterable<array-key, MiddlewareInterface> $pipeline
+     */
     public static function assertPipelineContainsInstanceOf(
         string $class,
         iterable $pipeline,
         ?string $message = null
     ): void {
-        $message = $message ?: 'Did not find expected middleware class type in pipeline';
+        $message = $message ?? 'Did not find expected middleware class type in pipeline';
         $found   = false;
 
         foreach ($pipeline as $middleware) {

test/Container/WhoopsFactoryTest.php

@@ -38,10 +38,9 @@ public function setUp(): void
 
     public function assertWhoopsContainsHandler(string $type, Whoops $whoops, ?string $message = null): void
     {
-        $message = $message ?: sprintf('Failed to assert whoops runtime composed handler of type %s', $type);
+        $message = $message ?? sprintf('Failed to assert whoops runtime composed handler of type %s', $type);
         $r       = new ReflectionProperty($whoops, 'handlerStack');
-        $r->setAccessible(true);
-        $stack = $r->getValue($whoops);
+        $stack   = $r->getValue($whoops);
 
         $found = false;
         foreach ($stack as $handler) {

test/Middleware/ErrorResponseGeneratorTest.php

@@ -146,7 +146,7 @@ public function testRendersTemplateWithoutErrorDetailsWhenRendererPresentAndNotI
 
         $this->request->method('getUri')->willReturn(new Uri('https://example.com/foo'));
 
-        $generator = $template
+        $generator = $template !== null
             ? new ErrorResponseGenerator(false, $this->renderer, $template)
             : new ErrorResponseGenerator(false, $this->renderer);
 
@@ -196,7 +196,7 @@ public function testRendersTemplateWithErrorDetailsWhenRendererPresentAndInDebug
 
         $this->request->method('getUri')->willReturn(new Uri('https://example.com/foo'));
 
-        $generator = $template
+        $generator = $template !== null
             ? new ErrorResponseGenerator(true, $this->renderer, $template)
             : new ErrorResponseGenerator(true, $this->renderer);