Craft 4 compatibility

Author: brandonkelly

composer.json

@@ -24,8 +24,9 @@
     "docs": "https://github.com/craftcms/webhooks/blob/master/README.md",
     "rss": "https://github.com/craftcms/webhooks/commits/master.atom"
   },
+  "minimum-stability": "dev",
   "require": {
-    "craftcms/cms": "^3.7.0"
+    "craftcms/cms": "^4.0.0-alpha"
   },
   "require-dev": {
     "phpstan/phpstan": "^0.12.96"

composer.lock

@@ -3,6 +3,7 @@
 namespace craft\webhooks;
 
 use Craft;
+use craft\base\Model;
 use craft\db\Query;
 use craft\events\RegisterComponentTypesEvent;
 use craft\events\RegisterUrlRulesEvent;
@@ -81,17 +82,17 @@ class Plugin extends \craft\base\Plugin
     /**
      * @inheritdoc
      */
-    public $hasCpSettings = true;
+    public bool $hasCpSettings = true;
 
     /**
      * @inheritdoc
      */
-    public $hasCpSection = true;
+    public bool $hasCpSection = true;
 
     /**
      * @inheritdoc
      */
-    public $schemaVersion = '2.4.0';
+    public string $schemaVersion = '2.4.0';
 
     /**
      * @var SendRequestJob[] The request jobs that should be queued up at the end of the web request.
@@ -252,7 +253,7 @@ function(RegisterUrlRulesEvent $e) {
     /**
      * @inheritdoc
      */
-    protected function settingsHtml()
+    protected function settingsHtml(): ?string
     {
         return Craft::$app->getView()->renderTemplate('webhooks/_settings', [
             'settings' => $this->getSettings(),
@@ -262,7 +263,7 @@ protected function settingsHtml()
     /**
      * @inheritdoc
      */
-    public function getCpNavItem()
+    public function getCpNavItem(): ?array
     {
         $item = parent::getCpNavItem();
         $item['subnav'] = [
@@ -494,7 +495,7 @@ public function getWebhookManager(): WebhookManager
     /**
      * @inheritdoc
      */
-    protected function createSettingsModel()
+    protected function createSettingsModel(): ?Model
     {
         return new Settings();
     }

src/Plugin.php

@@ -28,7 +28,7 @@ class SendRequestJob extends BaseJob
     /**
      * @inheritdoc
      */
-    public function defaultDescription()
+    public function defaultDescription(): ?string
     {
         if ($webhook = $this->_webhook()) {
             $description = Craft::t('webhooks', 'Sending webhook “{name}”', [
@@ -48,7 +48,7 @@ public function defaultDescription()
     /**
      * @inheritdoc
      */
-    public function execute($queue)
+    public function execute($queue): void
     {
         $success = Plugin::getInstance()->sendRequest($this->requestId);
 

src/SendRequestJob.php

@@ -46,7 +46,7 @@ class Settings extends Model
     /**
      * @inheritdoc
      */
-    public function setAttributes($values, $safeOnly = true)
+    public function setAttributes($values, $safeOnly = true): void
     {
         // attemptDelay → retryDelay
         if (($retryDelay = ArrayHelper::remove($values, 'attemptDelay')) !== null) {
@@ -80,7 +80,7 @@ protected function defineRules(): array
     /**
      * @inheritdoc
      */
-    public function fields()
+    public function fields(): array
     {
         $fields = parent::fields();
         // guzzleConfig can't be set from the UI so no point in storing it in the project config
@@ -91,7 +91,7 @@ public function fields()
     /**
      * @inheritdoc
      */
-    public function extraFields()
+    public function extraFields(): array
     {
         return [
             'guzzleConfig',

src/Settings.php

@@ -7,8 +7,8 @@
 
 namespace craft\webhooks\assets\activity;
 
-use craft\web\AssetBundle;
 use craft\web\assets\cp\CpAsset;
+use yii\web\AssetBundle;
 
 /**
  * Webhooks index asset bundle

src/assets/activity/ActivityAsset.php

@@ -7,8 +7,8 @@
 
 namespace craft\webhooks\assets\edit;
 
-use craft\web\AssetBundle;
 use craft\web\assets\cp\CpAsset;
+use yii\web\AssetBundle;
 
 /**
  * Webhooks index asset bundle

src/assets/edit/EditAsset.php

@@ -7,9 +7,9 @@
 
 namespace craft\webhooks\assets\manage;
 
-use craft\web\AssetBundle;
 use craft\web\assets\cp\CpAsset;
 use craft\web\View;
+use yii\web\AssetBundle;
 
 /**
  * Webhooks index asset bundle

src/assets/manage/ManageAsset.php

@@ -15,7 +15,7 @@ abstract class BaseController extends Controller
     /**
      * @inheritdoc
      */
-    public function beforeAction($action)
+    public function beforeAction($action): bool
     {
         if (!parent::beforeAction($action)) {
             return false;