Merge branch '6.3' into 6.4

nicolas-grekas · nicolas-grekas · commit 3cd13dc5c2c4 · 2024-01-23T15:51:35.000+01:00
* 6.3:
  minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench)
  Fix bad merge
  List CS fix in .git-blame-ignore-revs
  Fix implicitly-required parameters
  List CS fix in .git-blame-ignore-revs
  Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value
diff --git a/Attribute/AsAnnounceListener.php b/Attribute/AsAnnounceListener.php
@@ -22,11 +22,11 @@ final class AsAnnounceListener extends AsEventListener
     use BuildEventNameTrait;
 
     public function __construct(
-        string $workflow = null,
-        string $transition = null,
-        string $method = null,
+        ?string $workflow = null,
+        ?string $transition = null,
+        ?string $method = null,
         int $priority = 0,
-        string $dispatcher = null,
+        ?string $dispatcher = null,
     ) {
         parent::__construct($this->buildEventName('announce', 'transition', $workflow, $transition), $method, $priority, $dispatcher);
     }
diff --git a/Attribute/AsCompletedListener.php b/Attribute/AsCompletedListener.php
@@ -22,11 +22,11 @@ final class AsCompletedListener extends AsEventListener
     use BuildEventNameTrait;
 
     public function __construct(
-        string $workflow = null,
-        string $transition = null,
-        string $method = null,
+        ?string $workflow = null,
+        ?string $transition = null,
+        ?string $method = null,
         int $priority = 0,
-        string $dispatcher = null,
+        ?string $dispatcher = null,
     ) {
         parent::__construct($this->buildEventName('completed', 'transition', $workflow, $transition), $method, $priority, $dispatcher);
     }
diff --git a/Attribute/AsEnterListener.php b/Attribute/AsEnterListener.php
@@ -22,11 +22,11 @@ final class AsEnterListener extends AsEventListener
     use BuildEventNameTrait;
 
     public function __construct(
-        string $workflow = null,
-        string $place = null,
-        string $method = null,
+        ?string $workflow = null,
+        ?string $place = null,
+        ?string $method = null,
         int $priority = 0,
-        string $dispatcher = null,
+        ?string $dispatcher = null,
     ) {
         parent::__construct($this->buildEventName('enter', 'place', $workflow, $place), $method, $priority, $dispatcher);
     }
diff --git a/Attribute/AsEnteredListener.php b/Attribute/AsEnteredListener.php
@@ -22,11 +22,11 @@ final class AsEnteredListener extends AsEventListener
     use BuildEventNameTrait;
 
     public function __construct(
-        string $workflow = null,
-        string $place = null,
-        string $method = null,
+        ?string $workflow = null,
+        ?string $place = null,
+        ?string $method = null,
         int $priority = 0,
-        string $dispatcher = null,
+        ?string $dispatcher = null,
     ) {
         parent::__construct($this->buildEventName('entered', 'place', $workflow, $place), $method, $priority, $dispatcher);
     }
diff --git a/Attribute/AsGuardListener.php b/Attribute/AsGuardListener.php
@@ -22,11 +22,11 @@ final class AsGuardListener extends AsEventListener
     use BuildEventNameTrait;
 
     public function __construct(
-        string $workflow = null,
-        string $transition = null,
-        string $method = null,
+        ?string $workflow = null,
+        ?string $transition = null,
+        ?string $method = null,
         int $priority = 0,
-        string $dispatcher = null,
+        ?string $dispatcher = null,
     ) {
         parent::__construct($this->buildEventName('guard', 'transition', $workflow, $transition), $method, $priority, $dispatcher);
     }
diff --git a/Attribute/AsLeaveListener.php b/Attribute/AsLeaveListener.php
@@ -22,11 +22,11 @@ final class AsLeaveListener extends AsEventListener
     use BuildEventNameTrait;
 
     public function __construct(
-        string $workflow = null,
-        string $place = null,
-        string $method = null,
+        ?string $workflow = null,
+        ?string $place = null,
+        ?string $method = null,
         int $priority = 0,
-        string $dispatcher = null,
+        ?string $dispatcher = null,
     ) {
         parent::__construct($this->buildEventName('leave', 'place', $workflow, $place), $method, $priority, $dispatcher);
     }
diff --git a/Attribute/AsTransitionListener.php b/Attribute/AsTransitionListener.php
@@ -22,11 +22,11 @@ final class AsTransitionListener extends AsEventListener
     use BuildEventNameTrait;
 
     public function __construct(
-        string $workflow = null,
-        string $transition = null,
-        string $method = null,
+        ?string $workflow = null,
+        ?string $transition = null,
+        ?string $method = null,
         int $priority = 0,
-        string $dispatcher = null,
+        ?string $dispatcher = null,
     ) {
         parent::__construct($this->buildEventName('transition', 'transition', $workflow, $transition), $method, $priority, $dispatcher);
     }
diff --git a/Attribute/BuildEventNameTrait.php b/Attribute/BuildEventNameTrait.php
@@ -20,7 +20,7 @@
  */
 trait BuildEventNameTrait
 {
-    private static function buildEventName(string $keyword, string $argument, string $workflow = null, string $node = null): string
+    private static function buildEventName(string $keyword, string $argument, ?string $workflow = null, ?string $node = null): string
     {
         if (null === $workflow) {
             if (null !== $node) {
diff --git a/DataCollector/WorkflowDataCollector.php b/DataCollector/WorkflowDataCollector.php
@@ -40,7 +40,7 @@ public function __construct(
     ) {
     }
 
-    public function collect(Request $request, Response $response, \Throwable $exception = null): void
+    public function collect(Request $request, Response $response, ?\Throwable $exception = null): void
     {
     }
 
@@ -165,7 +165,7 @@ private function getEventListeners(WorkflowInterface $workflow): array
         return $listeners;
     }
 
-    private function summarizeListener(callable $callable, string $eventName = null, Transition $transition = null): array
+    private function summarizeListener(callable $callable, ?string $eventName = null, ?Transition $transition = null): array
     {
         $extra = [];
 
diff --git a/Definition.php b/Definition.php
@@ -32,7 +32,7 @@ final class Definition
      * @param Transition[]         $transitions
      * @param string|string[]|null $initialPlaces
      */
-    public function __construct(array $places, array $transitions, string|array $initialPlaces = null, MetadataStoreInterface $metadataStore = null)
+    public function __construct(array $places, array $transitions, string|array|null $initialPlaces = null, ?MetadataStoreInterface $metadataStore = null)
     {
         foreach ($places as $place) {
             $this->addPlace($place);
@@ -76,7 +76,7 @@ public function getMetadataStore(): MetadataStoreInterface
         return $this->metadataStore;
     }
 
-    private function setInitialPlaces(string|array $places = null): void
+    private function setInitialPlaces(string|array|null $places = null): void
     {
         if (1 > \func_num_args()) {
             trigger_deprecation('symfony/workflow', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
diff --git a/Dumper/DumperInterface.php b/Dumper/DumperInterface.php
@@ -25,5 +25,5 @@ interface DumperInterface
     /**
      * Dumps a workflow definition.
      */
-    public function dump(Definition $definition, Marking $marking = null, array $options = []): string;
+    public function dump(Definition $definition, ?Marking $marking = null, array $options = []): string;
 }
diff --git a/Dumper/GraphvizDumper.php b/Dumper/GraphvizDumper.php
@@ -42,7 +42,7 @@ class GraphvizDumper implements DumperInterface
      *  * node: The default options for nodes (places + transitions)
      *  * edge: The default options for edges
      */
-    public function dump(Definition $definition, Marking $marking = null, array $options = []): string
+    public function dump(Definition $definition, ?Marking $marking = null, array $options = []): string
     {
         $withMetadata = $options['with-metadata'] ?? false;
 
@@ -64,7 +64,7 @@ public function dump(Definition $definition, Marking $marking = null, array $opt
     /**
      * @internal
      */
-    protected function findPlaces(Definition $definition, bool $withMetadata, Marking $marking = null): array
+    protected function findPlaces(Definition $definition, bool $withMetadata, ?Marking $marking = null): array
     {
         $workflowMetadata = $definition->getMetadataStore();
 
diff --git a/Dumper/MermaidDumper.php b/Dumper/MermaidDumper.php
@@ -57,7 +57,7 @@ public function __construct(string $transitionType, string $direction = self::DI
         $this->transitionType = $transitionType;
     }
 
-    public function dump(Definition $definition, Marking $marking = null, array $options = []): string
+    public function dump(Definition $definition, ?Marking $marking = null, array $options = []): string
     {
         $this->linkCount = 0;
         $placeNameMap = [];
diff --git a/Dumper/PlantUmlDumper.php b/Dumper/PlantUmlDumper.php
@@ -61,7 +61,7 @@ public function __construct(string $transitionType)
         $this->transitionType = $transitionType;
     }
 
-    public function dump(Definition $definition, Marking $marking = null, array $options = []): string
+    public function dump(Definition $definition, ?Marking $marking = null, array $options = []): string
     {
         $options = array_replace_recursive(self::DEFAULT_OPTIONS, $options);
 
@@ -191,7 +191,7 @@ private function escape(string $string): string
         return '"'.str_replace('"', '', $string).'"';
     }
 
-    private function getState(string $place, Definition $definition, Marking $marking = null): string
+    private function getState(string $place, Definition $definition, ?Marking $marking = null): string
     {
         $workflowMetadata = $definition->getMetadataStore();
 
diff --git a/Dumper/StateMachineGraphvizDumper.php b/Dumper/StateMachineGraphvizDumper.php
@@ -25,7 +25,7 @@ class StateMachineGraphvizDumper extends GraphvizDumper
      *  * node: The default options for nodes (places)
      *  * edge: The default options for edges
      */
-    public function dump(Definition $definition, Marking $marking = null, array $options = []): string
+    public function dump(Definition $definition, ?Marking $marking = null, array $options = []): string
     {
         $withMetadata = $options['with-metadata'] ?? false;
 
diff --git a/Event/Event.php b/Event/Event.php
@@ -29,7 +29,7 @@ class Event extends BaseEvent
     private ?Transition $transition;
     private ?WorkflowInterface $workflow;
 
-    public function __construct(object $subject, Marking $marking, Transition $transition = null, WorkflowInterface $workflow = null, array $context = [])
+    public function __construct(object $subject, Marking $marking, ?Transition $transition = null, ?WorkflowInterface $workflow = null, array $context = [])
     {
         $this->subject = $subject;
         $this->marking = $marking;
diff --git a/Event/GuardEvent.php b/Event/GuardEvent.php
@@ -25,7 +25,7 @@ final class GuardEvent extends Event
 {
     private TransitionBlockerList $transitionBlockerList;
 
-    public function __construct(object $subject, Marking $marking, Transition $transition, WorkflowInterface $workflow = null)
+    public function __construct(object $subject, Marking $marking, Transition $transition, ?WorkflowInterface $workflow = null)
     {
         parent::__construct($subject, $marking, $transition, $workflow);
 
@@ -49,7 +49,7 @@ public function isBlocked(): bool
         return !$this->transitionBlockerList->isEmpty();
     }
 
-    public function setBlocked(bool $blocked, string $message = null): void
+    public function setBlocked(bool $blocked, ?string $message = null): void
     {
         if (!$blocked) {
             $this->transitionBlockerList->clear();
diff --git a/EventListener/GuardListener.php b/EventListener/GuardListener.php
@@ -32,7 +32,7 @@ class GuardListener
     private ?RoleHierarchyInterface $roleHierarchy;
     private ?ValidatorInterface $validator;
 
-    public function __construct(array $configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authorizationChecker, AuthenticationTrustResolverInterface $trustResolver, RoleHierarchyInterface $roleHierarchy = null, ValidatorInterface $validator = null)
+    public function __construct(array $configuration, ExpressionLanguage $expressionLanguage, TokenStorageInterface $tokenStorage, AuthorizationCheckerInterface $authorizationChecker, AuthenticationTrustResolverInterface $trustResolver, ?RoleHierarchyInterface $roleHierarchy = null, ?ValidatorInterface $validator = null)
     {
         $this->configuration = $configuration;
         $this->expressionLanguage = $expressionLanguage;
diff --git a/Metadata/GetMetadataTrait.php b/Metadata/GetMetadataTrait.php
@@ -21,7 +21,7 @@ trait GetMetadataTrait
     /**
      * @return mixed
      */
-    public function getMetadata(string $key, string|Transition $subject = null)
+    public function getMetadata(string $key, string|Transition|null $subject = null)
     {
         if (null === $subject) {
             return $this->getWorkflowMetadata()[$key] ?? null;
diff --git a/Metadata/InMemoryMetadataStore.php b/Metadata/InMemoryMetadataStore.php
@@ -27,7 +27,7 @@ final class InMemoryMetadataStore implements MetadataStoreInterface
     /**
      * @param \SplObjectStorage<Transition, array>|null $transitionsMetadata
      */
-    public function __construct(array $workflowMetadata = [], array $placesMetadata = [], \SplObjectStorage $transitionsMetadata = null)
+    public function __construct(array $workflowMetadata = [], array $placesMetadata = [], ?\SplObjectStorage $transitionsMetadata = null)
     {
         $this->workflowMetadata = $workflowMetadata;
         $this->placesMetadata = $placesMetadata;
diff --git a/Metadata/MetadataStoreInterface.php b/Metadata/MetadataStoreInterface.php
@@ -37,5 +37,5 @@ public function getTransitionMetadata(Transition $transition): array;
      *
      * @return mixed
      */
-    public function getMetadata(string $key, string|Transition $subject = null);
+    public function getMetadata(string $key, string|Transition|null $subject = null);
 }
diff --git a/Registry.php b/Registry.php
@@ -30,7 +30,7 @@ public function addWorkflow(WorkflowInterface $workflow, WorkflowSupportStrategy
         $this->workflows[] = [$workflow, $supportStrategy];
     }
 
-    public function has(object $subject, string $workflowName = null): bool
+    public function has(object $subject, ?string $workflowName = null): bool
     {
         foreach ($this->workflows as [$workflow, $supportStrategy]) {
             if ($this->supports($workflow, $supportStrategy, $subject, $workflowName)) {
@@ -41,7 +41,7 @@ public function has(object $subject, string $workflowName = null): bool
         return false;
     }
 
-    public function get(object $subject, string $workflowName = null): WorkflowInterface
+    public function get(object $subject, ?string $workflowName = null): WorkflowInterface
     {
         $matched = [];
 
diff --git a/StateMachine.php b/StateMachine.php
@@ -20,7 +20,7 @@
  */
 class StateMachine extends Workflow
 {
-    public function __construct(Definition $definition, MarkingStoreInterface $markingStore = null, EventDispatcherInterface $dispatcher = null, string $name = 'unnamed', array $eventsToDispatch = null)
+    public function __construct(Definition $definition, ?MarkingStoreInterface $markingStore = null, ?EventDispatcherInterface $dispatcher = null, string $name = 'unnamed', ?array $eventsToDispatch = null)
     {
         parent::__construct($definition, $markingStore ?? new MethodMarkingStore(true), $dispatcher, $name, $eventsToDispatch);
     }
diff --git a/Tests/Attribute/AsListenerTest.php b/Tests/Attribute/AsListenerTest.php
@@ -20,7 +20,7 @@ class AsListenerTest extends TestCase
     /**
      * @dataProvider provideOkTests
      */
-    public function testOk(string $class, string $expectedEvent, string $workflow = null, string $node = null)
+    public function testOk(string $class, string $expectedEvent, ?string $workflow = null, ?string $node = null)
     {
         $attribute = new $class($workflow, $node);
 
diff --git a/Tests/EventListener/GuardListenerTest.php b/Tests/EventListener/GuardListenerTest.php
@@ -137,7 +137,7 @@ public function testGuardExpressionBlocks()
         $this->assertTrue($event->isBlocked());
     }
 
-    private function createEvent(Transition $transition = null): GuardEvent
+    private function createEvent(?Transition $transition = null): GuardEvent
     {
         $subject = new Subject();
         $transition ??= new Transition('name', 'from', 'to');
diff --git a/Tests/WorkflowTest.php b/Tests/WorkflowTest.php
@@ -782,7 +782,7 @@ class EventDispatcherMock implements \Symfony\Contracts\EventDispatcher\EventDis
 {
     public array $dispatchedEvents = [];
 
-    public function dispatch($event, string $eventName = null): object
+    public function dispatch($event, ?string $eventName = null): object
     {
         $this->dispatchedEvents[] = $eventName;
 
diff --git a/TransitionBlocker.php b/TransitionBlocker.php
@@ -67,7 +67,7 @@ public static function createBlockedByExpressionGuardListener(string $expression
      * Creates a blocker that says the transition cannot be made because of an
      * unknown reason.
      */
-    public static function createUnknown(string $message = null, int $backtraceFrame = 2): self
+    public static function createUnknown(?string $message = null, int $backtraceFrame = 2): self
     {
         if (null !== $message) {
             return new static($message, self::UNKNOWN);
diff --git a/Workflow.php b/Workflow.php
@@ -67,7 +67,7 @@ class Workflow implements WorkflowInterface
      */
     private ?array $eventsToDispatch = null;
 
-    public function __construct(Definition $definition, MarkingStoreInterface $markingStore = null, EventDispatcherInterface $dispatcher = null, string $name = 'unnamed', array $eventsToDispatch = null)
+    public function __construct(Definition $definition, ?MarkingStoreInterface $markingStore = null, ?EventDispatcherInterface $dispatcher = null, string $name = 'unnamed', ?array $eventsToDispatch = null)
     {
         $this->definition = $definition;
         $this->markingStore = $markingStore ?? new MethodMarkingStore();

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`*/`
`21`	`21`	`trait BuildEventNameTrait`
`22`	`22`	`{`
`23`		`- private static function buildEventName(string $keyword, string $argument, string $workflow = null, string $node = null): string`
	`23`	`+ private static function buildEventName(string $keyword, string $argument, ?string $workflow = null, ?string $node = null): string`
`24`	`24`	`{`
`25`	`25`	`if (null === $workflow) {`
`26`	`26`	`if (null !== $node) {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public function __construct(`
`40`	`40`	`) {`
`41`	`41`	`}`
`42`	`42`
`43`		`- public function collect(Request $request, Response $response, \Throwable $exception = null): void`
	`43`	`+ public function collect(Request $request, Response $response, ?\Throwable $exception = null): void`
`44`	`44`	`{`
`45`	`45`	`}`
`46`	`46`
`@@ -165,7 +165,7 @@ private function getEventListeners(WorkflowInterface $workflow): array`
`165`	`165`	`return $listeners;`
`166`	`166`	`}`
`167`	`167`
`168`		`- private function summarizeListener(callable $callable, string $eventName = null, Transition $transition = null): array`
	`168`	`+ private function summarizeListener(callable $callable, ?string $eventName = null, ?Transition $transition = null): array`
`169`	`169`	`{`
`170`	`170`	`$extra = [];`
`171`	`171`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ final class Definition`
`32`	`32`	`* @param Transition[] $transitions`
`33`	`33`	`* @param string\|string[]\|null $initialPlaces`
`34`	`34`	`*/`
`35`		`- public function __construct(array $places, array $transitions, string\|array $initialPlaces = null, MetadataStoreInterface $metadataStore = null)`
	`35`	`+ public function __construct(array $places, array $transitions, string\|array\|null $initialPlaces = null, ?MetadataStoreInterface $metadataStore = null)`
`36`	`36`	`{`
`37`	`37`	`foreach ($places as $place) {`
`38`	`38`	`$this->addPlace($place);`
`@@ -76,7 +76,7 @@ public function getMetadataStore(): MetadataStoreInterface`
`76`	`76`	`return $this->metadataStore;`
`77`	`77`	`}`
`78`	`78`
`79`		`- private function setInitialPlaces(string\|array $places = null): void`
	`79`	`+ private function setInitialPlaces(string\|array\|null $places = null): void`
`80`	`80`	`{`
`81`	`81`	`if (1 > \func_num_args()) {`
`82`	`82`	`trigger_deprecation('symfony/workflow', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);`