get rid of maybe_setup_scheduled_event by scheduling it at plugin activation and whenever settings are saved

Author: dannyvankooten

src/class-aggregator.php

@@ -16,7 +16,9 @@ public function __construct()
     {
         add_action('koko_analytics_aggregate_stats', [$this, 'aggregate'], 10, 0);
         add_filter('cron_schedules', [$this, 'add_interval'], 10, 1);
-        add_action('init', [$this, 'maybe_setup_scheduled_event'], 10, 0);
+        add_action('koko_analytics_save_settings', [$this, 'setup_scheduled_event'], 10, 0);
+        register_activation_hook(KOKO_ANALYTICS_PLUGIN_FILE, [$this, 'setup_scheduled_event'], 10, 0);
+        register_deactivation_hook(KOKO_ANALYTICS_PLUGIN_FILE, [$this, 'clear_scheduled_event'], 10, 0);
     }
 
     /**
@@ -38,13 +40,9 @@ public function setup_scheduled_event(): void
         }
     }
 
-    public function maybe_setup_scheduled_event(): void
+    public function clear_scheduled_event(): void
     {
-        if (! isset($_SERVER['REQUEST_METHOD']) || $_SERVER['REQUEST_METHOD'] !== 'POST' || ! is_admin()) {
-            return;
-        }
-
-        $this->setup_scheduled_event();
+        wp_clear_scheduled_hook('koko_analytics_aggregate_stats');
     }
 
     /**
@@ -54,7 +52,7 @@ public function maybe_setup_scheduled_event(): void
      */
     public function aggregate(): void
     {
-        update_option('koko_analytics_last_aggregation_at', time(), true);
+        update_option('koko_analytics_last_aggregation_at', \time(), true);
 
         // init pageview aggregator
         $pageview_aggregator = new Pageview_Aggregator();
@@ -67,7 +65,7 @@ public function aggregate(): void
         }
 
         // rename file to temporary location so nothing new is written to it while we process it
-        $tmp_filename = \dirname($filename) . '/pageviews-' . time() . '.php';
+        $tmp_filename = \dirname($filename) . '/pageviews-' . \time() . '.php';
         $renamed = \rename($filename, $tmp_filename);
         if ($renamed !== true) {
             if (WP_DEBUG) {