Rename Action to AbstractAction

VerifiedJoseph · Apr 21, 2024 · 8807918 · 8807918
1 parent 934094f
commit 8807918
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 18 deletions.
diff --git a/src/Action.php → src/Action/AbstractAction.php b/src/Action.php → src/Action/AbstractAction.php
@@ -1,13 +1,13 @@
 <?php
 
-namespace Ntfy;
+namespace Ntfy\Action;
 
 /**
  * Base class for button actions
  *
  * @see https://ntfy.sh/docs/publish/#action-buttons
  */
-abstract class Action
+abstract class AbstractAction
 {
     /** @var string $type Button action type */
     protected string $type = '';

diff --git a/src/Action/Broadcast.php b/src/Action/Broadcast.php
@@ -2,14 +2,12 @@
 
 namespace Ntfy\Action;
 
-use Ntfy\Action;
-
 /**
  * Class for creating an android broadcast button action
  *
  * @see https://ntfy.sh/docs/publish/#send-android-broadcast
  */
-class Broadcast extends Action
+class Broadcast extends AbstractAction
 {
     /** {@inheritDoc} */
     protected string $type = 'broadcast';

diff --git a/src/Action/Http.php b/src/Action/Http.php
@@ -2,14 +2,12 @@
 
 namespace Ntfy\Action;
 
-use Ntfy\Action;
-
 /**
  * Class for creating a http button action
  *
  * @see https://ntfy.sh/docs/publish/#open-websiteapp
  */
-class Http extends Action
+class Http extends AbstractAction
 {
     /** {@inheritDoc} */
     protected string $type = 'http';

diff --git a/src/Action/View.php b/src/Action/View.php
@@ -2,14 +2,12 @@
 
 namespace Ntfy\Action;
 
-use Ntfy\Action;
-
 /**
  * Class for creating a view button action
  *
  * @see https://ntfy.sh/docs/publish/#open-websiteapp
  */
-class View extends Action
+class View extends AbstractAction
 {
     /** {@inheritDoc} */
     protected string $type = 'view';

diff --git a/src/Message.php b/src/Message.php
@@ -2,6 +2,9 @@
 
 namespace Ntfy;
 
+use Ntfy\Action\Broadcast;
+use Ntfy\Action\Http;
+use Ntfy\Action\View;
 use Ntfy\Exception\NtfyException;
 
 /**
@@ -191,11 +194,11 @@ public function attachURL(string $url, string $name = ''): void
     /**
      * Set an action button
      *
-     * @param Action $action Action class instance
+     * @param Broadcast|Http|View $action Action class instance
      *
      * @see https://ntfy.sh/docs/publish/#action-buttons
      */
-    public function action(Action $action): void
+    public function action(Broadcast|Http|View $action): void
     {
         $this->data['actions'][] = $action->get();
     }

diff --git a/tests/Action/BroadcastTest.php b/tests/Action/BroadcastTest.php
@@ -5,7 +5,7 @@
 use Ntfy\Action\Broadcast;
 
 #[CoversClass(Broadcast::class)]
-#[UsesClass(Ntfy\Action::class)]
+#[UsesClass(Ntfy\Action\AbstractAction::class)]
 class BroadcastTest extends TestCase
 {
     /**

diff --git a/tests/Action/HttpTest.php b/tests/Action/HttpTest.php
@@ -5,7 +5,7 @@
 use Ntfy\Action\Http;
 
 #[CoversClass(Http::class)]
-#[UsesClass(Ntfy\Action::class)]
+#[UsesClass(Ntfy\Action\AbstractAction::class)]
 class HttpTest extends TestCase
 {
     /**

diff --git a/tests/Action/ViewTest.php b/tests/Action/ViewTest.php
@@ -4,7 +4,7 @@
 use Ntfy\Action\View;
 
 #[CoversClass(View::class)]
-#[CoversClass(Ntfy\Action::class)]
+#[CoversClass(Ntfy\Action\AbstractAction::class)]
 class ViewTest extends TestCase
 {
     /**

diff --git a/tests/ClientTest.php b/tests/ClientTest.php
@@ -13,12 +13,12 @@
 #[UsesClass(Server::class)]
 #[UsesClass(Message::class)]
 #[UsesClass(Json::class)]
-#[UsesClass(Action::class)]
 #[UsesClass(Ntfy\Guzzle::class)]
 #[UsesClass(Ntfy\Auth\User::class)]
 #[UsesClass(Ntfy\Auth\Token::class)]
 #[UsesClass(Ntfy\Auth\AbstractAuth::class)]
 #[UsesClass(Ntfy\Action\View::class)]
+#[UsesClass(Ntfy\Action\AbstractAction::class)]
 class ClientTest extends TestCase
 {
     protected static stdClass $authParams;

diff --git a/tests/MessageTest.php b/tests/MessageTest.php
@@ -8,9 +8,9 @@
 use Ntfy\Exception\NtfyException;
 
 #[CoversClass(Message::class)]
-#[UsesClass(Action::class)]
 #[UsesClass(Json::class)]
 #[UsesClass(Action\View::class)]
+#[UsesClass(Action\AbstractAction::class)]
 #[UsesClass(NtfyException::class)]
 class MessageTest extends TestCase
 {