Skip to content

Commit 2ec5a50

Browse files
committed
Added Test for Bridge::throughMiddlewares(), code cleanup.
1 parent 23261d2 commit 2ec5a50

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

Server/Bridge.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
use LogicException;
88
use Psr\Container\ContainerInterface;
99
use Psr\Http\Server\MiddlewareInterface;
10-
use TheWebSolver\Codegarage\Pipeline\Pipe;
1110
use TheWebSolver\Codegarage\Pipeline\Pipeline;
1211
use TheWebSolver\Codegarage\Pipeline\Middleware;
1312
use Psr\Http\Message\ResponseInterface as Response;

Server/Middleware.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
use Throwable;
88
use LogicException;
99
use Psr\Container\ContainerInterface;
10-
use TheWebSolver\Codegarage\Pipeline\Pipe;
1110
use Psr\Http\Server\MiddlewareInterface;
11+
use TheWebSolver\Codegarage\Pipeline\Pipe;
1212
use TheWebSolver\Codegarage\Pipeline\Resolver;
1313
use Psr\Http\Message\ResponseInterface as Response;
1414
use Psr\Http\Message\ServerRequestInterface as Request;

Tests/BridgeTest.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public function process( ServerRequestInterface $request, RequestHandlerInterfac
117117
);
118118
}
119119

120-
private function getRequestHandlerMiddlewares(): array {
120+
private function getMiddlewares(): array {
121121
$middlewares = array( MiddlewareStub::class );
122122
$middlewares[] = static function ( ServerRequestInterface $request, RequestHandlerInterface $h ) {
123123
return ( $r = $h->handle( $request ) )->withStatus( $r->getStatusCode() + 50 );
@@ -132,18 +132,24 @@ public function process( ServerRequestInterface $request, RequestHandlerInterfac
132132
return $middlewares;
133133
}
134134

135-
public function testPipelineBridgeWithPsr() {
135+
public function testPipelineBridgeWithPsr(): void {
136136
/** @var ServerRequestInterface */
137137
$request = $this->createStub( ServerRequestInterface::class );
138138
$response = ( new ResponseStub() )->withStatus( 100 );
139-
$pipes = array_map( Middleware::toPipe( ... ), $this->getRequestHandlerMiddlewares() );
139+
$pipes = array_map( Middleware::toPipe( ... ), $this->getMiddlewares() );
140140
$handler = new RequestHandlerStub( ( new Pipeline() )->use( $request )->send( $response )->through( $pipes ) );
141141

142142
$this->assertSame( expected: 500, actual: $handler->handle( $request )->getStatusCode() );
143143

144144
$handler = new RequestHandlerStub( ( new Bridge() )->for( $request, $response )->through( ...$pipes ) );
145145

146146
$this->assertSame( expected: 500, actual: $handler->handle( $request )->getStatusCode() );
147+
148+
$handler = new RequestHandlerStub(
149+
( new Bridge() )->for( $request, $response )->throughMiddlewares( ...$this->getMiddlewares() )
150+
);
151+
152+
$this->assertSame( expected: 500, actual: $handler->handle( $request )->getStatusCode() );
147153
}
148154

149155
public function testExceptionThrownWithInvalidHandler(): void {

0 commit comments

Comments
 (0)