Merge branch 'trunk' of https://github.com/newfold-labs/wp-module-onb…

…oarding into add/PRESS2-682-support-crazydomains

bootstrap.php

@@ -3,6 +3,9 @@
 use NewfoldLabs\WP\Module\Onboarding\Application;
 use function NewfoldLabs\WP\ModuleLoader\register;
 use NewfoldLabs\WP\Module\Onboarding\ModuleController;
+use NewfoldLabs\WP\Module\Onboarding\Compatibility\Scan;
+use NewfoldLabs\WP\Module\Onboarding\Compatibility\Safe_Mode;
+use NewfoldLabs\WP\Module\Onboarding\Compatibility\Status;
 
 /**
  * Register Onboarding with Newfold Module Loader
@@ -19,7 +22,7 @@ function nfd_wp_module_onboarding_register() {
 
 				// Set Global Constants
 				if ( ! defined( 'NFD_ONBOARDING_VERSION' ) ) {
-					define( 'NFD_ONBOARDING_VERSION', '1.2.2' );
+					define( 'NFD_ONBOARDING_VERSION', '1.3.0' );
 				}
 				if ( ! defined( 'NFD_ONBOARDING_DIR' ) ) {
 					define( 'NFD_ONBOARDING_DIR', __DIR__ );
@@ -33,6 +36,14 @@ function nfd_wp_module_onboarding_register() {
 				if ( ! defined( 'NFD_ONBOARDING_BUILD_URL' && defined( 'NFD_ONBOARDING_VERSION' ) ) ) {
 					define( 'NFD_ONBOARDING_BUILD_URL', $container->plugin()->url . '/vendor/newfold-labs/wp-module-onboarding/build/' . NFD_ONBOARDING_VERSION );
 				}
+
+				if ( 'compatible' !== Status::get() ) {
+					$compatibility_scan = new Scan();
+					Status::set( $compatibility_scan );
+					if ( 'compatible' !== $compatibility_scan->result ) {
+						return new Safe_Mode( $compatibility_scan );
+					}
+				}
 				// Instantiate Onboarding Module Application
 				new Application( $container );
 			},

build/1.2.2/onboarding.asset.php → build/1.3.0/onboarding.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-url'), 'version' => 'ceb1ddf748eb98f11d6ae5db55c77e52');
+<?php return array('dependencies' => array('lodash', 'react', 'wp-a11y', 'wp-api-fetch', 'wp-block-editor', 'wp-block-library', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-data-controls', 'wp-deprecated', 'wp-dom', 'wp-dom-ready', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-preferences', 'wp-primitives', 'wp-url'), 'version' => '0d9e7e2ec8be5e32441c0b39e65bbc51');

includes/Application.php

@@ -1,6 +1,7 @@
 <?php
 namespace NewfoldLabs\WP\Module\Onboarding;
 
+use NewfoldLabs\WP\Module\Onboarding\Compatibility\Status;
 use NewfoldLabs\WP\Module\Onboarding\RestApi\RestApi;
 use NewfoldLabs\WP\ModuleLoader\Container;
 use NewfoldLabs\WP\Module\Onboarding\Data\Options;
@@ -13,16 +14,16 @@
 final class Application {
 
 	/**
-	 * Newfold Labs Module Container
+	 * The Plugin container.
 	 *
 	 * @var Container
 	 */
 	protected $container;
 
 	/**
-	 * Arguments for the container
+	 * Arguments for Onboarding.
 	 *
-	 * @var agrs
+	 * @var array
 	 */
 	protected $args;
 
@@ -51,6 +52,9 @@ public function __construct( Container $container ) {
 
 		\do_action( 'nfd_module_onboarding_pre_init' );
 
+		// Reset the stored Compatibility Status every time WP Core is updated.
+		\add_action( '_core_updated_successfully', array( Status::class, 'reset' ) );
+
 		\add_action( 'login_redirect', array( LoginRedirect::class, 'handle_redirect' ), 10, 3 );
 		\add_filter(
 			Options::get_option_name( 'redirect' ) . '_disable',
@@ -72,4 +76,3 @@ public function __construct( Container $container ) {
 		\do_action( 'nfd_module_onboarding_post_init' );
 	}
 }
-// END /NewfoldLabs/WP/Module/Onboarding/Application