[1.x] Refactor to use first-class callable (#315)

* refactor to use first-class callables

Signed-off-by: Pushpak Chhajed <[email protected]>

* fix test

Signed-off-by: Pushpak Chhajed <[email protected]>

* update roster package

Signed-off-by: Pushpak Chhajed <[email protected]>

* Centralize table validation logic in `isTableProvided` method

Signed-off-by: Pushpak Chhajed <[email protected]>

* isTableProvided -> hasTable

---------

Signed-off-by: Pushpak Chhajed <[email protected]>
Co-authored-by: Joe Tannenbaum <[email protected]>

Author: pushpak1300

rector.php

@@ -3,9 +3,9 @@
 declare(strict_types=1);
 
 use Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector;
+use Rector\CodingStyle\Rector\FunctionLike\FunctionLikeToFirstClassCallableRector;
 use Rector\Config\RectorConfig;
 use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
-use Rector\Strict\Rector\BooleanNot\BooleanInBooleanNotRuleFixerRector;
 use Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector;
 
 return RectorConfig::configure()
@@ -17,13 +17,14 @@
         ReadOnlyPropertyRector::class,
         EncapsedStringsToSprintfRector::class,
         DisallowedEmptyRuleFixerRector::class,
-        BooleanInBooleanNotRuleFixerRector::class,
+        FunctionLikeToFirstClassCallableRector::class => [
+            __DIR__.'src/Install/CodeEnvironmentsDetector.php',
+        ],
     ])
     ->withPreparedSets(
         deadCode: true,
         codeQuality: true,
         codingStyle: true,
         typeDeclarations: true,
         earlyReturn: true,
-        strictBooleans: true,
     )->withPhpSets(php81: true);

src/BoostServiceProvider.php

@@ -74,7 +74,7 @@ public function boot(Router $router): void
 
         if (config('boost.browser_logs_watcher', true)) {
             $this->registerBrowserLogger();
-            $this->callAfterResolving('blade.compiler', fn (BladeCompiler $bladeCompiler) => $this->registerBladeDirectives($bladeCompiler));
+            $this->callAfterResolving('blade.compiler', $this->registerBladeDirectives(...));
             $this->hookIntoResponses($router);
         }
     }

src/Install/Cli/DisplayHelper.php

@@ -87,7 +87,7 @@ public static function grid(array $items, int $maxWidth = 80): void
         }
 
         $maxWidth -= 2;  // account for grid margins
-        $maxItemLength = max(array_map('mb_strlen', $items));
+        $maxItemLength = max(array_map(mb_strlen(...), $items));
         $cellWidth = $maxItemLength + self::GRID_CELL_PADDING;
         $cellsPerRow = max(1, (int) floor(($maxWidth - 1) / ($cellWidth + 1)));
         $rows = array_chunk($items, $cellsPerRow);

src/Install/Detection/DetectionStrategyFactory.php

@@ -22,7 +22,7 @@ public function make(string|array $type, array $config = []): DetectionStrategy
     {
         if (is_array($type)) {
             return new CompositeDetectionStrategy(
-                array_map(fn ($singleType): \Laravel\Boost\Install\Contracts\DetectionStrategy => $this->make($singleType, $config), $type)
+                array_map(fn (string|array $singleType): \Laravel\Boost\Install\Contracts\DetectionStrategy => $this->make($singleType, $config), $type)
             );
         }
 

src/Mcp/Tools/DatabaseSchema/DatabaseSchemaDriver.php

@@ -8,6 +8,11 @@ abstract class DatabaseSchemaDriver
 {
     public function __construct(protected $connection = null) {}
 
+    protected function hasTable(?string $table): bool
+    {
+        return ! in_array($table, [null, '', '0'], true);
+    }
+
     abstract public function getViews(): array;
 
     abstract public function getStoredProcedures(): array;

src/Mcp/Tools/DatabaseSchema/MySQLSchemaDriver.php

@@ -43,7 +43,7 @@ public function getFunctions(): array
     public function getTriggers(?string $table = null): array
     {
         try {
-            if ($table !== null && $table !== '' && $table !== '0') {
+            if ($this->hasTable($table)) {
                 return DB::connection($this->connection)->select('SHOW TRIGGERS WHERE `Table` = ?', [$table]);
             }
 

src/Mcp/Tools/DatabaseSchema/PostgreSQLSchemaDriver.php

@@ -60,7 +60,7 @@ public function getTriggers(?string $table = null): array
                 FROM information_schema.triggers
                 WHERE trigger_schema = current_schema()
             ';
-            if ($table !== null && $table !== '' && $table !== '0') {
+            if ($this->hasTable($table)) {
                 $sql .= ' AND event_object_table = ?';
 
                 return DB::connection($this->connection)->select($sql, [$table]);

src/Mcp/Tools/DatabaseSchema/SQLiteSchemaDriver.php

@@ -36,7 +36,7 @@ public function getTriggers(?string $table = null): array
     {
         try {
             $sql = "SELECT name, sql FROM sqlite_master WHERE type = 'trigger'";
-            if ($table !== null && $table !== '' && $table !== '0') {
+            if ($this->hasTable($table)) {
                 $sql .= ' AND tbl_name = ?';
 
                 return DB::connection($this->connection)->select($sql, [$table]);

src/Mcp/Tools/ListAvailableEnvVars.php

@@ -60,7 +60,7 @@ public function handle(Request $request): Response
             return Response::error('Failed to parse .env file');
         }
 
-        $envVars = array_map('trim', $matches[1]);
+        $envVars = array_map(trim(...), $matches[1]);
 
         sort($envVars);
 

src/Mcp/Tools/SearchDocs.php

@@ -54,7 +54,7 @@ public function handle(Request $request): Response|Generator
         $packagesFilter = $request->get('packages');
 
         $queries = array_filter(
-            array_map('trim', $request->get('queries')),
+            array_map(trim(...), $request->get('queries')),
             fn (string $query): bool => $query !== '' && $query !== '*'
         );