Merge pull request #7 from mattgrayisok/craft-4

Craft 4

CHANGELOG.md

@@ -1,23 +1,33 @@
 # Recently Viewed Changelog
 
-All notable changes to this project will be documented in this file.
+## 2.0.0 - 2022-05-12
 
-The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
+### Added
+
+- Craft 4 compat
 
 ## 1.0.3 - 2019-01-10
+
 ### Added
+
 - Postgres support
 - Max limit of 99 elements in history
 
 ## 1.0.2 - 2019-01-08
+
 ### Updated
+
 - Fixed null state issue when combined with ordering
 
 ## 1.0.1 - 2019-01-07
+
 ### Updated
+
 - Made filtering work nicely with `limit()`s
 - Set elements as most recently viewed even if they are already in list of elements
 
 ## 1.0.0 - 2019-01-07
+
 ### Added
+
 - Initial release

composer.json

@@ -2,7 +2,7 @@
     "name": "mattgrayisok/craft-recently-viewed",
     "description": "Craft CMS plugin to find recently viewed elements of any type.",
     "type": "craft-plugin",
-    "version": "1.0.3",
+    "version": "2.0.0",
     "keywords": [
         "craft",
         "cms",
@@ -23,7 +23,8 @@
         }
     ],
     "require": {
-        "craftcms/cms": "^3.0.0-RC1"
+        "craftcms/cms": "^4.0.0-beta.1",
+        "php": "^8.0.0"
     },
     "autoload": {
         "psr-4": {

src/RecentlyViewed.php

@@ -14,7 +14,7 @@
 use mattgrayisok\recentlyviewed\behaviors\RecentlyViewedBehavior;
 use mattgrayisok\recentlyviewed\models\Settings;
 
-
+use craft\base\Model;
 use Craft;
 use craft\base\Plugin;
 use craft\services\Plugins;
@@ -49,9 +49,9 @@ class RecentlyViewed extends Plugin
     /**
      * @var string
      */
-    public $schemaVersion = '1.0.2';
+    public string $schemaVersion = '1.0.2';
 
-    public $hasCpSettings = true;
+    public bool $hasCpSettings = true;
 
     /**
      * @inheritdoc
@@ -103,12 +103,12 @@ public function registerComponentsAndServices()
         });
     }
 
-    protected function createSettingsModel()
+    protected function createSettingsModel() : ?Model
     {
         return new Settings();
     }
 
-    protected function settingsHtml()
+    protected function settingsHtml() : ?string
     {
         return \Craft::$app->getView()->renderTemplate('recently-viewed/settings', [
             'settings' => $this->getSettings()

src/models/Settings.php

@@ -8,7 +8,7 @@ class Settings extends Model
 {
     public $autoTrack = true;
 
-    public function rules()
+    public function rules(): array
     {
         return [
             [['autoTrack'], 'boolean'],