wip Foundation

src/Foundation/Client.php

@@ -44,10 +44,8 @@ public function __construct(Credential $credential = null, \GuzzleHttp\Client $h
      */
     public function send(Contracts\Message $message): ResponseInterface
     {
-        assert($message instanceof Message);
-
         return $this
             ->httpClient
-            ->request($message->httpMethod(), $message->httpUri(), $message->httpOptions());
+            ->request($message->httpMethod(), $message->httpUri(), $message->toHttpOptions());
     }
 }

src/Foundation/Concerns/AsBody.php

@@ -20,7 +20,7 @@
  */
 trait AsBody
 {
-    public function httpOptions(): array
+    public function toHttpOptions(): array
     {
         return [
             RequestOptions::BODY => $this->toPayload(),

src/Foundation/Concerns/AsFormParams.php

@@ -20,7 +20,7 @@
  */
 trait AsFormParams
 {
-    public function httpOptions(): array
+    public function toHttpOptions(): array
     {
         return [
             RequestOptions::FORM_PARAMS => $this->toPayload(),

src/Foundation/Concerns/AsJson.php

@@ -20,7 +20,7 @@
  */
 trait AsJson
 {
-    public function httpOptions(): array
+    public function toHttpOptions(): array
     {
         return [
             RequestOptions::JSON => $this->toPayload(),

src/Foundation/Concerns/AsMultipart.php

@@ -20,7 +20,7 @@
  */
 trait AsMultipart
 {
-    public function httpOptions(): array
+    public function toHttpOptions(): array
     {
         return [
             RequestOptions::MULTIPART => $this->toPayload(),

src/Foundation/Concerns/AsQuery.php

@@ -20,7 +20,7 @@
  */
 trait AsQuery
 {
-    public function httpOptions(): array
+    public function toHttpOptions(): array
     {
         return [
             RequestOptions::QUERY => $this->toPayload(),

src/Foundation/Contracts/Message.php

@@ -12,12 +12,16 @@
 
 namespace Guanguans\Notify\Foundation\Contracts;
 
-use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\UriInterface;
 
 interface Message extends \ArrayAccess
 {
+    public function httpMethod(): string;
+
     /**
-     * @return string|resource|array|object|StreamInterface
+     * @return string|UriInterface
      */
-    public function toPayload();
+    public function httpUri();
+
+    public function toHttpOptions(): array;
 }

src/Foundation/Message.php

@@ -14,7 +14,7 @@
 
 use Guanguans\Notify\Foundation\Traits\HasOptions;
 use Guanguans\Notify\Traits\CreateStaticable;
-use Psr\Http\Message\UriInterface;
+use Psr\Http\Message\StreamInterface;
 
 abstract class Message implements Contracts\Message
 {
@@ -26,15 +26,11 @@ public function __construct(array $options = [])
         $this->setOptions($options);
     }
 
-    abstract public function httpMethod(): string;
-
     /**
-     * @return string|UriInterface
+     * @return string|array|object|resource|StreamInterface
+     *
+     * @noinspection PhpReturnDocTypeMismatchInspection
      */
-    abstract public function httpUri();
-
-    abstract public function httpOptions(): array;
-
     public function toPayload()
     {
         return $this->options;

src/Foundation/Support/helpers.php

@@ -9,3 +9,15 @@
  *
  * This source file is subject to the MIT license that is bundled.
  */
+
+if (! function_exists('tap')) {
+    /**
+     * Call the given Closure with the given value then return the value.
+     */
+    function tap($value, callable $callback)
+    {
+        $callback($value);
+
+        return $value;
+    }
+}

src/Foundation/Traits/Tappable.php

@@ -16,8 +16,6 @@ trait Tappable
 {
     public function tap(callable $callback): self
     {
-        $callback($this);
-
-        return $this;
+        return tap($this, $callback);
     }
 }