Apply suggestions from code review

Co-authored-by: Juliette <[email protected]>

Author: rodrigoprimo

WordPress/Docs/WP/OptionAutoloadStandard.xml

@@ -7,8 +7,9 @@
     <![CDATA[
     When using `add_option()`, `update_option()`, `wp_set_options_autoload()`,
     `wp_set_option_autoload()`, or `wp_set_option_autoload_values()`, it is recommended to
-    explicitly set the autoload parameter to ensure predictable behavior. This parameter determines
-    whether the option is automatically loaded on every page load, which can impact site performance.
+    explicitly set the autoload parameter to ensure predictable behavior.
+    The autoload flag determines whether the option is automatically loaded on every page load,
+    which can impact site performance.
     ]]>
     </standard>
     <standard>
@@ -23,7 +24,7 @@
     'on', or 'off' in plugin/theme code is strongly discouraged as those values are meant for
     internal-use only.
 
-    Any other values, including `null` for functions other than `add_option()` and `update_option()`
+    Any other values, including `null` for functions other than `add_option()` and `update_option()`,
     are invalid.
     ]]>
     </standard>
@@ -75,7 +76,7 @@ wp_set_options_autoload(
     <standard>
     <![CDATA[
     Even though the autoload parameter is optional for `add_option()` and `update_option()`, it is
-    recommended to always explicitly set it.
+    strongly recommended to always explicitly set it.
     ]]>
     </standard>
     <code_comparison>

WordPress/Sniffs/WP/OptionAutoloadSniff.php

@@ -240,7 +240,7 @@ private function handle_wp_set_option_autoload_values( array $options_param, $st
 		$array_token = $this->phpcsFile->findNext(
 			Tokens::$emptyTokens,
 			$options_param['start'],
-			$options_param['end'],
+			( $options_param['end'] + 1 ),
 			true
 		);
 
@@ -311,8 +311,8 @@ private function maybe_display_missing_autoload_warning( $stackPtr, $function_na
 	 *
 	 * @since 3.2.0
 	 *
-	 * @param array  $autoload_info Information about the autoload value (start and end tokens and
-	 *                              the clean value).
+	 * @param array  $autoload_info Information about the autoload value (start and end tokens,
+	 *                              the clean value and potentially the "raw" value - which isn't used).
 	 * @param string $function_name The token content (function name) which was matched
 	 *                              in lowercase.
 	 *
@@ -369,7 +369,7 @@ private function check_autoload_value( array $autoload_info, $function_name ) {
 		if ( $param_second_token
 			&& false === isset( Collections::arrayOpenTokensBC()[ $this->tokens[ $param_first_token ]['code'] ] )
 		) {
-			// Bail early if the parameter has two or more non-empty tokens and the second token is
+			// Bail early if the parameter has two or more non-empty tokens and the first token is
 			// not an array opener as this means an undetermined param value or a value that is not
 			// easy to determine.
 			$this->phpcsFile->recordMetric( $param_first_token, self::METRIC_NAME, 'undetermined value' );
@@ -401,13 +401,7 @@ private function check_autoload_value( array $autoload_info, $function_name ) {
 			$error_code = 'InternalUseOnly';
 			$data       = array( $autoload_info['clean'] );
 		} else {
-			$valid_values        = array_map(
-				function ( $value ) {
-					return '`' . $value . '`';
-				},
-				$valid_values
-			);
-			$valid_values_string = implode( ', ', $valid_values );
+			$valid_values_string = '`' . implode( '`, `', $valid_values ) . '`';
 			$valid_values_string = substr_replace( $valid_values_string, ' or', strrpos( $valid_values_string, ',' ), 1 );
 			$message             = 'The use of `%s` as the value of the `$autoload` parameter is invalid. Use %s instead.';
 			$error_code          = 'InvalidValue';
@@ -422,7 +416,7 @@ function ( $value ) {
 				$data
 			);
 
-			if ( $fix ) {
+			if ( true === $fix ) {
 				$this->phpcsFile->fixer->replaceToken( $param_first_token, $this->fixable_values[ $autoload_value ] );
 			}