Decorate callable double-pass middleware to fix deprecation errors

Author: thexpand

src/MiddlewareListener.php

@@ -1,25 +1,26 @@
 <?php
 /**
- * @link      http://github.com/zendframework/zend-mvc for the canonical source repository
- * @copyright Copyright (c) 2005-2018 Zend Technologies USA Inc. (http://www.zend.com)
+ * @see       https://github.com/zendframework/zend-mvc for the canonical source repository
+ * @copyright Copyright (c) 2018 Zend Technologies USA Inc. (http://www.zend.com)
  * @license   https://github.com/zendframework/zend-mvc/blob/master/LICENSE.md New BSD License
  */
 
 namespace Zend\Mvc;
 
+use Closure;
 use Interop\Container\ContainerInterface;
+use Interop\Http\ServerMiddleware\DelegateInterface;
 use Interop\Http\ServerMiddleware\MiddlewareInterface;
-use Psr\Http\Message\ResponseInterface as PsrResponseInterface;
 use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface as PsrServerRequestInterface;
+use Psr\Http\Message\ResponseInterface as PsrResponseInterface;
+use ReflectionFunction;
+use ReflectionMethod;
 use Zend\EventManager\AbstractListenerAggregate;
 use Zend\EventManager\EventManagerInterface;
-use Zend\Mvc\Exception\InvalidMiddlewareException;
-use Zend\Mvc\Exception\ReachedFinalHandlerException;
 use Zend\Mvc\Controller\MiddlewareController;
+use Zend\Mvc\Exception\InvalidMiddlewareException;
 use Zend\Psr7Bridge\Psr7Response;
-use Zend\Router\RouteMatch;
-use Zend\Stratigility\Delegate\CallableDelegateDecorator;
+use Zend\Stratigility\Middleware\DoublePassMiddlewareDecorator;
 use Zend\Stratigility\MiddlewarePipe;
 
 class MiddlewareListener extends AbstractListenerAggregate
@@ -146,6 +147,19 @@ private function createPipeFromSpec(
                 throw InvalidMiddlewareException::fromMiddlewareName($middlewareName);
             }
 
+            // Decorate double-pass middleware
+            if (is_callable($middlewareToBePiped)) {
+                $r = $this->getReflectionFunction($middlewareToBePiped);
+                $paramsCount = $r->getNumberOfParameters();
+
+                $params = $r->getParameters();
+                $type = isset($params[1]) ? $params[1]->getClass() : null;
+
+                if ($paramsCount !== 2 || ! $type || ! is_a($type->getName(), DelegateInterface::class, true)) {
+                    $middlewareToBePiped = new DoublePassMiddlewareDecorator($middlewareToBePiped);
+                }
+            }
+
             $pipe->pipe($middlewareToBePiped);
         }
         return $pipe;
@@ -184,4 +198,23 @@ protected function marshalInvalidMiddleware(
         }
         return $return;
     }
+
+    /**
+     * @param callable $middleware
+     * @return \ReflectionFunctionAbstract
+     */
+    private function getReflectionFunction(callable $middleware)
+    {
+        if (is_array($middleware)) {
+            $class = array_shift($middleware);
+            $method = array_shift($middleware);
+            return new ReflectionMethod($class, $method);
+        }
+
+        if ($middleware instanceof Closure || ! is_object($middleware)) {
+            return new ReflectionFunction($middleware);
+        }
+
+        return new ReflectionMethod($middleware, '__invoke');
+    }
 }