Merge pull request #3523 from woocommerce/PCP-4998-fatal-error-when-using-feature-flag-filter-to-disable-new-settings-ui

Always enable the new settings module (4998)

Author: Dinamiko

modules.php

@@ -33,6 +33,7 @@
 		( require "$modules_dir/ppcp-blocks/module.php" )(),
 		( require "$modules_dir/ppcp-paypal-subscriptions/module.php" )(),
 		( require "$modules_dir/ppcp-local-alternative-payment-methods/module.php" )(),
+		( require "$modules_dir/ppcp-settings/module.php" )(),
 	);
 	// phpcs:disable WordPress.NamingConventions.ValidHookName.UseUnderscores
 
@@ -91,12 +92,5 @@
 		$modules[] = ( require "$modules_dir/ppcp-axo-block/module.php" )();
 	}
 
-	if ( apply_filters(
-		'woocommerce.feature-flags.woocommerce_paypal_payments.settings_enabled',
-		true
-	) ) {
-		$modules[] = ( require "$modules_dir/ppcp-settings/module.php" )();
-	}
-
 	return $modules;
 };

modules/ppcp-settings/src/SettingsModule.php

@@ -66,20 +66,29 @@ class SettingsModule implements ServiceModule, ExecutableModule {
 	 * Returns whether the old settings UI should be loaded.
 	 */
 	public static function should_use_the_old_ui() : bool {
-		// New merchants should never see the #legacy-ui.
-		$show_new_ux = '1' === get_option( 'woocommerce-ppcp-is-new-merchant' );
+		/**
+		 * Determine if the new Settings UI is disabled via feature flag.
+		 *
+		 * This is the highest-priority check: if the `woocommerce.feature-flags.woocommerce_paypal_payments.settings_enabled` filter
+		 * is used to disable the new UI, it will override all other conditions.
+		 */
+		if ( ! apply_filters(
+			// phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores -- feature flags use this convention
+			'woocommerce.feature-flags.woocommerce_paypal_payments.settings_enabled',
+			getenv( 'PCP_SETTINGS_ENABLED' ) !== '1'
+		) ) {
+			return true;
+		}
 
-		if ( $show_new_ux ) {
+		// New merchants always see the new UI if the filter above is not used.
+		if ( '1' === get_option( 'woocommerce-ppcp-is-new-merchant' ) ) {
 			return false;
 		}
 
-		// Existing merchants can opt-in to see the new UI.
-		$opt_out_choice = 'yes' === get_option( SwitchSettingsUiEndpoint::OPTION_NAME_SHOULD_USE_OLD_UI );
+		// Existing merchants can opt out via DB option.
+		$opt_out = 'yes' === get_option( SwitchSettingsUiEndpoint::OPTION_NAME_SHOULD_USE_OLD_UI );
 
-		return apply_filters(
-			'woocommerce_paypal_payments_should_use_the_old_ui',
-			$opt_out_choice
-		);
+		return apply_filters( 'woocommerce_paypal_payments_should_use_the_old_ui', $opt_out );
 	}
 
 	/**