Fix PHP Lint errors

10up · felipeelia · Dec 11, 2024 · Dec 10, 2024 · Dec 10, 2024 · Dec 11, 2024
commit aabe217589b2e8617fdd0913ea70d1849ca3cc43
diff --git a/elasticpress.php b/elasticpress.php
@@ -72,7 +72,7 @@ function () {
  * @since 2.6
  */
 spl_autoload_register(
-	function ( $class ) {
+	function ( $class_name ) {
 			// project-specific namespace prefix.
 			$prefix = 'ElasticPress\\';
 
@@ -82,11 +82,11 @@ function ( $class ) {
 			// does the class use the namespace prefix?
 			$len = strlen( $prefix );
 
-		if ( strncmp( $prefix, $class, $len ) !== 0 ) {
+		if ( strncmp( $prefix, $class_name, $len ) !== 0 ) {
 			return;
 		}
 
-			$relative_class = substr( $class, $len );
+			$relative_class = substr( $class_name, $len );
 
 			$file = $base_dir . str_replace( '\\', '/', $relative_class ) . '.php';
 

diff --git a/includes/classes/Features.php b/includes/classes/Features.php
@@ -295,23 +295,21 @@ public function handle_feature_activation() {
 
 					$this->activate_feature( $slug, $activate_feature_target );
 				}
-			} else {
+			} elseif ( $old_requirement_statuses[ $slug ] !== $code && ( 0 === $code || 2 === $code ) ) {
 				// This feature has a 0 "ok" code when it did not before
-				if ( $old_requirement_statuses[ $slug ] !== $code && ( 0 === $code || 2 === $code ) ) {
-					$active = ( 0 === $code );
-
-					if ( ! $feature->is_active() && $active ) {
-						// Need to activate and maybe set a sync notice
-						if ( $feature->requires_install_reindex ) {
-							$activate_feature_target = 'draft';
-							Utils\update_option( 'ep_feature_auto_activated_sync', sanitize_text_field( $slug ) );
-						}
-
-						$this->activate_feature( $slug, $activate_feature_target );
-					} elseif ( $feature->is_active() && ! $active ) {
-						// Just deactivate, don't force
-						$this->deactivate_feature( $slug, false );
+				$active = ( 0 === $code );
+
+				if ( ! $feature->is_active() && $active ) {
+					// Need to activate and maybe set a sync notice
+					if ( $feature->requires_install_reindex ) {
+						$activate_feature_target = 'draft';
+						Utils\update_option( 'ep_feature_auto_activated_sync', sanitize_text_field( $slug ) );
 					}
+
+					$this->activate_feature( $slug, $activate_feature_target );
+				} elseif ( $feature->is_active() && ! $active ) {
+					// Just deactivate, don't force
+					$this->deactivate_feature( $slug, false );
 				}
 			}
 		}

diff --git a/includes/classes/IndexHelper.php b/includes/classes/IndexHelper.php
@@ -1277,14 +1277,12 @@ protected function stop_the_insanity() {
 		 */
 		if ( function_exists( 'wp_cache_flush_runtime' ) ) {
 			wp_cache_flush_runtime();
-		} else {
+		} elseif ( ! wp_using_ext_object_cache() ) {
 			/*
 			 * In the case where we're not using an external object cache, we need to call flush on the default
 			 * WordPress object cache class to clear the values from the cache property
 			 */
-			if ( ! wp_using_ext_object_cache() ) {
-				wp_cache_flush();
-			}
+			wp_cache_flush();
 		}
 
 		if ( is_object( $wp_object_cache ) ) {

diff --git a/includes/compat.php b/includes/compat.php
@@ -4,6 +4,8 @@
  *
  * @since  3.0
  * @package elasticpress
+ *
+ * phpcs:disable Universal.Files.SeparateFunctionsFromOO.Mixed
  */
 
 /**

diff --git a/tests/php/TestUtils.php b/tests/php/TestUtils.php
@@ -394,9 +394,6 @@ public function testGetElasticsearchErrorReason() {
 				],
 				'items'  => [
 					[
-						'index' => [
-							'status' => 201,
-						],
 						'index' => [
 							'error' => [
 								'reason' => 'Error reason',

diff --git a/tests/php/includes/classes/mock/class-wp-cli.php b/tests/php/includes/classes/mock/class-wp-cli.php
@@ -3,6 +3,7 @@
  * WP_CLI Mock
  *
  * phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped
+ * phpcs:disable WordPress.Security.EscapeOutput.ExceptionNotEscaped
  *
  * @package elasticpress
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,8 @@ @@
      *
      * @since  3.0
      * @package elasticpress
+     *
+     * phpcs:disable Universal.Files.SeparateFunctionsFromOO.Mixed
      */
     /**
@@ Expand Down @@