You've already forked Php-Template
fix: update PHPDoc annotations and improve null handling in middleware classes
All checks were successful
🧪✨ Tests Workflow / 🛡️ 🔒 Library Audit (push) Successful in 1m49s
🧪✨ Tests Workflow / 📝 ✨ Code Lint (push) Successful in 1m49s
🧪✨ Tests Workflow / 🛡️ 🔒 License Check (push) Successful in 2m18s
🧪✨ Tests Workflow / 🧪 ✨ Database Migrations (push) Successful in 2m50s
🧪✨ Tests Workflow / 🐙 🔍 Code Sniffer (push) Successful in 2m34s
🧪✨ Tests Workflow / 🧪 ✅ Unit Tests (push) Successful in 1m33s
All checks were successful
🧪✨ Tests Workflow / 🛡️ 🔒 Library Audit (push) Successful in 1m49s
🧪✨ Tests Workflow / 📝 ✨ Code Lint (push) Successful in 1m49s
🧪✨ Tests Workflow / 🛡️ 🔒 License Check (push) Successful in 2m18s
🧪✨ Tests Workflow / 🧪 ✨ Database Migrations (push) Successful in 2m50s
🧪✨ Tests Workflow / 🐙 🔍 Code Sniffer (push) Successful in 2m34s
🧪✨ Tests Workflow / 🧪 ✅ Unit Tests (push) Successful in 1m33s
This commit is contained in:
@@ -43,7 +43,7 @@ class JwtMiddleware extends Middleware
|
||||
return $handler->handle($request);
|
||||
}
|
||||
|
||||
/** @var $class Controller */
|
||||
/** @var Controller $class */
|
||||
[$class, $method] = $callable;
|
||||
|
||||
if (class_exists($class::class)) {
|
||||
@@ -137,4 +137,4 @@ class JwtMiddleware extends Middleware
|
||||
|
||||
return new SignedWith(new Hmac256(), $key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,7 +22,7 @@ abstract class Middleware implements MiddlewareInterface
|
||||
$lastSegment = array_last($handler->getMiddlewareStack());
|
||||
|
||||
if ($lastSegment === null) {
|
||||
return $handler->handle($request);
|
||||
return null;
|
||||
}
|
||||
|
||||
$callable = $lastSegment->getCallable();
|
||||
|
||||
@@ -27,7 +27,7 @@ class ScopeMiddleware extends Middleware
|
||||
return $handler->handle($request);
|
||||
}
|
||||
|
||||
/** @var $class Controller */
|
||||
/** @var Controller $class */
|
||||
[$class, $method] = $callable;
|
||||
|
||||
if (class_exists($class::class)) {
|
||||
@@ -43,10 +43,16 @@ class ScopeMiddleware extends Middleware
|
||||
|
||||
$userScopes = $request->getAttribute('scopes', []);
|
||||
|
||||
if (array_any($requiredScopes, fn($requiredScope) => !in_array($requiredScope, $userScopes, true))) {
|
||||
if (
|
||||
array_any(
|
||||
$requiredScopes,
|
||||
fn($requiredScope) => !in_array($requiredScope, $userScopes, true)
|
||||
)
|
||||
) {
|
||||
return JsonResponseFactory::createJsonResponse([
|
||||
'error' => 'insufficient_scope',
|
||||
'error_description' => 'The request requires higher privileges than provided by the access token.'
|
||||
'error_description' =>
|
||||
'The request requires higher privileges than provided by the access token.'
|
||||
], CodesEnum::FORBIDDEN);
|
||||
}
|
||||
}
|
||||
@@ -55,4 +61,4 @@ class ScopeMiddleware extends Middleware
|
||||
|
||||
return $handler->handle($request);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user