Add Craft 4 compatibility; bump to 1.1.0

vaersaagod · Apr 23, 2022 · a034320 · a034320
1 parent 0e3484b
commit a034320
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.1.0 - 2022-04-23
+### Added
+- Adds Craft 4.0 compatibility
+
 ## 1.0.1 - 2020-09-01  
 
 ### Fixed

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Instructions plugin for Craft CMS 3.x
+# Instructions plugin for Craft CMS
 
 Adds an _Instructions_ field type that can be used to render field instructions as native UI elements inside Matrix field layouts.
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "vaersaagod/instructions",
     "description": "Adds an \"Instructions\" field type that can be used to render field instructions as native UI elements inside Matrix field layouts.",
     "type": "craft-plugin",
-    "version": "1.0.1",
+    "version": "1.1.0",
     "keywords": [
         "craft",
         "cms",
@@ -22,7 +22,8 @@
         }
     ],
     "require": {
-        "craftcms/cms": "^3.5.5"
+        "craftcms/cms": "^3.5.5|^4.0.0-beta.4",
+        "php": "^7.2.5|^8.0"
     },
     "autoload": {
         "psr-4": {
@@ -32,6 +33,7 @@
     "extra": {
         "name": "Instructions",
         "handle": "instructions",
+        "schemaVersion": "1.0.0",
         "developer": "Værsågod AS",
         "developerUrl": "https://vaersaagod.no",
         "documentationUrl": "https://github.com/vaersaagod/instructions/blob/master/README.md",

diff --git a/src/Instructions.php b/src/Instructions.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Instructions plugin for Craft CMS 3.x
+ * Instructions plugin for Craft CMS
  *
  * Adds an _Instructions_ field type that can be used to render field instructions as native UI elements inside Matrix field layouts.
  *
@@ -16,8 +16,6 @@
 use craft\base\Plugin;
 use craft\events\RegisterComponentTypesEvent;
 use craft\services\Fields;
-use craft\services\Plugins;
-use craft\events\PluginEvent;
 
 use yii\base\Event;
 
@@ -31,51 +29,13 @@
  */
 class Instructions extends Plugin
 {
-    // Static Properties
-    // =========================================================================
-
-    /**
-     * @var Instructions
-     */
-    public static $plugin;
-
-    // Public Properties
-    // =========================================================================
-
-    /**
-     * @var string
-     */
-    public $schemaVersion = '1.0.0';
-
-    /**
-     * @var bool
-     */
-    public $hasCpSettings = false;
-
-    /**
-     * @var bool
-     */
-    public $hasCpSection = false;
-
-    // Public Methods
-    // =========================================================================
 
     /**
      * @inheritdoc
      */
-    public function init()
+    public function init(): void
     {
         parent::init();
-        self::$plugin = $this;
-
-        Event::on(
-            Plugins::class,
-            Plugins::EVENT_AFTER_INSTALL_PLUGIN,
-            function (PluginEvent $event) {
-                if ($event->plugin === $this) {
-                }
-            }
-        );
 
         Event::on(
             Fields::class,
@@ -95,7 +55,4 @@ function (RegisterComponentTypesEvent $event) {
         );
     }
 
-    // Protected Methods
-    // =========================================================================
-
 }
diff --git a/src/fields/Instructions.php b/src/fields/Instructions.php
@@ -44,7 +44,7 @@ public static function hasContentColumn(): bool
     /**
      * @inheritdoc
      */
-    public function getSettingsHtml()
+    public function getSettingsHtml(): ?string
     {
         return Craft::$app->getView()->renderTemplate('instructions/_settings',
             [

diff --git a/src/migrations/Install.php b/src/migrations/Install.php
@@ -4,6 +4,7 @@
 
 use Craft;
 use craft\db\Migration;
+
 use vaersaagod\instructions\fields\Instructions;
 
 /**
@@ -15,7 +16,7 @@ class Install extends Migration
     /**
      * @inheritdoc
      */
-    public function safeUp()
+    public function safeUp(): bool
     {
         echo "> Migrating CP Field Instructions field type to Instructions...\n";
 

diff --git a/src/translations/en/instructions.php b/src/translations/en/instructions.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Instructions plugin for Craft CMS 3.x
+ * Instructions plugin for Craft CMS
  *
  * Adds an _Instructions_ field type that can be used to render field instructions as native UI elements inside Matrix field layouts.
  *