Skip to content

Commit ed3e621

Browse files
authored
Phpstan level8 (#3)
* Bump to 8, fix cast for origin * Check origin * Explicit cast
1 parent 277ac8d commit ed3e621

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
},
3333
"scripts": {
3434
"test": "phpunit",
35-
"analyse": "phpstan analyse src tests --level=7",
35+
"analyse": "phpstan analyse src tests --level=8",
3636
"check-style": "phpcs -p --standard=PSR12 --exclude=Generic.Files.LineLength --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests",
3737
"fix-style": "phpcbf -p --standard=PSR12 --exclude=Generic.Files.LineLength --runtime-set ignore_errors_on_exit 1 --runtime-set ignore_warnings_on_exit 1 src tests"
3838
},

src/CorsService.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,11 +181,14 @@ public function isOriginAllowed(Request $request): bool
181181

182182
$origin = $request->headers->get('Origin');
183183

184+
if ($origin === null) {
185+
return false;
186+
}
187+
184188
if (in_array($origin, $this->options['allowedOrigins'])) {
185189
return true;
186190
}
187191

188-
/** @var string $pattern */
189192
foreach ($this->options['allowedOriginsPatterns'] as $pattern) {
190193
if (preg_match($pattern, $origin)) {
191194
return true;
@@ -219,7 +222,7 @@ private function configureAllowedOrigin(Response $response, Request $request): v
219222
} else {
220223
// For dynamic headers, set the requested Origin header when set and allowed
221224
if ($this->isCorsRequest($request) && $this->isOriginAllowed($request)) {
222-
$response->headers->set('Access-Control-Allow-Origin', $request->headers->get('Origin'));
225+
$response->headers->set('Access-Control-Allow-Origin', (string) $request->headers->get('Origin'));
223226
}
224227

225228
$this->varyHeader($response, 'Origin');
@@ -250,7 +253,7 @@ private function configureAllowedMethods(Response $response, Request $request):
250253
private function configureAllowedHeaders(Response $response, Request $request): void
251254
{
252255
if ($this->options['allowAllHeaders'] === true) {
253-
$allowHeaders = $request->headers->get('Access-Control-Request-Headers');
256+
$allowHeaders = (string) $request->headers->get('Access-Control-Request-Headers');
254257
$this->varyHeader($response, 'Access-Control-Request-Headers');
255258
} else {
256259
$allowHeaders = implode(', ', $this->options['allowedHeaders']);

0 commit comments

Comments
 (0)