Skip to content

Explicitly marking parameters as nullable #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tigrov merged 4 commits into from
May 31, 2025
Merged

Explicitly marking parameters as nullable #79

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
995171e
Explicitly marking parameters as nullable
Tigrov May 30, 2025
4742114
Update composer.json
Tigrov May 30, 2025
369a9be
Run tests on PHP 8.4
Tigrov May 31, 2025
ec2b6ec
Update CHANGELOG.md
Tigrov May 31, 2025
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## 2.2.2 under development

- no changes in this release.
- Enh #79: Explicitly marking parameters as nullable (@Tigrov)
Comment thread
Tigrov marked this conversation as resolved.
Outdated

## 2.2.1 March 05, 2025

Expand Down
7 changes: 3 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}
],
"require": {
"php": "~7.4.0 || ~8.0.0 || ~8.1.0 || ~8.2.0 || ~8.3.0 || ~8.4.0",
"php": "~7.4.0 || 8.0 - 8.4",
"ext-hash": "*",
"psr/http-factory": "^1.0",
"psr/http-factory-implementation": "1.0",
Expand All @@ -48,8 +48,8 @@
"require-dev": {
"maglnet/composer-require-checker": "^3.8 || ^4.2",
"nyholm/psr7": "^1.8.2",
"phpunit/phpunit": "^9.6.22",
"rector/rector": "^2.0.9",
"phpunit/phpunit": "^9.6.23",
"rector/rector": "^2.0.16",
"roave/infection-static-analysis-plugin": "^1.18",
"spatie/phpunit-watcher": "^1.23.6",
"vimeo/psalm": "^4.30 || ^5.26.1 || ^6.8.8",
Expand All @@ -76,7 +76,6 @@
},
"config": {
"sort-packages": true,
"bump-after-update": "dev",
"allow-plugins": {
"infection/extension-installer": true,
"composer/package-versions-deprecated": true
Expand Down
2 changes: 1 addition & 1 deletion src/CsrfHeaderMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ final class CsrfHeaderMiddleware implements MiddlewareInterface

public function __construct(
ResponseFactoryInterface $responseFactory,
RequestHandlerInterface $failureHandler = null
?RequestHandlerInterface $failureHandler = null
) {
$this->responseFactory = $responseFactory;
$this->failureHandler = $failureHandler;
Expand Down
2 changes: 1 addition & 1 deletion src/CsrfMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ final class CsrfMiddleware implements MiddlewareInterface
public function __construct(
ResponseFactoryInterface $responseFactory,
CsrfTokenInterface $token,
RequestHandlerInterface $failureHandler = null
?RequestHandlerInterface $failureHandler = null
) {
$this->responseFactory = $responseFactory;
$this->token = $token;
Expand Down
2 changes: 1 addition & 1 deletion src/CsrfTokenMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ final class CsrfTokenMiddleware implements MiddlewareInterface
public function __construct(
ResponseFactoryInterface $responseFactory,
CsrfTokenInterface $token,
RequestHandlerInterface $failureHandler = null
?RequestHandlerInterface $failureHandler = null
) {
$this->responseFactory = $responseFactory;
$this->token = $token;
Expand Down
2 changes: 1 addition & 1 deletion tests/CsrfHeaderMiddlewareProcessTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
}

private function createMiddleware(
RequestHandlerInterface $failureHandler = null
?RequestHandlerInterface $failureHandler = null
): CsrfHeaderMiddleware {
return new CsrfHeaderMiddleware(new Psr17Factory(), $failureHandler);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/CsrfTokenMiddlewareProcessTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ private function getBodyRequestParamsByToken(string $token): array

protected function createCsrfTokenMiddleware(
?CsrfTokenInterface $csrfToken = null,
RequestHandlerInterface $failureHandler = null
?RequestHandlerInterface $failureHandler = null
): CsrfTokenMiddleware {
$csrfToken = new MaskedCsrfToken($csrfToken ?? $this->createCsrfToken());
$this->token = $csrfToken->getValue();
Expand Down
2 changes: 1 addition & 1 deletion tests/DeprecatedTokenCsrfMiddlewareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ private function getBodyRequestParamsByToken(string $token): array

protected function createCsrfMiddleware(
?CsrfTokenInterface $csrfToken = null,
RequestHandlerInterface $failureHandler = null
?RequestHandlerInterface $failureHandler = null
): CsrfMiddleware {
$csrfToken = new MaskedCsrfToken($csrfToken ?? $this->createCsrfToken());
$this->token = $csrfToken->getValue();
Expand Down
2 changes: 1 addition & 1 deletion tests/MaskedCsrfTokenTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public function testBase(): void
$this->assertSame('test_token', TokenMask::remove($csrfToken->getValue()));
}

private function createCsrfToken(string $token = null): MaskedCsrfToken
private function createCsrfToken(?string $token = null): MaskedCsrfToken
{
$mock = $this->createMock(MockCsrfTokenStorage::class);
if ($token !== null) {
Expand Down