Merge branch 'develop' into add/tests-for-onboarding

* develop:
  i18n updates
  coming soon settings component updates
  update coming soon module to v 1.1.18
  version bump to 2.6.2
  Composer(deps): Bump newfold-labs/wp-module-patterns
  Composer(deps): Bump newfold-labs/wp-module-data from 2.4.17 to 2.4.18
  Bump version to 2.6.1
  Update to data module 2.4.17
  Fix composer validation
  Prep release 2.6.0
  GitHub Actions(deps): Bump actions/cache from 3 to 4

# Conflicts:
#	cypress.config.js

.github/workflows/cypress-matrix.yml

@@ -66,7 +66,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/cypress-tests-beta.yml

@@ -47,7 +47,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/cypress-tests.yml

@@ -57,7 +57,7 @@ jobs:
         run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.npm-cache.outputs.dir }}
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -69,7 +69,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/lint-php.yml

@@ -42,7 +42,7 @@ jobs:
         if: "!! env.GIT_DIFF"
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/upload-artifact-on-push.yml

@@ -53,7 +53,7 @@ jobs:
         run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.npm-cache.outputs.dir }}
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -65,7 +65,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/upload-asset-on-release.yml

@@ -63,7 +63,7 @@ jobs:
         run: echo "dir=$(npm config get cache)" >> $GITHUB_OUTPUT
 
       - name: Cache node modules
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.npm-cache.outputs.dir }}
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
@@ -75,7 +75,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/wp-i18n.yml

@@ -38,7 +38,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache Composer vendor directory
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

bootstrap.php

@@ -11,6 +11,7 @@
 use WP_Forge\UpgradeHandler\UpgradeHandler;
 use NewfoldLabs\WP\ModuleLoader\Container;
 use NewfoldLabs\WP\ModuleLoader\Plugin;
+
 use function NewfoldLabs\WP\ModuleLoader\container as setContainer;
 
 // Composer autoloader

composer.json

@@ -66,17 +66,17 @@
     },
     "require": {
         "doctrine/inflector": "1.4.4 as 1.3.1",
-        "newfold-labs/wp-module-coming-soon": "^1.1.15",
-        "newfold-labs/wp-module-data": "^2.4.16",
+        "newfold-labs/wp-module-coming-soon": "^1.1.18",
+        "newfold-labs/wp-module-data": "^2.4.18",
         "newfold-labs/wp-module-deactivation": "^1.0.4",
-        "newfold-labs/wp-module-ecommerce": "^1.3.19",
+        "newfold-labs/wp-module-ecommerce": "v1.3.18",
         "newfold-labs/wp-module-global-ctb": "^1.0.9",
         "newfold-labs/wp-module-help-center": "^1.0.22",
         "newfold-labs/wp-module-loader": "^1.0.10",
         "newfold-labs/wp-module-marketplace": "^2.2.0",
         "newfold-labs/wp-module-notifications": "^1.2.2",
         "newfold-labs/wp-module-onboarding": "^1.12.0",
-        "newfold-labs/wp-module-patterns": "^0.1.12",
+        "newfold-labs/wp-module-patterns": "^0.1.13",
         "newfold-labs/wp-module-performance": "^1.3.0",
         "newfold-labs/wp-module-runtime": "^1.0.7",
         "newfold-labs/wp-module-secure-passwords": "^1.1",

cypress.config.js

@@ -1,23 +1,23 @@
-const { defineConfig } = require('cypress')
-const { phpVersion, core } = require('./.wp-env.json')
+const {defineConfig} = require('cypress')
+const {phpVersion, core} = require('./.wp-env.json')
 const wpVersion = /[^/]*$/.exec(core)[0]
 
 module.exports = defineConfig({
-  projectId: "kuks2q",
-  env: {
-    wpUsername: 'admin',
-    wpPassword: 'password',
+	projectId: 'kuks2q',
+	env: {
+		wpUsername: 'admin',
+		wpPassword: 'password',
 		wpVersion,
 		phpVersion,
-    pluginId: 'hostgator',
-    appId: 'hgwp',
-  },
-  downloadsFolder: 'tests/cypress/downloads',
-  fixturesFolder: 'tests/cypress/fixtures',
-  screenshotsFolder: 'tests/cypress/screenshots',
-  video: true,
-  videosFolder: 'tests/cypress/videos',
-  chromeWebSecurity: false,
+		pluginId: 'hostgator',
+		appId: 'hgwp',
+	},
+	downloadsFolder: 'tests/cypress/downloads',
+	fixturesFolder: 'tests/cypress/fixtures',
+	screenshotsFolder: 'tests/cypress/screenshots',
+	video: true,
+	videosFolder: 'tests/cypress/videos',
+	chromeWebSecurity: false,
 	viewportWidth: 1024,
 	viewportHeight: 768,
 	blockHosts: [

inc/RestApi/SettingsController.php

@@ -2,6 +2,8 @@
 
 namespace HostGator\RestApi;
 
+use function NewfoldLabs\WP\ModuleLoader\container;
+
 /**
  * Class SettingsController
  */
@@ -66,8 +68,11 @@ public function update_item( $request ) {
 				$new_value = $params[ $setting ];
 				switch ( $setting ) {
 					case 'comingSoon':
-						$new_value = ( $new_value ) ? 'true' : 'false';
-						update_option( 'nfd_coming_soon', $new_value );
+						if ( $new_value ) {
+							container()->get( 'comingSoon' )->enable();
+						} else {
+							container()->get( 'comingSoon' )->disable();
+						}
 						break;
 					case 'autoUpdatesMajorCore':
 						$new_value = ( $new_value ) ? 'true' : 'false';
@@ -168,7 +173,7 @@ public function get_current_settings() {
 		}
 
 		$settings = array(
-			'comingSoon'              => ( 'true' === get_option( 'nfd_coming_soon', 'false' ) ),
+			'comingSoon'              => container()->get( 'comingSoon' )->is_enabled(),
 			'autoUpdatesAll'          => $major && $plugins && $themes,
 			'autoUpdatesMajorCore'    => $major,
 			'autoUpdatesMinorCore'    => $minor,