change from protected to private where possible

Author: limenet

src/Client/ElasticaClient.php

@@ -9,9 +9,9 @@
 
 class ElasticaClient
 {
-    protected Client $client;
+    private Client $client;
 
-    protected static ?bool $listenToEvents = null;
+    private static ?bool $listenToEvents = null;
 
     public function __construct()
     {

src/Commands/DeleteCommand.php

@@ -15,8 +15,8 @@ class DeleteCommand extends Command
     protected $description = 'Delete all Elasticsearch indices known to the package';
 
     public function __construct(
-        protected ElasticaClient $elastica,
-        protected IndexRepository $indexRepository
+        private readonly ElasticaClient $elastica,
+        private readonly IndexRepository $indexRepository
     ) {
         parent::__construct();
     }

src/Commands/IndexCommand.php

@@ -6,7 +6,6 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Bus;
-use Limenet\LaravelElasticaBridge\Client\ElasticaClient;
 use Limenet\LaravelElasticaBridge\Jobs\ActivateIndex;
 use Limenet\LaravelElasticaBridge\Jobs\PopulateIndex;
 use Limenet\LaravelElasticaBridge\Jobs\SetupIndex;
@@ -19,8 +18,7 @@ class IndexCommand extends Command
     protected $description = 'Re-create the ES index and populate with data';
 
     public function __construct(
-        protected ElasticaClient $elastica,
-        protected IndexRepository $indexRepository
+        private readonly IndexRepository $indexRepository
     ) {
         parent::__construct();
     }

src/Commands/StatusCommand.php

@@ -17,8 +17,8 @@ class StatusCommand extends Command
     protected $description = 'Displays the status of the configured Elasticsearch indices';
 
     public function __construct(
-        protected ElasticaClient $elastica,
-        protected IndexRepository $indexRepository
+        private readonly ElasticaClient $elastica,
+        private readonly IndexRepository $indexRepository
     ) {
         parent::__construct();
     }
@@ -85,7 +85,7 @@ public function handle(): int
         return self::SUCCESS;
     }
 
-    protected function formatBoolean(bool $val): string
+    private function formatBoolean(bool $val): string
     {
         if ($val) {
             return '✓';
@@ -97,7 +97,7 @@ protected function formatBoolean(bool $val): string
     /**
      * @see https://stackoverflow.com/a/2510540
      */
-    protected function formatBytes(int $bytes): string
+    private function formatBytes(int $bytes): string
     {
         $base = log($bytes, 1024);
         $suffixes = ['', 'K', 'M', 'G', 'T'];

src/Index/AbstractIndex.php

@@ -20,8 +20,9 @@
 
 abstract class AbstractIndex implements IndexInterface
 {
-    public function __construct(protected ElasticaClient $client)
-    {
+    public function __construct(
+        protected ElasticaClient $client
+    ) {
         $this->client = $client;
     }
 

src/Jobs/ActivateIndex.php

@@ -8,8 +8,9 @@
 
 class ActivateIndex extends AbstractIndexJob
 {
-    public function __construct(protected IndexInterface $indexConfig)
-    {
+    public function __construct(
+        protected IndexInterface $indexConfig
+    ) {
     }
 
     public function handle(): void

src/Jobs/PopulateBatchIndex.php

@@ -24,11 +24,11 @@ class PopulateBatchIndex implements ShouldQueue
     use SerializesModels;
 
     public function __construct(
-        protected Index $index,
-        protected IndexInterface $indexConfig,
-        protected string $indexDocument,
-        protected int $limit,
-        protected int $offset
+        private readonly Index $index,
+        private readonly IndexInterface $indexConfig,
+        private readonly string $indexDocument,
+        private readonly int $limit,
+        private readonly int $offset
     ) {
     }
 

src/Jobs/PopulateIndex.php

@@ -11,8 +11,9 @@ class PopulateIndex extends AbstractIndexJob
 {
     use Batchable;
 
-    public function __construct(protected IndexInterface $indexConfig)
-    {
+    public function __construct(
+        protected IndexInterface $indexConfig
+    ) {
     }
 
     public function handle(): void

src/Jobs/SetupIndex.php

@@ -18,7 +18,7 @@ class SetupIndex extends AbstractIndexJob
 
     public function __construct(
         protected IndexInterface $indexConfig,
-        protected bool $deleteExisting
+        private readonly bool $deleteExisting
     ) {
     }
 

src/Model/ElasticsearchableTrait.php

@@ -32,13 +32,11 @@ public function toElasticaDocument(IndexInterface $indexConfig): Document
     {
         return new Document(
             $this->getElasticsearchId(),
-            array_merge(
-                $this->toElasticsearch($indexConfig),
-                [
-                    IndexInterface::DOCUMENT_MODEL_CLASS => $this::class,
-                    IndexInterface::DOCUMENT_MODEL_ID => $this->id,
-                ]
-            )
+            [
+                ...$this->toElasticsearch($indexConfig),
+                IndexInterface::DOCUMENT_MODEL_CLASS => $this::class,
+                IndexInterface::DOCUMENT_MODEL_ID => $this->id,
+            ]
         );
     }
 }

src/Repository/IndexRepository.php

@@ -13,7 +13,7 @@
  */
 class IndexRepository
 {
-    protected array $indices;
+    private array $indices;
 
     public function __construct(array $indices)
     {

src/Services/ModelEventListener.php

@@ -30,8 +30,9 @@ class ModelEventListener
         self::EVENT_DELETED,
     ];
 
-    public function __construct(protected IndexRepository $indexRepository)
-    {
+    public function __construct(
+        private readonly IndexRepository $indexRepository
+    ) {
     }
 
     public function handle(string $event, Model $model): void
@@ -58,13 +59,13 @@ public function handle(string $event, Model $model): void
     }
 
     /** @param  ElasticsearchableInterface&Model  $model */
-    protected function ensureModelPresentInIndex(IndexInterface $index, Model $model): void
+    private function ensureModelPresentInIndex(IndexInterface $index, Model $model): void
     {
         $index->getElasticaIndex()->addDocument($model->toElasticaDocument($index));
     }
 
     /** @param  ElasticsearchableInterface&Model  $model */
-    protected function ensureModelMissingFromIndex(IndexInterface $index, Model $model): void
+    private function ensureModelMissingFromIndex(IndexInterface $index, Model $model): void
     {
         try {
             $index->getElasticaIndex()->deleteById($model->getElasticsearchId());