getRequest() → $this->request

Author: brandonkelly

src/controllers/ActivityController.php

@@ -37,7 +37,7 @@ public function actionIndex(): Response
             ->orderBy(['id' => SORT_DESC]);
 
         $paginator = new Paginator($query, [
-            'currentPage' => Craft::$app->getRequest()->getPageNum(),
+            'currentPage' => $this->request->getPageNum(),
         ]);
 
         $requests = $paginator->getPageResults();
@@ -71,7 +71,7 @@ public function actionClear(): Response
      */
     public function actionDetails(): Response
     {
-        $requestId = Craft::$app->getRequest()->getRequiredBodyParam('requestId');
+        $requestId = $this->request->getRequiredBodyParam('requestId');
         $request = Plugin::getInstance()->getRequestData($requestId);
 
         if ($request['requestHeaders'] && $request['requestBody'] && $this->_isJson($request['requestHeaders'])) {
@@ -96,7 +96,7 @@ public function actionDetails(): Response
      */
     public function actionRedeliver(): Response
     {
-        $requestId = Craft::$app->getRequest()->getRequiredBodyParam('requestId');
+        $requestId = $this->request->getRequiredBodyParam('requestId');
         Plugin::getInstance()->sendRequest($requestId);
 
         return $this->runAction('details');

src/controllers/ManageController.php

@@ -46,11 +46,10 @@ public function actionSaveGroup(): Response
     {
         $this->requirePostRequest();
 
-        $request = Craft::$app->getRequest();
         $manager = Plugin::getInstance()->getWebhookManager();
 
-        $id = $request->getBodyParam('id');
-        $name = $request->getRequiredBodyParam('name');
+        $id = $this->request->getBodyParam('id');
+        $name = $this->request->getRequiredBodyParam('name');
         $group = new Group(compact('id', 'name'));
 
         if (!$manager->saveGroup($group)) {
@@ -74,7 +73,7 @@ public function actionSaveGroup(): Response
      */
     public function actionDeleteGroup(): Response
     {
-        $id = Craft::$app->getRequest()->getRequiredBodyParam('id');
+        $id = $this->request->getRequiredBodyParam('id');
         Plugin::getInstance()->getWebhookManager()->deleteGroupById($id);
         Craft::$app->getSession()->setNotice(Craft::t('webhooks', 'Group deleted.'));
         return $this->asJson([

src/controllers/WebhooksController.php

@@ -116,10 +116,9 @@ public function actionSave()
     {
         $this->requirePostRequest();
 
-        $request = Craft::$app->getRequest();
         $manager = Plugin::getInstance()->getWebhookManager();
 
-        $id = $request->getBodyParam('id');
+        $id = $this->request->getBodyParam('id');
 
         if ($id) {
             try {
@@ -131,7 +130,7 @@ public function actionSave()
             $webhook = new Webhook();
         }
 
-        $attributes = $request->getBodyParams();
+        $attributes = $this->request->getBodyParams();
         $customPayload = ArrayHelper::remove($attributes, 'customPayload');
         if ($customPayload !== null) {
             if ($customPayload) {
@@ -149,7 +148,7 @@ public function actionSave()
         $webhook->setAttributes($attributes);
 
         if (!Plugin::getInstance()->getWebhookManager()->saveWebhook($webhook)) {
-            if ($request->getAcceptsJson()) {
+            if ($this->request->getAcceptsJson()) {
                 return $this->asJson([
                     'success' => false,
                     'errors' => $webhook->getErrors(),
@@ -164,7 +163,7 @@ public function actionSave()
             return null;
         }
 
-        if ($request->getAcceptsJson()) {
+        if ($this->request->getAcceptsJson()) {
             return $this->asJson([
                 'success' => true,
                 'webhook' => $webhook->toArray(),
@@ -183,7 +182,7 @@ public function actionSave()
     public function actionDelete(): Response
     {
         $this->requirePostRequest();
-        $id = Craft::$app->getRequest()->getRequiredBodyParam('id');
+        $id = $this->request->getRequiredBodyParam('id');
         Plugin::getInstance()->getWebhookManager()->deleteWebhookById($id);
         return $this->redirectToPostedUrl();
     }
@@ -207,7 +206,7 @@ public function actionClassSuggestions(): Response
      */
     public function actionEventSuggestions(): Response
     {
-        $senderClass = Craft::$app->getRequest()->getRequiredBodyParam('senderClass');
+        $senderClass = $this->request->getRequiredBodyParam('senderClass');
 
         return $this->asJson([
             'events' => WebhookHelper::eventSuggestions($senderClass),
@@ -221,9 +220,8 @@ public function actionEventSuggestions(): Response
      */
     public function actionFilters(): Response
     {
-        $request = Craft::$app->getRequest();
-        $senderClass = $request->getRequiredBodyParam('senderClass');
-        $event = $request->getRequiredBodyParam('event');
+        $senderClass = $this->request->getRequiredBodyParam('senderClass');
+        $event = $this->request->getRequiredBodyParam('event');
 
         $filters = [];