Merge pull request #33191 from blackfireio/bot-update-deps-phive

Update PHIVE dependencies
blackfireio · Mar 4, 2024 · 3ffc11d · 3ffc11d
2 parents de8f00d + 2bd8816
commit 3ffc11d
Show file tree

Hide file tree

Showing 20 changed files with 33 additions and 33 deletions.
diff --git a/Player/Build/Build.php b/Player/Build/Build.php
@@ -15,7 +15,7 @@
 {
     public function __construct(
         public string $uuid,
-        public string|null $url = null,
+        public ?string $url = null,
     ) {
     }
 }
diff --git a/Player/BuildApi.php b/Player/BuildApi.php
@@ -46,7 +46,7 @@ public function getOrCreate(string $env, ScenarioSet $scenarioSet): Build
         return $build;
     }
 
-    public function createBuild(string|null $buildName, string $env): Build
+    public function createBuild(?string $buildName, string $env): Build
     {
         $options = [
             'trigger_name' => 'Blackfire Player',

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

diff --git a/Player/Console/PlayerCommand.php b/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|null $blackfireHttpClient;
-    private BlackfireSdkAdapterInterface|null $blackfireSdkAdapter;
+    private ?HttpClientInterface $blackfireHttpClient;
+    private ?BlackfireSdkAdapterInterface $blackfireSdkAdapter;
     private string $transactionId;
 
     public function __construct(
-        HttpClientInterface|null $blackfireHttpClient, BlackfireSdkAdapterInterface|null $blackfireSdkAdapter, string $transactionId)
+        ?HttpClientInterface $blackfireHttpClient, ?BlackfireSdkAdapterInterface $blackfireSdkAdapter, string $transactionId)
     {
         $this->blackfireHttpClient = $blackfireHttpClient;
         $this->blackfireSdkAdapter = $blackfireSdkAdapter;

diff --git a/Player/Extension/BlackfireEnvResolver.php b/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|null $defaultEnv,
+        private ?string $defaultEnv,
         private ExpressionLanguage $language,
     ) {
     }

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

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

diff --git a/Player/Scenario.php b/Player/Scenario.php
@@ -29,7 +29,7 @@ public function getType(): ?string
         return null;
     }
 
-    public function getBlackfireBuildUuid(): string|null
+    public function getBlackfireBuildUuid(): ?string
     {
         return $this->blackfireBuildUuid;
     }

diff --git a/Player/ScenarioContext.php b/Player/ScenarioContext.php
@@ -21,8 +21,8 @@
  */
 class ScenarioContext
 {
-    private Response|null $lastResponse = null;
-    private Crawler|null $crawler = null;
+    private ?Response $lastResponse = null;
+    private ?Crawler $crawler = null;
     private ValueBag $valueBag;
     private ValueBag $extraBag;
 
@@ -102,7 +102,7 @@ public function getName(): ?string
         return $this->name;
     }
 
-    public function getScenarioSet(): ScenarioSet|null
+    public function getScenarioSet(): ?ScenarioSet
     {
         return $this->scenarioSet;
     }

diff --git a/Player/ScenarioResult.php b/Player/ScenarioResult.php
@@ -22,7 +22,7 @@ class ScenarioResult
 {
     public function __construct(
         private readonly ScenarioContext $scenarioContext,
-        private \Throwable|null $error,
+        private ?\Throwable $error,
     ) {
     }
 
@@ -53,7 +53,7 @@ public function getError(): ?\Throwable
         return $this->error;
     }
 
-    public function getScenarioName(): string|null
+    public function getScenarioName(): ?string
     {
         return $this->scenarioContext->getName();
     }

diff --git a/Player/Step/ConditionStep.php b/Player/Step/ConditionStep.php
@@ -18,8 +18,8 @@
  */
 class ConditionStep extends BlockStep
 {
-    private AbstractStep|null $ifStep = null;
-    private AbstractStep|null $elseStep = null;
+    private ?AbstractStep $ifStep = null;
+    private ?AbstractStep $elseStep = null;
 
     public function __construct(
         private readonly string $condition,
@@ -59,12 +59,12 @@ public function getCondition(): string
         return $this->condition;
     }
 
-    public function getIfStep(): AbstractStep|null
+    public function getIfStep(): ?AbstractStep
     {
         return $this->ifStep;
     }
 
-    public function getElseStep(): AbstractStep|null
+    public function getElseStep(): ?AbstractStep
     {
         return $this->elseStep;
     }

diff --git a/Player/Step/LoopStep.php b/Player/Step/LoopStep.php
@@ -18,7 +18,7 @@
  */
 class LoopStep extends BlockStep
 {
-    private AbstractStep|null $loopStep = null;
+    private ?AbstractStep $loopStep = null;
 
     public function __construct(
         private readonly string $values,
@@ -48,7 +48,7 @@ public function getValues(): string
         return $this->values;
     }
 
-    public function getLoopStep(): AbstractStep|null
+    public function getLoopStep(): ?AbstractStep
     {
         return $this->loopStep;
     }

diff --git a/Player/Step/StepInitiatorTrait.php b/Player/Step/StepInitiatorTrait.php
@@ -23,7 +23,7 @@ public function getInitiator(): ?Step
         return $this->initiator;
     }
 
-    public function setInitiator(Step|null $step): void
+    public function setInitiator(?Step $step): void
     {
         if ($step instanceof StepInitiatorInterface) {
             $this->initiator = $step->getInitiator() ?? $step;
@@ -32,7 +32,7 @@ public function setInitiator(Step|null $step): void
         }
     }
 
-    public function getInitiatorUuid(): string|null
+    public function getInitiatorUuid(): ?string
     {
         return $this->initiator?->getUuid();
     }

diff --git a/Player/Step/WhileStep.php b/Player/Step/WhileStep.php
@@ -18,7 +18,7 @@
  */
 class WhileStep extends BlockStep
 {
-    private AbstractStep|null $whileStep = null;
+    private ?AbstractStep $whileStep = null;
 
     public function __construct(
         private readonly string $condition,
@@ -46,7 +46,7 @@ public function getCondition(): string
         return $this->condition;
     }
 
-    public function getWhileStep(): AbstractStep|null
+    public function getWhileStep(): ?AbstractStep
     {
         return $this->whileStep;
     }

diff --git a/Player/StepProcessor/ExpressionEvaluator.php b/Player/StepProcessor/ExpressionEvaluator.php
@@ -27,7 +27,7 @@ public function __construct(
     ) {
     }
 
-    public function evaluateExpression(string|null $expression, StepContext $stepContext, ScenarioContext $scenarioContext, bool $trim = true): mixed
+    public function evaluateExpression(?string $expression, StepContext $stepContext, ScenarioContext $scenarioContext, bool $trim = true): mixed
     {
         if (!$expression) {
             return $expression;

diff --git a/Player/StepProcessor/StepContextFactory.php b/Player/StepProcessor/StepContextFactory.php
@@ -27,7 +27,7 @@ public function __construct(
     ) {
     }
 
-    public function createStepContext(AbstractStep $step, StepContext $parentStepContext): StepContext|null
+    public function createStepContext(AbstractStep $step, StepContext $parentStepContext): ?StepContext
     {
         if (!$step instanceof ConfigurableStep) {
             return null;

diff --git a/Player/StepProcessor/UriResolver.php b/Player/StepProcessor/UriResolver.php
@@ -19,7 +19,7 @@
  */
 class UriResolver
 {
-    public function resolveUri(string|null $baseUri, string $uri): string
+    public function resolveUri(?string $baseUri, string $uri): string
     {
         if (!$baseUri) {
             if (null === parse_url($uri, \PHP_URL_SCHEME)) {

diff --git a/Player/Tests/Console/MockServerTrait.php b/Player/Tests/Console/MockServerTrait.php
@@ -17,7 +17,7 @@
 
 trait MockServerTrait
 {
-    protected static Process|null $server = null;
+    protected static ?Process $server = null;
 
     public static function getRunningServer(string $fixturesDir, ?string $port = null): Process
     {

diff --git a/Player/Tests/Http/JsonViewLoggerHttpClient.php b/Player/Tests/Http/JsonViewLoggerHttpClient.php
@@ -21,7 +21,7 @@ class JsonViewLoggerHttpClient implements HttpClientInterface
 {
     use AsyncDecoratorTrait;
 
-    private array|null $lastJsonView;
+    private ?array $lastJsonView;
 
     public function __construct(
         private readonly HttpClientInterface $httpClient,
@@ -45,7 +45,7 @@ public function resetLastJsonView(): void
         $this->lastJsonView = null;
     }
 
-    public function getLastJsonView(): array|null
+    public function getLastJsonView(): ?array
     {
         return $this->lastJsonView;
     }

diff --git a/phive.xml b/phive.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
   <phar name="phpstan" version="^1.5.0" installed="1.10.59" location="./bin/tools/phpstan" copy="true"/>
-  <phar name="php-cs-fixer" version="^3.0" installed="3.50.0" location="./bin/tools/php-cs-fixer" copy="true"/>
+  <phar name="php-cs-fixer" version="^3.0" installed="3.51.0" location="./bin/tools/php-cs-fixer" copy="true"/>
 </phive>