From 3f1dbf86e5d56f79af31b9e566547b557036a335 Mon Sep 17 00:00:00 2001
From: Rebecca Hum <16962021+rebeccahum@users.noreply.github.com>
Date: Wed, 31 Mar 2021 15:20:21 -0600
Subject: [PATCH 1/2] Add new OptionsRaceConditionSniff

---
 .../Functions/OptionsRaceConditionSniff.php   | 222 ++++++++++++++++++
 .../OptionsRaceConditionUnitTest.inc          | 112 +++++++++
 .../OptionsRaceConditionUnitTest.php          |  53 +++++
 3 files changed, 387 insertions(+)
 create mode 100644 WordPressVIPMinimum/Sniffs/Functions/OptionsRaceConditionSniff.php
 create mode 100644 WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.inc
 create mode 100644 WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.php

diff --git a/WordPressVIPMinimum/Sniffs/Functions/OptionsRaceConditionSniff.php b/WordPressVIPMinimum/Sniffs/Functions/OptionsRaceConditionSniff.php
new file mode 100644
index 00000000..afc88448
--- /dev/null
+++ b/WordPressVIPMinimum/Sniffs/Functions/OptionsRaceConditionSniff.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * WordPressVIPMinimum Coding Standard.
+ *
+ * @package VIPCS\WordPressVIPMinimum
+ */
+
+namespace WordPressVIPMinimum\Sniffs\Functions;
+
+use WordPressVIPMinimum\Sniffs\Sniff;
+use PHP_CodeSniffer\Util\Tokens;
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\AbstractScopeSniff;
+
+/**
+ * This sniff checks to see if the deletion of an option is immediately followed by an addition of the same option.
+ */
+class OptionsRaceConditionSniff extends AbstractScopeSniff {
+
+	/**
+	 * Function name to delete option.
+	 *
+	 * @var string
+	 */
+	private $delete_option = 'delete_option';
+
+	/**
+	 * Function name to add option.
+	 *
+	 * @var string
+	 */
+	private $add_option = 'add_option';
+
+	/**
+	 * Constructs the test with the tokens it wishes to listen for.
+	 */
+	public function __construct() {
+		parent::__construct(
+			[ T_FUNCTION ],
+			[ T_STRING ]
+		);
+	}
+
+	/**
+	 * Processes the function tokens within the class.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+	 * @param int                         $stackPtr  The position where the token was found.
+	 * @param int                         $currScope The current scope opener token.
+	 *
+	 * @return void
+	 */
+	protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currScope ) {
+		$tokens = $phpcsFile->getTokens();
+
+		if ( $tokens[ $stackPtr ]['content'] !== $this->delete_option ) {
+			$stackPtr = $phpcsFile->findNext(
+				[ T_STRING ],
+				$stackPtr + 1,
+				null,
+				true,
+				$this->delete_option
+			);
+
+			if ( ! $stackPtr ) {
+				return; // No delete_option found, bail.
+			}
+		}
+
+		$delete_option_scope_start = $phpcsFile->findNext(
+			Tokens::$emptyTokens,
+			$stackPtr + 1,
+			null,
+			true
+		);
+
+		if ( ! $delete_option_scope_start || $tokens[ $delete_option_scope_start ]['code'] !== T_OPEN_PARENTHESIS ) {
+			return; // Not a function call, bail.
+		}
+
+		$delete_option_semicolon = $phpcsFile->findNext(
+			[ T_SEMICOLON ],
+			$tokens[ $delete_option_scope_start ]['parenthesis_closer'] + 1,
+			null,
+			false
+		);
+
+		$delete_option_key = $phpcsFile->findNext(
+			Tokens::$emptyTokens,
+			$delete_option_scope_start + 1,
+			null,
+			true
+		);
+
+		$add_option = $phpcsFile->findNext(
+			Tokens::$emptyTokens,
+			$delete_option_semicolon + 1,
+			null,
+			true
+		);
+
+		$message = 'Concurrent calls to `delete_option()` and `add_option()` for %s may lead to race conditions in persistent object caching. Please consider using `update_option()` in place of both function calls, as it will also add the option if it does not exist.';
+
+		if ( $tokens[ $add_option ]['code'] === T_IF ) {
+			// Check inside scope of first IF statement after for `add_option()` being called.
+			$add_option_inside_if = $phpcsFile->findNext(
+				[ T_STRING ],
+				$tokens[ $add_option ]['scope_opener'] + 1,
+				null,
+				false,
+				$this->add_option
+			);
+
+			if ( ! $add_option_inside_if || $add_option_inside_if > $tokens[ $add_option ]['scope_closer'] ) {
+				return; // No add_option() call inside first IF statement or add_option found not in IF scope.
+			}
+
+			$add_option_inside_if_scope_start = $phpcsFile->findNext(
+				Tokens::$emptyTokens,
+				$add_option_inside_if + 1,
+				null,
+				true
+			);
+
+			if ( ! $add_option_inside_if_scope_start || $tokens[ $add_option_inside_if_scope_start ]['code'] !== T_OPEN_PARENTHESIS ) {
+				return; // Not a function call, bail.
+			}
+
+			$add_option_inside_if_option_key = $phpcsFile->findNext(
+				Tokens::$emptyTokens,
+				$add_option_inside_if_scope_start + 1,
+				null,
+				true
+			);
+
+			if ( $add_option_inside_if_option_key && $this->is_same_option_key( $tokens, $add_option_inside_if_option_key, $delete_option_key ) ) {
+				$phpcsFile->addWarning( $message, $add_option_inside_if_option_key, 'OptionsRaceCondition' );
+			}
+
+			// Walk ahead out of IF control structure.
+			$add_option = $phpcsFile->findNext(
+				Tokens::$emptyTokens,
+				$tokens[ $add_option ]['scope_closer'] + 1,
+				null,
+				true
+			);
+		}
+
+		if ( $tokens[ $add_option ]['code'] === T_VARIABLE ) {
+			// Account for variable assignments.
+			$equals = $phpcsFile->findNext(
+				Tokens::$emptyTokens,
+				$add_option + 1,
+				null,
+				true
+			);
+
+			if ( $tokens[ $equals ]['code'] === T_EQUAL ) {
+				$add_option = $phpcsFile->findNext(
+					Tokens::$emptyTokens,
+					$equals + 1,
+					null,
+					true
+				);
+			}
+		}
+
+		if ( $tokens[ $add_option ]['code'] !== T_STRING || $tokens[ $add_option ]['content'] !== $this->add_option ) {
+			return; // add_option() isn't immediately following delete_option(), bail.
+		}
+
+		$add_option_scope_start = $phpcsFile->findNext(
+			Tokens::$emptyTokens,
+			$add_option + 1,
+			null,
+			true
+		);
+
+		if ( ! $add_option_scope_start || $tokens[ $add_option_scope_start ]['code'] !== T_OPEN_PARENTHESIS ) {
+			return; // Not a function call, bail.
+		}
+
+		// Check if it's the same option being deleted earlier.
+		$add_option_key = $phpcsFile->findNext(
+			Tokens::$emptyTokens,
+			$add_option_scope_start + 1,
+			null,
+			true
+		);
+
+		if ( $this->is_same_option_key( $tokens, $add_option_key, $delete_option_key ) ) {
+			$phpcsFile->addWarning( $message, $add_option_key, 'OptionsRaceCondition' );
+			return;
+		}
+	}
+
+	/**
+	 * Processes a token that is found within the scope that this test is
+	 * listening to.
+	 *
+	 * @param \PHP_CodeSniffer\Files\File $phpcsFile The file where this token was found.
+	 * @param int                         $stackPtr  The position in the stack where this
+	 *                                               token was found.
+	 * @return void
+	 */
+	protected function processTokenOutsideScope( File $phpcsFile, $stackPtr ) {
+	}
+
+	/**
+	 * Check if option is the same.
+	 *
+	 * @param array $tokens        List of PHPCS tokens.
+	 * @param int   $first_option  Stack position of first option.
+	 * @param int   $second_option Stack position of second option to match against.
+	 *
+	 * @return false
+	 */
+	private function is_same_option_key( $tokens, $first_option, $second_option ) {
+		return $tokens[ $first_option ]['code'] === $tokens[ $second_option ]['code'] &&
+		$tokens[ $first_option ]['content'] === $tokens[ $second_option ]['content'];
+	}
+}
diff --git a/WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.inc b/WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.inc
new file mode 100644
index 00000000..0dae72fd
--- /dev/null
+++ b/WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.inc
@@ -0,0 +1,112 @@
+<?php
+
+function test_with_function_between() {
+	$defaults = get_default_settings();
+	delete_option( 'my_settings' );
+
+	do_stuff();
+
+	add_option( 'my_settings', $defaults ); // OK - since there is stuff being done in between.
+}
+
+function test_different_option_name() {
+	$defaults = get_default_settings();
+	delete_option( 'my_settings' );
+	add_option( 'settings', [] ); // OK - Not same key as delete_option().
+}
+
+function test_same_option_key_by_var_assignment() {
+	$key = 'option_key';
+	delete_option( $key );
+	$add = add_option( $key, $key ); // Warning.
+}
+
+function test_same_option_key() {
+	$key = 'option_key';
+	delete_option( $key );
+	add_option( $key, 'data' ); // Warning.
+}
+
+function test_same_option_key_var_assignment2() {
+	$delete = delete_option( 'option_key' );
+	add_option( 'option_key', [ 'stuff', '123' ] ); // Warning.
+}
+
+function test_same_option_key_string() {
+	$delete = delete_option(  'option_key' );
+	add_option( 'option_key', [] ); // Warning.
+}
+
+function test_line_breaks() {
+	$delete = delete_option(  'option_key' );
+
+
+
+	add_option( 'option_key', [] ); // Warning.
+}
+
+function test_bad_spacing() {
+		$delete =    delete_option(    'option_key' );
+	add_option('option_key', []); // Warning.
+}
+
+function test_empty_tokens_between() {
+	delete_option( 'key' );
+
+	// Random comment here.
+	/* Random stuff. */
+        
+	add_option ( 'key' ); // Warning.
+}
+
+function test_first_if() {
+	$delete = delete_option ( 'option_key' );
+	if ( $delete ) {
+		add_option( 'option_key', [] ); // Warning.
+	}
+}
+
+function test_inside_first_if_but_different_key() {
+	$delete = delete_option ( 'option_key' );
+	if ( $delete ) {
+		add_option( 'different_option_key', [] ); // OK.
+	}
+}
+
+function test_second_if() {
+	$delete = delete_option ( 'option_key' );
+	if ( do_something() ) {
+		// Stuff.
+	}
+	if ( $delete ) {
+		add_option( 'option_key', [] ); // OK - Not on first IF.
+	}
+}
+
+function concurrent_option_writes() {
+	delete_option( 'test_option' );
+	add_option( 'test_option', [ 1, 2, 3 ] ); // Warning.
+
+	do_stuff();
+
+	$delete = delete_option( 'another_test_option' );
+	if ( $delete ) {
+		add_option( 'another_test_option', $data ); // Warning.
+	}
+}
+
+function concurrent_option_writes_with_one_if_different_key() {
+	$test = delete_option( 'test_option' );
+	if ( $test ) {
+		add_option( 'option', [ 1, 2, 3 ] );
+	}
+	$test = add_option( 'test_option', [ 1, 2, 3 ] ); // Warning.
+}
+
+function concurrent_option_writes_with_one_if_same_key() {
+	$test = delete_option( 'test_option' );
+	if ( $test ) {
+		add_option( 'test_option', [] ); // Warning.
+	}
+	$test = add_option( 'test_option', [ 1, 2, 3 ] ); // Warning.
+}
diff --git a/WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.php b/WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.php
new file mode 100644
index 00000000..ad8fe179
--- /dev/null
+++ b/WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Unit test class for WordPressVIPMinimum Coding Standard.
+ *
+ * @package VIPCS\WordPressVIPMinimum
+ */
+
+namespace WordPressVIPMinimum\Tests\Functions;
+
+use PHP_CodeSniffer\Tests\Standards\AbstractSniffUnitTest;
+
+/**
+ * Unit test class for the OptionsRaceCondition sniff.
+ *
+ * @package VIPCS\WordPressVIPMinimum
+ *
+ * @covers \WordPressVIPMinimum\Sniffs\Functions\OptionsRaceConditionSniff
+ */
+class OptionsRaceConditionUnitTest extends AbstractSniffUnitTest {
+
+	/**
+	 * Returns the lines where errors should occur.
+	 *
+	 * @return array <int line number> => <int number of errors>
+	 */
+	public function getErrorList() {
+		return [];
+	}
+
+	/**
+	 * Returns the lines where warnings should occur.
+	 *
+	 * @return array <int line number> => <int number of warnings>
+	 */
+	public function getWarningList() {
+		return [
+			21  => 1,
+			27  => 1,
+			32  => 1,
+			37  => 1,
+			45  => 1,
+			50  => 1,
+			59  => 1,
+			65  => 1,
+			88  => 1,
+			94  => 1,
+			103 => 1,
+			109 => 1,
+			111 => 1,
+		];
+	}
+
+}

From dfc1dd610da7fe0e703b25e6473dd374b8a37284 Mon Sep 17 00:00:00 2001
From: Rebecca Hum <16962021+rebeccahum@users.noreply.github.com>
Date: Fri, 9 Apr 2021 09:37:24 -0600
Subject: [PATCH 2/2] Account for concatenation in option names

---
 .../Functions/OptionsRaceConditionSniff.php   | 162 +++++++++++++++---
 .../OptionsRaceConditionUnitTest.inc          |  47 ++++-
 .../OptionsRaceConditionUnitTest.php          |   7 +-
 3 files changed, 191 insertions(+), 25 deletions(-)

diff --git a/WordPressVIPMinimum/Sniffs/Functions/OptionsRaceConditionSniff.php b/WordPressVIPMinimum/Sniffs/Functions/OptionsRaceConditionSniff.php
index afc88448..44f4e9e2 100644
--- a/WordPressVIPMinimum/Sniffs/Functions/OptionsRaceConditionSniff.php
+++ b/WordPressVIPMinimum/Sniffs/Functions/OptionsRaceConditionSniff.php
@@ -54,6 +54,7 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 		$tokens = $phpcsFile->getTokens();
 
 		if ( $tokens[ $stackPtr ]['content'] !== $this->delete_option ) {
+			// delete_option is not first function found.
 			$stackPtr = $phpcsFile->findNext(
 				[ T_STRING ],
 				$stackPtr + 1,
@@ -78,23 +79,58 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 			return; // Not a function call, bail.
 		}
 
-		$delete_option_semicolon = $phpcsFile->findNext(
-			[ T_SEMICOLON ],
-			$tokens[ $delete_option_scope_start ]['parenthesis_closer'] + 1,
+		$delete_option_name = $phpcsFile->findNext(
+			Tokens::$emptyTokens,
+			$delete_option_scope_start + 1,
 			null,
-			false
+			true
 		);
 
-		$delete_option_key = $phpcsFile->findNext(
+		$delete_option_concat = $phpcsFile->findNext(
 			Tokens::$emptyTokens,
-			$delete_option_scope_start + 1,
+			$delete_option_name + 1,
 			null,
 			true
 		);
 
+		$delete_option_name = $this->trim_strip_quotes( $tokens[ $delete_option_name ]['content'] );
+
+		$is_delete_option_concat = $tokens[ $delete_option_concat ]['code'] === T_STRING_CONCAT;
+		if ( $is_delete_option_concat ) {
+			// If option name is concatenated, we need to build it out.
+			$delete_option_concat = $phpcsFile->findNext(
+				Tokens::$emptyTokens,
+				$delete_option_concat + 1,
+				null,
+				true
+			);
+
+			while ( $delete_option_concat < $tokens[ $delete_option_scope_start ]['parenthesis_closer'] ) {
+				$delete_option_name .= $this->trim_strip_quotes( $tokens[ $delete_option_concat ]['content'] );
+
+				$delete_option_concat = $phpcsFile->findNext(
+					array_merge( Tokens::$emptyTokens, [ T_STRING_CONCAT ] ),
+					$delete_option_concat + 1,
+					null,
+					true
+				);
+			}
+		}
+
+		$delete_option_scope_end = $phpcsFile->findNext(
+			[ T_SEMICOLON ],
+			$tokens[ $delete_option_scope_start ]['parenthesis_closer'] + 1,
+			null,
+			false
+		);
+
+		if ( ! $delete_option_scope_end ) {
+			return; // Something went wrong with the syntax.
+		}
+
 		$add_option = $phpcsFile->findNext(
 			Tokens::$emptyTokens,
-			$delete_option_semicolon + 1,
+			$delete_option_scope_end + 1,
 			null,
 			true
 		);
@@ -126,15 +162,55 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 				return; // Not a function call, bail.
 			}
 
-			$add_option_inside_if_option_key = $phpcsFile->findNext(
+			$add_option_inside_if_option_name = $phpcsFile->findNext(
 				Tokens::$emptyTokens,
 				$add_option_inside_if_scope_start + 1,
 				null,
 				true
 			);
 
-			if ( $add_option_inside_if_option_key && $this->is_same_option_key( $tokens, $add_option_inside_if_option_key, $delete_option_key ) ) {
-				$phpcsFile->addWarning( $message, $add_option_inside_if_option_key, 'OptionsRaceCondition' );
+			$add_option_inside_if_concat = $phpcsFile->findNext(
+				Tokens::$emptyTokens,
+				$add_option_inside_if_option_name + 1,
+				null,
+				true
+			);
+
+			$add_option_inside_if_option_name = $this->trim_strip_quotes( $tokens[ $add_option_inside_if_option_name ]['content'] );
+
+			if ( $is_delete_option_concat && $tokens[ $add_option_inside_if_concat ]['code'] === T_STRING_CONCAT ) {
+				$add_option_inside_if_concat = $phpcsFile->findNext(
+					array_merge( Tokens::$emptyTokens, [ T_STRING_CONCAT ] ),
+					$add_option_inside_if_concat + 1,
+					null,
+					true
+				);
+
+				$add_option_inside_if_scope_end = $phpcsFile->findNext(
+					[ T_COMMA ],
+					$add_option_inside_if_concat + 1,
+					null,
+					false
+				);
+
+				if ( ! $add_option_inside_if_scope_end ) {
+					return; // Something went wrong.
+				}
+
+				while ( $add_option_inside_if_concat < $add_option_inside_if_scope_end ) {
+					$add_option_inside_if_option_name .= $this->trim_strip_quotes( $tokens[ $add_option_inside_if_concat ]['content'] );
+
+					$add_option_inside_if_concat = $phpcsFile->findNext(
+						array_merge( Tokens::$emptyTokens, [ T_STRING_CONCAT ] ),
+						$add_option_inside_if_concat + 1,
+						null,
+						true
+					);
+				}
+			}
+
+			if ( $this->is_same_option_key( $delete_option_name, $add_option_inside_if_option_name ) ) {
+				$phpcsFile->addWarning( $message, $add_option_inside_if_scope_start, 'OptionsRaceCondition' );
 			}
 
 			// Walk ahead out of IF control structure.
@@ -180,16 +256,54 @@ protected function processTokenWithinScope( File $phpcsFile, $stackPtr, $currSco
 			return; // Not a function call, bail.
 		}
 
-		// Check if it's the same option being deleted earlier.
-		$add_option_key = $phpcsFile->findNext(
+		$add_option_name = $phpcsFile->findNext(
 			Tokens::$emptyTokens,
 			$add_option_scope_start + 1,
 			null,
 			true
 		);
 
-		if ( $this->is_same_option_key( $tokens, $add_option_key, $delete_option_key ) ) {
-			$phpcsFile->addWarning( $message, $add_option_key, 'OptionsRaceCondition' );
+		$add_option_concat = $phpcsFile->findNext(
+			Tokens::$emptyTokens,
+			$add_option_name + 1,
+			null,
+			true
+		);
+
+		$add_option_name = $this->trim_strip_quotes( $tokens[ $add_option_name ]['content'] );
+		if ( $is_delete_option_concat && $tokens[ $add_option_concat ]['code'] === T_STRING_CONCAT ) {
+			$add_option_concat = $phpcsFile->findNext(
+				Tokens::$emptyTokens,
+				$add_option_concat + 1,
+				null,
+				true
+			);
+
+			$add_option_scope_end = $phpcsFile->findNext(
+				[ T_COMMA ],
+				$add_option_concat + 1,
+				null,
+				false
+			);
+
+			if ( ! $add_option_scope_end ) {
+				return; // Something went wrong.
+			}
+
+			while ( $add_option_concat < $add_option_scope_end ) {
+				$add_option_name .= $this->trim_strip_quotes( $tokens[ $add_option_concat ]['content'] );
+
+				$add_option_concat = $phpcsFile->findNext(
+					array_merge( Tokens::$emptyTokens, [ T_STRING_CONCAT ] ),
+					$add_option_concat + 1,
+					null,
+					true
+				);
+			}
+		}
+
+		if ( $this->is_same_option_key( $delete_option_name, $add_option_name ) ) {
+			$phpcsFile->addWarning( $message, $add_option_scope_start, 'OptionsRaceCondition' );
 			return;
 		}
 	}
@@ -209,14 +323,22 @@ protected function processTokenOutsideScope( File $phpcsFile, $stackPtr ) {
 	/**
 	 * Check if option is the same.
 	 *
-	 * @param array $tokens        List of PHPCS tokens.
-	 * @param int   $first_option  Stack position of first option.
-	 * @param int   $second_option Stack position of second option to match against.
+	 * @param string $option_name             Option name.
+	 * @param string $option_name_to_compare  Option name to compare against.
 	 *
 	 * @return false
 	 */
-	private function is_same_option_key( $tokens, $first_option, $second_option ) {
-		return $tokens[ $first_option ]['code'] === $tokens[ $second_option ]['code'] &&
-		$tokens[ $first_option ]['content'] === $tokens[ $second_option ]['content'];
+	private function is_same_option_key( $option_name, $option_name_to_compare ) {
+		return $option_name === $option_name_to_compare;
+	}
+
+	/**
+	 * Trim whitespace and strip quotes surrounding an arbitrary string.
+	 *
+	 * @param string $string The raw string.
+	 * @return string String without whitespace or quotes around it.
+	 */
+	public function trim_strip_quotes( $string ) {
+		return trim( preg_replace( '`^([\'"])(.*)\1$`Ds', '$2', $string ) );
 	}
 }
diff --git a/WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.inc b/WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.inc
index 0dae72fd..eacfbde1 100644
--- a/WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.inc
+++ b/WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.inc
@@ -27,9 +27,9 @@ function test_same_option_key() {
 	add_option( $key, 'data' ); // Warning.
 }
 
-function test_same_option_key_var_assignment2() {
-	$delete = delete_option( 'option_key' );
-	add_option( 'option_key', [ 'stuff', '123' ] ); // Warning.
+function test_same_option_key_double_quoted_string() {
+	$delete = delete_option( "option_{$id}" );
+	add_option( "option_{$id}", [ 'stuff', '123' ] ); // Warning.
 }
 
 function test_same_option_key_string() {
@@ -103,10 +103,49 @@ function concurrent_option_writes_with_one_if_different_key() {
 	$test = add_option( 'test_option', [ 1, 2, 3 ] ); // Warning.
 }
 
-function concurrent_option_writes_with_one_if_same_key() {
+function test_concurrent_option_writes_with_if() {
 	$test = delete_option( 'test_option' );
 	if ( $test ) {
 		add_option( 'test_option', [] ); // Warning.
 	}
 	$test = add_option( 'test_option', [ 1, 2, 3 ] ); // Warning.
 }
+
+function test_different_quotes() {
+	delete_option( 'foobar' );
+	add_option( "foobar", 'baz' ); // Warning.
+}
+
+function test_spacing_inside_option_name() {
+	delete_option( 'foobar' );
+	add_option( '     foobar   ', 'baz' ); // Warning.
+}
+
+function test_concat_same_string_var() {
+	delete_option( 'foo_' . $bar );
+	add_option( 'foo_' . $bar, 'baz' ); // Warning.
+}
+
+function test_concat_different_string_var() {
+	delete_option( 'foo_' . $ba );
+	add_option( 'foo_' . $bar, 'baz' ); // OK - Not same option name.
+}
+
+function test_inside_if_concat_option_name( $test ) {
+	$test = delete_option( "foo_" . $bar );
+	if ( $test ) {
+		add_option( 'foo_' . $bar, [ 1, 2, 3 ] ); // Warning.
+	}
+}
+
+function test_long_concat() {
+	delete_option( 'foo_' . $bar . '_' . $id );
+	add_option( "foo_" . $bar . '_' . $id, 'baz' ); // Warning.
+}
+
+function test_long_concat_inside_if() {
+	$test = delete_option( 'foo_' . $bar . '_' . $id );
+	if ( $test ) {
+		$option_added = add_option( "foo_" . $bar . '_' . $id, 'baz' ); // Warning.
+	}
+}
diff --git a/WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.php b/WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.php
index ad8fe179..fd9f883c 100644
--- a/WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.php
+++ b/WordPressVIPMinimum/Tests/Functions/OptionsRaceConditionUnitTest.php
@@ -47,7 +47,12 @@ public function getWarningList() {
 			103 => 1,
 			109 => 1,
 			111 => 1,
+			116 => 1,
+			121 => 1,
+			126 => 1,
+			137 => 1,
+			143 => 1,
+			149 => 1,
 		];
 	}
-
 }