fix: destination 的类型约束去掉 array (#824)

yansongda · Jul 9, 2023 · b9cf6ee · b9cf6ee
1 parent c222940
commit b9cf6ee
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## v3.5.0
 
+### fixed
+
+- fix: `destination` 的类型约束去掉 array(#824)
+
+## v3.5.0
+
 ### deleted
 
 - deleted: 移除 `Yansongda\Pay\Direction\ArrayDirection` 类(#818, #819)

diff --git a/src/Provider/AbstractProvider.php b/src/Provider/AbstractProvider.php
@@ -56,7 +56,7 @@ public function call(string $plugin, array $params = []): Collection|MessageInte
      * @throws ContainerException
      * @throws InvalidParamsException
      */
-    public function pay(array $plugins, array $params): Collection|MessageInterface|array|null
+    public function pay(array $plugins, array $params): Collection|MessageInterface|null
     {
         Logger::info('[AbstractProvider] 即将进行 pay 操作', func_get_args());
 

diff --git a/src/Rocket.php b/src/Rocket.php
@@ -32,7 +32,7 @@ class Rocket implements JsonSerializableInterface, ArrayAccess
 
     private string $direction = DirectionInterface::class;
 
-    private array|null|MessageInterface|Collection $destination = null;
+    private null|MessageInterface|Collection $destination = null;
 
     private null|RequestInterface|ResponseInterface $destinationOrigin = null;
 
@@ -114,12 +114,12 @@ public function setDirection(string $direction): Rocket
         return $this;
     }
 
-    public function getDestination(): Collection|MessageInterface|array|null
+    public function getDestination(): Collection|MessageInterface|null
     {
         return $this->destination;
     }
 
-    public function setDestination(Collection|MessageInterface|array|null $destination): Rocket
+    public function setDestination(Collection|MessageInterface|null $destination): Rocket
     {
         $this->destination = $destination;
 

diff --git a/tests/Plugin/Unipay/LaunchPluginTest.php b/tests/Plugin/Unipay/LaunchPluginTest.php
@@ -155,7 +155,7 @@ public function testArrayDirection()
         ];
 
         $rocket = new Rocket();
-        $rocket->setDestination($response);
+        $rocket->setDestination(Collection::wrap($response));
 
         $result = $this->plugin->assembly($rocket, function ($rocket) { return $rocket; });
 

diff --git a/tests/Plugin/Wechat/LaunchPluginTest.php b/tests/Plugin/Wechat/LaunchPluginTest.php
@@ -72,12 +72,12 @@ public function testArrayDestination()
 
         $rocket = new Rocket();
         $rocket->setDirection(OriginResponseDirection::class);
-        $rocket->setDestination($destination);
+        $rocket->setDestination(Collection::wrap($destination));
         $rocket->setDestinationOrigin(new ServerRequest('POST', 'http://localhost'));
 
         $result = $this->plugin->assembly($rocket, function ($rocket) { return $rocket; });
 
-        self::assertEquals($destination, $result->getDestination());
+        self::assertEquals($destination, $result->getDestination()->toArray());
     }
 
     public function testCollectionDestination()