From 3c1522f3382658bbc4d6cbd8381a212b30bc6de3 Mon Sep 17 00:00:00 2001
From: Herbert Roth <herbert.roth@pimcore.com>
Date: Mon, 15 Jan 2024 08:33:13 +0100
Subject: [PATCH] Add strict_types. Change docker container to dev. Add
 php-cs-fixer to composer. Fix PSR-4 autoload config. Fix composer name.

---
 .gitignore                                                 | 3 ++-
 composer.json                                              | 7 ++++---
 docker-compose.yml                                         | 4 ++--
 src/Command/Update/IndexUpdateCommand.php                  | 1 +
 .../Compiler/SearchIndexFieldDefinitionPass.php            | 1 +
 src/DependencyInjection/Configuration.php                  | 1 +
 .../PimcoreGenericDataIndexExtension.php                   | 1 +
 src/Entity/IndexQueue.php                                  | 1 +
 src/Enum/DependencyInjection/CompilerPassTag.php           | 1 +
 src/Enum/SearchIndex/ElementType.php                       | 1 +
 src/Enum/SearchIndex/FieldCategory.php                     | 1 +
 src/Enum/SearchIndex/FieldCategory/SystemField.php         | 1 +
 src/Enum/SearchIndex/IndexQueueOperation.php               | 1 +
 src/Enum/SearchIndex/OpenSearch/AttributeType.php          | 1 +
 src/Message/IndexUpdateQueueMessage.php                    | 1 +
 src/MessageHandler/IndexUpdateQueueHandler.php             | 1 +
 src/PimcoreGenericDataIndexBundle.php                      | 1 +
 src/Service/DataObject/SelectOptionsService.php            | 1 +
 .../Messenger/Middleware/CollectGarbageMiddleware.php      | 1 +
 .../DataObject/FieldDefinitionAdapter/BooleanAdapter.php   | 1 +
 .../DataObject/FieldDefinitionAdapter/DateAdapter.php      | 1 +
 .../DataObject/FieldDefinitionAdapter/DateTimeAdapter.php  | 1 +
 .../DataObject/FieldDefinitionAdapter/DefaultAdapter.php   | 1 +
 .../FieldDefinitionAdapterInterface.php                    | 1 +
 .../FieldDefinitionAdapter/LocalizedFieldsAdapter.php      | 1 +
 .../FieldDefinitionAdapter/MultiSelectAdapter.php          | 1 +
 .../DataObject/FieldDefinitionAdapter/NumericAdapter.php   | 1 +
 .../FieldDefinitionAdapter/QuantityValueAdapter.php        | 1 +
 .../DataObject/FieldDefinitionAdapter/SelectAdapter.php    | 1 +
 .../DataObject/FieldDefinitionAdapter/TextAdapter.php      | 1 +
 .../SearchIndex/DataObject/FieldDefinitionService.php      | 1 +
 src/Service/SearchIndex/IndexQueueService.php              | 1 +
 .../SearchIndex/IndexService/AbstractIndexService.php      | 1 +
 src/Service/SearchIndex/IndexService/AssetIndexService.php | 1 +
 .../SearchIndex/IndexService/DataObjectIndexService.php    | 1 +
 src/Service/SearchIndex/IndexServiceInterface.php          | 1 +
 src/Service/SearchIndex/IndexUpdateService.php             | 1 +
 src/Service/SearchIndex/LanguageService.php                | 1 +
 .../SearchIndex/OpenSearch/BulkOperationService.php        | 1 +
 src/Service/SearchIndex/OpenSearch/OpenSearchService.php   | 1 +
 src/Service/SearchIndex/SearchIndexConfigService.php       | 1 +
 src/Service/Workflow/WorkflowService.php                   | 1 +
 src/Traits/LoggerAwareTrait.php                            | 1 +
 43 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index c78ed7ab..0cb72a3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,4 +46,5 @@ package-lock.json
 /.env
 /.htaccess
 /auth.json
-/config.json
\ No newline at end of file
+/config.json
+/composer.phar
diff --git a/composer.json b/composer.json
index 739e6aa0..b9f59895 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name": "pimcore/x-template-name-bundle-x",
+  "name": "pimcore/generic-data-index-bundle",
   "license": "Pimcore Enterprise License (PEL)",
   "type": "pimcore-bundle",
   "description": "Pimcore xTemplate Bundlex",
@@ -34,11 +34,12 @@
     "phpunit/phpunit": "10.2.7",
     "nyholm/psr7": "^1",
     "symfony/phpunit-bridge": "^6",
-    "fakerphp/faker": "^1.23"
+    "fakerphp/faker": "^1.23",
+    "friendsofphp/php-cs-fixer": "^3.4"
   },
   "autoload": {
     "psr-4": {
-      "Pimcore\\Bundle\\xTemplateBundlex\\": "src/",
+      "Pimcore\\Bundle\\GenericDataIndexBundle\\": "src/",
       "Pimcore\\": "core-extension/Pimcore/"
     }
   },
diff --git a/docker-compose.yml b/docker-compose.yml
index 2b94ee61..58320e0a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.0'
 services:
-    php-x-template-bundle-x:
-        image: pimcore/pimcore:php8.2-debug-latest
+    php-generic-data-index-bundle:
+        image: pimcore/pimcore:php8.2-debug-dev
         environment:
             PHP_IDE_CONFIG: serverName=localhost
         volumes:
diff --git a/src/Command/Update/IndexUpdateCommand.php b/src/Command/Update/IndexUpdateCommand.php
index a0a11aea..4cbe32f0 100644
--- a/src/Command/Update/IndexUpdateCommand.php
+++ b/src/Command/Update/IndexUpdateCommand.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/DependencyInjection/Compiler/SearchIndexFieldDefinitionPass.php b/src/DependencyInjection/Compiler/SearchIndexFieldDefinitionPass.php
index f7d0f611..a061a872 100644
--- a/src/DependencyInjection/Compiler/SearchIndexFieldDefinitionPass.php
+++ b/src/DependencyInjection/Compiler/SearchIndexFieldDefinitionPass.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/DependencyInjection/Configuration.php b/src/DependencyInjection/Configuration.php
index b4054946..cf3bea40 100644
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/DependencyInjection/PimcoreGenericDataIndexExtension.php b/src/DependencyInjection/PimcoreGenericDataIndexExtension.php
index 024977dd..033238c2 100644
--- a/src/DependencyInjection/PimcoreGenericDataIndexExtension.php
+++ b/src/DependencyInjection/PimcoreGenericDataIndexExtension.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Entity/IndexQueue.php b/src/Entity/IndexQueue.php
index 5b039430..a368f20f 100644
--- a/src/Entity/IndexQueue.php
+++ b/src/Entity/IndexQueue.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Enum/DependencyInjection/CompilerPassTag.php b/src/Enum/DependencyInjection/CompilerPassTag.php
index bdd3949b..57545e43 100644
--- a/src/Enum/DependencyInjection/CompilerPassTag.php
+++ b/src/Enum/DependencyInjection/CompilerPassTag.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Enum/SearchIndex/ElementType.php b/src/Enum/SearchIndex/ElementType.php
index 74e9b180..ef066690 100644
--- a/src/Enum/SearchIndex/ElementType.php
+++ b/src/Enum/SearchIndex/ElementType.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Enum/SearchIndex/FieldCategory.php b/src/Enum/SearchIndex/FieldCategory.php
index c3a2b9d3..179f191c 100644
--- a/src/Enum/SearchIndex/FieldCategory.php
+++ b/src/Enum/SearchIndex/FieldCategory.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Enum/SearchIndex/FieldCategory/SystemField.php b/src/Enum/SearchIndex/FieldCategory/SystemField.php
index 28cc7193..15d1e121 100644
--- a/src/Enum/SearchIndex/FieldCategory/SystemField.php
+++ b/src/Enum/SearchIndex/FieldCategory/SystemField.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Enum/SearchIndex/IndexQueueOperation.php b/src/Enum/SearchIndex/IndexQueueOperation.php
index 5080224d..0a08cc59 100644
--- a/src/Enum/SearchIndex/IndexQueueOperation.php
+++ b/src/Enum/SearchIndex/IndexQueueOperation.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Enum/SearchIndex/OpenSearch/AttributeType.php b/src/Enum/SearchIndex/OpenSearch/AttributeType.php
index 8ff7ce99..1f2e92ea 100644
--- a/src/Enum/SearchIndex/OpenSearch/AttributeType.php
+++ b/src/Enum/SearchIndex/OpenSearch/AttributeType.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Message/IndexUpdateQueueMessage.php b/src/Message/IndexUpdateQueueMessage.php
index ea467fe3..d2c72087 100644
--- a/src/Message/IndexUpdateQueueMessage.php
+++ b/src/Message/IndexUpdateQueueMessage.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/MessageHandler/IndexUpdateQueueHandler.php b/src/MessageHandler/IndexUpdateQueueHandler.php
index 2bfe1f10..21e51def 100644
--- a/src/MessageHandler/IndexUpdateQueueHandler.php
+++ b/src/MessageHandler/IndexUpdateQueueHandler.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/PimcoreGenericDataIndexBundle.php b/src/PimcoreGenericDataIndexBundle.php
index 3f2af4d6..e128d242 100644
--- a/src/PimcoreGenericDataIndexBundle.php
+++ b/src/PimcoreGenericDataIndexBundle.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/DataObject/SelectOptionsService.php b/src/Service/DataObject/SelectOptionsService.php
index 827d6bdd..81e574af 100644
--- a/src/Service/DataObject/SelectOptionsService.php
+++ b/src/Service/DataObject/SelectOptionsService.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/Messenger/Middleware/CollectGarbageMiddleware.php b/src/Service/Messenger/Middleware/CollectGarbageMiddleware.php
index ae9d2e16..9cc2a7b5 100644
--- a/src/Service/Messenger/Middleware/CollectGarbageMiddleware.php
+++ b/src/Service/Messenger/Middleware/CollectGarbageMiddleware.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/BooleanAdapter.php b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/BooleanAdapter.php
index bdc91e67..82b2cbe0 100644
--- a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/BooleanAdapter.php
+++ b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/BooleanAdapter.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/DateAdapter.php b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/DateAdapter.php
index aa595052..89ae5a7d 100644
--- a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/DateAdapter.php
+++ b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/DateAdapter.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/DateTimeAdapter.php b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/DateTimeAdapter.php
index b8a00f31..a08aac75 100644
--- a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/DateTimeAdapter.php
+++ b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/DateTimeAdapter.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/DefaultAdapter.php b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/DefaultAdapter.php
index 3b069a6f..f09ece20 100644
--- a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/DefaultAdapter.php
+++ b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/DefaultAdapter.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/FieldDefinitionAdapterInterface.php b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/FieldDefinitionAdapterInterface.php
index e614f9ba..3b63bba0 100644
--- a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/FieldDefinitionAdapterInterface.php
+++ b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/FieldDefinitionAdapterInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/LocalizedFieldsAdapter.php b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/LocalizedFieldsAdapter.php
index 72107ad7..c1a48db9 100644
--- a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/LocalizedFieldsAdapter.php
+++ b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/LocalizedFieldsAdapter.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/MultiSelectAdapter.php b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/MultiSelectAdapter.php
index fee24873..db253b79 100644
--- a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/MultiSelectAdapter.php
+++ b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/MultiSelectAdapter.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/NumericAdapter.php b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/NumericAdapter.php
index 95f64ba4..d6646d4e 100644
--- a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/NumericAdapter.php
+++ b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/NumericAdapter.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/QuantityValueAdapter.php b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/QuantityValueAdapter.php
index a52b2312..5e573a24 100644
--- a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/QuantityValueAdapter.php
+++ b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/QuantityValueAdapter.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/SelectAdapter.php b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/SelectAdapter.php
index 850bff9c..560d3840 100644
--- a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/SelectAdapter.php
+++ b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/SelectAdapter.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/TextAdapter.php b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/TextAdapter.php
index e5136357..802a214d 100644
--- a/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/TextAdapter.php
+++ b/src/Service/SearchIndex/DataObject/FieldDefinitionAdapter/TextAdapter.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/DataObject/FieldDefinitionService.php b/src/Service/SearchIndex/DataObject/FieldDefinitionService.php
index a0352cf0..20243e5a 100644
--- a/src/Service/SearchIndex/DataObject/FieldDefinitionService.php
+++ b/src/Service/SearchIndex/DataObject/FieldDefinitionService.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/IndexQueueService.php b/src/Service/SearchIndex/IndexQueueService.php
index 81a8ff1c..6e9c1622 100644
--- a/src/Service/SearchIndex/IndexQueueService.php
+++ b/src/Service/SearchIndex/IndexQueueService.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/IndexService/AbstractIndexService.php b/src/Service/SearchIndex/IndexService/AbstractIndexService.php
index ba7f6bb4..ba17ae1d 100644
--- a/src/Service/SearchIndex/IndexService/AbstractIndexService.php
+++ b/src/Service/SearchIndex/IndexService/AbstractIndexService.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/IndexService/AssetIndexService.php b/src/Service/SearchIndex/IndexService/AssetIndexService.php
index b937ef7d..6d07ba58 100644
--- a/src/Service/SearchIndex/IndexService/AssetIndexService.php
+++ b/src/Service/SearchIndex/IndexService/AssetIndexService.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/IndexService/DataObjectIndexService.php b/src/Service/SearchIndex/IndexService/DataObjectIndexService.php
index ce47d071..c0143703 100644
--- a/src/Service/SearchIndex/IndexService/DataObjectIndexService.php
+++ b/src/Service/SearchIndex/IndexService/DataObjectIndexService.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/IndexServiceInterface.php b/src/Service/SearchIndex/IndexServiceInterface.php
index 93d2cc20..9c387fff 100644
--- a/src/Service/SearchIndex/IndexServiceInterface.php
+++ b/src/Service/SearchIndex/IndexServiceInterface.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/IndexUpdateService.php b/src/Service/SearchIndex/IndexUpdateService.php
index dccc984d..822fb097 100644
--- a/src/Service/SearchIndex/IndexUpdateService.php
+++ b/src/Service/SearchIndex/IndexUpdateService.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/LanguageService.php b/src/Service/SearchIndex/LanguageService.php
index 999330a8..06ee8ca0 100644
--- a/src/Service/SearchIndex/LanguageService.php
+++ b/src/Service/SearchIndex/LanguageService.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/OpenSearch/BulkOperationService.php b/src/Service/SearchIndex/OpenSearch/BulkOperationService.php
index 2e3b22dd..6a2e48da 100644
--- a/src/Service/SearchIndex/OpenSearch/BulkOperationService.php
+++ b/src/Service/SearchIndex/OpenSearch/BulkOperationService.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/OpenSearch/OpenSearchService.php b/src/Service/SearchIndex/OpenSearch/OpenSearchService.php
index 17eedb9c..15271be1 100644
--- a/src/Service/SearchIndex/OpenSearch/OpenSearchService.php
+++ b/src/Service/SearchIndex/OpenSearch/OpenSearchService.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/SearchIndex/SearchIndexConfigService.php b/src/Service/SearchIndex/SearchIndexConfigService.php
index 1b96b6fb..43463353 100644
--- a/src/Service/SearchIndex/SearchIndexConfigService.php
+++ b/src/Service/SearchIndex/SearchIndexConfigService.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Service/Workflow/WorkflowService.php b/src/Service/Workflow/WorkflowService.php
index 0d29114f..6bbbec23 100644
--- a/src/Service/Workflow/WorkflowService.php
+++ b/src/Service/Workflow/WorkflowService.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore
diff --git a/src/Traits/LoggerAwareTrait.php b/src/Traits/LoggerAwareTrait.php
index ec937afa..ecac3502 100644
--- a/src/Traits/LoggerAwareTrait.php
+++ b/src/Traits/LoggerAwareTrait.php
@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 /**
  * Pimcore