rector

Author: limenet

composer.json

@@ -24,16 +24,16 @@
     "require-dev": {
         "driftingly/rector-laravel": "^2.0.2",
         "larastan/larastan": "^3.1",
-        "laravel/pint": "^1.21.0",
+        "laravel/pint": "^1.21.1",
         "nunomaduro/collision": "^8.6.1",
-        "orchestra/testbench": "^9.11 || ^10.0",
+        "orchestra/testbench": "^9.11 || ^10.1",
         "phpstan/extension-installer": "^1.4.3",
         "phpstan/phpstan-deprecation-rules": "^2.0.1",
         "phpstan/phpstan-phpunit": "^2.0.4",
         "phpstan/phpstan-strict-rules": "^2.0.3",
-        "phpunit/phpunit": "^11.5.10",
+        "phpunit/phpunit": "^11.5.12",
         "psr/log": "^3.0.2",
-        "rector/rector": "^2.0.9",
+        "rector/rector": "^2.0.10",
         "sentry/sentry": "^4.10.0",
         "symfony/http-client": "^7.2.4"
     },

rector.php

@@ -5,10 +5,23 @@
 use Rector\Config\RectorConfig;
 use Rector\Php55\Rector\String_\StringClassNameToClassConstantRector;
 use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
+use Rector\PHPUnit\CodeQuality\Rector\MethodCall\AssertCountWithZeroToAssertEmptyRector;
 use RectorLaravel\Set\LaravelSetList;
 
 return RectorConfig::configure()
-    ->withPreparedSets()
+    ->withPreparedSets(
+        deadCode: true,
+        codeQuality: true,
+        codingStyle: true,
+        typeDeclarations: true,
+        privatization: true,
+        naming: false,
+        instanceOf: true,
+        earlyReturn: true,
+        strictBooleans: true,
+        carbon: true,
+        phpunitCodeQuality: true,
+    )
     ->withSets([
         LaravelSetList::LARAVEL_110,
     ])
@@ -26,4 +39,5 @@
         StringClassNameToClassConstantRector::class => [
             'src/Client/ElasticaClient.php',
         ],
+        AssertCountWithZeroToAssertEmptyRector::class,
     ]);

src/Commands/DeleteCommand.php

@@ -32,6 +32,7 @@ public function handle(): int
             if (! $client->exists()) {
                 continue;
             }
+
             $this->info($index);
 
             foreach ($client->getAliases() as $alias) {

src/Events/EventHandler.php

@@ -20,7 +20,7 @@ public function subscribe(Dispatcher $events): void
             collect(ModelEventListener::EVENTS)
                 ->map(fn (string $name): string => sprintf('eloquent.%s:*', $name))
                 ->toArray(),
-            function ($event, $models) {
+            function ($event, $models): void {
                 if (! $this->elasticaClient->listensToEvents()) {
                     return;
                 }

src/Index/AbstractIndex.php

@@ -23,11 +23,7 @@
 
 abstract class AbstractIndex implements IndexInterface
 {
-    public function __construct(
-        protected ElasticaClient $client
-    ) {
-        $this->client = $client;
-    }
+    public function __construct(protected ElasticaClient $client) {}
 
     public function getMapping(): array
     {

src/Jobs/PopulateBatchIndex.php

@@ -49,15 +49,15 @@ public function handle(): void
             $esDocuments[] = $record->toElasticaDocument($this->indexConfig);
         }
 
-        if (count($esDocuments) === 0) {
+        if ($esDocuments === []) {
             return;
         }
 
         try {
             $this->index->addDocuments($esDocuments);
-        } catch (Throwable $th) {
+        } catch (Throwable $throwable) {
             if (! $this->indexConfig->ingoreIndexingErrors()) {
-                throw $th;
+                throw $throwable;
             }
         }
     }

src/Jobs/SetupIndex.php

@@ -26,6 +26,7 @@ public function handle(ElasticaClient $elastica): void
         if ($this->batch()?->cancelled() === true) {
             return;
         }
+
         $this->migrate($elastica);
         $this->cleanup($elastica);
         $this->setup($elastica);
@@ -42,7 +43,7 @@ private function migrate(ElasticaClient $elastica): void
         try {
             $response = ElasticsearchResponse::getResponse($elastica->getClient()->indices()->existsAlias(['name' => $this->indexConfig->getName()]))->asBool();
         } catch (ElasticaException) {
-            if ($index->exists() && count($index->getAliases()) === 0) {
+            if ($index->exists() && $index->getAliases() === []) {
                 $index->delete();
             }
 

tests/Feature/EventTest.php

@@ -25,7 +25,7 @@ public function test_event_create_disabled_listener(): void
         $this->index($this->productIndex);
         LaravelElasticaBridgeFacade::disableEventListener();
         $product = Product::factory()->create();
-        $this->assertNull($this->productIndex->getDocumentInstance($product));
+        $this->assertNotInstanceOf(\Elastica\Document::class, $this->productIndex->getDocumentInstance($product));
     }
 
     public function test_event_create_enabled_listener(): void
@@ -44,7 +44,7 @@ public function test_event_update_disabled_listener(): void
         LaravelElasticaBridgeFacade::disableEventListener();
         $product = Product::all()->random();
         $oldName = $product->name;
-        $newName = time();
+        $newName = \Carbon\Carbon::now()->getTimestamp();
         $product->name = $newName;
         $this->assertSame($oldName, $this->productIndex->getDocumentInstance($product)->get('name'));
         $this->assertNotSame($oldName, $newName);
@@ -59,7 +59,7 @@ public function test_event_update_enabled_listener(): void
         LaravelElasticaBridgeFacade::enableEventListener();
         $product = Product::all()->random();
         $oldName = $product->name;
-        $newName = time();
+        $newName = \Carbon\Carbon::now()->getTimestamp();
         $product->name = $newName;
         $this->assertSame($oldName, $this->productIndex->getDocumentInstance($product)->get('name'));
         $this->assertNotSame($oldName, $newName);
@@ -82,15 +82,15 @@ public function test_event_delete_enabled_listener(): void
         LaravelElasticaBridgeFacade::enableEventListener();
         $product = Product::all()->random();
         $product->delete();
-        $this->assertNull($this->productIndex->getDocumentInstance($product));
+        $this->assertNotInstanceOf(\Elastica\Document::class, $this->productIndex->getDocumentInstance($product));
     }
 
     public function test_event_delete_model_not_in_index(): void
     {
         $this->index($this->customerIndex);
         LaravelElasticaBridgeFacade::enableEventListener();
         $customer = Customer::findOrFail(1);
-        $this->assertNull($this->customerIndex->getDocumentInstance($customer));
+        $this->assertNotInstanceOf(\Elastica\Document::class, $this->customerIndex->getDocumentInstance($customer));
         $customer->delete();
         $this->assertNull($this->customerIndex->getDocumentInstance($customer));
     }

tests/Feature/TestCase.php

@@ -57,11 +57,13 @@ protected function cleanupIndices(): void
                 if ($index->getElasticaIndex()->hasAlias($index->getName())) {
                     $index->getElasticaIndex()->removeAlias($index->getName());
                 }
+
                 $active = $index->getBlueGreenActiveElasticaIndex();
                 $inactive = $index->getBlueGreenInactiveElasticaIndex();
                 if ($active->exists()) {
                     $active->delete();
                 }
+
                 if ($inactive->exists()) {
                     $inactive->delete();
                 }

tests/TestCase.php

@@ -23,7 +23,7 @@ protected function setUp(): void
         $this->setUpDatabase();
 
         Factory::guessFactoryNamesUsing(
-            fn (string $modelName) => 'Limenet\\LaravelElasticaBridge\\Tests\\Database\\Factories\\'.class_basename($modelName).'Factory'
+            fn (string $modelName): string => 'Limenet\\LaravelElasticaBridge\\Tests\\Database\\Factories\\'.class_basename($modelName).'Factory'
         );
 
         $this->seed(DatabaseSeeder::class);