DateTime/CurrentTimeTimestamp: rename some local variables

... to be more descriptive in the context of named parameters. Includes defensive coding tweak of making sure the `$content_type` variable is always defined.
WordPress · Aug 17, 2023 · 782f8fe · 782f8fe
1 parent 3bca142
commit 782f8fe
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php b/WordPress/Sniffs/DateTime/CurrentTimeTimestampSniff.php
@@ -80,14 +80,15 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 			return;
 		}
 
+		$content_type = '';
 		for ( $i = $type_param['start']; $i <= $type_param['end']; $i++ ) {
 			if ( isset( Tokens::$emptyTokens[ $this->tokens[ $i ]['code'] ] ) ) {
 				continue;
 			}
 
 			if ( isset( Tokens::$textStringTokens[ $this->tokens[ $i ]['code'] ] ) ) {
-				$content_first = trim( TextStrings::stripQuotes( $this->tokens[ $i ]['content'] ) );
-				if ( 'U' !== $content_first && 'timestamp' !== $content_first ) {
+				$content_type = trim( TextStrings::stripQuotes( $this->tokens[ $i ]['content'] ) );
+				if ( 'U' !== $content_type && 'timestamp' !== $content_type ) {
 					// Most likely valid use of current_time().
 					return;
 				}
@@ -113,10 +114,10 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		 */
 		$gmt_param = PassedParameters::getParameterFromStack( $parameters, 2, 'gmt' );
 		if ( is_array( $gmt_param ) ) {
-			$content_second = '';
+			$content_gmt = '';
 			if ( 'true' === $gmt_param['clean'] || '1' === $gmt_param['clean'] ) {
-				$content_second = $gmt_param['clean'];
-				$gmt_true       = true;
+				$content_gmt = $gmt_param['clean'];
+				$gmt_true    = true;
 			}
 		}
 
@@ -140,9 +141,9 @@ public function process_parameters( $stackPtr, $group_name, $matched_content, $p
 		$error       = 'Don\'t use current_time() for retrieving a Unix (UTC) timestamp. Use time() instead. Found: %s';
 		$error_code  = 'RequestedUTC';
 
-		$code_snippet = "current_time( '" . $content_first . "'";
-		if ( isset( $content_second ) ) {
-			$code_snippet .= ', ' . $content_second;
+		$code_snippet = "current_time( '" . $content_type . "'";
+		if ( isset( $content_gmt ) ) {
+			$code_snippet .= ', ' . $content_gmt;
 		}
 		$code_snippet .= ' )';