psalm fixes

Author: limenet

psalm-baseline.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files psalm-version="4.7.2@83a0325c0a95c0ab531d6b90c877068b464377b5">
+  <file src="src/Commands/IndexCommand.php">
+    <PossiblyInvalidArgument occurrences="1">
+      <code>$this-&gt;argument('index')</code>
+    </PossiblyInvalidArgument>
+  </file>
+  <file src="src/Jobs/PopulateBatchIndex.php">
+    <PossiblyNullReference occurrences="1">
+      <code>cancelled</code>
+    </PossiblyNullReference>
+  </file>
+  <file src="src/Jobs/PopulateIndex.php">
+    <PossiblyNullReference occurrences="2">
+      <code>add</code>
+      <code>cancelled</code>
+    </PossiblyNullReference>
+  </file>
+</files>

psalm.xml.dist

@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="4"
+    errorLevel="3"
     findUnusedVariablesAndParams="true"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
     xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+    errorBaseline="psalm-baseline.xml"
 >
     <projectFiles>
         <directory name="src"/>

src/Commands/IndexCommand.php

@@ -61,7 +61,7 @@ public function handle()
             Bus::batch([
                 [new PopulateIndex($indexConfig)],
             ])
-                ->then(function (Batch $batch) use ($indexConfig): void {
+                ->then(function () use ($indexConfig): void {
                     dispatch(new ActivateIndex($indexConfig));
                 })
                 ->name('ES index: '.$indexConfig->getName())

src/Commands/StatusCommand.php

@@ -120,6 +120,6 @@ protected function formatBytes(int $bytes): string
         $base = log($bytes, 1024);
         $suffixes = ['', 'K', 'M', 'G', 'T'];
 
-        return round(1024 ** ($base - floor($base)), 2).' '.$suffixes[floor($base)].'B';
+        return round(1024 ** ($base - floor($base)), 2).' '.$suffixes[(int)floor($base)].'B';
     }
 }

src/Index/IndexInterface.php

@@ -71,7 +71,7 @@ public function getCreateArguments(): array;
     /**
      * Defines the types of documents found in this index. Array of classes implementing ElasticsearchableInterface.
      *
-     * @return array<class-string<Model>> Class names of Model classes
+     * @return array<string> Class names of Model classes
      */
     public function getAllowedDocuments(): array;
 

src/Jobs/PopulateBatchIndex.php

@@ -8,6 +8,7 @@
 use Illuminate\Bus\Batchable;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Database\Eloquent\Model;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
@@ -52,9 +53,10 @@ public function handle(): void
             $esDocuments[] = $record->toElasticaDocument();
         }
 
-        if (count($esDocuments) > 0) {
-            $this->index->addDocuments($esDocuments);
-            $esDocuments = [];
+        if (count($esDocuments) === 0) {
+            return;
         }
+
+        $this->index->addDocuments($esDocuments);
     }
 }

src/Jobs/PopulateIndex.php

@@ -35,14 +35,19 @@ public function handle(): void
         $index->delete();
         $index->create($this->indexConfig->getCreateArguments());
 
+        $jobs = [];
+
         foreach ($this->indexConfig->getAllowedDocuments() as $indexDocument) {
             $modelCount = $indexDocument::count();
 
             for ($batchNumber = 0; $batchNumber < ceil($modelCount / $this->indexConfig->getBatchSize()); $batchNumber++) {
-                $this->batch()->add(new PopulateBatchIndex($index, $indexDocument, $this->indexConfig->getBatchSize(), $batchNumber * $this->indexConfig->getBatchSize()));
+                $jobs[]=new PopulateBatchIndex($index, $indexDocument, $this->indexConfig->getBatchSize(), $batchNumber * $this->indexConfig->getBatchSize());
             }
         }
 
+
+        $this->batch()->add($jobs);
+
         $index->refresh();
     }
 }

src/LaravelElasticaBridgeServiceProvider.php

@@ -24,7 +24,7 @@ public function configurePackage(Package $package): void
             ->hasCommands([IndexCommand::class,StatusCommand::class]);
     }
 
-    public function packageRegistered()
+    public function packageRegistered():void
     {
         $this->app->singleton(ElasticaClient::class);
         $this->app->tag(config('elastica-bridge.indices'), 'elasticaBridgeIndices');