Merge pull request #194 from mzur/webhook-patch-1

Fix webhook action for Kirby 3
mzur · Mar 9, 2020 · 375f26a · 375f26a
2 parents 9ce6bb8 + 775f8c5
commit 375f26a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/Actions/WebhookAction.php b/src/Actions/WebhookAction.php
@@ -2,6 +2,7 @@
 
 namespace Uniform\Actions;
 
+use Exception;
 use Kirby\Toolkit\A;
 use Kirby\Http\Remote;
 use Kirby\Toolkit\I18n;
@@ -49,10 +50,10 @@ public function perform()
 
         $params['headers'] = array_merge(A::get($params, 'headers', []), $headers);
 
-        $response = $this->request($url, $params);
-
-        if ($response->error !== 0) {
-            $this->fail(I18n::translate('uniform-webhook-error').$response->message);
+        try {
+            $this->request($url, $params);
+        } catch (Exception $e) {
+            $this->fail(I18n::translate('uniform-webhook-error').$e->getMessage());
         }
     }
 

diff --git a/tests/Actions/WebhookActionTest.php b/tests/Actions/WebhookActionTest.php
@@ -2,7 +2,6 @@
 
 namespace Uniform\Tests\Actions;
 
-use StdClass;
 use Exception;
 use Uniform\Form;
 use Uniform\Tests\TestCase;
@@ -89,14 +88,15 @@ public function testProcessData()
 
 class WebhookActionStub extends WebhookAction
 {
+    public $shouldFail = false;
+
     protected function request($url, $params)
     {
         $this->url = $url;
         $this->params = $params;
-        $response = new StdClass;
-        $response->error = isset($this->shouldFail) ? 1 : 0;
-        $response->message = '';
-        return $response;
+        if ($this->shouldFail) {
+            throw new Exception;
+        }
     }
 }