Craft 4 updates

verbb · Aug 22, 2022 · d5afdd6 · d5afdd6
1 parent daf048d
commit d5afdd6
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 3.0.0 - 2022-08-22
+
+### Changed
+- Now requires PHP `8.0.2+`.
+- Now requires Craft `4.0.0+`.
+
+### Removed
+- Removed `j()` function.
+
 ## 2.0.0 - 2022-08-22
 
 > {note} The plugin’s package name has changed to `verbb/kint`. Kint will need be updated to 2.0 from a terminal, by running `composer require verbb/kint && composer remove mildlygeeky/craft-kint`.

diff --git a/README.md b/README.md
@@ -44,11 +44,6 @@ it is interactive, with keyboard shortcuts to expand and collapse objects, separ
 
 This is the simplest usage, and will output an interactive debugger for the variable passed in.
 
-#### j (dump - console.log())
-`{{ j(entry) }}` or `{{ j(entry, otherEntry) }}`
-
-This is the same as `d`, except all output will be sent to `console.log()`
-
 #### s (simple dump)
 `{{ s(someTwigVariable) }}` or `{{ s(entry, otherEntry) }}`
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "verbb/kint",
     "description": "Adds Kint, an in-app PHP debugger for use in Twig and PHP.",
     "type": "craft-plugin",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "keywords": [
         "craft",
         "cms",
@@ -29,11 +29,11 @@
         }
     ],
     "require": {
-        "craftcms/cms": "^3.7.0",
-        "verbb/base": "^1.0.2",
-        "kint-php/kint": "^3.1",
-        "kint-php/kint-twig": "^2.0",
-        "kint-php/kint-js": "^2.0"
+        "php": "^8.0.2",
+        "craftcms/cms": "^4.0.0",
+        "verbb/base": "^2.0.0",
+        "kint-php/kint": "^4.0",
+        "kint-php/kint-twig": "^3.0"
     },
     "autoload": {
         "psr-4": {
@@ -43,7 +43,7 @@
     "extra": {
         "name": "Kint",
         "handle": "kint",
-        "changelogUrl": "https://raw.githubusercontent.com/verbb/kint/craft-3/CHANGELOG.md",
+        "changelogUrl": "https://raw.githubusercontent.com/verbb/kint/craft-4/CHANGELOG.md",
         "class": "verbb\\kint\\Kint"
     }
 }
diff --git a/src/Kint.php b/src/Kint.php
@@ -22,8 +22,8 @@ class Kint extends Plugin
     // Properties
     // =========================================================================
 
-    public $schemaVersion = '1.0.0';
-    public $hasCpSettings = true;
+    public string $schemaVersion = '1.0.0';
+    public bool $hasCpSettings = true;
 
 
     // Traits
@@ -50,9 +50,9 @@ public function init(): void
         $this->_registerCpRoutes();
     }
 
-    public function getSettingsResponse()
+    public function getSettingsResponse(): mixed
     {
-        Craft::$app->getResponse()->redirect(UrlHelper::cpUrl('kint/settings'));
+        return Craft::$app->getResponse()->redirect(UrlHelper::cpUrl('kint/settings'));
     }
 
 

diff --git a/src/base/PluginTrait.php b/src/base/PluginTrait.php
@@ -1,6 +1,8 @@
 <?php
 namespace verbb\kint\base;
 
+use verbb\kint\Kint;
+
 use Craft;
 
 use yii\log\Logger;
@@ -12,7 +14,7 @@ trait PluginTrait
     // Static Properties
     // =========================================================================
 
-    public static $plugin;
+    public static Kint $plugin;
 
 
     // Public Methods

diff --git a/src/models/Settings.php b/src/models/Settings.php
@@ -8,6 +8,6 @@ class Settings extends Model
     // Properties
     // =========================================================================
 
-    public $kintDisplayTheme = 'original.css';
+    public string $kintDisplayTheme = 'original.css';
 
 }