PSR 12 for serializable-closure and prompts and illuminate

Admin · Admin · commit 9d4de88546db · 2025-07-03T18:11:34.000+03:00
diff --git a/illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php b/illuminate/Broadcasting/Broadcasters/PusherBroadcaster.php
@@ -55,10 +55,10 @@ public function resolveAuthenticatedUser($request)
         $decodedString = "{$request->socket_id}::user::{$encodedUser}";
 
         $auth = $settings['auth_key'] . ':' . hash_hmac(
-                'sha256',
-                $decodedString,
-                $settings['secret']
-            );
+            'sha256',
+            $decodedString,
+            $settings['secret']
+        );
 
         return [
             'auth' => $auth,
@@ -122,17 +122,17 @@ public function validAuthenticationResponse($request, $result)
             $request,
             method_exists($this->pusher, 'authorizePresenceChannel')
                 ? $this->pusher->authorizePresenceChannel(
-                $request->channel_name,
-                $request->socket_id,
-                $broadcastIdentifier,
-                $result
-            )
+                    $request->channel_name,
+                    $request->socket_id,
+                    $broadcastIdentifier,
+                    $result
+                )
                 : $this->pusher->presence_auth(
-                $request->channel_name,
-                $request->socket_id,
-                $broadcastIdentifier,
-                $result
-            )
+                    $request->channel_name,
+                    $request->socket_id,
+                    $broadcastIdentifier,
+                    $result
+                )
         );
     }
 
diff --git a/illuminate/Console/Scheduling/Event.php b/illuminate/Console/Scheduling/Event.php
@@ -645,7 +645,7 @@ protected function pingCallback($url)
         return function (Container $container, HttpClient $http) use ($url) {
             try {
                 $http->request('GET', $url);
-            } catch (ClientExceptionInterface|TransferException $e) {
+            } catch (ClientExceptionInterface | TransferException $e) {
                 $container->make(ExceptionHandler::class)->report($e);
             }
         };
diff --git a/illuminate/Database/Connectors/SqlServerConnector.php b/illuminate/Database/Connectors/SqlServerConnector.php
@@ -200,9 +200,9 @@ protected function getSqlSrvDsn(array $config)
      */
     protected function buildConnectString($driver, array $arguments)
     {
-        return $driver . ':' . implode(';', array_map(function ($key) use ($arguments) {
-                return sprintf('%s=%s', $key, $arguments[$key]);
-            }, array_keys($arguments)));
+        return $driver . ':' . implode(';', array_map(function ($key) use ($arguments): string {
+            return sprintf('%s=%s', $key, $arguments[$key]);
+        }, array_keys($arguments)));
     }
 
     /**
diff --git a/illuminate/Database/Console/Migrations/MigrateCommand.php b/illuminate/Database/Console/Migrations/MigrateCommand.php
@@ -192,9 +192,11 @@ protected function createMissingSqliteDatabase($path)
      */
     protected function createMissingMysqlDatabase($connection)
     {
-        if ($this->laravel['config']->get(
+        if (
+            $this->laravel['config']->get(
                 "database.connections.{$connection->getName()}.database"
-            ) !== $connection->getDatabaseName()) {
+            ) !== $connection->getDatabaseName()
+        ) {
             return false;
         }
 
diff --git a/illuminate/Database/Console/ShowCommand.php b/illuminate/Database/Console/ShowCommand.php
@@ -172,8 +172,8 @@ protected function displayForCli(array $data)
                     ($tableSize ? $tableSize : '—') . ($this->option(
                         'counts'
                     ) ? ' <fg=gray;options=bold>/</> <fg=yellow;options=bold>' . number_format(
-                            $table['rows']
-                        ) . '</>' : '')
+                        $table['rows']
+                    ) . '</>' : '')
                 );
 
                 if ($this->output->isVerbose()) {
diff --git a/illuminate/Database/Eloquent/Model.php b/illuminate/Database/Eloquent/Model.php
@@ -24,8 +24,15 @@
 use JsonSerializable;
 use LogicException;
 
-abstract class Model implements Arrayable, ArrayAccess, CanBeEscapedWhenCastToString, HasBroadcastChannel, Jsonable,
-                                JsonSerializable, QueueableEntity, UrlRoutable
+abstract class Model implements
+    Arrayable,
+    ArrayAccess,
+    CanBeEscapedWhenCastToString,
+    HasBroadcastChannel,
+    Jsonable,
+    JsonSerializable,
+    QueueableEntity,
+    UrlRoutable
 {
     use Concerns\HasAttributes;
     use Concerns\HasEvents;
diff --git a/illuminate/Database/Query/Grammars/Grammar.php b/illuminate/Database/Query/Grammars/Grammar.php
@@ -615,9 +615,9 @@ protected function whereJsonContains(Builder $query, $where)
         $not = $where['not'] ? 'not ' : '';
 
         return $not . $this->compileJsonContains(
-                $where['column'],
-                $this->parameter($where['value'])
-            );
+            $where['column'],
+            $this->parameter($where['value'])
+        );
     }
 
     /**
@@ -656,9 +656,7 @@ protected function whereJsonContainsKey(Builder $query, $where)
     {
         $not = $where['not'] ? 'not ' : '';
 
-        return $not . $this->compileJsonContainsKey(
-                $where['column']
-            );
+        return $not . $this->compileJsonContainsKey($where['column']);
     }
 
     /**
@@ -761,10 +759,10 @@ protected function compileGroups(Builder $query, $groups)
     protected function compileHavings(Builder $query)
     {
         return 'having ' . $this->removeLeadingBoolean(
-                collect($query->havings)->map(function ($having) {
-                    return $having['boolean'] . ' ' . $this->compileHaving($having);
-                })->implode(' ')
-            );
+            collect($query->havings)->map(function (array $having): string {
+                return $having['boolean'] . ' ' . $this->compileHaving($having);
+            })->implode(' ')
+        );
     }
 
     /**
diff --git a/illuminate/Database/Query/Grammars/SQLiteGrammar.php b/illuminate/Database/Query/Grammars/SQLiteGrammar.php
@@ -169,8 +169,8 @@ protected function compileJsonContains($column, $value)
         [$field, $path] = $this->wrapJsonFieldAndPath($column);
 
         return 'exists (select 1 from json_each(' . $field . $path . ') where ' . $this->wrap(
-                'json_each.value'
-            ) . ' is ' . $value . ')';
+            'json_each.value'
+        ) . ' is ' . $value . ')';
     }
 
     /**
diff --git a/illuminate/Database/Schema/Grammars/SqlServerGrammar.php b/illuminate/Database/Schema/Grammars/SqlServerGrammar.php
@@ -445,9 +445,9 @@ public function compileDropColumn(Blueprint $blueprint, Fluent $command)
         $dropExistingConstraintsSql = $this->compileDropDefaultConstraint($blueprint, $command) . ';';
 
         return $dropExistingConstraintsSql . 'alter table ' . $this->wrapTable($blueprint) . ' drop column ' . implode(
-                ', ',
-                $columns
-            );
+            ', ',
+            $columns
+        );
     }
 
     /**
diff --git a/illuminate/Foundation/Console/AboutCommand.php b/illuminate/Foundation/Console/AboutCommand.php
@@ -198,10 +198,8 @@ protected function gatherApplicationInformation()
                     return value(
                         static::format(
                             value: $logChannel,
-                            console: fn($value
-                            ) => '<fg=yellow;options=bold>' . $value . '</> <fg=gray;options=bold>/</> ' . $secondary->implode(
-                                    ', '
-                                ),
+                            console: fn($value): string => '<fg=yellow;options=bold>' . $value .
+                                '</> <fg=gray;options=bold>/</> ' . $secondary->implode(', '),
                             json: fn() => $secondary->all(),
                         ),
                         $json
diff --git a/illuminate/Foundation/Console/DocsCommand.php b/illuminate/Foundation/Console/DocsCommand.php
@@ -259,9 +259,9 @@ protected function guessPage($search)
                 Str::slug($page['title'], ' '),
                 Str::slug($search, ' ')
             ))->keys()->first() ?? $this->pages()->map(fn($page) => similar_text(
-            Str::slug($page['title'], ' '),
-            Str::slug($search, ' '),
-        ))
+                Str::slug($page['title'], ' '),
+                Str::slug($search, ' '),
+            ))
             ->filter(fn($score) => $score >= min(3, Str::length($search)))
             ->sortDesc()
             ->keys()
@@ -308,9 +308,9 @@ protected function guessSection($page)
                 Str::slug($section['title'], ' '),
                 Str::slug($this->argument('section'), ' ')
             ))->keys()->first() ?? $this->sectionsFor($page)->map(fn($section) => similar_text(
-            Str::slug($section['title'], ' '),
-            Str::slug($this->argument('section'), ' '),
-        ))
+                Str::slug($section['title'], ' '),
+                Str::slug($this->argument('section'), ' '),
+            ))
             ->filter(fn($score) => $score >= min(3, Str::length($this->argument('section'))))
             ->sortDesc()
             ->keys()
diff --git a/illuminate/Foundation/Console/Kernel.php b/illuminate/Foundation/Console/Kernel.php
@@ -370,10 +370,10 @@ protected function load($paths)
     protected function commandClassFromFile(SplFileInfo $file, string $namespace): string
     {
         return $namespace . str_replace(
-                ['/', '.php'],
-                ['\\', ''],
-                Str::after($file->getRealPath(), realpath(app_path()) . DIRECTORY_SEPARATOR)
-            );
+            ['/', '.php'],
+            ['\\', ''],
+            Str::after($file->getRealPath(), realpath(app_path()) . DIRECTORY_SEPARATOR)
+        );
     }
 
     /**
diff --git a/illuminate/Foundation/Console/KeyGenerateCommand.php b/illuminate/Foundation/Console/KeyGenerateCommand.php
@@ -60,9 +60,7 @@ public function handle()
      */
     protected function generateRandomKey()
     {
-        return 'base64:' . base64_encode(
-                Encrypter::generateKey($this->laravel['config']['app.cipher'])
-            );
+        return 'base64:' . base64_encode(Encrypter::generateKey($this->laravel['config']['app.cipher']));
     }
 
     /**
diff --git a/illuminate/Foundation/Console/RouteListCommand.php b/illuminate/Foundation/Console/RouteListCommand.php
@@ -389,9 +389,11 @@ protected function forCli($routes)
 
             $dots = empty($dots) ? $dots : " $dots";
 
-            if ($action && !$this->output->isVerbose() && mb_strlen(
-                    $method . $spaces . $uri . $action . $dots
-                ) > ($terminalWidth - 6)) {
+            if (
+                $action
+                && !$this->output->isVerbose()
+                && mb_strlen($method . $spaces . $uri . $action . $dots) > ($terminalWidth - 6)
+            ) {
                 $action = substr($action, 0, $terminalWidth - 7 - mb_strlen($method . $spaces . $uri . $dots)) . '…';
             }
 
@@ -443,10 +445,10 @@ protected function formatActionForCli($route)
 
         $actionClass = explode('@', $action)[0];
 
-        if (class_exists($actionClass) && str_starts_with(
-                (new ReflectionClass($actionClass))->getFilename(),
-                base_path('vendor')
-            )) {
+        if (
+            class_exists($actionClass)
+            && str_starts_with((new ReflectionClass($actionClass))->getFilename(), base_path('vendor'))
+        ) {
             $actionCollection = collect(explode('\\', $action));
 
             return $name . $actionCollection->take(2)->implode('\\') . '   ' . $actionCollection->last();
diff --git a/illuminate/Foundation/Vite.php b/illuminate/Foundation/Vite.php
@@ -494,11 +494,11 @@ protected function resolvePreloadTagAttributes($src, $url, $chunk, $manifest)
             'href' => $url,
             'nonce' => $this->nonce ?? false,
             'crossorigin' => $this->resolveStylesheetTagAttributes(
-                    $src,
-                    $url,
-                    $chunk,
-                    $manifest
-                )['crossorigin'] ?? false,
+                $src,
+                $url,
+                $chunk,
+                $manifest
+            )['crossorigin'] ?? false,
         ] : [
             'rel' => 'modulepreload',
             'href' => $url,
diff --git a/illuminate/Http/Client/Request.php b/illuminate/Http/Client/Request.php
@@ -146,11 +146,11 @@ public function hasFile($name, $value = null, $filename = null)
             return false;
         }
 
-        return collect($this->data)->reject(function ($file) use ($name, $value, $filename) {
-                return $file['name'] != $name ||
-                    ($value && $file['contents'] != $value) ||
-                    ($filename && $file['filename'] != $filename);
-            })->count() > 0;
+        return collect($this->data)->reject(function ($file) use ($name, $value, $filename): bool {
+            return $file['name'] != $name ||
+                ($value && $file['contents'] != $value) ||
+                ($filename && $file['filename'] != $filename);
+        })->count() > 0;
     }
 
     /**
diff --git a/illuminate/Http/Concerns/InteractsWithContentTypes.php b/illuminate/Http/Concerns/InteractsWithContentTypes.php
@@ -157,7 +157,8 @@ public static function matchesType($actual, $type)
 
         $split = explode('/', $actual);
 
-        return isset($split[1]) && preg_match(
+        return isset($split[1])
+            && preg_match(
                 '#' . preg_quote($split[0], '#') . '/.+\+' . preg_quote($split[1], '#') . '#',
                 $type
             );
diff --git a/illuminate/Http/Middleware/SetCacheHeaders.php b/illuminate/Http/Middleware/SetCacheHeaders.php
@@ -42,8 +42,14 @@ public function handle($request, Closure $next, $options = [])
     {
         $response = $next($request);
 
-        if (!$request->isMethodCacheable() || (!$response->getContent(
-                ) && !$response instanceof BinaryFileResponse && !$response instanceof StreamedResponse)) {
+        if (
+            !$request->isMethodCacheable()
+            || (
+                !$response->getContent()
+                && !$response instanceof BinaryFileResponse
+                && !$response instanceof StreamedResponse
+            )
+        ) {
             return $response;
         }
 
diff --git a/illuminate/Notifications/NotificationSender.php b/illuminate/Notifications/NotificationSender.php
@@ -174,9 +174,7 @@ protected function shouldSendNotification($notifiable, $notification, $channel)
             return false;
         }
 
-        return $this->events->until(
-                new NotificationSending($notifiable, $notification, $channel)
-            ) !== false;
+        return $this->events->until(new NotificationSending($notifiable, $notification, $channel)) !== false;
     }
 
     /**
diff --git a/illuminate/Queue/Console/RetryBatchCommand.php b/illuminate/Queue/Console/RetryBatchCommand.php
@@ -46,7 +46,9 @@ public function handle()
         $this->components->info("Pushing failed queue jobs of the batch [$id] back onto the queue.");
 
         foreach ($batch->failedJobIds as $failedJobId) {
-            $this->components->task($failedJobId, fn() => $this->callSilent('queue:retry', ['id' => $failedJobId]) == 0
+            $this->components->task(
+                $failedJobId,
+                fn(): bool => $this->callSilent('queue:retry', ['id' => $failedJobId]) == 0
             );
         }
 
diff --git a/illuminate/Queue/Console/RetryCommand.php b/illuminate/Queue/Console/RetryCommand.php
@@ -190,10 +190,11 @@ protected function refreshRetryUntil($payload)
             throw new RuntimeException('Unable to extract job payload.');
         }
 
-        if (is_object($instance) && !$instance instanceof \__PHP_Incomplete_Class && method_exists(
-                $instance,
-                'retryUntil'
-            )) {
+        if (
+            is_object($instance)
+            && !$instance instanceof \__PHP_Incomplete_Class
+            && method_exists($instance, 'retryUntil')
+        ) {
             $retryUntil = $instance->retryUntil();
 
             $payload['retryUntil'] = $retryUntil instanceof DateTimeInterface
diff --git a/illuminate/Queue/Failed/DatabaseFailedJobProvider.php b/illuminate/Queue/Failed/DatabaseFailedJobProvider.php
@@ -6,8 +6,10 @@
 use Illuminate\Database\ConnectionResolverInterface;
 use Illuminate\Support\Facades\Date;
 
-class DatabaseFailedJobProvider implements CountableFailedJobProvider, FailedJobProviderInterface,
-                                           PrunableFailedJobProvider
+class DatabaseFailedJobProvider implements
+    CountableFailedJobProvider,
+    FailedJobProviderInterface,
+    PrunableFailedJobProvider
 {
     /**
      * The connection resolver implementation.
diff --git a/illuminate/Queue/Failed/DatabaseUuidFailedJobProvider.php b/illuminate/Queue/Failed/DatabaseUuidFailedJobProvider.php
@@ -6,8 +6,10 @@
 use Illuminate\Database\ConnectionResolverInterface;
 use Illuminate\Support\Facades\Date;
 
-class DatabaseUuidFailedJobProvider implements CountableFailedJobProvider, FailedJobProviderInterface,
-                                               PrunableFailedJobProvider
+class DatabaseUuidFailedJobProvider implements
+    CountableFailedJobProvider,
+    FailedJobProviderInterface,
+    PrunableFailedJobProvider
 {
     /**
      * The connection resolver implementation.
diff --git a/illuminate/Redis/Limiters/ConcurrencyLimiter.php b/illuminate/Redis/Limiters/ConcurrencyLimiter.php
diff --git a/illuminate/Routing/Console/ControllerMakeCommand.php b/illuminate/Routing/Console/ControllerMakeCommand.php
diff --git a/illuminate/Routing/RouteUrlGenerator.php b/illuminate/Routing/RouteUrlGenerator.php
diff --git a/illuminate/Routing/RoutingServiceProvider.php b/illuminate/Routing/RoutingServiceProvider.php
diff --git a/illuminate/Routing/UrlGenerator.php b/illuminate/Routing/UrlGenerator.php
diff --git a/illuminate/Session/Middleware/AuthenticateSession.php b/illuminate/Session/Middleware/AuthenticateSession.php
diff --git a/illuminate/Support/Composer.php b/illuminate/Support/Composer.php
diff --git a/illuminate/Support/Testing/Fakes/NotificationFake.php b/illuminate/Support/Testing/Fakes/NotificationFake.php
diff --git a/illuminate/Validation/Concerns/ValidatesAttributes.php b/illuminate/Validation/Concerns/ValidatesAttributes.php
diff --git a/illuminate/View/Compilers/Compiler.php b/illuminate/View/Compilers/Compiler.php

Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ protected function pingCallback($url)`
`645`	`645`	`return function (Container $container, HttpClient $http) use ($url) {`
`646`	`646`	`try {`
`647`	`647`	`$http->request('GET', $url);`
`648`		`- } catch (ClientExceptionInterface\|TransferException $e) {`
	`648`	`+ } catch (ClientExceptionInterface \| TransferException $e) {`
`649`	`649`	`$container->make(ExceptionHandler::class)->report($e);`
`650`	`650`	`}`
`651`	`651`	`};`
Original file line number	Diff line number	Diff line change
`@@ -200,9 +200,9 @@ protected function getSqlSrvDsn(array $config)`
`200`	`200`	`*/`
`201`	`201`	`protected function buildConnectString($driver, array $arguments)`
`202`	`202`	`{`
`203`		`- return $driver . ':' . implode(';', array_map(function ($key) use ($arguments) {`
`204`		`- return sprintf('%s=%s', $key, $arguments[$key]);`
`205`		`- }, array_keys($arguments)));`
	`203`	`+ return $driver . ':' . implode(';', array_map(function ($key) use ($arguments): string {`
	`204`	`+ return sprintf('%s=%s', $key, $arguments[$key]);`
	`205`	`+ }, array_keys($arguments)));`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -192,9 +192,11 @@ protected function createMissingSqliteDatabase($path)`
`192`	`192`	`*/`
`193`	`193`	`protected function createMissingMysqlDatabase($connection)`
`194`	`194`	`{`
`195`		`- if ($this->laravel['config']->get(`
	`195`	`+ if (`
	`196`	`+ $this->laravel['config']->get(`
`196`	`197`	`"database.connections.{$connection->getName()}.database"`
`197`		`- ) !== $connection->getDatabaseName()) {`
	`198`	`+ ) !== $connection->getDatabaseName()`
	`199`	`+ ) {`
`198`	`200`	`return false;`
`199`	`201`	`}`
`200`	`202`
Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,8 @@ protected function compileJsonContains($column, $value)`
`169`	`169`	`[$field, $path] = $this->wrapJsonFieldAndPath($column);`
`170`	`170`
`171`	`171`	`return 'exists (select 1 from json_each(' . $field . $path . ') where ' . $this->wrap(`
`172`		`- 'json_each.value'`
`173`		`- ) . ' is ' . $value . ')';`
	`172`	`+ 'json_each.value'`
	`173`	`+ ) . ' is ' . $value . ')';`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`/**`