Merge pull request #276 from pimcore/update-php

alexz707 · web-flow · commit b5520afeb4fd · 2025-01-15T17:19:39.000+01:00
Remove php version from composer
diff --git a/.github/workflows/elastic-search-codeception.yaml b/.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:
diff --git a/.github/workflows/open-search-codeception.yaml b/.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:
diff --git a/.github/workflows/static-analysis.yaml b/.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"
diff --git a/composer.json b/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",
diff --git a/src/Command/DeploymentReindexCommand.php b/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);
     }
diff --git a/src/Command/ReindexItemsCommand.php b/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);
     }
diff --git a/src/DependencyInjection/Configuration.php b/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);
diff --git a/src/Enum/SearchIndex/FieldCategory/SystemField/SystemFieldTrait.php b/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;
 
diff --git a/src/Exception/DefaultSearch/ResultWindowTooLargeException.php b/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);
     }
diff --git a/src/Exception/DefaultSearch/SearchFailedException.php b/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);
     }
diff --git a/src/Exception/QueryLanguage/ParsingException.php b/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);
 
diff --git a/src/Model/DefaultSearch/Aggregation/AggregationList.php b/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;
diff --git a/src/Model/DefaultSearch/DefaultSearchInterface.php b/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;
 
diff --git a/src/Model/DefaultSearch/Query/QueryList.php b/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) {
diff --git a/src/Model/DefaultSearch/Search.php b/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);
 
diff --git a/src/Model/DefaultSearch/Sort/FieldSortList.php b/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;
diff --git a/src/SearchIndexAdapter/DataObject/AdapterInterface.php b/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;
 }
diff --git a/src/SearchIndexAdapter/DefaultSearch/DataObject/FieldDefinitionAdapter/AbstractAdapter.php b/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 [];
diff --git a/src/SearchIndexAdapter/DefaultSearch/DataObject/FieldDefinitionAdapter/ClassificationStoreAdapter.php b/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);
diff --git a/src/SearchIndexAdapter/DefaultSearch/DataObject/FieldDefinitionAdapter/LocalizedFieldsAdapter.php b/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)) {
diff --git a/src/SearchIndexAdapter/DefaultSearch/DataObject/FieldDefinitionAdapter/ObjectBrickAdapter.php b/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 [];
diff --git a/src/SearchIndexAdapter/DefaultSearch/DefaultSearchService.php b/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);
     }
diff --git a/src/SearchIndexAdapter/DefaultSearch/IndexAliasService.php b/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,
diff --git a/src/SearchIndexAdapter/DefaultSearch/QueryLanguage/FieldNameValidator/LocalizedFieldValidator.php b/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();
     }
diff --git a/src/SearchIndexAdapter/DefaultSearch/Search/LocateInTreeService.php b/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();
 
diff --git a/src/SearchIndexAdapter/IndexAliasServiceInterface.php b/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;
 
diff --git a/src/SearchIndexAdapter/SearchIndexServiceInterface.php b/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;
 
diff --git a/src/Service/Serializer/Denormalizer/Search/AssetSearchResultDenormalizer.php b/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);
     }
diff --git a/src/Service/Serializer/Denormalizer/Search/DataObjectSearchResultDenormalizer.php b/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);
     }
diff --git a/src/Service/Serializer/Denormalizer/Search/DocumentSearchResultDenormalizer.php b/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);
     }
diff --git a/src/Service/Serializer/Normalizer/AssetNormalizer.php b/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;
     }
diff --git a/src/Service/Serializer/Normalizer/DataObjectNormalizer.php b/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;
     }
diff --git a/src/Service/Serializer/Normalizer/DocumentNormalizer.php b/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;
     }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ final class DeploymentReindexCommand extends AbstractCommand`
`36`	`36`	`public function __construct(`
`37`	`37`	`private readonly EnqueueServiceInterface $enqueueService,`
`38`	`38`	`private readonly ClassDefinitionReindexServiceInterface $classDefinitionReindexService,`
`39`		`- string $name = null`
	`39`	`+ ?string $name = null`
`40`	`40`	`) {`
`41`	`41`	`parent::__construct($name);`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ final class ReindexItemsCommand extends AbstractCommand`
`33`	`33`
`34`	`34`	`public function __construct(`
`35`	`35`	`private readonly ReindexServiceInterface $reindexService,`
`36`		`- string $name = null`
	`36`	`+ ?string $name = null`
`37`	`37`	`) {`
`38`	`38`	`parent::__construct($name);`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`
`21`	`21`	`trait SystemFieldTrait`
`22`	`22`	`{`
`23`		`- public function getPath(string $subField = null): string`
	`23`	`+ public function getPath(?string $subField = null): string`
`24`	`24`	`{`
`25`	`25`	`$path = FieldCategory::SYSTEM_FIELDS->value . '.' . $this->value;`
`26`	`26`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public function __construct(`
`30`	`30`	`private readonly SearchInformation $searchInformation,`
`31`	`31`	`mixed $message = '',`
`32`	`32`	`mixed $code = 0,`
`33`		`- Throwable $previous = null`
	`33`	`+ ?Throwable $previous = null`
`34`	`34`	`) {`
`35`	`35`	`parent::__construct($message, $code, $previous);`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public function __construct(`
`27`	`27`	`private readonly SearchInformation $searchInformation,`
`28`	`28`	`mixed $message = '',`
`29`	`29`	`mixed $code = 0,`
`30`		`- Throwable $previous = null`
	`30`	`+ ?Throwable $previous = null`
`31`	`31`	`) {`
`32`	`32`	`parent::__construct($message, $code, $previous);`
`33`	`33`	`}`