Remove php version from composer

.github/workflows/elastic-search-codeception.yaml

@@ -30,7 +30,7 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev as 11.99.9", experimental: true, search_engine: "elasticsearch"}
+                    - { php-version: "8.4", dependencies: "highest", pimcore_version: "12.x-dev as 12.99.9", experimental: true, search_engine: "elasticsearch"}
 
         services:
             mariadb:

.github/workflows/open-search-codeception.yaml

@@ -30,9 +30,9 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { php-version: "8.2", dependencies: "lowest", pimcore_version: "", experimental: false, search_engine: "openSearch" }
-                    - { php-version: "8.3", dependencies: "highest", pimcore_version: "", experimental: false, search_engine: "openSearch"}
-                    - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev as 11.99.9", experimental: true, search_engine: "openSearch"}
+                    - { php-version: "8.3", dependencies: "lowest", pimcore_version: "", experimental: false, search_engine: "openSearch" }
+                    - { php-version: "8.4", dependencies: "highest", pimcore_version: "", experimental: false, search_engine: "openSearch"}
+                    - { php-version: "8.4", dependencies: "highest", pimcore_version: "12.x-dev as 12.99.9", experimental: true, search_engine: "openSearch"}
 
         services:
             mariadb:

.github/workflows/static-analysis.yaml

@@ -24,9 +24,9 @@ jobs:
         strategy:
             matrix:
                 include:
-                    - { php-version: "8.2", dependencies: "lowest", experimental: false }
-                    - { php-version: "8.3", dependencies: "highest", experimental: false }
-                    - { php-version: "8.3", dependencies: "highest", pimcore_version: "11.x-dev as 11.99.9", experimental: true }
+                    - { php-version: "8.3", dependencies: "lowest", experimental: false }
+                    - { php-version: "8.4", dependencies: "highest", experimental: false }
+                    - { php-version: "8.4", dependencies: "highest", pimcore_version: "12.x-dev as 12.99.9", experimental: true }
         steps:
             - name: "Checkout code"
               uses: "actions/checkout@v2"

composer.json

@@ -17,8 +17,8 @@
   "prefer-stable": true,
   "minimum-stability": "dev",
   "require": {
-    "php": "~8.2.0 || ~8.3.0 ",
-    "pimcore/pimcore": "^v11.5",
+    "php": "~8.3.0 || ~8.4.0 ",
+    "pimcore/pimcore": "^12.x-dev",
     "pimcore/static-resolver-bundle": "^1.4.0 || ^2.0",
     "pimcore/opensearch-client": "^1.1",
     "pimcore/elasticsearch-client": "^1.1",

src/Command/DeploymentReindexCommand.php

@@ -36,7 +36,7 @@ final class DeploymentReindexCommand extends AbstractCommand
     public function __construct(
         private readonly EnqueueServiceInterface $enqueueService,
         private readonly ClassDefinitionReindexServiceInterface $classDefinitionReindexService,
-        string $name = null
+        ?string $name = null
     ) {
         parent::__construct($name);
     }

src/Command/ReindexItemsCommand.php

@@ -33,7 +33,7 @@ final class ReindexItemsCommand extends AbstractCommand
 
     public function __construct(
         private readonly ReindexServiceInterface $reindexService,
-        string $name = null
+        ?string $name = null
     ) {
         parent::__construct($name);
     }

src/DependencyInjection/Configuration.php

@@ -131,8 +131,11 @@ public function getConfigTreeBuilder(): TreeBuilder
         return $treeBuilder;
     }
 
-    private function buildVariableNode(string $name, array $defaultValue = [], string $documentation = null): NodeDefinition
-    {
+    private function buildVariableNode(
+        string $name,
+        array $defaultValue = [],
+        ?string $documentation = null
+    ): NodeDefinition {
         $node = new VariableNodeDefinition($name);
         if ($documentation) {
             $node->info($documentation);

src/Enum/SearchIndex/FieldCategory/SystemField/SystemFieldTrait.php

@@ -20,7 +20,7 @@
 
 trait SystemFieldTrait
 {
-    public function getPath(string $subField = null): string
+    public function getPath(?string $subField = null): string
     {
         $path = FieldCategory::SYSTEM_FIELDS->value . '.' . $this->value;
 

src/Exception/DefaultSearch/ResultWindowTooLargeException.php

@@ -30,7 +30,7 @@ public function __construct(
         private readonly SearchInformation $searchInformation,
         mixed $message = '',
         mixed $code = 0,
-        Throwable $previous = null
+        ?Throwable $previous = null
     ) {
         parent::__construct($message, $code, $previous);
     }

src/Exception/DefaultSearch/SearchFailedException.php

@@ -27,7 +27,7 @@ public function __construct(
         private readonly SearchInformation $searchInformation,
         mixed $message = '',
         mixed $code = 0,
-        Throwable $previous = null
+        ?Throwable $previous = null
     ) {
         parent::__construct($message, $code, $previous);
     }

src/Exception/QueryLanguage/ParsingException.php

@@ -28,7 +28,7 @@ public function __construct(
         private readonly ?Token $token,
         ?string $message = null,
         private readonly ?int $position = null,
-        Exception $previous = null
+        ?Exception $previous = null
     ) {
         $message = $message ?? sprintf('Expected %s, found %s.', $expected, $found);
 

src/Model/DefaultSearch/Aggregation/AggregationList.php

@@ -24,7 +24,7 @@ public function __construct(
     ) {
     }
 
-    public function addAggregation(Aggregation $aggregation = null): AggregationList
+    public function addAggregation(?Aggregation $aggregation = null): AggregationList
     {
         if ($aggregation !== null) {
             $this->aggregations[] = $aggregation;

src/Model/DefaultSearch/DefaultSearchInterface.php

@@ -27,7 +27,7 @@
  */
 interface DefaultSearchInterface extends AdapterSearchInterface
 {
-    public function addQuery(QueryInterface $query = null): DefaultSearchInterface;
+    public function addQuery(?QueryInterface $query = null): DefaultSearchInterface;
 
     public function addSort(FieldSort $sort): DefaultSearchInterface;
 

src/Model/DefaultSearch/Query/QueryList.php

@@ -32,7 +32,7 @@ public function __construct(
     ) {
     }
 
-    public function addQuery(QueryInterface $query = null): QueryList
+    public function addQuery(?QueryInterface $query = null): QueryList
     {
         if ($query instanceof BoolQuery && !$query->isEmpty()) {
             if ($this->boolQuery !== null) {

src/Model/DefaultSearch/Search.php

@@ -74,7 +74,7 @@ public function setSource(bool|array|string|null $source): DefaultSearchInterfac
         return $this;
     }
 
-    public function addQuery(QueryInterface $query = null): DefaultSearchInterface
+    public function addQuery(?QueryInterface $query = null): DefaultSearchInterface
     {
         $this->queryList->addQuery($query);
 

src/Model/DefaultSearch/Sort/FieldSortList.php

@@ -24,7 +24,7 @@ public function __construct(
     ) {
     }
 
-    public function addSort(FieldSort $sort = null): FieldSortList
+    public function addSort(?FieldSort $sort = null): FieldSortList
     {
         if ($sort !== null) {
             $this->sort[] = $sort;

src/SearchIndexAdapter/DataObject/AdapterInterface.php

@@ -47,6 +47,6 @@ public function getInheritedData(
         mixed $value,
         string $key,
         ?string $language = null,
-        callable $callback = null
+        ?callable $callback = null
     ): array;
 }

src/SearchIndexAdapter/DefaultSearch/DataObject/FieldDefinitionAdapter/AbstractAdapter.php

@@ -76,7 +76,7 @@ public function getInheritedData(
         mixed $value,
         string $key,
         ?string $language = null,
-        callable $callback = null
+        ?callable $callback = null
     ): array {
         if (!$this->fieldDefinition->isEmpty($value)) {
             return [];

src/SearchIndexAdapter/DefaultSearch/DataObject/FieldDefinitionAdapter/ClassificationStoreAdapter.php

@@ -117,7 +117,7 @@ public function getInheritedData(
         mixed $value,
         string $key,
         ?string $language = null,
-        callable $callback = null
+        ?callable $callback = null
     ): array {
         $classificationStore = $this->getClassificationStoreDefinition();
         $languages = $this->getValidLanguages($classificationStore);

src/SearchIndexAdapter/DefaultSearch/DataObject/FieldDefinitionAdapter/LocalizedFieldsAdapter.php

@@ -97,7 +97,7 @@ public function getInheritedData(
         mixed $value,
         string $key,
         ?string $language = null,
-        callable $callback = null
+        ?callable $callback = null
     ): array {
         $indexData = $this->getIndexData($value);
         if (empty($indexData)) {

src/SearchIndexAdapter/DefaultSearch/DataObject/FieldDefinitionAdapter/ObjectBrickAdapter.php

@@ -97,7 +97,7 @@ public function getInheritedData(
         mixed $value,
         string $key,
         ?string $language = null,
-        callable $callback = null
+        ?callable $callback = null
     ): array {
         if (!$value instanceof Objectbrick) {
             return [];

src/SearchIndexAdapter/DefaultSearch/DefaultSearchService.php

@@ -125,7 +125,7 @@ public function reindex(string $indexName, array $mapping): void
         $this->switchIndexAliasAndCleanup($indexName, $oldIndexName, $newIndexName);
     }
 
-    public function createIndex(string $indexName, array $mappings = null): DefaultSearchService
+    public function createIndex(string $indexName, ?array $mappings = null): DefaultSearchService
     {
         $this->deleteIndex($indexName, true);
 
@@ -161,7 +161,7 @@ public function addAlias(string $aliasName, string $indexName): array
         return $this->indexAliasService->addAlias($aliasName, $indexName);
     }
 
-    public function existsAlias(string $aliasName, string $indexName = null): bool
+    public function existsAlias(string $aliasName, ?string $indexName = null): bool
     {
         return $this->indexAliasService->existsAlias($aliasName, $indexName);
     }

src/SearchIndexAdapter/DefaultSearch/IndexAliasService.php

@@ -47,7 +47,7 @@ public function addAlias(string $aliasName, string $indexName): array
         return $this->client->updateIndexAliases($params);
     }
 
-    public function existsAlias(string $aliasName, string $indexName = null): bool
+    public function existsAlias(string $aliasName, ?string $indexName = null): bool
     {
         return $this->client->existsIndexAlias([
             'name' => $aliasName,

src/SearchIndexAdapter/DefaultSearch/QueryLanguage/FieldNameValidator/LocalizedFieldValidator.php

@@ -32,7 +32,7 @@
 
     public function __construct(
         private MappingAnalyzerServiceInterface $mappingAnalyzerService,
-        string $defaultLanguage = null
+        ?string $defaultLanguage = null
     ) {
         $this->defaultLocale = $defaultLanguage ?? Tool::getDefaultLanguage();
     }

src/SearchIndexAdapter/DefaultSearch/Search/LocateInTreeService.php

@@ -90,8 +90,8 @@ private function getElementPosition(SearchInterface $search, int $elementId): ?i
 
     private function createDefaultSearch(
         SearchInterface $search,
-        int $pageSize = null,
-        SearchResult $searchAfterSearchResult = null
+        ?int $pageSize = null,
+        ?SearchResult $searchAfterSearchResult = null
     ): Search {
         $pageSize = $pageSize ?? $search->getPageSize();
 

src/SearchIndexAdapter/IndexAliasServiceInterface.php

@@ -23,7 +23,7 @@ interface IndexAliasServiceInterface
 {
     public function addAlias(string $aliasName, string $indexName): array;
 
-    public function existsAlias(string $aliasName, string $indexName = null): bool;
+    public function existsAlias(string $aliasName, ?string $indexName = null): bool;
 
     public function deleteAlias(string $indexName, string $aliasName): array;
 

src/SearchIndexAdapter/SearchIndexServiceInterface.php

@@ -37,11 +37,11 @@ public function getCurrentIndexVersion(string $indexName): string;
      */
     public function reindex(string $indexName, array $mapping): void;
 
-    public function createIndex(string $indexName, array $mappings = null): self;
+    public function createIndex(string $indexName, ?array $mappings = null): self;
 
     public function addAlias(string $aliasName, string $indexName): array;
 
-    public function existsAlias(string $aliasName, string $indexName = null): bool;
+    public function existsAlias(string $aliasName, ?string $indexName = null): bool;
 
     public function deleteAlias(string $indexName, string $aliasName): array;
 

src/Service/Serializer/Denormalizer/Search/AssetSearchResultDenormalizer.php

@@ -38,7 +38,7 @@ public function __construct(
     public function denormalize(
         mixed $data,
         string $type,
-        string $format = null,
+        ?string $format = null,
         array $context = []
     ): AssetSearchResultItem {
 
@@ -80,7 +80,7 @@ public function denormalize(
 
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null): bool
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null): bool
     {
         return is_array($data) && is_subclass_of($type, AssetSearchResultItem::class);
     }

src/Service/Serializer/Denormalizer/Search/DataObjectSearchResultDenormalizer.php

@@ -37,7 +37,7 @@ public function __construct(
     public function denormalize(
         mixed $data,
         string $type,
-        string $format = null,
+        ?string $format = null,
         array $context = []
     ): DataObjectSearchResultItem {
 
@@ -92,7 +92,7 @@ public function denormalize(
 
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null): bool
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null): bool
     {
         return is_array($data) && is_subclass_of($type, DataObjectSearchResultItem::class);
     }

src/Service/Serializer/Denormalizer/Search/DocumentSearchResultDenormalizer.php

@@ -35,7 +35,7 @@ public function __construct(
     public function denormalize(
         mixed $data,
         string $type,
-        string $format = null,
+        ?string $format = null,
         array $context = []
     ): DocumentSearchResultItem {
 
@@ -74,7 +74,7 @@ public function denormalize(
             ->setHasWorkflowWithPermissions(SystemField::HAS_WORKFLOW_WITH_PERMISSIONS->getData($data));
     }
 
-    public function supportsDenormalization(mixed $data, string $type, string $format = null): bool
+    public function supportsDenormalization(mixed $data, string $type, ?string $format = null): bool
     {
         return is_array($data) && is_subclass_of($type, DocumentSearchResultItem::class);
     }

src/Service/Serializer/Normalizer/AssetNormalizer.php

@@ -46,7 +46,7 @@ public function __construct(
     ) {
     }
 
-    public function normalize(mixed $object, string $format = null, array $context = []): array
+    public function normalize(mixed $object, ?string $format = null, array $context = []): array
     {
         $skipLazyLoadedFields = SerializerContext::SKIP_LAZY_LOADED_FIELDS->containedInContext($context);
 
@@ -63,7 +63,7 @@ public function normalize(mixed $object, string $format = null, array $context =
         return [];
     }
 
-    public function supportsNormalization(mixed $data, string $format = null): bool
+    public function supportsNormalization(mixed $data, ?string $format = null): bool
     {
         return $data instanceof Asset;
     }

src/Service/Serializer/Normalizer/DataObjectNormalizer.php

@@ -52,7 +52,7 @@ public function __construct(
      *
      * @throws Exception
      */
-    public function normalize(mixed $object, string $format = null, array $context = []): array
+    public function normalize(mixed $object, ?string $format = null, array $context = []): array
     {
         $skipLazyLoadedFields = SerializerContext::SKIP_LAZY_LOADED_FIELDS->containedInContext($context);
 
@@ -69,7 +69,7 @@ public function normalize(mixed $object, string $format = null, array $context =
         return [];
     }
 
-    public function supportsNormalization(mixed $data, string $format = null): bool
+    public function supportsNormalization(mixed $data, ?string $format = null): bool
     {
         return $data instanceof AbstractObject;
     }

src/Service/Serializer/Normalizer/DocumentNormalizer.php

@@ -42,7 +42,7 @@ public function __construct(
     ) {
     }
 
-    public function normalize(mixed $object, string $format = null, array $context = []): array
+    public function normalize(mixed $object, ?string $format = null, array $context = []): array
     {
         $skipLazyLoadedFields = SerializerContext::SKIP_LAZY_LOADED_FIELDS->containedInContext($context);
 
@@ -59,7 +59,7 @@ public function normalize(mixed $object, string $format = null, array $context =
         return [];
     }
 
-    public function supportsNormalization(mixed $data, string $format = null): bool
+    public function supportsNormalization(mixed $data, ?string $format = null): bool
     {
         return $data instanceof Document;
     }