Use closure.

w7corp · Oct 23, 2017 · ac8ceff · ac8ceff
1 parent 5f21692
commit ac8ceff
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 30 deletions.
diff --git a/src/Payment/Application.php b/src/Payment/Application.php
@@ -11,6 +11,7 @@
 
 namespace EasyWeChat\Payment;
 
+use Closure;
 use EasyWeChat\BasicService;
 use EasyWeChat\Kernel\ServiceContainer;
 use EasyWeChat\Kernel\Support;
@@ -85,33 +86,33 @@ public function scheme(string $productId): string
     }
 
     /**
-     * @param callable $callback
+     * @param \Closure $closure
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function handlePaidNotify(callable $callback)
+    public function handlePaidNotify(Closure $closure)
     {
-        return (new Notify\Paid($this))->handle($callback);
+        return (new Notify\Paid($this))->handle($closure);
     }
 
     /**
-     * @param callable $callback
+     * @param \Closure $closure
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function handleRefundedNotify(callable $callback)
+    public function handleRefundedNotify(Closure $closure)
     {
-        return (new Notify\Refunded($this))->handle($callback);
+        return (new Notify\Refunded($this))->handle($closure);
     }
 
     /**
-     * @param callable $callback
+     * @param \Closure $closure
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function handleScannedNotify(callable $callback)
+    public function handleScannedNotify(Closure $closure)
     {
-        return (new Notify\Scanned($this))->handle($callback);
+        return (new Notify\Scanned($this))->handle($closure);
     }
 
     /**

diff --git a/src/Payment/Notify/Handler.php b/src/Payment/Notify/Handler.php
@@ -11,6 +11,7 @@
 
 namespace EasyWeChat\Payment\Notify;
 
+use Closure;
 use EasyWeChat\Kernel\Exceptions\Exception;
 use EasyWeChat\Kernel\Support;
 use EasyWeChat\Kernel\Support\XML;
@@ -68,11 +69,11 @@ public function __construct($app)
     /**
      * Handle incoming notify.
      *
-     * @param callable $callback
+     * @param \Closure $closure
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    abstract public function handle(callable $callback): Response;
+    abstract public function handle(Closure $closure);
 
     /**
      * @param string $message

diff --git a/src/Payment/Notify/Paid.php b/src/Payment/Notify/Paid.php
@@ -11,19 +11,19 @@
 
 namespace EasyWeChat\Payment\Notify;
 
-use Symfony\Component\HttpFoundation\Response;
+use Closure;
 
 class Paid extends Handler
 {
     /**
-     * @param callable $callback
+     * @param \Closure $closure
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function handle(callable $callback): Response
+    public function handle(Closure $closure)
     {
         $this->strict(
-            call_user_func_array($callback, [$this->getMessage(), [$this, 'fail']])
+            $closure->bindTo($this)->__invoke($this->getMessage(), [$this, 'fail'])
         );
 
         return $this->toResponse();

diff --git a/src/Payment/Notify/Refunded.php b/src/Payment/Notify/Refunded.php
@@ -11,28 +11,33 @@
 
 namespace EasyWeChat\Payment\Notify;
 
+use Closure;
 use EasyWeChat\Kernel\Support\XML;
-use Symfony\Component\HttpFoundation\Response;
 
 class Refunded extends Handler
 {
     protected $check = false;
 
     /**
-     * @param callable $callback
+     * @param \Closure $closure
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function handle(callable $callback): Response
+    public function handle(Closure $closure)
     {
         $this->strict(
-            call_user_func_array($callback, [$this->getMessage(), [$this, 'fail']])
+            $closure->bindTo($this)->__invoke($this->getMessage(), [$this, 'fail'])
         );
 
         return $this->toResponse();
     }
 
-    public function decryptedInfo()
+    /**
+     * Decrypt the `req_info` from request message.
+     *
+     * @return array
+     */
+    public function reqInfo()
     {
         return XML::parse($this->decryptMessage('req_info'));
     }

diff --git a/src/Payment/Notify/Scanned.php b/src/Payment/Notify/Scanned.php
@@ -11,7 +11,7 @@
 
 namespace EasyWeChat\Payment\Notify;
 
-use Symfony\Component\HttpFoundation\Response;
+use Closure;
 
 class Scanned extends Handler
 {
@@ -24,24 +24,20 @@ class Scanned extends Handler
 
     /**
      * @param string $message
-     *
-     * @return $this
      */
     public function alert(string $message)
     {
         $this->alert = $message;
-
-        return $this;
     }
 
     /**
-     * @param callable $callback
+     * @param \Closure $closure
      *
      * @return \Symfony\Component\HttpFoundation\Response
      */
-    public function handle(callable $callback): Response
+    public function handle(Closure $closure)
     {
-        $result = call_user_func_array($callback, [$this->getMessage(), [$this, 'fail'], [$this, 'alert']]);
+        $result = $closure->bindTo($this)->__invoke($this->getMessage(), [$this, 'fail'], [$this, 'alert']);
 
         $attributes = [
             'result_code' => is_null($this->alert) && is_null($this->fail) ? static::SUCCESS : static::FAIL,

diff --git a/tests/Payment/Notify/PaidTest.php b/tests/Payment/Notify/PaidTest.php
@@ -38,8 +38,9 @@ public function testPaidNotify()
 
         $notify = new Paid($app);
 
-        $response = $notify->handle(function ($message) {
-            $this->assertSame([
+        $that = $this;
+        $response = $notify->handle(function ($message) use ($that) {
+            $that->assertSame([
                 'foo' => 'bar',
                 'sign' => '280F9CB28E99DC917792FCC7AC1B88C4',
             ], $message);