Merge branch 'main' into update-wp-cli-tests-v4

Author: swissspidy

cache-command.php

@@ -4,7 +4,7 @@
 	return;
 }
 
-$wpcli_cache_autoloader = dirname( __FILE__ ) . '/vendor/autoload.php';
+$wpcli_cache_autoloader = __DIR__ . '/vendor/autoload.php';
 if ( file_exists( $wpcli_cache_autoloader ) ) {
 	require_once $wpcli_cache_autoloader;
 }

src/Cache_Command.php

@@ -406,5 +406,4 @@ public function flush_group( $args, $assoc_args ) {
 		}
 		WP_CLI::success( "Cache group '$group' was flushed." );
 	}
-
 }

src/Transient_Command.php

@@ -466,8 +466,7 @@ private function delete_expired( $network ) {
 					time()
 				)
 			);
-		} else {
-			if ( ! is_multisite() ) {
+		} elseif ( ! is_multisite() ) {
 				// Non-Multisite stores site transients in the options table.
 				$count += $wpdb->query(
 					$wpdb->prepare(
@@ -481,21 +480,20 @@ private function delete_expired( $network ) {
 						time()
 					)
 				);
-			} else {
-				// Multisite stores site transients in the sitemeta table.
-				$count += $wpdb->query(
-					$wpdb->prepare(
-						"DELETE a, b FROM {$wpdb->sitemeta} a, {$wpdb->sitemeta} b
+		} else {
+			// Multisite stores site transients in the sitemeta table.
+			$count += $wpdb->query(
+				$wpdb->prepare(
+					"DELETE a, b FROM {$wpdb->sitemeta} a, {$wpdb->sitemeta} b
 							WHERE a.meta_key LIKE %s
 							AND a.meta_key NOT LIKE %s
 							AND b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) )
 							AND b.meta_value < %d",
-						Utils\esc_like( '_site_transient_' ) . '%',
-						Utils\esc_like( '_site_transient_timeout_' ) . '%',
-						time()
-					)
-				);
-			}
+					Utils\esc_like( '_site_transient_' ) . '%',
+					Utils\esc_like( '_site_transient_timeout_' ) . '%',
+					time()
+				)
+			);
 		}
 
 		// The above queries delete the transient and the transient timeout
@@ -553,8 +551,7 @@ private function delete_all( $network ) {
 					Utils\esc_like( '_transient_' ) . '%'
 				)
 			);
-		} else {
-			if ( ! is_multisite() ) {
+		} elseif ( ! is_multisite() ) {
 				// Non-Multisite stores site transients in the options table.
 				$deleted = $wpdb->query(
 					$wpdb->prepare(
@@ -575,28 +572,27 @@ private function delete_all( $network ) {
 						Utils\esc_like( '_site_transient_' ) . '%'
 					)
 				);
-			} else {
-				// Multisite stores site transients in the sitemeta table.
-				$deleted = $wpdb->query(
-					$wpdb->prepare(
-						"DELETE a, b FROM {$wpdb->sitemeta} a, {$wpdb->sitemeta} b
+		} else {
+			// Multisite stores site transients in the sitemeta table.
+			$deleted = $wpdb->query(
+				$wpdb->prepare(
+					"DELETE a, b FROM {$wpdb->sitemeta} a, {$wpdb->sitemeta} b
 							WHERE a.meta_key LIKE %s
 							AND a.meta_key NOT LIKE %s
 							AND b.meta_key = CONCAT( '_site_transient_timeout_', SUBSTRING( a.meta_key, 17 ) )",
-						Utils\esc_like( '_site_transient_' ) . '%',
-						Utils\esc_like( '_site_transient_timeout_' ) . '%'
-					)
-				);
+					Utils\esc_like( '_site_transient_' ) . '%',
+					Utils\esc_like( '_site_transient_timeout_' ) . '%'
+				)
+			);
 
-				$count += $deleted / 2; // Ignore affected rows for timeouts.
+			$count += $deleted / 2; // Ignore affected rows for timeouts.
 
-				$count += $wpdb->query(
-					$wpdb->prepare(
-						"DELETE FROM $wpdb->sitemeta WHERE meta_key LIKE %s",
-						Utils\esc_like( '_site_transient_' ) . '%'
-					)
-				);
-			}
+			$count += $wpdb->query(
+				$wpdb->prepare(
+					"DELETE FROM $wpdb->sitemeta WHERE meta_key LIKE %s",
+					Utils\esc_like( '_site_transient_' ) . '%'
+				)
+			);
 		}
 
 		if ( $count > 0 ) {