moved getDefaultCacheExclusions function to functions file

newfold-labs · Nov 7, 2024 · 9a7cd89 · 9a7cd89
1 parent 449116b
commit 9a7cd89
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/includes/CacheManager.php b/includes/CacheManager.php
@@ -7,6 +7,8 @@
 use NewfoldLabs\WP\ModuleLoader\Container;
 use WP_Forge\Collection\Collection;
 
+use function NewfoldLabs\WP\Module\Performance\getDefaultCacheExclusions;
+
 class CacheManager {
 
 	/**
@@ -60,16 +62,7 @@ public function register_routes() {
 	 * @return array
 	 */
 	public function add_to_runtime( $sdk ) {
-		return array_merge( $sdk, array( 'cacheExclusion' => get_option( 'cache_exclusion', $this->defaultCacheExclusions() ) ) );
-	}
-
-	/**
-	 * Return defaul exclusions.
-	 *
-	 * @return array
-	 */
-	public function defaultCacheExclusions() {
-		return join( ',', [ 'cart', 'checkout', 'wp-admin', rest_get_url_prefix() ] );
+		return array_merge( $sdk, array( 'cacheExclusion' => get_option( 'cache_exclusion', getDefaultCacheExclusions() ) ) );
 	}
 
 	/**

diff --git a/includes/RestApi/CacheExclusionController.php b/includes/RestApi/CacheExclusionController.php
@@ -5,6 +5,8 @@
 use NewfoldLabs\WP\Module\ECommerce\Permissions;
 use NewfoldLabs\WP\ModuleLoader\Container;
 
+use function NewfoldLabs\WP\Module\Performance\getDefaultCacheExclusions;
+
 /**
  * Class CacheExclusionController
  */
@@ -79,7 +81,7 @@ public function register_routes() {
 	public function get_settings() {
 		return new \WP_REST_Response(
 			array(
-				'cacheExclusion' => get_option( 'cache_exclusion', '' ),
+				'cacheExclusion' => get_option( 'cache_exclusion', getDefaultCacheExclusions() ),
 			),
 			200
 		);

diff --git a/includes/functions.php b/includes/functions.php
@@ -2,6 +2,15 @@
 
 namespace NewfoldLabs\WP\Module\Performance;
 
+/**
+ * Return defaul exclusions.
+ *
+ * @return array
+ */
+function getDefaultCacheExclusions() {
+	return join( ',', [ 'cart', 'checkout', 'wp-admin', rest_get_url_prefix() ] );
+}
+
 /**
  * Get the current cache level.
  *