Skip to content
This repository has been archived by the owner on Jan 29, 2020. It is now read-only.

Pipe should not decorate MiddlewarePipe instances #98

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions src/MiddlewarePipe.php
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,9 @@ public function pipe($path, $middleware = null)
$path = '/';
}

// Decorate callable middleware as http-interop middleware if we have
// a response prototype present.
// Decorate callable middleware as http-interop middleware
if (is_callable($middleware)
&& ! $this->isInteropMiddleware($middleware)
&& ! $middleware instanceof ServerMiddlewareInterface
) {
$middleware = $this->decorateCallableMiddleware($middleware);
}
Expand Down Expand Up @@ -266,18 +265,6 @@ private function getCallableMiddlewareDecorator()
return $this->callableMiddlewareDecorator;
}

/**
* Is the provided middleware argument http-interop middleware?
*
* @param mixed $middleware
* @return bool
*/
private function isInteropMiddleware($middleware)
{
return ! is_callable($middleware)
&& $middleware instanceof ServerMiddlewareInterface;
}

/**
* @param callable $middleware
* @return \ReflectionFunctionAbstract
Expand Down
15 changes: 15 additions & 0 deletions test/MiddlewarePipeTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -518,4 +518,19 @@ public function testWillDecorateCallableArrayMiddlewareWithoutErrors()
$this->assertInstanceOf(CallableMiddlewareWrapper::class, $test);
$this->assertAttributeSame($middleware, 'middleware', $test);
}

public function testPipeShouldNotWrapMiddlewarePipeInstancesAsCallableMiddleware()
{
$nested = new MiddlewarePipe();
$pipeline = new MiddlewarePipe();

$pipeline->pipe($nested);

$r = new ReflectionProperty($pipeline, 'pipeline');
$r->setAccessible(true);
$queue = $r->getValue($pipeline);

$route = $queue->dequeue();
$this->assertSame($nested, $route->handler);
}
}