update dependencies

php-service-bus · Feb 13, 2021 · 5b0fa94 · 5b0fa94
1 parent d898302
commit 5b0fa94
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 21 deletions.
diff --git a/composer.json b/composer.json
@@ -51,16 +51,16 @@
     "php-service-bus/code-style-config": "v1.3.*",
     "doctrine/dbal": "v3.0.*",
     "phpunit/phpunit": "v9.5.*",
-    "vimeo/psalm": "v4.4.*",
+    "vimeo/psalm": "v4.5.*",
     "phpstan/phpstan": "v0.12.*"
   },
   "prefer-stable": true,
   "minimum-stability": "stable",
   "scripts": {
     "psalm": "./vendor/bin/psalm --config=psalm.xml",
     "phpstan": "./vendor/bin/phpstan analyse src --level 7",
-    "tests": "./vendor/bin/phpunit --configuration phpunit.xml --verbose",
-    "coverage": "./vendor/bin/phpunit --configuration phpunit.xml --coverage-html ./coverage --verbose",
+    "tests": "./vendor/bin/phpunit --configuration phpunit.xml --debug --verbose --debug",
+    "coverage": "XDEBUG_MODE=coverage ./vendor/bin/phpunit --configuration phpunit.xml --coverage-html ./coverage --debug --verbose --debug",
     "cs-check": "./vendor/bin/php-cs-fixer fix --allow-risky=yes --dry-run",
     "cs-fix": "./vendor/bin/php-cs-fixer fix --allow-risky=yes",
     "pre-commit": "PHP_CS_FIXER_IGNORE_ENV=1 ./vendor/bin/php-cs-fixer fix --allow-risky=yes && ./vendor/bin/psalm --config=psalm.xml && ./vendor/bin/phpstan analyse src --level 7 && ./vendor/bin/phpunit --configuration phpunit.xml --verbose"

diff --git a/src/Configuration/Attributes/SagaAttributeBasedConfigurationLoader.php b/src/Configuration/Attributes/SagaAttributeBasedConfigurationLoader.php
@@ -55,6 +55,7 @@ public function load(string $sagaClass): SagaConfiguration
         {
             $attributes = $this->attributesReader->extract($sagaClass);
 
+            /** @psalm-suppress MixedArgumentTypeCoercion */
             $sagaHeader = self::searchSagaHeader(
                 sagaClass: $sagaClass,
                 classLevelAttributes: $attributes->classLevelCollection
@@ -65,6 +66,7 @@ classLevelAttributes: $attributes->classLevelCollection
                 sagaHeader: $sagaHeader
             );
 
+            /** @psalm-suppress MixedArgumentTypeCoercion */
             $handlersCollection = $this->collectSagaEventHandlers(
                 methodLevelAttributes: $attributes->methodLevelCollection,
                 sagaMetadata: $sagaMetadata

diff --git a/tests/stubs/TestContext.php b/tests/stubs/TestContext.php
@@ -84,6 +84,6 @@ public function headers(): array
 
     public function metadata(): IncomingMessageMetadata
     {
-        return TestIncomingMessageMetadata::create(uuid(), []);
+        return new TestIncomingMessageMetadata(uuid(), []);
     }
 }
diff --git a/tests/stubs/TestIncomingMessageMetadata.php b/tests/stubs/TestIncomingMessageMetadata.php
@@ -13,6 +13,7 @@
 namespace ServiceBus\Sagas\Tests\stubs;
 
 use ServiceBus\Common\Context\IncomingMessageMetadata;
+use function ServiceBus\Common\uuid;
 
 /**
  *
@@ -30,23 +31,9 @@ final class TestIncomingMessageMetadata implements IncomingMessageMetadata
      */
     private $variables;
 
-    public static function create(string $messageId, array $variables): self
+    public function traceId(): string
     {
-        return new self(
-            messageId: $messageId,
-            variables: $variables
-        );
-    }
-
-    public function with(string $key, float|bool|int|string|null $value): self
-    {
-        $variables       = $this->variables;
-        $variables[$key] = $value;
-
-        return new self(
-            messageId: $this->messageId,
-            variables: $variables
-        );
+        return uuid();
     }
 
     public function messageId(): string
@@ -72,7 +59,7 @@ public function get(string $key, float|bool|int|string|null $default = null): st
     /**
      * @psalm-param array<string, string|int|float|bool|null> $variables
      */
-    private function __construct(string $messageId, array $variables)
+    public function __construct(string $messageId, array $variables)
     {
         $this->messageId = $messageId;
         $this->variables = $variables;