Progress on craft 4 support

born05 · Apr 28, 2022 · d5e5362 · d5e5362
1 parent 706d72e
commit d5e5362
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -22,7 +22,8 @@
         }
     ],
     "require": {
-        "craftcms/cms": "^3.0"
+        "php": "^8.0.2",
+        "craftcms/cms": "^4.0.0-alpha"
     },
     "autoload": {
         "psr-4": {

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -16,18 +16,15 @@
 
 class Plugin extends CraftPlugin
 {
-    /**
-     * @var string
-     */
-    public $schemaVersion = '1.0.0';
+    public string $schemaVersion = '1.0.0';
 
     /**
      * Static property that is an instance of this plugin class so that it can be accessed via
      * Plugin::$plugin
      *
      * @var Plugin
      */
-    public static $plugin;
+    public static Plugin $plugin;
 
     /**
      * @inheritdoc
@@ -85,7 +82,7 @@ function (ModelEvent $event) {
     /**
      * @inheritdoc
      */
-    protected function createSettingsModel()
+    protected function createSettingsModel(): Settings
     {
         return new Settings();
     }

diff --git a/src/jobs/RequirePasswordReset.php b/src/jobs/RequirePasswordReset.php
@@ -3,7 +3,6 @@
 namespace born05\enforcepassword\jobs;
 
 use born05\enforcepassword\Plugin as EnforcePassword;
-use born05\enforcepassword\records\Password as PasswordRecord;
 
 use Craft;
 use craft\elements\User;
@@ -16,7 +15,7 @@ class RequirePasswordReset extends BaseJob
     /**
      * @inheritdoc
      */
-    public function execute($queue)
+    public function execute($queue): void
     {
         $settings = EnforcePassword::$plugin->getSettings();