chore: code cleanup (#4161)

Author: xHeaven

framework/core/src/Admin/Content/AdminPayload.php

@@ -54,9 +54,7 @@ public function __invoke(Document $document, Request $request): void
         $document->payload['extensions'] = $this->extensions->getExtensions()->toArray();
 
         $document->payload['displayNameDrivers'] = array_keys($this->container->make('flarum.user.display_name.supported_drivers'));
-        $document->payload['slugDrivers'] = array_map(function ($resourceDrivers) {
-            return array_keys($resourceDrivers);
-        }, $this->container->make('flarum.http.slugDrivers'));
+        $document->payload['slugDrivers'] = array_map(array_keys(...), $this->container->make('flarum.http.slugDrivers'));
         $document->payload['searchDrivers'] = $this->getSearchDrivers();
 
         $document->payload['phpVersion'] = $this->appInfo->identifyPHPVersion();

framework/core/src/Api/Controller/UninstallExtensionController.php

@@ -27,7 +27,7 @@ protected function delete(ServerRequestInterface $request): void
 
         $name = Arr::get($request->getQueryParams(), 'name');
 
-        if ($this->extensions->getExtension($name) == null) {
+        if ($this->extensions->getExtension($name) === null) {
             return;
         }
 

framework/core/src/Api/Endpoint/Concerns/ExtractsListingParams.php

@@ -103,7 +103,7 @@ public function defaultExtracts(Context $context): array
         return [
             'filter' => RequestUtil::extractFilter($context->request),
             'sort' => RequestUtil::extractSort($context->request, $this->defaultSort, $this->getAvailableSorts($context)),
-            'limit' => $limit = (RequestUtil::extractLimit($context->request, $this->limit, $this->maxLimit) ?? null),
+            'limit' => $limit = RequestUtil::extractLimit($context->request, $this->limit, $this->maxLimit),
             'offset' => RequestUtil::extractOffset($context->request, $limit),
         ];
     }

framework/core/src/Api/Endpoint/Concerns/HasEagerLoading.php

@@ -13,7 +13,6 @@
 use Flarum\Api\Resource\AbstractDatabaseResource;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Relations\Relation;
 use Illuminate\Support\Str;
 use Tobyz\JsonApiServer\Context;
 
@@ -147,13 +146,10 @@ protected function compileSimpleEagerLoads(Context $context, array $included): a
 
     protected function compileWhereEagerLoads(Context $context): array
     {
-        $relations = [];
-
-        foreach ($this->loadRelationWhere as $name => $callable) {
-            $relations[$name] = function ($query) use ($callable, $context) {
-                $callable($query, $context);
-            };
-        }
+        $relations = array_map(
+            callback: fn ($callable) => fn ($query) => $callable($query, $context),
+            array: $this->loadRelationWhere
+        );
 
         return $relations;
     }

framework/core/src/Api/Endpoint/Create.php

@@ -89,7 +89,7 @@ public function setUp(): void
     final protected function fillDefaultValues(Context $context, array &$data): void
     {
         foreach ($context->fields($context->resource) as $field) {
-            if (! has_value($data, $field) && ($default = $field->default)) {
+            if (($default = $field->default) && ! has_value($data, $field)) {
                 set_value($data, $field, $default($context->withField($field)));
             }
         }

framework/core/src/Api/Endpoint/Index.php

@@ -43,7 +43,6 @@ class Index extends Endpoint
     use HasCustomHooks;
 
     public Closure $paginationResolver;
-    public ?string $defaultSort = null;
     protected ?Closure $query = null;
 
     public function __construct(string $name)

framework/core/src/Api/Middleware/FakeHttpMethods.php

@@ -16,7 +16,7 @@
 
 class FakeHttpMethods implements Middleware
 {
-    const HEADER_NAME = 'x-http-method-override';
+    public const HEADER_NAME = 'x-http-method-override';
 
     public function process(Request $request, Handler $handler): Response
     {

framework/core/src/Api/Middleware/ThrottleApi.php

@@ -42,7 +42,9 @@ public function throttle(Request $request): bool
             // Anything else is ignored.
             if ($result === false) {
                 return false;
-            } elseif ($result === true) {
+            }
+
+            if ($result === true) {
                 $throttle = true;
             }
         }

framework/core/src/Api/Resource/AbstractDatabaseResource.php

@@ -74,9 +74,9 @@ public function getValue(object $model, Field $field, Context $context): mixed
     {
         if ($field instanceof Relationship) {
             return $this->getRelationshipValue($model, $field, $context);
-        } else {
-            return $this->getAttributeValue($model, $field, $context);
         }
+
+        return $this->getAttributeValue($model, $field, $context);
     }
 
     /**

framework/core/src/Api/Resource/AccessTokenResource.php

@@ -79,18 +79,18 @@ public function fields(): array
     {
         return [
             Schema\Str::make('token')
-                ->visible(function (AccessToken $token, Context $context) {
+                ->visible(function (#[\SensitiveParameter] AccessToken $token, Context $context) {
                     return $context->getActor()->id === $token->user_id && ! in_array('token', $token->getHidden(), true);
                 }),
             Schema\Integer::make('userId'),
             Schema\DateTime::make('createdAt'),
             Schema\DateTime::make('lastActivityAt'),
             Schema\Boolean::make('isCurrent')
-                ->get(function (AccessToken $token, Context $context) {
+                ->get(function (#[\SensitiveParameter] AccessToken $token, Context $context) {
                     return $token->token === $context->request->getAttribute('session')->get('access_token');
                 }),
             Schema\Boolean::make('isSessionToken')
-                ->get(function (AccessToken $token) {
+                ->get(function (#[\SensitiveParameter] AccessToken $token) {
                     return in_array($token->type, [SessionAccessToken::$type, RememberAccessToken::$type], true);
                 }),
             Schema\Str::make('title')
@@ -99,7 +99,7 @@ public function fields(): array
                 ->maxLength(255),
             Schema\Str::make('lastIpAddress'),
             Schema\Str::make('device')
-                ->get(function (AccessToken $token) {
+                ->get(function (#[\SensitiveParameter] AccessToken $token) {
                     $agent = new Agent();
                     $agent->setUserAgent($token->last_user_agent);