Craft 5 updates

verbb · Dec 29, 2024 · 116ca8d · 116ca8d
1 parent 9b86539
commit 116ca8d
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 61 deletions.
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "verbb/metrix",
     "description": "Display your analytics within Craft. Supports Google Analytics, Plausible, Fathom and more.",
     "type": "craft-plugin",
-    "version": "1.0.0",
+    "version": "2.0.0",
     "keywords": [
         "craft",
         "cms",
@@ -25,11 +25,11 @@
         }
     ],
     "require": {
-        "php": "^8.0.2",
-        "craftcms/cms": "^4.0.0",
-        "nystudio107/craft-plugin-vite": "^4.0.0",
-        "verbb/auth": "^1.0.0",
-        "verbb/base": "^2.0.0"
+        "php": "^8.2",
+        "craftcms/cms": "^5.0.0",
+        "nystudio107/craft-plugin-vite": "^5.0.0",
+        "verbb/auth": "^2.0.0",
+        "verbb/base": "^3.0.0"
     },
     "autoload": {
         "psr-4": {
@@ -39,7 +39,7 @@
     "extra": {
         "name": "Metrix",
         "handle": "metrix",
-        "changelogUrl": "https://raw.githubusercontent.com/verbb/metrix/craft-4/CHANGELOG.md",
+        "changelogUrl": "https://raw.githubusercontent.com/verbb/metrix/craft-5/CHANGELOG.md",
         "class": "verbb\\metrix\\Metrix"
     }
 }
diff --git a/docs/get-started/requirements.md b/docs/get-started/requirements.md
@@ -1,7 +1,7 @@
 # Requirements
 
 ## Craft CMS
-Metrix requires Craft CMS 4.0 or greater.
+Metrix requires Craft CMS 5.0 or greater.
 
 ## PHP
-Metrix requires PHP 8.0.2 or greater.
+Metrix requires PHP 8.2 or greater.
diff --git a/src/base/PluginTrait.php b/src/base/PluginTrait.php
@@ -12,10 +12,10 @@
 
 use Craft;
 
-use yii\log\Logger;
+use verbb\base\LogTrait;
+use verbb\base\helpers\Plugin;
 
 use verbb\auth\Auth;
-use verbb\base\BaseHelper;
 
 use nystudio107\pluginvite\services\VitePluginService;
 
@@ -24,28 +24,43 @@ trait PluginTrait
     // Static Properties
     // =========================================================================
 
-    public static Metrix $plugin;
+    public static ?Metrix $plugin = null;
 
 
-    // Public Methods
+    // Traits
     // =========================================================================
 
-    public static function log(string $message, array $attributes = []): void
-    {
-        if ($attributes) {
-            $message = Craft::t('metrix', $message, $attributes);
-        }
+    use LogTrait;
 
-        Craft::getLogger()->log($message, Logger::LEVEL_INFO, 'metrix');
-    }
 
-    public static function error(string $message, array $attributes = []): void
-    {
-        if ($attributes) {
-            $message = Craft::t('metrix', $message, $attributes);
-        }
+    // Static Methods
+    // =========================================================================
 
-        Craft::getLogger()->log($message, Logger::LEVEL_ERROR, 'metrix');
+    public static function config(): array
+    {
+        Plugin::bootstrapPlugin('metrix');
+
+        return [
+            'components' => [
+                'periods' => Periods::class,
+                'presets' => Presets::class,
+                'service' => Service::class,
+                'sources' => Sources::class,
+                'views' => Views::class,
+                'vite' => [
+                    'class' => VitePluginService::class,
+                    'assetClass' => MetrixAsset::class,
+                    'useDevServer' => true,
+                    'devServerPublic' => 'http://localhost:4040/',
+                    'errorEntry' => 'js/main.js',
+                    'cacheKeySuffix' => '',
+                    'devServerInternal' => 'http://localhost:4040/',
+                    'checkDevServer' => true,
+                    'includeReactRefreshShim' => true,
+                ],
+                'widgets' => Widgets::class,
+            ],
+        ];
     }
 
 
@@ -87,39 +102,4 @@ public function getWidgets(): Widgets
         return $this->get('widgets');
     }
 
-
-    // Private Methods
-    // =========================================================================
-
-    private function _setPluginComponents(): void
-    {
-        $this->setComponents([
-            'periods' => Periods::class,
-            'presets' => Presets::class,
-            'service' => Service::class,
-            'sources' => Sources::class,
-            'views' => Views::class,
-            'vite' => [
-                'class' => VitePluginService::class,
-                'assetClass' => MetrixAsset::class,
-                'useDevServer' => true,
-                'devServerPublic' => 'http://localhost:4040/',
-                'errorEntry' => 'js/main.js',
-                'cacheKeySuffix' => '',
-                'devServerInternal' => 'http://localhost:4040/',
-                'checkDevServer' => true,
-                'includeReactRefreshShim' => true,
-            ],
-            'widgets' => Widgets::class,
-        ]);
-
-        Auth::registerModule();
-        BaseHelper::registerModule();
-    }
-
-    private function _setLogging(): void
-    {
-        BaseHelper::setFileLogging('metrix');
-    }
-
 }