Merge branch 'develop' into enhancement/6570-js-error-handling

wp-media · Apr 30, 2024 · 8b623fe · 8b623fe
2 parents ec0ad55 + b86840b
commit 8b623fe
Show file tree

Hide file tree

Showing 24 changed files with 360 additions and 53 deletions.
diff --git a/assets/js/lcp-beacon.js b/assets/js/lcp-beacon.js
@@ -338,4 +338,4 @@ class RocketLcpBeacon {
 	}
 }
 
-RocketLcpBeacon.run();
+RocketLcpBeacon.run();
diff --git a/assets/js/lcp-beacon.js.min.map b/assets/js/lcp-beacon.js.min.map
diff --git a/assets/js/wpr-admin.js.min.map b/assets/js/wpr-admin.js.min.map
diff --git a/inc/Engine/Activation/Activation.php b/inc/Engine/Activation/Activation.php
@@ -75,6 +75,7 @@ public static function activate_plugin() {
 		require WP_ROCKET_FUNCTIONS_PATH . 'i18n.php';
 		require WP_ROCKET_FUNCTIONS_PATH . 'htaccess.php';
 		require WP_ROCKET_FUNCTIONS_PATH . 'api.php';
+		require WP_ROCKET_FUNCTIONS_PATH . 'admin.php';
 
 		/**
 		 * WP Rocket activation.

diff --git a/inc/Engine/Common/Database/Queries/AbstractQuery.php b/inc/Engine/Common/Database/Queries/AbstractQuery.php
@@ -166,7 +166,12 @@ public function create_new_job( string $url, string $job_id = '', string $queue_
 		 * @param mixed $is_success New job status: ID of inserted row if successfully added; false otherwise.
 		 * @param string $timestamp Current timestamp.
 		 */
-		do_action( 'rocket_last_rucss_job_added_time', $result, current_time( 'mysql', true ) );
+		rocket_do_action_and_deprecated(
+			'rocket_last_saas_job_added_time',
+			[ $result, current_time( 'mysql', true ) ],
+			'3.16',
+			'rocket_last_rucss_job_added_time'
+		);
 
 		return $result;
 	}

diff --git a/inc/Engine/Common/Database/Tables/AbstractTable.php b/inc/Engine/Common/Database/Tables/AbstractTable.php
@@ -54,11 +54,16 @@ public function delete_old_rows() {
 		}
 
 		/**
-		 * Filters the old RUCSS deletion interval
+		 * Filters the old SaaS data deletion interval
 		 *
-		 * @param int $delete_interval Old RUCSS deletion interval in months
+		 * @param int $delete_interval Old Saas data deletion interval in months
 		 */
-		$delete_interval = (int) apply_filters( 'rocket_saas_delete_interval', 1 );
+		$delete_interval = (int) rocket_apply_filter_and_deprecated(
+			'rocket_saas_delete_interval',
+			[ 1 ],
+			'3.16',
+			'rocket_rucss_delete_interval'
+		);
 
 		if ( $delete_interval <= 0 ) {
 			return false;

diff --git a/inc/Engine/Common/JobManager/Cron/Subscriber.php b/inc/Engine/Common/JobManager/Cron/Subscriber.php
@@ -173,7 +173,12 @@ public function add_interval( $schedules ) {
 		 *
 		 * @param int $interval Interval in seconds.
 		 */
-		$interval = apply_filters( 'rocket_saas_pending_jobs_cron_interval', 1 * rocket_get_constant( 'MINUTE_IN_SECONDS', 60 ) );
+		$interval = rocket_apply_filter_and_deprecated(
+			'rocket_saas_pending_jobs_cron_interval',
+			[ 1 * rocket_get_constant( 'MINUTE_IN_SECONDS', 60 ) ],
+			'3.16',
+			'rocket_rucss_pending_jobs_cron_interval'
+		);
 
 		$schedules['rocket_saas_pending_jobs'] = [
 			'interval' => $interval,
@@ -186,7 +191,12 @@ public function add_interval( $schedules ) {
 		 *
 		 * @param int $interval Interval in seconds.
 		 */
-		$interval = apply_filters( 'rocket_remove_saas_failed_jobs_cron_interval', $default_interval );
+		$interval = rocket_apply_filter_and_deprecated(
+			'rocket_remove_saas_failed_jobs_cron_interval',
+			[ $default_interval ],
+			'3.16',
+			'rocket_remove_rucss_failed_jobs_cron_interval'
+		);
 		$interval = (bool) $interval ? $interval : $default_interval;
 
 		$schedules['rocket_remove_saas_failed_jobs'] = [
@@ -199,7 +209,12 @@ public function add_interval( $schedules ) {
 		 *
 		 * @param int $interval Interval in seconds.
 		 */
-		$interval = (int) apply_filters( 'rocket_remove_saas_on_submit_jobs_cron_interval', 1 * rocket_get_constant( 'MINUTE_IN_SECONDS', 60 ) );
+		$interval = (int) rocket_apply_filter_and_deprecated(
+			'rocket_remove_saas_on_submit_jobs_cron_interval',
+			[ 1 * rocket_get_constant( 'MINUTE_IN_SECONDS', 60 ) ],
+			'3.16',
+			'rocket_remove_rucss_on_submit_jobs_cron_interval'
+		);
 
 		$schedules['rocket_saas_on_submit_jobs'] = [
 			'interval' => $interval,
@@ -312,7 +327,12 @@ protected function is_deletion_enabled(): bool {
 		 *
 		 * @param bool $delete_saas_jobs True to enable deletion, false otherwise.
 		 */
-		return (bool) apply_filters( 'rocket_saas_deletion_enabled', true );
+		return (bool) rocket_apply_filter_and_deprecated(
+			'rocket_saas_deletion_enabled',
+			[ true ],
+			'3.16',
+			'rocket_rucss_deletion_enabled'
+		);
 	}
 
 	/**
-Original file line number
+Diff line change
@@ Expand Up / @@ -338,4 +338,4 @@ class RocketLcpBeacon { @@
     	}
     }
-    RocketLcpBeacon.run();
+    RocketLcpBeacon.run();