allow overiding conditional logic keys when migrating rules

hizzle-co · Mar 25, 2024 · 3e51fd7 · 3e51fd7
1 parent 64a350b
commit 3e51fd7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -37,6 +37,7 @@ jobs:
       - name: Setup Environment Variables
         run: |
           echo "export PATH=$HOME/.composer/vendor/bin:$PATH" >> $HOME/.bashrc
+          echo "export WP_TESTS_PHPUNIT_POLYFILLS_PATH=$HOME/.composer/vendor/yoast/phpunit-polyfills" >> $HOME/.bashrc
           source $HOME/.bashrc
 
       - name: Install Dependencies

diff --git a/src/DB/Automation_Rule.php b/src/DB/Automation_Rule.php
@@ -196,7 +196,7 @@ public function get_conditional_logic() {
 	 *
 	 * @param array $rules The rules.
 	 */
-	public function add_conditional_logic_rules( $rules, $delete_settings = array() ) {
+	public function add_conditional_logic_rules( $rules, $delete_settings = array(), $overwrite = array() ) {
 		$conditional_logic = array_merge( noptin_get_default_conditional_logic(), $this->get_conditional_logic() );
 		$existing_rules    = $conditional_logic['enabled'] ? $conditional_logic['rules'] : array();
 
@@ -211,6 +211,10 @@ public function add_conditional_logic_rules( $rules, $delete_settings = array()
 			}
 		}
 
+		if ( is_array( $overwrite ) ) {
+			$conditional_logic = array_merge( $conditional_logic, $overwrite );
+		}
+
 		$new_settings['conditional_logic'] = $conditional_logic;
 		$this->set_trigger_settings( $new_settings );
 	}

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'hizzle-co/noptin',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => '66d41cdea77a435076f0858bada03467853938b4',
+        'reference' => '64a350ba0152326612503eeb747be3d9f9ad07a3',
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -13,7 +13,7 @@
         'hizzle-co/noptin' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => '66d41cdea77a435076f0858bada03467853938b4',
+            'reference' => '64a350ba0152326612503eeb747be3d9f9ad07a3',
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),