Merge branch 'feature/663' into develop

Forward port #663
zendframework · Jun 12, 2019 · cd74edb · cd74edb
2 parents c9bcc36 + 98c30a2
commit cd74edb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -44,7 +44,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
-- Nothing.
+- [#663](https://github.com/zendframework/zend-expressive/pull/663) fixes parameter
+  types in docblock for `Zend\Expressive\MiddlewareFactory::pipeline()`
 
 ## 3.2.1 - 2018-11-08
 

diff --git a/phpstan.neon b/phpstan.neon
@@ -11,5 +11,3 @@ parameters:
 		- '#Parameter \#1 \$path of function Zend\\Stratigility\\path expects string, array\|callable\|Psr\\Http\\Server\\MiddlewareInterface\|Psr\\Http\\Server\\RequestHandlerInterface\|string given.#'
 		# @see src/Container/WhoopsFactory.php (zend-expressive supports Whoops 1.x)
 		- '#Call to an undefined method Whoops\\Handler\\JsonResponseHandler::onlyForAjaxRequests\(\).#'
-		# @see src/MiddlewareFactory
-		- '#PHPDoc tag @param for parameter \$middleware with type array\|string\|Zend\\Stratigility\\MiddlewarePipe is not subtype of native type array\<int, mixed\>#'
diff --git a/src/MiddlewareFactory.php b/src/MiddlewareFactory.php
@@ -125,7 +125,7 @@ public function lazy(string $middleware) : Middleware\LazyLoadingMiddleware
      * Each item is passed to prepare() before being passed to the
      * MiddlewarePipe instance the method returns.
      *
-     * @param string|array|MiddlewarePipe $middleware
+     * @param string|array|callable|MiddlewareInterface|RequestHandlerInterface ...$middleware
      */
     public function pipeline(...$middleware) : MiddlewarePipe
     {