chore: merge develop and update readme

includes/admin/settings/class-settings-advanced.php

@@ -419,7 +419,7 @@ public function sanitize_option_donor_default_user_role($value) {
         }
 
         /**
-         * @unreleased
+         * @since 3.18.0
          */
         public function _render_give_based_form_editor_notice($field, $value)
         {

includes/admin/settings/class-settings-gateways.php

@@ -412,7 +412,7 @@ static function ($value, $key) {
             ];
 
             /**
-             * @unreleased
+             * @since 3.18.0
              */
             $groups = apply_filters('give_settings_payment_gateways_menu_groups', $groups);
 

readme.txt

@@ -269,6 +269,7 @@ You can report security bugs through the Patchstack Vulnerability Disclosure Pro
 = 3.18.0: November 20th, 2024 =
 * New: Added support to our form migration process for our upcoming Constant Contact add-on 3.0.0 version 
 * New: The donor wall now shows the donor's uploaded image avatar when available
+* New: Added a global setting to enable or disable the Option-Based Form Editor and settings.
 * Fix: Resolved an issue with multi-step form designs growing extra space outside the form
 * Fix: Resolved an issue where some people were not able to connect to PayPal
 * Fix: Resolved an issue that was preventing the form migration process from completing

src/FeatureFlags/FeatureFlags.php

@@ -3,12 +3,12 @@
 namespace Give\FeatureFlags;
 
 /**
- * @unreleased
+ * @since 3.18.0
  */
 interface FeatureFlags
 {
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     public static function isEnabled(): bool;
 }

src/FeatureFlags/OptionBasedFormEditor/OptionBasedFormEditor.php

@@ -8,12 +8,12 @@
 use Give\Framework\QueryBuilder\QueryBuilder;
 
 /**
- * @unreleased
+ * @since 3.18.0
  */
 class OptionBasedFormEditor implements FeatureFlags
 {
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     public static function isEnabled(): bool
     {
@@ -30,7 +30,7 @@ public static function isEnabled(): bool
     }
 
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     public static function helperText(): string
     {
@@ -53,7 +53,7 @@ public static function helperText(): string
     }
 
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     public static function existOptionBasedFormsOnDb(): bool
     {

src/FeatureFlags/OptionBasedFormEditor/ServiceProvider.php

@@ -9,19 +9,19 @@
 use Give\ServiceProviders\ServiceProvider as ServiceProviderInterface;
 
 /**
- * @unreleased
+ * @since 3.18.0
  */
 class ServiceProvider implements ServiceProviderInterface
 {
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     public function register()
     {
     }
 
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     public function boot()
     {

src/FeatureFlags/OptionBasedFormEditor/Settings/AbstractOptionBasedFormEditorSettings.php

@@ -5,33 +5,33 @@
 use Give\FeatureFlags\OptionBasedFormEditor\OptionBasedFormEditor;
 
 /**
- * @unreleased
+ * @since 3.18.0
  */
 abstract class AbstractOptionBasedFormEditorSettings
 {
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     abstract public function getDisabledOptionIds(): array;
 
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     public function getDisabledSectionIds(): array
     {
         return [];
     }
 
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     public function getNewDefaultSection(): string
     {
         return '';
     }
 
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     final public function maybeDisableSections(array $sections): array
     {
@@ -49,7 +49,7 @@ final public function maybeDisableSections(array $sections): array
     }
 
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     final public function maybeDisableOptions(array $options): array
     {
@@ -69,7 +69,7 @@ final public function maybeDisableOptions(array $options): array
     }
 
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     final public function maybeSetNewDefaultSection($currentSection)
     {
@@ -83,15 +83,15 @@ final public function maybeSetNewDefaultSection($currentSection)
     }
 
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     private function isOptionDisabled($option): bool
     {
         return $option && in_array($option, $this->getDisabledOptionIds());
     }
 
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     private function isCurrentSectionDisabled(): bool
     {

src/FeatureFlags/OptionBasedFormEditor/Settings/Advanced.php

@@ -3,12 +3,12 @@
 namespace Give\FeatureFlags\OptionBasedFormEditor\Settings;
 
 /**
- * @unreleased
+ * @since 3.18.0
  */
 class Advanced extends AbstractOptionBasedFormEditorSettings
 {
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     public function getDisabledOptionIds(): array
     {

src/FeatureFlags/OptionBasedFormEditor/Settings/DefaultOptions.php

@@ -3,12 +3,12 @@
 namespace Give\FeatureFlags\OptionBasedFormEditor\Settings;
 
 /**
- * @unreleased
+ * @since 3.18.0
  */
 class DefaultOptions extends AbstractOptionBasedFormEditorSettings
 {
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     public function getDisabledOptionIds(): array
     {

src/FeatureFlags/OptionBasedFormEditor/Settings/General.php

@@ -3,12 +3,12 @@
 namespace Give\FeatureFlags\OptionBasedFormEditor\Settings;
 
 /**
- * @unreleased
+ * @since 3.18.0
  */
 class General extends AbstractOptionBasedFormEditorSettings
 {
     /**
-     * @unreleased
+     * @since 3.18.0
      */
     public function getDisabledOptionIds(): array
     {