Use null type instead of ?

.php-cs-fixer.dist.php

@@ -26,7 +26,8 @@
         'return_assignment' => true,
         'fopen_flags' => false,
         'strict_param' => true,
-        'phpdoc_separation' => ['groups' => [['ORM\\*'], ['Assert\\*']]],
+        'phpdoc_separation' => ['groups' => [['ORM\\*'], ['Assert\\*', 'Assert'], ['SymfonySerializer\\*']]],
+        'nullable_type_declaration' => ['syntax' => 'union'],
         'header_comment' => ['header' => $header],
     ))
 ;

Player/Adapter/BlackfireSdkAdapter.php

@@ -45,7 +45,7 @@ public function createRequest(string|Configuration|null $config = null): Request
         }
     }
 
-    public function updateProfile(string $uuid, string $title, ?array $metadata = null): bool
+    public function updateProfile(string $uuid, string $title, array|null $metadata = null): bool
     {
         try {
             return $this->blackfireClient->updateProfile($uuid, $title, $metadata);
@@ -63,7 +63,7 @@ public function getProfile(string $uuid): Profile
         }
     }
 
-    public function startBuild(?string $env = null, array $options = []): Build
+    public function startBuild(string|null $env = null, array $options = []): Build
     {
         try {
             $sdkBuild = $this->blackfireClient->startBuild($env, $options);

Player/Adapter/BlackfireSdkAdapterInterface.php

@@ -23,9 +23,9 @@ public function getConfiguration(): ClientConfiguration;
 
     public function createRequest(string|Configuration|null $config = null): Request;
 
-    public function updateProfile(string $uuid, string $title, ?array $metadata = null): bool;
+    public function updateProfile(string $uuid, string $title, array|null $metadata = null): bool;
 
     public function getProfile(string $uuid): Profile;
 
-    public function startBuild(?string $env = null, array $options = []): Build;
+    public function startBuild(string|null $env = null, array $options = []): Build;
 }

Player/Build/Build.php

@@ -15,7 +15,7 @@
 {
     public function __construct(
         public string $uuid,
-        public ?string $url = null,
+        public string|null $url = null,
     ) {
     }
 }

Player/BuildApi.php

@@ -46,7 +46,7 @@ public function getOrCreate(string $env, ScenarioSet $scenarioSet): Build
         return $build;
     }
 
-    public function createBuild(?string $buildName, string $env): Build
+    public function createBuild(string|null $buildName, string $env): Build
     {
         $options = [
             'trigger_name' => 'Blackfire Player',

Player/Console/Application.php

@@ -26,7 +26,7 @@
  */
 final class Application extends BaseApplication
 {
-    public function __construct(?BlackfireSdkAdapterInterface $blackfireSdk, ?HttpClientInterface $blackfireHttpClient, string $transactionId)
+    public function __construct(BlackfireSdkAdapterInterface|null $blackfireSdk, HttpClientInterface|null $blackfireHttpClient, string $transactionId)
     {
         parent::__construct('Blackfire Player', Player::version());
 

Player/Console/PlayerCommand.php

@@ -84,12 +84,12 @@ final class PlayerCommand extends Command
     public const EXIT_CODE_SCENARIO_ERROR_NON_FATAL = 66;
     public const EXIT_CODE_BLACKFIRE_NETWORK_ERROR = 67;
 
-    private ?HttpClientInterface $blackfireHttpClient;
-    private ?BlackfireSdkAdapterInterface $blackfireSdkAdapter;
+    private HttpClientInterface|null $blackfireHttpClient;
+    private BlackfireSdkAdapterInterface|null $blackfireSdkAdapter;
     private string $transactionId;
 
     public function __construct(
-        ?HttpClientInterface $blackfireHttpClient, ?BlackfireSdkAdapterInterface $blackfireSdkAdapter, string $transactionId)
+        HttpClientInterface|null $blackfireHttpClient, BlackfireSdkAdapterInterface|null $blackfireSdkAdapter, string $transactionId)
     {
         $this->blackfireHttpClient = $blackfireHttpClient;
         $this->blackfireSdkAdapter = $blackfireSdkAdapter;
@@ -347,7 +347,7 @@ private function createReport(ScenarioSetResult $results): array
         return $report;
     }
 
-    private function getEnvOrDefault(string $envVar, ?string $default = null): ?string
+    private function getEnvOrDefault(string $envVar, string|null $default = null): string|null
     {
         $env = getenv($envVar);
         if (!$env) {

Player/Exception/ExpectationFailureException.php

@@ -18,7 +18,7 @@ class ExpectationFailureException extends LogicException
 {
     private array $results;
 
-    public function __construct(?string $message = null, array $results = [], int $code = 0, ?\Exception $previous = null)
+    public function __construct(string|null $message = null, array $results = [], int $code = 0, \Exception|null $previous = null)
     {
         parent::__construct($message, $code, $previous);
 

Player/ExpressionLanguage/ExpressionLanguage.php

@@ -20,9 +20,9 @@
  */
 class ExpressionLanguage extends SymfonyExpressionLanguage
 {
-    private ?ExtractResultsVisitor $resultsVisitor = null;
-    private ?ValidatorParser $parser = null;
-    private ?Lexer $lexer = null;
+    private ExtractResultsVisitor|null $resultsVisitor = null;
+    private ValidatorParser|null $parser = null;
+    private Lexer|null $lexer = null;
 
     public function extractResults(ParsedExpression $expression, array $variables): array
     {

Player/ExpressionLanguage/ExtractResultsVisitor.php

@@ -39,7 +39,7 @@ public function extractResults(ParsedExpression $expression, array $variables):
         return array_unique($results, \SORT_REGULAR);
     }
 
-    private function visit(Node\Node $node, array $variables, ?Node\Node $parentNode = null): array
+    private function visit(Node\Node $node, array $variables, Node\Node|null $parentNode = null): array
     {
         $subExpressions = [];
 

Player/ExpressionLanguage/Provider.php

@@ -35,7 +35,7 @@ class Provider implements ExpressionFunctionProviderInterface
     private readonly FakerGenerator $faker;
 
     public function __construct(
-        ?FakerGenerator $faker = null,
+        FakerGenerator|null $faker = null,
         private readonly bool $sandbox = false,
     ) {
         $this->faker = null !== $faker ? $faker : FakerFactory::create();
@@ -69,7 +69,7 @@ public function getFunctions(): array
                 return $arguments['_crawler']->selectButton($selector);
             }),
 
-            new ExpressionFunction('file', $compiler, function (array $arguments, string $filename, ?string $name = null) {
+            new ExpressionFunction('file', $compiler, function (array $arguments, string $filename, string|null $name = null) {
                 if ($this->sandbox) {
                     if (UploadFile::isAbsolutePath($filename)) {
                         $extra = $arguments['_extra'];
@@ -186,7 +186,7 @@ public function getFunctions(): array
                 return array_merge($arr1, $arr2);
             }),
 
-            new ExpressionFunction('fake', $compiler, function (array $arguments, ?string $provider = null/* , $othersArgs ... */) {
+            new ExpressionFunction('fake', $compiler, function (array $arguments, string|null $provider = null/* , $othersArgs ... */) {
                 $arguments = \func_get_args();
 
                 if (!$provider) {
@@ -222,7 +222,7 @@ public function getFunctions(): array
                 return $ret;
             }),
 
-            new ExpressionFunction('regex', $compiler, function (array $arguments, string $regex, ?string $str = null) {
+            new ExpressionFunction('regex', $compiler, function (array $arguments, string $regex, string|null $str = null) {
                 if (null === $str) {
                     if ($arguments['_response'] instanceof Response) {
                         $str = $arguments['_response']->body;

Player/ExpressionLanguage/ValidatorParser.php

@@ -22,8 +22,8 @@
  */
 class ValidatorParser extends SymfonyParser
 {
-    private ?TokenStream $stream = null;
-    private ?array $names = null;
+    private TokenStream|null $stream = null;
+    private array|null $names = null;
     private array $missingNames = [];
 
     public function __construct(

Player/Extension/BlackfireEnvResolver.php

@@ -25,7 +25,7 @@
     private const DEPRECATION_ENV_RESOLVING = 'Resolving an environment at the scenario level using the "blackfire" property is deprecated. Please use `--blackfire-env` instead.';
 
     public function __construct(
-        private ?string $defaultEnv,
+        private string|null $defaultEnv,
         private ExpressionLanguage $language,
     ) {
     }

Player/Extension/BlackfireExtension.php

@@ -391,7 +391,7 @@ public function afterScenarioSet(ScenarioSet $scenarios, int $concurrency, Scena
         }
     }
 
-    private function findEnvBuildFromExtraBag(string $env, ScenarioSet $scenarios): ?Build
+    private function findEnvBuildFromExtraBag(string $env, ScenarioSet $scenarios): Build|null
     {
         $bag = $scenarios->getExtraBag();
 

Player/Http/Cookie.php

@@ -35,7 +35,7 @@ final class Cookie
     private function __construct(
         private readonly string $name,
         private readonly string $value,
-        private readonly ?string $expires,
+        private readonly string|null $expires,
         private readonly string $path,
         private readonly string $domain,
         private readonly bool $secure,
@@ -74,7 +74,7 @@ public function __toString(): string
      *
      * @throws \InvalidArgumentException
      */
-    public static function fromString(string $cookie, ?string $url = null): static
+    public static function fromString(string $cookie, string|null $url = null): static
     {
         $parts = explode(';', $cookie);
 
@@ -135,7 +135,7 @@ public static function fromString(string $cookie, ?string $url = null): static
         );
     }
 
-    private static function parseDate(string $dateValue): ?string
+    private static function parseDate(string $dateValue): string|null
     {
         // trim single quotes around date if present
         if (($length = \strlen($dateValue)) > 1 && "'" === $dateValue[0] && "'" === $dateValue[$length - 1]) {

Player/Http/CookieJar.php

@@ -33,7 +33,7 @@ public function clear(): void
         $this->cookieJar = [];
     }
 
-    public function updateFromSetCookie(array $setCookies, ?string $uri = null): void
+    public function updateFromSetCookie(array $setCookies, string|null $uri = null): void
     {
         $cookies = [];
 
@@ -56,7 +56,7 @@ public function updateFromSetCookie(array $setCookies, ?string $uri = null): voi
         }
     }
 
-    public function updateFromResponse(ResponseInterface $response, ?string $uri = null): void
+    public function updateFromResponse(ResponseInterface $response, string|null $uri = null): void
     {
         $headers = $response->getHeaders(false);
         $this->updateFromSetCookie($headers['set-cookie'] ?? [], $uri);

Player/Http/CrawlerFactory.php

@@ -20,7 +20,7 @@
  */
 class CrawlerFactory
 {
-    public static function create(Response $response, ?string $uri): ?Crawler
+    public static function create(Response $response, string|null $uri): Crawler|null
     {
         $contentType = $response->headers['content-type'][0] ?? null;
         if (!$contentType) {

Player/Input.php

@@ -27,7 +27,7 @@ final class Input
 
     public function __construct(
         string $input,
-        private readonly ?string $file = null,
+        private readonly string|null $file = null,
     ) {
         $this->lines = $this->splitInput($input);
 
@@ -70,7 +70,7 @@ public function getIndent(): int
         return $this->computeIndent($this->lineno);
     }
 
-    public function getFile(): ?string
+    public function getFile(): string|null
     {
         return $this->file;
     }

Player/Parser.php

@@ -54,7 +54,7 @@ class Parser
     /** @var string[] */
     private array $missingVariables = [];
     private array $groups;
-    private ?string $name = null;
+    private string|null $name = null;
 
     public function __construct(
         private readonly ExpressionLanguage $expressionLanguage,
@@ -106,7 +106,7 @@ protected function doLoad(mixed $file): ScenarioSet
         return $this->parse($input, $file);
     }
 
-    public function parse(string $input, ?string $file = null): ScenarioSet
+    public function parse(string $input, string|null $file = null): ScenarioSet
     {
         $input = new Input($input, $file);
 

Player/PlayerNext.php

@@ -32,8 +32,8 @@ class PlayerNext
 {
     /** @var (StepExtensionInterface|ScenarioExtensionInterface|ScenarioSetExtensionInterface|NextStepExtensionInterface|ExceptionExtensionInterface)[][] */
     private array $extensions = [];
-    private ?array $extensionsSorted = null;
-    private ?AbstractStep $currentStep = null;
+    private array|null $extensionsSorted = null;
+    private AbstractStep|null $currentStep = null;
 
     public function __construct(
         private readonly StepContextFactory $stepContextFactory,

Player/Scenario.php

@@ -22,14 +22,14 @@
 class Scenario extends GroupStep
 {
     #[Ignore]
-    protected ?string $blackfireBuildUuid = null;
+    protected string|null $blackfireBuildUuid = null;
 
-    public function getType(): ?string
+    public function getType(): string|null
     {
         return null;
     }
 
-    public function getBlackfireBuildUuid(): ?string
+    public function getBlackfireBuildUuid(): string|null
     {
         return $this->blackfireBuildUuid;
     }

Player/ScenarioContext.php

@@ -21,14 +21,14 @@
  */
 class ScenarioContext
 {
-    private ?Response $lastResponse = null;
-    private ?Crawler $crawler = null;
+    private Response|null $lastResponse = null;
+    private Crawler|null $crawler = null;
     private ValueBag $valueBag;
     private ValueBag $extraBag;
 
     public function __construct(
-        private readonly ?string $name,
-        private ?ScenarioSet $scenarioSet,
+        private readonly string|null $name,
+        private ScenarioSet|null $scenarioSet,
     ) {
         $this->valueBag = new ValueBag();
         $this->extraBag = new ValueBag();
@@ -97,12 +97,12 @@ public function removeExtraValue(string $name): void
         $this->extraBag->remove($name);
     }
 
-    public function getName(): ?string
+    public function getName(): string|null
     {
         return $this->name;
     }
 
-    public function getScenarioSet(): ?ScenarioSet
+    public function getScenarioSet(): ScenarioSet|null
     {
         return $this->scenarioSet;
     }

Player/ScenarioResult.php

@@ -22,7 +22,7 @@ class ScenarioResult
 {
     public function __construct(
         private readonly ScenarioContext $scenarioContext,
-        private ?\Throwable $error,
+        private \Throwable|null $error,
     ) {
     }
 
@@ -48,12 +48,12 @@ public function isErrored(): bool
         return null !== $this->error;
     }
 
-    public function getError(): ?\Throwable
+    public function getError(): \Throwable|null
     {
         return $this->error;
     }
 
-    public function getScenarioName(): ?string
+    public function getScenarioName(): string|null
     {
         return $this->scenarioContext->getName();
     }