Update code style; fix PHP8.4 nullable types deprecations

composer.json

@@ -59,7 +59,7 @@
         "jetbrains/phpstorm-attributes": "dev-master@dev",
         "laminas/laminas-code": "^4.0",
         "phpunit/phpunit": "^10.5",
-        "spiral/code-style": "~2.1.2",
+        "spiral/code-style": "~2.2.1",
         "spiral/core": "^3.13",
         "symfony/var-dumper": "^6.0 || ^7.0",
         "vimeo/psalm": "^4.30 || ^5.4"
@@ -91,7 +91,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.11.x-dev"
+            "dev-master": "2.12.x-dev"
         }
     },
     "config": {

src/Activity.php

@@ -26,7 +26,6 @@ final class Activity extends Facade
     /**
      * Returns information about current activity execution.
      *
-     * @return ActivityInfo
      * @throws OutOfContextException in the absence of the activity execution context.
      */
     public static function getInfo(): ActivityInfo
@@ -53,7 +52,6 @@ public static function getInfo(): ActivityInfo
      *  }
      * ```
      *
-     * @return ValuesInterface
      * @throws OutOfContextException in the absence of the activity execution context.
      */
     public static function getInput(): ValuesInterface
@@ -69,7 +67,6 @@ public static function getInput(): ValuesInterface
      *
      * This method returns **true** if the first argument has been passed to the {@see Activity::heartbeat()} method.
      *
-     * @return bool
      * @throws OutOfContextException in the absence of the activity execution context.
      */
     public static function hasHeartbeatDetails(): bool

src/Activity/ActivityContextInterface.php

@@ -22,7 +22,6 @@ interface ActivityContextInterface
      *
      * @see Activity::getInfo()
      *
-     * @return ActivityInfo
      */
     public function getInfo(): ActivityInfo;
 
@@ -31,7 +30,6 @@ public function getInfo(): ActivityInfo;
      *
      * @see Activity::getInput()
      *
-     * @return ValuesInterface
      */
     public function getInput(): ValuesInterface;
 
@@ -40,7 +38,6 @@ public function getInput(): ValuesInterface;
      *
      * @see Activity::hasHeartbeatDetails()
      *
-     * @return bool
      */
     public function hasHeartbeatDetails(): bool;
 
@@ -59,7 +56,6 @@ public function getHeartbeatDetails($type = null);
      *
      * @see Activity::doNotCompleteOnReturn()
      *
-     * @return void
      */
     public function doNotCompleteOnReturn(): void;
 

src/Activity/ActivityInfo.php

@@ -38,26 +38,16 @@ final class ActivityInfo
      *
      * @see ActivityCompletionClientInterface::complete()
      *
-     * @var string
      */
     #[Marshal(name: 'TaskToken')]
     public string $taskToken;
 
-    /**
-     * @var WorkflowType|null
-     */
     #[Marshal(name: 'WorkflowType', type: NullableType::class, of: WorkflowType::class)]
     public ?WorkflowType $workflowType = null;
 
-    /**
-     * @var string
-     */
     #[Marshal(name: 'WorkflowNamespace')]
     public string $workflowNamespace = 'default';
 
-    /**
-     * @var WorkflowExecution|null
-     */
     #[Marshal(name: 'WorkflowExecution', type: NullableType::class, of: WorkflowExecution::class)]
     public ?WorkflowExecution $workflowExecution = null;
 
@@ -67,53 +57,44 @@ final class ActivityInfo
      *
      * @see ActivityCompletionClientInterface::complete()
      *
-     * @var string
      */
     #[Marshal(name: 'ActivityID')]
     public string $id;
 
     /**
      * Type (name) of the activity.
      *
-     * @var ActivityType
      */
     #[Marshal(name: 'ActivityType', type: ObjectType::class, of: ActivityType::class)]
     public ActivityType $type;
 
-    /**
-     * @var string
-     */
     #[Marshal(name: 'TaskQueue')]
     public string $taskQueue = WorkerFactoryInterface::DEFAULT_TASK_QUEUE;
 
     /**
      * Maximum time between heartbeats. 0 means no heartbeat needed.
      *
-     * @var \DateInterval
      */
     #[Marshal(name: 'HeartbeatTimeout', type: DateIntervalType::class)]
     public \DateInterval $heartbeatTimeout;
 
     /**
      * Time of activity scheduled by a workflow
      *
-     * @var \DateTimeInterface
      */
     #[Marshal(name: 'ScheduledTime', type: DateTimeType::class)]
     public \DateTimeInterface $scheduledTime;
 
     /**
      * Time of activity start
      *
-     * @var \DateTimeInterface
      */
     #[Marshal(name: 'StartedTime', type: DateTimeType::class)]
     public \DateTimeInterface $startedTime;
 
     /**
      * Time of activity timeout
      *
-     * @var \DateTimeInterface
      */
     #[Marshal(name: 'Deadline', type: DateTimeType::class)]
     public \DateTimeInterface $deadline;
@@ -122,7 +103,6 @@ final class ActivityInfo
      * Attempt starts from 1, and increased by 1 for every retry if
      * retry policy is specified.
      *
-     * @var int
      */
     #[Marshal(name: 'Attempt')]
     public int $attempt = 1;

src/Activity/ActivityInterface.php

@@ -49,9 +49,6 @@ class ActivityInterface
     #[Immutable]
     public string $prefix = '';
 
-    /**
-     * @param string $prefix
-     */
     public function __construct(string $prefix = '')
     {
         $this->prefix = $prefix;

src/Activity/ActivityMethod.php

@@ -33,10 +33,7 @@ final class ActivityMethod
     #[Immutable]
     public ?string $name = null;
 
-    /**
-     * @param string|null $name
-     */
-    public function __construct(string $name = null)
+    public function __construct(?string $name = null)
     {
         $this->name = $name;
     }

src/Activity/ActivityOptions.php

@@ -123,10 +123,9 @@ public function __construct()
     }
 
     /**
-     * @param MethodRetry|null $retry
      * @return $this
      */
-    public function mergeWith(MethodRetry $retry = null): self
+    public function mergeWith(?MethodRetry $retry = null): self
     {
         $self = clone $this;
 
@@ -142,7 +141,6 @@ public function mergeWith(MethodRetry $retry = null): self
      *
      * By default, it is the same task list name the workflow was started with.
      *
-     * @param string|null $taskQueue
      * @return $this
      */
     #[Pure]
@@ -269,7 +267,6 @@ public function withCancellationType(ActivityCancellationType|int $type): self
     }
 
     /**
-     * @param string $activityId
      * @return $this
      */
     #[Pure]
@@ -283,7 +280,6 @@ public function withActivityId(string $activityId): self
     }
 
     /**
-     * @param RetryOptions|null $options
      * @return $this
      */
     #[Pure]

src/Activity/ActivityOptionsInterface.php

@@ -11,5 +11,5 @@
  */
 interface ActivityOptionsInterface
 {
-    public function mergeWith(MethodRetry $retry = null): self;
+    public function mergeWith(?MethodRetry $retry = null): self;
 }

src/Activity/ActivityType.php

@@ -21,7 +21,6 @@ class ActivityType
     /**
      * @psalm-readonly
      * @psalm-allow-private-mutation
-     * @var string
      */
     #[Marshal(name: 'Name')]
     public string $name = '';

src/Activity/LocalActivityInterface.php

@@ -49,9 +49,6 @@ final class LocalActivityInterface extends ActivityInterface
     #[Immutable]
     public string $prefix = '';
 
-    /**
-     * @param string $prefix
-     */
     public function __construct(string $prefix = '')
     {
         $this->prefix = $prefix;

src/Activity/LocalActivityOptions.php

@@ -79,10 +79,9 @@ public function __construct()
     }
 
     /**
-     * @param MethodRetry|null $retry
      * @return $this
      */
-    public function mergeWith(MethodRetry $retry = null): self
+    public function mergeWith(?MethodRetry $retry = null): self
     {
         $self = clone $this;
 
@@ -142,7 +141,6 @@ public function withStartToCloseTimeout($timeout): self
     }
 
     /**
-     * @param RetryOptions|null $options
      * @return $this
      */
     #[Pure]

src/Client/ActivityCompletionClientInterface.php

@@ -20,61 +20,34 @@
 interface ActivityCompletionClientInterface
 {
     /**
-     * @param string $workflowId
-     * @param string|null $runId
-     * @param string $activityId
      * @param mixed $result
      */
     public function complete(string $workflowId, ?string $runId, string $activityId, $result = null): void;
 
     /**
-     * @param string $taskToken
      * @param mixed $result
      */
     public function completeByToken(string $taskToken, $result = null): void;
 
-    /**
-     * @param string $workflowId
-     * @param string|null $runId
-     * @param string $activityId
-     * @param \Throwable $error
-     */
     public function completeExceptionally(
         string $workflowId,
         ?string $runId,
         string $activityId,
         \Throwable $error,
     ): void;
 
-    /**
-     * @param string $taskToken
-     * @param \Throwable $error
-     */
     public function completeExceptionallyByToken(string $taskToken, \Throwable $error): void;
 
-    /**
-     * @param string $workflowId
-     * @param string|null $runId
-     * @param string $activityId
-     * @param $details
-     */
     public function reportCancellation(
         string $workflowId,
         ?string $runId,
         string $activityId,
         $details = null,
     ): void;
 
-    /**
-     * @param string $taskToken
-     * @param $details
-     */
     public function reportCancellationByToken(string $taskToken, $details = null): void;
 
     /**
-     * @param string $workflowId
-     * @param string|null $runId
-     * @param string $activityId
      * @param mixed $details
      *
      * @throw ActivityCanceledException
@@ -87,7 +60,6 @@ public function recordHeartbeat(
     );
 
     /**
-     * @param string $taskToken
      * @param mixed $details
      *
      * @throw ActivityCanceledException

src/Client/ClientOptions.php

@@ -31,14 +31,8 @@ class ClientOptions
      */
     public string $namespace = self::DEFAULT_NAMESPACE;
 
-    /**
-     * @var string
-     */
     public string $identity;
 
-    /**
-     * @var int
-     */
     #[ExpectedValues(valuesFromClass: QueryRejectCondition::class)]
     public int $queryRejectionCondition = QueryRejectCondition::QUERY_REJECT_CONDITION_NONE;
 
@@ -65,7 +59,6 @@ public function withNamespace(string $namespace): self
     }
 
     /**
-     * @param string $identity
      * @return $this
      */
     #[Pure]

src/Client/Common/Paginator.php

@@ -111,7 +111,6 @@ public function getPageNumber(): int
      * Note: the method may call yet another RPC to get total number of items.
      * It means that the result may be different from the number of items at the moment of the pagination start.
      *
-     * @return int
      * @throws \LogicException If counter is not set.
      */
     public function count(): int

src/Client/Common/RpcRetryOptions.php

@@ -51,8 +51,6 @@ public static function fromRetryOptions(RetryOptions $options): self
      * @param DateIntervalValue|null $interval Interval to wait on first retry, on congestion failures.
      *        Defaults to 1000ms, which is used if set to {@see null}.
      *
-     * @return self
-     *
      * @psalm-suppress ImpureMethodCall
      */
     #[Pure]
@@ -76,7 +74,6 @@ public function withCongestionInitialInterval($interval): self
      * @param null|float $coefficient Maximum amount of jitter.
      *        Default will be used if set to {@see null}.
      *
-     * @return self
      */
     #[Pure]
     public function withMaximumJitterCoefficient(?float $coefficient): self