Merge pull request #39 from arnedesmedt/feature/php8.4-remove-deprecations

arnedesmedt · web-flow · commit 272d63e5c62e · 2025-01-17T18:15:59.000+01:00
Remove php8.4 deprecations
diff --git a/examples/FunctionalFlavour/Api/Command.php b/examples/FunctionalFlavour/Api/Command.php
@@ -36,7 +36,7 @@ public static function canCreate(string $commandName): bool
         return array_key_exists($commandName, self::CLASS_MAP);
     }
 
-    public static function createFromNameAndPayload(string $commandName, array $payload, array $metadata = null)
+    public static function createFromNameAndPayload(string $commandName, array $payload, ?array $metadata = null)
     {
         $class = self::CLASS_MAP[$commandName];
 
diff --git a/src/Aggregate/GenericAggregateRepository.php b/src/Aggregate/GenericAggregateRepository.php
@@ -54,9 +54,9 @@ public function __construct(
         Flavour $flavour,
         EventStore $eventStore,
         string $streamName,
-        DocumentStore $documentStore = null,
-        string $aggregateCollection = null,
-        string $multiStoreMode = null
+        ?DocumentStore $documentStore = null,
+        ?string $aggregateCollection = null,
+        ?string $multiStoreMode = null
     ) {
         $this->flavour = $flavour;
         $this->eventStore = $eventStore;
@@ -140,7 +140,7 @@ public function getAggregateRoot(
         string $aggregateType,
         string $aggregateId,
         array $eventApplyMap,
-        int $expectedVersion = null
+        ?int $expectedVersion = null
     ): ?FlavouredAggregateRoot {
         $documentStore = $this->getDocumentStore();
 
@@ -207,7 +207,7 @@ public function getAggregateRootUntil(
         string $aggregateType,
         string $aggregateId,
         array $eventApplyMap,
-        int $maxVersion = null
+        ?int $maxVersion = null
     ): ?FlavouredAggregateRoot {
         $streamEvents = $this->eventStore->loadAggregateEvents($this->streamName, $aggregateType, $aggregateId, 1, $maxVersion);
 
diff --git a/src/Commanding/CommandDispatch.php b/src/Commanding/CommandDispatch.php
@@ -53,7 +53,7 @@ public static function exec(
         bool $autoProject,
         MessageProducer $eventQueue,
         EventEngine $eventEngine,
-        DocumentStore $documentStore = null,
+        ?DocumentStore $documentStore = null,
         array $contextProviders = [],
         array $services = [],
         bool $forwardMetadata = false
diff --git a/src/Commanding/CommandProcessor.php b/src/Commanding/CommandProcessor.php
@@ -118,7 +118,7 @@ public static function fromDescriptionArraysAndDependencies(
         EventStore $eventStore,
         LogEngine $logEngine,
         EventEngine $eventEngine,
-        DocumentStore $documentStore = null,
+        ?DocumentStore $documentStore = null,
         $contextProviders = [],
         array $services = [],
         $forwardMetadata = false
@@ -194,8 +194,8 @@ private function __construct(
         array $services,
         bool $forwardMetadata,
         array $contextProviders,
-        DocumentStore $documentStore = null,
-        string $aggregateCollection = null
+        ?DocumentStore $documentStore = null,
+        ?string $aggregateCollection = null
     ) {
         $this->commandName = $commandName;
         $this->aggregateType = $aggregateType;
diff --git a/src/EventEngine.php b/src/EventEngine.php
@@ -268,8 +268,8 @@ public static function fromCachedConfig(
         EventStore $eventStore,
         LogEngine $logEngine,
         ContainerInterface $container,
-        DocumentStore $documentStore = null,
-        MessageProducer $eventQueue = null
+        ?DocumentStore $documentStore = null,
+        ?MessageProducer $eventQueue = null
     ): self {
         $self = new self($schema);
 
@@ -472,7 +472,7 @@ public function registerEvent(string $eventName, PayloadSchema $schema): self
         return $this;
     }
 
-    public function registerQuery(string $queryName, PayloadSchema $payloadSchema = null): QueryDescription
+    public function registerQuery(string $queryName, ?PayloadSchema $payloadSchema = null): QueryDescription
     {
         $this->assertNotInitialized(__METHOD__);
 
@@ -511,12 +511,12 @@ public function registerProjection(string $projectionName, ProjectionDescription
         $this->projectionMap[$projectionName] = $projectionDescription;
     }
 
-    public function registerType(string $nameOrImmutableRecordClass, ResponseTypeSchema $schema = null): void
+    public function registerType(string $nameOrImmutableRecordClass, ?ResponseTypeSchema $schema = null): void
     {
         $this->registerResponseType($nameOrImmutableRecordClass, $schema);
     }
 
-    public function registerResponseType(string $nameOrImmutableRecordClass, ResponseTypeSchema $schema = null): void
+    public function registerResponseType(string $nameOrImmutableRecordClass, ?ResponseTypeSchema $schema = null): void
     {
         $this->assertNotInitialized(__METHOD__);
 
@@ -543,7 +543,7 @@ public function registerResponseType(string $nameOrImmutableRecordClass, Respons
         $this->typeSchemaMap->add($name, $schema);
     }
 
-    public function registerInputType(string $nameOrImmutableRecordClass, InputTypeSchema $schema = null): void
+    public function registerInputType(string $nameOrImmutableRecordClass, ?InputTypeSchema $schema = null): void
     {
         $this->assertNotInitialized(__METHOD__);
 
@@ -740,8 +740,8 @@ public function initialize(
         EventStore $eventStore,
         LogEngine $logEngine,
         ContainerInterface $container,
-        DocumentStore $documentStore = null,
-        MessageProducer $eventQueue = null
+        ?DocumentStore $documentStore = null,
+        ?MessageProducer $eventQueue = null
     ): self {
         $this->assertNotInitialized(__METHOD__);
 
@@ -1020,7 +1020,7 @@ public function rebuildAggregateState(string $aggregateType, string $aggregateId
         }
     }
 
-    public function loadAggregateState(string $aggregateType, string $aggregateId, int $expectedVersion = null)
+    public function loadAggregateState(string $aggregateType, string $aggregateId, ?int $expectedVersion = null)
     {
         $this->assertBootstrapped(__METHOD__);
 
@@ -1050,7 +1050,7 @@ public function loadAggregateEvents(
         string $aggregateType,
         string $aggregateId,
         int $minVersion = 1,
-        int $maxVersion = null
+        ?int $maxVersion = null
     ): \Iterator
     {
         $this->assertBootstrapped(__METHOD__);
@@ -1075,7 +1075,7 @@ public function loadAggregateEvents(
     }
 
 
-    public function loadAggregateStateUntil(string $aggregateType, string $aggregateId, int $maxVersion = null)
+    public function loadAggregateStateUntil(string $aggregateType, string $aggregateId, ?int $maxVersion = null)
     {
         $this->assertBootstrapped(__METHOD__);
 
@@ -1090,7 +1090,7 @@ public function loadAggregateStateUntil(string $aggregateType, string $aggregate
         return $aggregate->currentState();
     }
 
-    private function loadAggregateRoot(string $aggregateType, string $aggregateId, int $expectedVersion = null, bool $forceReplay = false)
+    private function loadAggregateRoot(string $aggregateType, string $aggregateId, ?int $expectedVersion = null, bool $forceReplay = false)
     {
         $aggregateDesc = $this->aggregateDescriptions[$aggregateType];
 
@@ -1135,7 +1135,7 @@ private function loadAggregateRoot(string $aggregateType, string $aggregateId, i
      * @param int $maxVersion
      * @return FlavouredAggregateRoot
      */
-    private function loadAggregateRootUntil(string $aggregateType, string $aggregateId, int $maxVersion = null): FlavouredAggregateRoot
+    private function loadAggregateRootUntil(string $aggregateType, string $aggregateId, ?int $maxVersion = null): FlavouredAggregateRoot
     {
         $aggregateDesc = $this->aggregateDescriptions[$aggregateType];
 
@@ -1330,7 +1330,7 @@ public function cacheAggregateState(string $aggregateType, string $aggregateId,
      * @param int|null $expectedVersion
      * @return null|mixed Null is returned if no state is cached, otherwise the cached process state
      */
-    public function loadAggregateStateFromCache(string $aggregateType, string $aggregateId, int $expectedVersion = null)
+    public function loadAggregateStateFromCache(string $aggregateType, string $aggregateId, ?int $expectedVersion = null)
     {
         $cache = $this->aggregateCache[$aggregateType][$aggregateId] ?? null;
         if (!$cache) {
diff --git a/src/Projecting/ProjectionInfo.php b/src/Projecting/ProjectionInfo.php
@@ -74,7 +74,7 @@ public static function fromDescriptionArray(array $desc): self
         );
     }
 
-    private function __construct(string $name, string $version, StreamCollection $sourceStreams, string $aggregateTypeFilter = null, array $eventsFilter = null)
+    private function __construct(string $name, string $version, StreamCollection $sourceStreams, ?string $aggregateTypeFilter = null, ?array $eventsFilter = null)
     {
         $this->name = $name;
         $this->version = $version;
diff --git a/src/Runtime/FunctionalFlavour.php b/src/Runtime/FunctionalFlavour.php
@@ -63,7 +63,7 @@ final class FunctionalFlavour implements Flavour, MessageFactoryAware
      */
     private $aggregateMetadataProvider;
 
-    public function __construct(Port $port, DataConverter $dataConverter = null, MetadataProvider $metadataProvider = null)
+    public function __construct(Port $port, ?DataConverter $dataConverter = null, ?MetadataProvider $metadataProvider = null)
     {
         $this->port = $port;
 
diff --git a/src/Runtime/PrototypingFlavour.php b/src/Runtime/PrototypingFlavour.php
@@ -62,7 +62,7 @@ final class PrototypingFlavour implements Flavour, MessageFactoryAware
      */
     private $aggregateMetadataProvider;
 
-    public function __construct(DataConverter $dataConverter = null, MetadataProvider $metadataProvider = null)
+    public function __construct(?DataConverter $dataConverter = null, ?MetadataProvider $metadataProvider = null)
     {
         if (null === $dataConverter) {
             $dataConverter = new ImmutableRecordDataConverter();
diff --git a/tests/EventEngineTestAbstract.php b/tests/EventEngineTestAbstract.php
@@ -185,9 +185,9 @@ protected function setUpRegisteredUsersProjector(
     }
 
     protected function initializeEventEngine(
-        LogEngine $logEngine = null,
-        DocumentStore $documentStore = null,
-        MessageProducer $eventQueue = null,
+        ?LogEngine $logEngine = null,
+        ?DocumentStore $documentStore = null,
+        ?MessageProducer $eventQueue = null,
         bool $autoProjecting = false,
         bool $forwardMetadata = false
     ): void {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public static function canCreate(string $commandName): bool`
`36`	`36`	`return array_key_exists($commandName, self::CLASS_MAP);`
`37`	`37`	`}`
`38`	`38`
`39`		`- public static function createFromNameAndPayload(string $commandName, array $payload, array $metadata = null)`
	`39`	`+ public static function createFromNameAndPayload(string $commandName, array $payload, ?array $metadata = null)`
`40`	`40`	`{`
`41`	`41`	`$class = self::CLASS_MAP[$commandName];`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -268,8 +268,8 @@ public static function fromCachedConfig(`
`268`	`268`	`EventStore $eventStore,`
`269`	`269`	`LogEngine $logEngine,`
`270`	`270`	`ContainerInterface $container,`
`271`		`- DocumentStore $documentStore = null,`
`272`		`- MessageProducer $eventQueue = null`
	`271`	`+ ?DocumentStore $documentStore = null,`
	`272`	`+ ?MessageProducer $eventQueue = null`
`273`	`273`	`): self {`
`274`	`274`	`$self = new self($schema);`
`275`	`275`
`@@ -472,7 +472,7 @@ public function registerEvent(string $eventName, PayloadSchema $schema): self`
`472`	`472`	`return $this;`
`473`	`473`	`}`
`474`	`474`
`475`		`- public function registerQuery(string $queryName, PayloadSchema $payloadSchema = null): QueryDescription`
	`475`	`+ public function registerQuery(string $queryName, ?PayloadSchema $payloadSchema = null): QueryDescription`
`476`	`476`	`{`
`477`	`477`	`$this->assertNotInitialized(__METHOD__);`
`478`	`478`
`@@ -511,12 +511,12 @@ public function registerProjection(string $projectionName, ProjectionDescription`
`511`	`511`	`$this->projectionMap[$projectionName] = $projectionDescription;`
`512`	`512`	`}`
`513`	`513`
`514`		`- public function registerType(string $nameOrImmutableRecordClass, ResponseTypeSchema $schema = null): void`
	`514`	`+ public function registerType(string $nameOrImmutableRecordClass, ?ResponseTypeSchema $schema = null): void`
`515`	`515`	`{`
`516`	`516`	`$this->registerResponseType($nameOrImmutableRecordClass, $schema);`
`517`	`517`	`}`
`518`	`518`
`519`		`- public function registerResponseType(string $nameOrImmutableRecordClass, ResponseTypeSchema $schema = null): void`
	`519`	`+ public function registerResponseType(string $nameOrImmutableRecordClass, ?ResponseTypeSchema $schema = null): void`
`520`	`520`	`{`
`521`	`521`	`$this->assertNotInitialized(__METHOD__);`
`522`	`522`
`@@ -543,7 +543,7 @@ public function registerResponseType(string $nameOrImmutableRecordClass, Respons`
`543`	`543`	`$this->typeSchemaMap->add($name, $schema);`
`544`	`544`	`}`
`545`	`545`
`546`		`- public function registerInputType(string $nameOrImmutableRecordClass, InputTypeSchema $schema = null): void`
	`546`	`+ public function registerInputType(string $nameOrImmutableRecordClass, ?InputTypeSchema $schema = null): void`
`547`	`547`	`{`
`548`	`548`	`$this->assertNotInitialized(__METHOD__);`
`549`	`549`
`@@ -740,8 +740,8 @@ public function initialize(`
`740`	`740`	`EventStore $eventStore,`
`741`	`741`	`LogEngine $logEngine,`
`742`	`742`	`ContainerInterface $container,`
`743`		`- DocumentStore $documentStore = null,`
`744`		`- MessageProducer $eventQueue = null`
	`743`	`+ ?DocumentStore $documentStore = null,`
	`744`	`+ ?MessageProducer $eventQueue = null`
`745`	`745`	`): self {`
`746`	`746`	`$this->assertNotInitialized(__METHOD__);`
`747`	`747`
`@@ -1020,7 +1020,7 @@ public function rebuildAggregateState(string $aggregateType, string $aggregateId`
`1020`	`1020`	`}`
`1021`	`1021`	`}`
`1022`	`1022`
`1023`		`- public function loadAggregateState(string $aggregateType, string $aggregateId, int $expectedVersion = null)`
	`1023`	`+ public function loadAggregateState(string $aggregateType, string $aggregateId, ?int $expectedVersion = null)`
`1024`	`1024`	`{`
`1025`	`1025`	`$this->assertBootstrapped(__METHOD__);`
`1026`	`1026`
`@@ -1050,7 +1050,7 @@ public function loadAggregateEvents(`
`1050`	`1050`	`string $aggregateType,`
`1051`	`1051`	`string $aggregateId,`
`1052`	`1052`	`int $minVersion = 1,`
`1053`		`- int $maxVersion = null`
	`1053`	`+ ?int $maxVersion = null`
`1054`	`1054`	`): \Iterator`
`1055`	`1055`	`{`
`1056`	`1056`	`$this->assertBootstrapped(__METHOD__);`
`@@ -1075,7 +1075,7 @@ public function loadAggregateEvents(`
`1075`	`1075`	`}`
`1076`	`1076`
`1077`	`1077`
`1078`		`- public function loadAggregateStateUntil(string $aggregateType, string $aggregateId, int $maxVersion = null)`
	`1078`	`+ public function loadAggregateStateUntil(string $aggregateType, string $aggregateId, ?int $maxVersion = null)`
`1079`	`1079`	`{`
`1080`	`1080`	`$this->assertBootstrapped(__METHOD__);`
`1081`	`1081`
`@@ -1090,7 +1090,7 @@ public function loadAggregateStateUntil(string $aggregateType, string $aggregate`
`1090`	`1090`	`return $aggregate->currentState();`
`1091`	`1091`	`}`
`1092`	`1092`
`1093`		`- private function loadAggregateRoot(string $aggregateType, string $aggregateId, int $expectedVersion = null, bool $forceReplay = false)`
	`1093`	`+ private function loadAggregateRoot(string $aggregateType, string $aggregateId, ?int $expectedVersion = null, bool $forceReplay = false)`
`1094`	`1094`	`{`
`1095`	`1095`	`$aggregateDesc = $this->aggregateDescriptions[$aggregateType];`
`1096`	`1096`
`@@ -1135,7 +1135,7 @@ private function loadAggregateRoot(string $aggregateType, string $aggregateId, i`
`1135`	`1135`	`* @param int $maxVersion`
`1136`	`1136`	`* @return FlavouredAggregateRoot`
`1137`	`1137`	`*/`
`1138`		`- private function loadAggregateRootUntil(string $aggregateType, string $aggregateId, int $maxVersion = null): FlavouredAggregateRoot`
	`1138`	`+ private function loadAggregateRootUntil(string $aggregateType, string $aggregateId, ?int $maxVersion = null): FlavouredAggregateRoot`
`1139`	`1139`	`{`
`1140`	`1140`	`$aggregateDesc = $this->aggregateDescriptions[$aggregateType];`
`1141`	`1141`
`@@ -1330,7 +1330,7 @@ public function cacheAggregateState(string $aggregateType, string $aggregateId,`
`1330`	`1330`	`* @param int\|null $expectedVersion`
`1331`	`1331`	`* @return null\|mixed Null is returned if no state is cached, otherwise the cached process state`
`1332`	`1332`	`*/`
`1333`		`- public function loadAggregateStateFromCache(string $aggregateType, string $aggregateId, int $expectedVersion = null)`
	`1333`	`+ public function loadAggregateStateFromCache(string $aggregateType, string $aggregateId, ?int $expectedVersion = null)`
`1334`	`1334`	`{`
`1335`	`1335`	`$cache = $this->aggregateCache[$aggregateType][$aggregateId] ?? null;`
`1336`	`1336`	`if (!$cache) {`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public static function fromDescriptionArray(array $desc): self`
`74`	`74`	`);`
`75`	`75`	`}`
`76`	`76`
`77`		`- private function __construct(string $name, string $version, StreamCollection $sourceStreams, string $aggregateTypeFilter = null, array $eventsFilter = null)`
	`77`	`+ private function __construct(string $name, string $version, StreamCollection $sourceStreams, ?string $aggregateTypeFilter = null, ?array $eventsFilter = null)`
`78`	`78`	`{`
`79`	`79`	`$this->name = $name;`
`80`	`80`	`$this->version = $version;`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ final class FunctionalFlavour implements Flavour, MessageFactoryAware`
`63`	`63`	`*/`
`64`	`64`	`private $aggregateMetadataProvider;`
`65`	`65`
`66`		`- public function __construct(Port $port, DataConverter $dataConverter = null, MetadataProvider $metadataProvider = null)`
	`66`	`+ public function __construct(Port $port, ?DataConverter $dataConverter = null, ?MetadataProvider $metadataProvider = null)`
`67`	`67`	`{`
`68`	`68`	`$this->port = $port;`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ final class PrototypingFlavour implements Flavour, MessageFactoryAware`
`62`	`62`	`*/`
`63`	`63`	`private $aggregateMetadataProvider;`
`64`	`64`
`65`		`- public function __construct(DataConverter $dataConverter = null, MetadataProvider $metadataProvider = null)`
	`65`	`+ public function __construct(?DataConverter $dataConverter = null, ?MetadataProvider $metadataProvider = null)`
`66`	`66`	`{`
`67`	`67`	`if (null === $dataConverter) {`
`68`	`68`	`$dataConverter = new ImmutableRecordDataConverter();`