Merge pull request #5442 from dlubitz/90/task/explicit-nullable-param…

…eter-84 TASK: Make nullable parameter explicit to become PHP 8.4 compatible
neos · Jan 17, 2025 · d6e578f · d6e578f
2 parents f638792 + ff97999
commit d6e578f
Show file tree

Hide file tree

Showing 58 changed files with 216 additions and 216 deletions.
diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ProjectionContentGraph.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Repository/ProjectionContentGraph.php
@@ -399,7 +399,7 @@ public function getIngoingHierarchyRelationsForNodeAndSubgraph(
     public function findIngoingHierarchyRelationsForNode(
         NodeRelationAnchorPoint $childAnchorPoint,
         ContentStreamId $contentStreamId,
-        DimensionSpacePointSet $restrictToSet = null
+        ?DimensionSpacePointSet $restrictToSet = null
     ): array {
         $ingoingHierarchyRelationsStatement = <<<SQL
             SELECT
@@ -439,7 +439,7 @@ public function findIngoingHierarchyRelationsForNode(
     public function findOutgoingHierarchyRelationsForNode(
         NodeRelationAnchorPoint $parentAnchorPoint,
         ContentStreamId $contentStreamId,
-        DimensionSpacePointSet $restrictToSet = null
+        ?DimensionSpacePointSet $restrictToSet = null
     ): array {
         $outgoingHierarchyRelationsStatement = <<<SQL
             SELECT
@@ -512,7 +512,7 @@ public function findOutgoingHierarchyRelationsForNodeAggregate(
     public function findIngoingHierarchyRelationsForNodeAggregate(
         ContentStreamId $contentStreamId,
         NodeAggregateId $nodeAggregateId,
-        DimensionSpacePointSet $dimensionSpacePointSet = null
+        ?DimensionSpacePointSet $dimensionSpacePointSet = null
     ): array {
         $ingoingHierarchyRelationsStatement = <<<SQL
             SELECT

diff --git a/...s/Classes/ProjectionRaceConditionTester/Command/RaceConditionTrackerCommandController.php b/...s/Classes/ProjectionRaceConditionTester/Command/RaceConditionTrackerCommandController.php
@@ -52,7 +52,7 @@ public function resetCommand(): void
      * @param string|null $storeTrace The path to store the full trace in NDJSON format (optional).
      * @internal
      */
-    public function analyzeTraceCommand(string $storeTrace = null): void
+    public function analyzeTraceCommand(?string $storeTrace = null): void
     {
         RedisInterleavingLogger::connect($this->configuration['redis']['host'], $this->configuration['redis']['port']);
         $traces = RedisInterleavingLogger::getTraces();

diff --git a/Neos.ContentRepository.Core/Classes/DimensionSpace/InterDimensionalVariationGraph.php b/Neos.ContentRepository.Core/Classes/DimensionSpace/InterDimensionalVariationGraph.php
@@ -326,7 +326,7 @@ public function getWeightedGeneralizations(DimensionSpacePoint $specialization):
     public function getSpecializationSet(
         DimensionSpacePoint $origin,
         bool $includeOrigin = true,
-        DimensionSpacePointSet $excludedSet = null
+        ?DimensionSpacePointSet $excludedSet = null
     ): DimensionSpacePointSet {
         if (!$this->contentDimensionZookeeper->getAllowedDimensionSubspace()->contains($origin)) {
             throw Exception\DimensionSpacePointNotFound::becauseItIsNotWithinTheAllowedDimensionSubspace($origin);

diff --git a/Neos.ContentRepository.Core/Classes/EventStore/DecoratedEvent.php b/Neos.ContentRepository.Core/Classes/EventStore/DecoratedEvent.php
@@ -30,10 +30,10 @@ private function __construct(
      */
     public static function create(
         DecoratedEvent|EventInterface $event,
-        EventId $eventId = null,
-        EventMetadata|array $metadata = null,
-        EventId|CausationId $causationId = null,
-        CorrelationId $correlationId = null,
+        ?EventId $eventId = null,
+        EventMetadata|array|null $metadata = null,
+        EventId|CausationId|null $causationId = null,
+        ?CorrelationId $correlationId = null,
     ): self {
         if ($event instanceof EventInterface) {
             $event = new self($event, null, null, null, null);

diff --git a/...asses/Feature/NodeCreation/Command/CreateNodeAggregateWithNodeAndSerializedProperties.php b/...asses/Feature/NodeCreation/Command/CreateNodeAggregateWithNodeAndSerializedProperties.php
@@ -70,7 +70,7 @@ private function __construct(
      * @param SerializedPropertyValues|null $initialPropertyValues The node's initial property values (serialized). Will be merged over the node type's default property values
      * @param SerializedNodeReferences|null $references The node's initial references (serialized).
      */
-    public static function create(WorkspaceName $workspaceName, NodeAggregateId $nodeAggregateId, NodeTypeName $nodeTypeName, OriginDimensionSpacePoint $originDimensionSpacePoint, NodeAggregateId $parentNodeAggregateId, NodeAggregateId $succeedingSiblingNodeAggregateId = null, SerializedPropertyValues $initialPropertyValues = null, SerializedNodeReferences $references = null): self
+    public static function create(WorkspaceName $workspaceName, NodeAggregateId $nodeAggregateId, NodeTypeName $nodeTypeName, OriginDimensionSpacePoint $originDimensionSpacePoint, NodeAggregateId $parentNodeAggregateId, ?NodeAggregateId $succeedingSiblingNodeAggregateId = null, ?SerializedPropertyValues $initialPropertyValues = null, ?SerializedNodeReferences $references = null): self
     {
         return new self($workspaceName, $nodeAggregateId, $nodeTypeName, $originDimensionSpacePoint, $parentNodeAggregateId, $initialPropertyValues ?? SerializedPropertyValues::createEmpty(), $succeedingSiblingNodeAggregateId, null, NodeAggregateIdsByNodePaths::createEmpty(), $references ?: SerializedNodeReferences::createEmpty());
     }

diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ArrayNormalizer.php b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ArrayNormalizer.php
@@ -14,12 +14,12 @@ final class ArrayNormalizer implements DenormalizerInterface
     /**
      * @param array<string,mixed> $context
      */
-    public function denormalize($data, $type, string $format = null, array $context = [])
+    public function denormalize($data, $type, ?string $format = null, array $context = [])
     {
         return $data;
     }
 
-    public function supportsDenormalization($data, $type, string $format = null)
+    public function supportsDenormalization($data, $type, ?string $format = null)
     {
         return $type === 'array';
     }

diff --git a/...Repository.Core/Classes/Infrastructure/Property/Normalizer/CollectionTypeDenormalizer.php b/...Repository.Core/Classes/Infrastructure/Property/Normalizer/CollectionTypeDenormalizer.php
@@ -34,7 +34,7 @@ final class CollectionTypeDenormalizer implements
      * @return array<int|string,mixed>
      * @throws NotNormalizableValueException
      */
-    public function denormalize($data, string $type, string $format = null, array $context = []): array
+    public function denormalize($data, string $type, ?string $format = null, array $context = []): array
     {
         if ($this->serializer === null) {
             throw new BadMethodCallException('Please set a serializer before calling denormalize()!', 1596463254);
@@ -72,7 +72,7 @@ public function denormalize($data, string $type, string $format = null, array $c
      * {@inheritdoc}
      * @param array<string,mixed> $context
      */
-    public function supportsDenormalization($data, string $type, string $format = null, array $context = []): bool
+    public function supportsDenormalization($data, string $type, ?string $format = null, array $context = []): bool
     {
         if ($this->serializer === null) {
             throw new BadMethodCallException(sprintf(

diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ScalarNormalizer.php b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/ScalarNormalizer.php
@@ -17,12 +17,12 @@ final class ScalarNormalizer implements NormalizerInterface, DenormalizerInterfa
      * @param array<string,mixed> $context
      * @return int|float|bool|string
      */
-    public function normalize($object, string $format = null, array $context = []): mixed
+    public function normalize($object, ?string $format = null, array $context = []): mixed
     {
         return $object;
     }
 
-    public function supportsNormalization($data, string $format = null)
+    public function supportsNormalization($data, ?string $format = null)
     {
         $type = TypeHandling::getTypeForValue($data);
         return TypeHandling::isSimpleType($type) && !TypeHandling::isCollectionType($type);
@@ -31,12 +31,12 @@ public function supportsNormalization($data, string $format = null)
     /**
      * @param array<string,mixed> $context
      */
-    public function denormalize($data, $type, string $format = null, array $context = [])
+    public function denormalize($data, $type, ?string $format = null, array $context = [])
     {
         return $data;
     }
 
-    public function supportsDenormalization($data, $type, string $format = null)
+    public function supportsDenormalization($data, $type, ?string $format = null)
     {
         return TypeHandling::isSimpleType($type) && !TypeHandling::isCollectionType($type);
     }

diff --git a/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/UriNormalizer.php b/Neos.ContentRepository.Core/Classes/Infrastructure/Property/Normalizer/UriNormalizer.php
@@ -16,25 +16,25 @@ final class UriNormalizer implements NormalizerInterface, DenormalizerInterface
     /**
      * @param array<string,mixed> $context
      */
-    public function normalize($data, string $format = null, array $context = []): string
+    public function normalize($data, ?string $format = null, array $context = []): string
     {
         return (string)$data;
     }
 
-    public function supportsNormalization($data, string $format = null)
+    public function supportsNormalization($data, ?string $format = null)
     {
         return $data instanceof Uri;
     }
 
     /**
      * @param array<string,mixed> $context
      */
-    public function denormalize($data, string $type, string $format = null, array $context = [])
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
     {
         return new Uri($data);
     }
 
-    public function supportsDenormalization($data, string $type, string $format = null)
+    public function supportsDenormalization($data, string $type, ?string $format = null)
     {
         return is_string($data) && $type === Uri::class;
     }

diff --git a/...pository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectArrayDenormalizer.php b/...pository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectArrayDenormalizer.php
@@ -14,12 +14,12 @@ final class ValueObjectArrayDenormalizer implements DenormalizerInterface
     /**
      * @param array<string,mixed> $context
      */
-    public function denormalize($data, $type, string $format = null, array $context = [])
+    public function denormalize($data, $type, ?string $format = null, array $context = [])
     {
         return $type::fromArray($data);
     }
 
-    public function supportsDenormalization($data, $type, string $format = null): bool
+    public function supportsDenormalization($data, $type, ?string $format = null): bool
     {
         return is_array($data) && class_exists($type) && method_exists($type, 'fromArray');
     }

diff --git a/...epository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectBoolDenormalizer.php b/...epository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectBoolDenormalizer.php
@@ -14,12 +14,12 @@ final class ValueObjectBoolDenormalizer implements DenormalizerInterface
     /**
      * @param array<string,mixed> $context
      */
-    public function denormalize($data, $type, string $format = null, array $context = [])
+    public function denormalize($data, $type, ?string $format = null, array $context = [])
     {
         return $type::fromBool($data);
     }
 
-    public function supportsDenormalization($data, $type, string $format = null): bool
+    public function supportsDenormalization($data, $type, ?string $format = null): bool
     {
         return is_bool($data) && class_exists($type) && method_exists($type, 'fromBool');
     }

diff --git a/...pository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectFloatDenormalizer.php b/...pository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectFloatDenormalizer.php
@@ -14,12 +14,12 @@ final class ValueObjectFloatDenormalizer implements DenormalizerInterface
     /**
      * @param array<string,mixed> $context
      */
-    public function denormalize($data, $type, string $format = null, array $context = [])
+    public function denormalize($data, $type, ?string $format = null, array $context = [])
     {
         return $type::fromFloat($data);
     }
 
-    public function supportsDenormalization($data, $type, string $format = null): bool
+    public function supportsDenormalization($data, $type, ?string $format = null): bool
     {
         return is_float($data) && class_exists($type) && method_exists($type, 'fromFloat');
     }

diff --git a/...Repository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectIntDenormalizer.php b/...Repository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectIntDenormalizer.php
@@ -14,12 +14,12 @@ final class ValueObjectIntDenormalizer implements DenormalizerInterface
     /**
      * @param array<string,mixed> $context
      */
-    public function denormalize($data, $type, string $format = null, array $context = [])
+    public function denormalize($data, $type, ?string $format = null, array $context = [])
     {
         return $type::fromInt($data);
     }
 
-    public function supportsDenormalization($data, $type, string $format = null): bool
+    public function supportsDenormalization($data, $type, ?string $format = null): bool
     {
         return is_int($data) && class_exists($type) && method_exists($type, 'fromInt');
     }

diff --git a/...ository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectStringDenormalizer.php b/...ository.Core/Classes/Infrastructure/Property/Normalizer/ValueObjectStringDenormalizer.php
@@ -14,12 +14,12 @@ final class ValueObjectStringDenormalizer implements DenormalizerInterface
     /**
      * @param array<string,mixed> $context
      */
-    public function denormalize($data, $type, string $format = null, array $context = [])
+    public function denormalize($data, $type, ?string $format = null, array $context = [])
     {
         return $type::fromString($data);
     }
 
-    public function supportsDenormalization($data, $type, string $format = null): bool
+    public function supportsDenormalization($data, $type, ?string $format = null): bool
     {
         return is_string($data) && class_exists($type) && method_exists($type, 'fromString');
     }

diff --git a/...ontentRepository.Core/Classes/Projection/ContentGraph/Filter/CountAncestorNodesFilter.php b/...ontentRepository.Core/Classes/Projection/ContentGraph/Filter/CountAncestorNodesFilter.php
@@ -32,7 +32,7 @@ private function __construct(
      * @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
      */
     public static function create(
-        NodeTypeCriteria|string $nodeTypes = null
+        NodeTypeCriteria|string|null $nodeTypes = null
     ): self {
         if (is_string($nodeTypes)) {
             $nodeTypes = NodeTypeCriteria::fromFilterString($nodeTypes);
@@ -52,7 +52,7 @@ public static function fromFindAncestorNodesFilter(FindAncestorNodesFilter $filt
      * @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
      */
     public function with(
-        NodeTypeCriteria|string $nodeTypes = null
+        NodeTypeCriteria|string|null $nodeTypes = null
     ): self {
         return self::create(
             $nodeTypes ?? $this->nodeTypes,

diff --git a/...ntentRepository.Core/Classes/Projection/ContentGraph/Filter/CountBackReferencesFilter.php b/...ntentRepository.Core/Classes/Projection/ContentGraph/Filter/CountBackReferencesFilter.php
@@ -49,12 +49,12 @@ private function __construct(
      * @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
      */
     public static function create(
-        NodeTypeCriteria|string $nodeTypes = null,
-        SearchTerm|string $nodeSearchTerm = null,
-        PropertyValueCriteriaInterface|string $nodePropertyValue = null,
-        SearchTerm|string $referenceSearchTerm = null,
-        PropertyValueCriteriaInterface|string $referencePropertyValue = null,
-        ReferenceName|string $referenceName = null,
+        NodeTypeCriteria|string|null $nodeTypes = null,
+        SearchTerm|string|null $nodeSearchTerm = null,
+        PropertyValueCriteriaInterface|string|null $nodePropertyValue = null,
+        SearchTerm|string|null $referenceSearchTerm = null,
+        PropertyValueCriteriaInterface|string|null $referencePropertyValue = null,
+        ReferenceName|string|null $referenceName = null,
     ): self {
         if (is_string($nodeTypes)) {
             $nodeTypes = NodeTypeCriteria::fromFilterString($nodeTypes);
@@ -89,12 +89,12 @@ public static function fromFindBackReferencesFilter(FindBackReferencesFilter $fi
      * @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
      */
     public function with(
-        NodeTypeCriteria|string $nodeTypes = null,
-        SearchTerm|string $nodeSearchTerm = null,
-        PropertyValueCriteriaInterface|string $nodePropertyValue = null,
-        SearchTerm|string $referenceSearchTerm = null,
-        PropertyValueCriteriaInterface|string $referencePropertyValue = null,
-        ReferenceName|string $referenceName = null,
+        NodeTypeCriteria|string|null $nodeTypes = null,
+        SearchTerm|string|null $nodeSearchTerm = null,
+        PropertyValueCriteriaInterface|string|null $nodePropertyValue = null,
+        SearchTerm|string|null $referenceSearchTerm = null,
+        PropertyValueCriteriaInterface|string|null $referencePropertyValue = null,
+        ReferenceName|string|null $referenceName = null,
     ): self {
         return self::create(
             $nodeTypes ?? $this->nodeTypes,

diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Filter/CountChildNodesFilter.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Filter/CountChildNodesFilter.php
@@ -41,9 +41,9 @@ private function __construct(
      * @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
      */
     public static function create(
-        NodeTypeCriteria|string $nodeTypes = null,
-        SearchTerm|string $searchTerm = null,
-        PropertyValueCriteriaInterface|string $propertyValue = null,
+        NodeTypeCriteria|string|null $nodeTypes = null,
+        SearchTerm|string|null $searchTerm = null,
+        PropertyValueCriteriaInterface|string|null $propertyValue = null,
     ): self {
         if (is_string($nodeTypes)) {
             $nodeTypes = NodeTypeCriteria::fromFilterString($nodeTypes);
@@ -69,9 +69,9 @@ public static function fromFindChildNodesFilter(FindChildNodesFilter $filter): s
      * @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
      */
     public function with(
-        NodeTypeCriteria|string $nodeTypes = null,
-        SearchTerm|string $searchTerm = null,
-        PropertyValueCriteriaInterface|string $propertyValue = null,
+        NodeTypeCriteria|string|null $nodeTypes = null,
+        SearchTerm|string|null $searchTerm = null,
+        PropertyValueCriteriaInterface|string|null $propertyValue = null,
     ): self {
         return self::create(
             $nodeTypes ?? $this->nodeTypes,

diff --git a/...tentRepository.Core/Classes/Projection/ContentGraph/Filter/CountDescendantNodesFilter.php b/...tentRepository.Core/Classes/Projection/ContentGraph/Filter/CountDescendantNodesFilter.php
@@ -41,9 +41,9 @@ private function __construct(
      * @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
      */
     public static function create(
-        NodeTypeCriteria|string $nodeTypes = null,
-        SearchTerm|string $searchTerm = null,
-        PropertyValueCriteriaInterface|string $propertyValue = null,
+        NodeTypeCriteria|string|null $nodeTypes = null,
+        SearchTerm|string|null $searchTerm = null,
+        PropertyValueCriteriaInterface|string|null $propertyValue = null,
     ): self {
         if (is_string($nodeTypes)) {
             $nodeTypes = NodeTypeCriteria::fromFilterString($nodeTypes);
@@ -69,9 +69,9 @@ public static function fromFindDescendantNodesFilter(FindDescendantNodesFilter $
      * @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
      */
     public function with(
-        NodeTypeCriteria|string $nodeTypes = null,
-        SearchTerm|string $searchTerm = null,
-        PropertyValueCriteriaInterface|string $propertyValue = null,
+        NodeTypeCriteria|string|null $nodeTypes = null,
+        SearchTerm|string|null $searchTerm = null,
+        PropertyValueCriteriaInterface|string|null $propertyValue = null,
     ): self {
         return self::create(
             $nodeTypes ?? $this->nodeTypes,

diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Filter/CountReferencesFilter.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Filter/CountReferencesFilter.php
@@ -49,12 +49,12 @@ private function __construct(
      * @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
      */
     public static function create(
-        NodeTypeCriteria|string $nodeTypes = null,
-        SearchTerm|string $nodeSearchTerm = null,
-        PropertyValueCriteriaInterface|string $nodePropertyValue = null,
-        SearchTerm|string $referenceSearchTerm = null,
-        PropertyValueCriteriaInterface|string $referencePropertyValue = null,
-        ReferenceName|string $referenceName = null,
+        NodeTypeCriteria|string|null $nodeTypes = null,
+        SearchTerm|string|null $nodeSearchTerm = null,
+        PropertyValueCriteriaInterface|string|null $nodePropertyValue = null,
+        SearchTerm|string|null $referenceSearchTerm = null,
+        PropertyValueCriteriaInterface|string|null $referencePropertyValue = null,
+        ReferenceName|string|null $referenceName = null,
     ): self {
         if (is_string($nodeTypes)) {
             $nodeTypes = NodeTypeCriteria::fromFilterString($nodeTypes);
@@ -89,12 +89,12 @@ public static function fromFindReferencesFilter(FindReferencesFilter $filter): s
      * @see https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments
      */
     public function with(
-        NodeTypeCriteria|string $nodeTypes = null,
-        SearchTerm|string $nodeSearchTerm = null,
-        PropertyValueCriteriaInterface|string $nodePropertyValue = null,
-        SearchTerm|string $referenceSearchTerm = null,
-        PropertyValueCriteriaInterface|string $referencePropertyValue = null,
-        ReferenceName|string $referenceName = null,
+        NodeTypeCriteria|string|null $nodeTypes = null,
+        SearchTerm|string|null $nodeSearchTerm = null,
+        PropertyValueCriteriaInterface|string|null $nodePropertyValue = null,
+        SearchTerm|string|null $referenceSearchTerm = null,
+        PropertyValueCriteriaInterface|string|null $referencePropertyValue = null,
+        ReferenceName|string|null $referenceName = null,
     ): self {
         return self::create(
             $nodeTypes ?? $this->nodeTypes,