Skip to content

Commit 30137a0

Browse files
committed
Fix for PHP 8.4
1 parent 00ddc62 commit 30137a0

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ jobs:
3939
- "8.0"
4040
- "8.1"
4141
- "8.2"
42+
- "8.3"
43+
- "8.4"
4244

4345
steps:
4446
- name: Checkout.

.github/workflows/static.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ jobs:
3535
- "8.0"
3636
- "8.1"
3737
- "8.2"
38+
- "8.3"
3839

3940
steps:
4041
- name: Checkout.

src/MiddlewarePipeline.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ final class MiddlewarePipeline implements MiddlewarePipelineInterface
2424
/**
2525
* {@inheritDoc}
2626
*/
27-
public function pipe(MiddlewareInterface $middleware, string $pathPrefix = null): void
27+
public function pipe(MiddlewareInterface $middleware, ?string $pathPrefix = null): void
2828
{
2929
$this->pipeline[] = (!$pathPrefix || $pathPrefix === '/') ? $middleware : $this->path($pathPrefix, $middleware);
3030
}

src/MiddlewarePipelineInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ interface MiddlewarePipelineInterface extends MiddlewareInterface, RequestHandle
5151
* @param MiddlewareInterface $middleware
5252
* @param string|null $pathPrefix path prefix from the root to which the middleware is attached.
5353
*/
54-
public function pipe(MiddlewareInterface $middleware, string $pathPrefix = null): void;
54+
public function pipe(MiddlewareInterface $middleware, ?string $pathPrefix = null): void;
5555
}

src/MiddlewareResolver.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ final class MiddlewareResolver implements MiddlewareResolverInterface
2626
/**
2727
* @param ContainerInterface|null $container
2828
*/
29-
public function __construct(ContainerInterface $container = null)
29+
public function __construct(?ContainerInterface $container = null)
3030
{
3131
$this->container = $container;
3232
}

src/ServerRequestRunner.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ final class ServerRequestRunner
3333
* @param MiddlewarePipelineInterface|null $pipeline
3434
* @param EmitterInterface|null $emitter
3535
*/
36-
public function __construct(MiddlewarePipelineInterface $pipeline = null, EmitterInterface $emitter = null)
36+
public function __construct(?MiddlewarePipelineInterface $pipeline = null, ?EmitterInterface $emitter = null)
3737
{
3838
$this->pipeline = $pipeline ?? new MiddlewarePipeline();
3939
$this->emitter = $emitter ?? new SapiEmitter();
@@ -44,7 +44,7 @@ public function __construct(MiddlewarePipelineInterface $pipeline = null, Emitte
4444
* @param RequestHandlerInterface|null $defaultHandler
4545
* @psalm-suppress RedundantCast
4646
*/
47-
public function run(ServerRequestInterface $request, RequestHandlerInterface $defaultHandler = null): void
47+
public function run(ServerRequestInterface $request, ?RequestHandlerInterface $defaultHandler = null): void
4848
{
4949
$response = ($defaultHandler === null)
5050
? $this->pipeline->handle($request)

0 commit comments

Comments
 (0)