Update version to support WordPress 6.6.2

Author: actions-user

config.json

@@ -1,4 +1,4 @@
 {
-  "TESTED_UP_TO": "6.6.1",
-  "STABLE_TAG": "1.25"
+  "TESTED_UP_TO": "6.6.2",
+  "STABLE_TAG": "1.26"
 }

readme.txt

@@ -4,9 +4,9 @@ Contributors: simpleanalytics
 Donate link: https://simpleanalytics.com
 Tags: privacy-first, privacy-friendly, free analytics, website analytics, simple analytics, analytics, statistics
 Requires at least: 5.2
-Tested up to: 6.6.1
+Tested up to: 6.6.2
 Requires PHP: 7.2.0
-Stable tag: 1.25
+Stable tag: 1.26
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -74,6 +74,10 @@ No changes needed for upgrades.
 
 == Changelog ==
 
+= 1.26 =
+* 2024-09-13
+* Upgraded to WordPress 6.6.2
+
 = 1.25 =
 * 2024-07-30
 * Upgraded to WordPress 6.6.1

simple-analytics.php

@@ -1,13 +1,13 @@
 <?php
 /*
  * Plugin Name: Simple Analytics Official
- * Version: 1.25
+ * Version: 1.26
  * Plugin URI: https://docs.simpleanalytics.com/install-simple-analytics-on-wordpress
  * Description: Embed Simple Analytics script in your WordPress website
  * Author: Simple Analytics
  * Author URI: https://simpleanalytics.com/
  * Requires at least: 5.2.0
- * Tested up to: 6.6.1
+ * Tested up to: 6.6.2
  *
  * Text Domain: simple-analytics
  * Domain Path: /lang/

src/Actions/AddInactiveComment.php

@@ -6,7 +6,10 @@ class AddInactiveComment
 {
     use Action;
 
-    protected string $hook = 'wp_footer';
+    /**
+     * @var string
+     */
+    protected $hook = 'wp_footer';
 
     public function handle(): void
     {

src/Actions/AddNoScriptTag.php

@@ -9,7 +9,10 @@ class AddNoScriptTag
 {
     use Action;
 
-    protected string $hook = 'wp_footer';
+    /**
+     * @var string
+     */
+    protected $hook = 'wp_footer';
 
     public function handle(): void
     {

src/Actions/AddPluginSettingsLink.php

@@ -11,7 +11,10 @@ class AddPluginSettingsLink
 {
     use Action;
 
-    protected string $hook = 'plugin_action_links_' . PLUGIN_BASENAME;
+    /**
+     * @var string
+     */
+    protected $hook = 'plugin_action_links_' . PLUGIN_BASENAME;
 
     public function handle($links): array
     {

src/Plugin.php

@@ -14,7 +14,6 @@ final class Plugin
 {
     use PluginLifecycle;
 
-    #[\Override]
     protected function onBoot(): void
     {
         if (is_admin()) {
@@ -23,29 +22,23 @@ protected function onBoot(): void
         }
     }
 
-    #[\Override]
     public function onActivation(): void
     {
         $this->addOptions();
     }
 
-    #[\Override]
     public function onUninstall(): void
     {
         $this->deleteOptions();
     }
 
-    #[\Override]
     public function onInit(): void
     {
         $shouldCollect = (new TrackingPolicy)->shouldCollectAnalytics();
-
         $this->addScripts($shouldCollect);
-
         if (! $shouldCollect) {
             AddInactiveComment::register();
         }
-
         if ($shouldCollect && Setting::boolean(SettingName::NOSCRIPT)) {
             AddNoScriptTag::register();
         }
@@ -121,7 +114,9 @@ protected function defineAdminPage(): void
                 $tab->callout('IP and role exclusion only works when there is no page caching.');
 
                 $tab->multiCheckbox(SettingName::EXCLUDED_ROLES, 'Exclude User Roles')
-                    ->options(fn() => wp_roles()->get_names());
+                    ->options(function () {
+                        return wp_roles()->get_names();
+                    });
 
                 $tab->ipList(SettingName::EXCLUDED_IP_ADDRESSES, 'Exclude IP Addresses')
                     ->placeholder("127.0.0.1\n192.168.0.1")

src/PluginLifecycle.php

@@ -7,9 +7,9 @@ trait PluginLifecycle
     public function boot(): void
     {
         $this->onBoot();
-        add_action('init', $this->onInit(...));
-        register_activation_hook(ENTRYPOINT_FILE, $this->onActivation(...));
-        register_deactivation_hook(ENTRYPOINT_FILE, $this->onUninstall(...));
+        add_action('init', \Closure::fromCallable([$this, 'onInit']));
+        register_activation_hook(ENTRYPOINT_FILE, \Closure::fromCallable([$this, 'onActivation']));
+        register_deactivation_hook(ENTRYPOINT_FILE, \Closure::fromCallable([$this, 'onUninstall']));
     }
 
     /** @internal */

src/ScriptManager.php

@@ -11,10 +11,11 @@
  */
 final class ScriptManager
 {
-    public function __construct(
+    private $scripts = [];
+    public function __construct($scripts = [])
+    {
         /** @var Script[] */
-        private $scripts = []
-    ) {
+        $this->scripts = $scripts;
     }
 
     public function add(Script $script): void
@@ -45,7 +46,7 @@ protected function enqueueScripts(): void
      */
     protected function addAttributes(): void
     {
-        add_filter('wp_script_attributes', $this->addAttributesFilter(...), 10, 2);
+        add_filter('wp_script_attributes', \Closure::fromCallable([$this, 'addAttributesFilter']), 10, 2);
     }
 
     protected function addAttributesFilter($attributes)
@@ -55,7 +56,7 @@ protected function addAttributesFilter($attributes)
                 $script instanceof HasAttributes &&
                 $script->handle() . '-js' === $attributes['id']
             ) {
-                return [...$attributes, ...$script->attributes()];
+                return array_merge(is_array($attributes) ? $attributes : iterator_to_array($attributes), $script->attributes());
             }
         }
 
@@ -64,7 +65,7 @@ protected function addAttributesFilter($attributes)
 
     protected function removeIds(): void
     {
-        add_filter('script_loader_tag', $this->removeIdsFilter(...), 10, 2);
+        add_filter('script_loader_tag', \Closure::fromCallable([$this, 'removeIdsFilter']), 10, 2);
     }
 
     protected function removeIdsFilter($tag, $handle): string

src/Scripts/AnalyticsScript.php

@@ -10,22 +10,16 @@
 
 class AnalyticsScript implements Script, HasAttributes, HideScriptId
 {
-    #[\Override]
     public function path(): string
     {
-        return sprintf(
-            "https://%s/latest.js",
-            Setting::get(SettingName::CUSTOM_DOMAIN, 'scripts.simpleanalyticscdn.com'),
-        );
+        return sprintf("https://%s/latest.js", Setting::get(SettingName::CUSTOM_DOMAIN, 'scripts.simpleanalyticscdn.com'));
     }
 
-    #[\Override]
     public function handle(): string
     {
         return 'simpleanalytics';
     }
 
-    #[\Override]
     public function attributes(): array
     {
         return array_filter([