Merge branch 'develop' into direct_links_support

Author: Dan0sz

src/Cron.php

@@ -13,6 +13,13 @@
 use Exception;
 
 class Cron {
+	/**
+	 * Cron job handle
+	 *
+	 * @var string
+	 */
+	const TASK_NAME = 'plausible_analytics_update_js';
+
 	/**
 	 * Build class
 	 *

src/Plugin.php

@@ -16,13 +16,19 @@ final class Plugin {
 	 * @return void
 	 */
 	public function register() {
+		$this->setup();
+
 		// Register services used throughout the plugin. (WP Rocket runs at priority 10)
 		add_action( 'plugins_loaded', [ $this, 'register_services' ], 9 );
 
 		// Load text domain.
 		add_action( 'init', [ $this, 'load_plugin_textdomain' ], 1000 );
 	}
 
+	public function setup() {
+		new Setup();
+	}
+
 	/**
 	 * Registers the individual services of the plugin.
 	 *
@@ -47,7 +53,6 @@ public function register_services() {
 		new Compatibility();
 		new Filters();
 		new Proxy();
-		new Setup();
 	}
 
 	/**

src/Setup.php

@@ -10,13 +10,6 @@
 namespace Plausible\Analytics\WP;
 
 class Setup {
-	/**
-	 * Cron job handle
-	 *
-	 * @var string
-	 */
-	private $cron = 'plausible_analytics_update_js';
-
 	/**
 	 * Filters and Hooks.
 	 *
@@ -28,7 +21,7 @@ public function __construct() {
 		register_deactivation_hook( PLAUSIBLE_ANALYTICS_PLUGIN_FILE, [ $this, 'deactivate_cron' ] );
 
 		// Attach the cron script to the cron action.
-		add_action( $this->cron, [ $this, 'load_cron_script' ] );
+		add_action( Cron::TASK_NAME, [ $this, 'load_cron_script' ] );
 
 		// This assures that the local file is downloaded/updated when settings are saved.
 		add_action( 'plausible_analytics_settings_saved', [ $this, 'load_cron_script' ] );
@@ -51,8 +44,8 @@ public function create_cache_dir() {
 	 * @codeCoverageIgnore
 	 */
 	public function activate_cron() {
-		if ( ! wp_next_scheduled( $this->cron ) ) {
-			wp_schedule_event( time(), 'daily', $this->cron );
+		if ( ! wp_next_scheduled( Cron::TASK_NAME ) ) {
+			wp_schedule_event( time(), 'daily', Cron::TASK_NAME );
 		}
 	}
 
@@ -62,8 +55,8 @@ public function activate_cron() {
 	 * @codeCoverageIgnore
 	 */
 	public function deactivate_cron() {
-		if ( wp_next_scheduled( $this->cron ) ) {
-			wp_clear_scheduled_hook( $this->cron );
+		if ( wp_next_scheduled( Cron::TASK_NAME ) ) {
+			wp_clear_scheduled_hook( Cron::TASK_NAME );
 		}
 	}