wp-studio 1.7.8-beta2 → 1.7.8-beta3

package/dist/cli/wp-files/sqlite-command/vendor/wp-cli/wp-cli/php/WP_CLI/Fetchers/Base.php

@@ -7,8 +7,6 @@ use WP_CLI\ExitException;
 
 /**
  * Fetch a WordPress entity for use in a subcommand.
- *
- * @template T
  */
 abstract class Base {
 
@@ -21,7 +19,7 @@ abstract class Base {
 
 	/**
 	 * @param string|int $arg The raw CLI argument.
-	 * @return T|false The item if found; false otherwise.
+	 * @return mixed|false The item if found; false otherwise.
 	 */
 	abstract public function get( $arg );
 
@@ -29,10 +27,8 @@ abstract class Base {
 	 * Like get(), but calls WP_CLI::error() instead of returning false.
 	 *
 	 * @param string $arg The raw CLI argument.
-	 * @return T The item if found.
+	 * @return mixed The item if found.
 	 * @throws ExitException If the item is not found.
-	 *
-	 * @phpstan-assert-if-true !false $this->get()
 	 */
 	public function get_check( $arg ) {
 		$item = $this->get( $arg );
@@ -48,7 +44,7 @@ abstract class Base {
 	 * Get multiple items.
 	 *
 	 * @param array $args The raw CLI arguments.
-	 * @return T[] The list of found items.
+	 * @return array The list of found items.
 	 */
 	public function get_many( $args ) {
 		$items = [];

package/dist/cli/wp-files/sqlite-command/vendor/wp-cli/wp-cli/php/WP_CLI/Fetchers/Comment.php

@@ -6,8 +6,6 @@ use WP_Comment;
 
 /**
  * Fetch a WordPress comment based on one of its attributes.
- *
- * @extends Base<\WP_Comment>
  */
 class Comment extends Base {
 
@@ -21,8 +19,8 @@ class Comment extends Base {
 	/**
 	 * Get a comment object by ID
 	 *
-	 * @param string|int $arg The raw CLI argument.
-	 * @return WP_Comment|false The item if found; false otherwise.
+	 * @param string $arg The raw CLI argument.
+	 * @return WP_Comment|array|false The item if found; false otherwise.
 	 */
 	public function get( $arg ) {
 		$comment_id = (int) $arg;

package/dist/cli/wp-files/sqlite-command/vendor/wp-cli/wp-cli/php/WP_CLI/Fetchers/Post.php

@@ -6,8 +6,6 @@ use WP_Post;
 
 /**
  * Fetch a WordPress post based on one of its attributes.
- *
- * @extends Base<\WP_Post>
  */
 class Post extends Base {
 
@@ -21,14 +19,11 @@ class Post extends Base {
 	/**
 	 * Get a post object by ID
 	 *
-	 * @param string|int $arg The raw CLI argument.
-	 * @return WP_Post|false The item if found; false otherwise.
+	 * @param string $arg The raw CLI argument.
+	 * @return WP_Post|array|false The item if found; false otherwise.
 	 */
 	public function get( $arg ) {
-		/**
-		 * @var WP_Post|null $post
-		 */
-		$post = get_post( (int) $arg );
+		$post = get_post( $arg );
 
 		if ( null === $post ) {
 			return false;

package/dist/cli/wp-files/sqlite-command/vendor/wp-cli/wp-cli/php/WP_CLI/Fetchers/Signup.php

@@ -4,8 +4,6 @@ namespace WP_CLI\Fetchers;
 
 /**
  * Fetch a signup based on one of its attributes.
- *
- * @extends Base<object>
  */
 class Signup extends Base {
 
@@ -29,7 +27,7 @@ class Signup extends Base {
 	/**
 	 * Get a signup by one of its identifying attributes.
 	 *
-	 * @param int|string $arg The raw CLI argument.
+	 * @param string $arg The raw CLI argument.
 	 * @return object|false The item if found; false otherwise.
 	 */
 	protected function get_signup( $arg ) {

package/dist/cli/wp-files/sqlite-command/vendor/wp-cli/wp-cli/php/WP_CLI/Fetchers/Site.php

@@ -4,10 +4,6 @@ namespace WP_CLI\Fetchers;
 
 /**
  * Fetch a WordPress site based on one of its attributes.
- *
- * @phpstan-type SiteObject object{blog_id: int, site_id: int, domain: string, path: string, registered: string, last_updated: string, public: int, archived: int, mature: int, spam: int, deleted: int, lang_id: int}
- *
- * @extends Base<SiteObject>
  */
 class Site extends Base {
 
@@ -21,13 +17,11 @@ class Site extends Base {
 	/**
 	 * Get a site object by ID
 	 *
-	 * @param string|int $site_id
+	 * @param int $site_id
 	 * @return object|false
-	 *
-	 * @phpstan-return SiteObject|false
 	 */
 	public function get( $site_id ) {
-		return $this->get_site( (int) $site_id );
+		return $this->get_site( $site_id );
 	}
 
 	/**
@@ -35,10 +29,8 @@ class Site extends Base {
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
-	 * @param string|int $arg The raw CLI argument.
-	 * @return object|false The item if found; false otherwise.
-	 *
-	 * @phpstan-return SiteObject|false
+	 * @param string $arg The raw CLI argument.
+	 * @return array|false The item if found; false otherwise.
 	 */
 	private function get_site( $arg ) {
 		global $wpdb;

package/dist/cli/wp-files/sqlite-command/vendor/wp-cli/wp-cli/php/WP_CLI/Fetchers/User.php

@@ -7,8 +7,6 @@ use WP_User;
 
 /**
  * Fetch a WordPress user based on one of its attributes.
- *
- * @extends Base<\WP_User>
  */
 class User extends Base {
 
@@ -22,7 +20,7 @@ class User extends Base {
 	/**
 	 * Get a user object by one of its identifying attributes.
 	 *
-	 * @param string|int $arg The raw CLI argument.
+	 * @param string $arg The raw CLI argument.
 	 * @return WP_User|false The item if found; false otherwise.
 	 */
 	public function get( $arg ) {

package/dist/cli/wp-files/sqlite-command/vendor/wp-cli/wp-cli/php/WP_CLI/FileCache.php

@@ -15,10 +15,7 @@ namespace WP_CLI;
 
 use DateTime;
 use Exception;
-use FilesystemIterator;
-use RecursiveDirectoryIterator;
-use RecursiveIteratorIterator;
-use SplFileInfo;
+use Symfony\Component\Finder\Finder;
 use WP_CLI;
 
 /**
@@ -54,7 +51,7 @@ class FileCache {
 	 * @param string $whitelist  List of characters that are allowed in path names (used in a regex character class)
 	 */
 	public function __construct( $cache_dir, $ttl, $max_size, $whitelist = 'a-z0-9._-' ) {
-		$this->root      = Path::trailingslashit( $cache_dir );
+		$this->root      = Utils\trailingslashit( $cache_dir );
 		$this->ttl       = (int) $ttl;
 		$this->max_size  = (int) $max_size;
 		$this->whitelist = $whitelist;
@@ -88,9 +85,7 @@ class FileCache {
 	 *
 	 * @param string $key cache key
 	 * @param int    $ttl time to live
-	 * @return false|string filename or false
-	 *
-	 * @phpstan-assert-if-true string $this->read()
+	 * @return bool|string filename or false
 	 */
 	public function has( $key, $ttl = null ) {
 		if ( ! $this->enabled ) {
@@ -112,12 +107,8 @@ class FileCache {
 			$ttl = (int) $ttl;
 		}
 
-		$modified_time = filemtime( $filename );
-		if ( false === $modified_time ) {
-			$modified_time = 0;
-		}
-
-		if ( $ttl > 0 && ( $modified_time + $ttl ) < time() ) {
+		//
+		if ( $ttl > 0 && ( filemtime( $filename ) + $ttl ) < time() ) {
 			if ( $this->ttl > 0 && $ttl >= $this->ttl ) {
 				unlink( $filename );
 			}
@@ -149,13 +140,13 @@ class FileCache {
 	 *
 	 * @param string $key cache key
 	 * @param int    $ttl time to live
-	 * @return false|string file contents or false
+	 * @return bool|string file contents or false
 	 */
 	public function read( $key, $ttl = null ) {
 		$filename = $this->has( $key, $ttl );
 
 		if ( $filename ) {
-			return (string) file_get_contents( $filename );
+			return file_get_contents( $filename );
 		}
 
 		return false;
@@ -238,13 +229,10 @@ class FileCache {
 			try {
 				$expire = new DateTime();
 				$expire->modify( '-' . $ttl . ' seconds' );
-				$expire_time = $expire->getTimestamp();
 
-				$files = $this->get_cache_files();
-				foreach ( $files as $file ) {
-					if ( $file->getMTime() <= $expire_time ) {
-						unlink( $file->getRealPath() );
-					}
+				$finder = $this->get_finder()->date( 'until ' . $expire->format( 'Y-m-d H:i:s' ) );
+				foreach ( $finder as $file ) {
+					unlink( $file->getRealPath() );
 				}
 			} catch ( Exception $e ) {
 				WP_CLI::error( $e->getMessage() );
@@ -253,16 +241,7 @@ class FileCache {
 
 		// Unlink older files if max cache size is exceeded.
 		if ( $max_size > 0 ) {
-			$files = $this->get_cache_files();
-
-			// Sort files by accessed time (newest first)
-			usort(
-				$files,
-				static function ( $a, $b ) {
-					return $b->getATime() <=> $a->getATime();
-				}
-			);
-
+			$files = array_reverse( iterator_to_array( $this->get_finder()->sortByAccessedTime()->getIterator() ) );
 			$total = 0;
 
 			foreach ( $files as $file ) {
@@ -287,9 +266,9 @@ class FileCache {
 			return false;
 		}
 
-		$files = $this->get_cache_files();
+		$finder = $this->get_finder();
 
-		foreach ( $files as $file ) {
+		foreach ( $finder as $file ) {
 			unlink( $file->getRealPath() );
 		}
 
@@ -306,78 +285,28 @@ class FileCache {
 			return false;
 		}
 
-		$cache_files = $this->get_cache_files();
+		/** @var Finder $finder */
+		$finder = $this->get_finder()->sortByName();
 
-		// Sort files by name
-		usort(
-			$cache_files,
-			static function ( $a, $b ) {
-				return strcmp( $a->getFilename(), $b->getFilename() );
-			}
-		);
-
-		$files_by_base = [];
-
-		// Group files by their base name (stripping version/timestamp).
-		foreach ( $cache_files as $file ) {
-			$basename   = $file->getBasename();
-			$pieces     = explode( '-', $file->getBasename( $file->getExtension() ) );
-			$last_piece = end( $pieces );
-
-			// Try to identify a version or timestamp suffix.
-			$basename_without_suffix = $basename;
-			$version_string          = null;
-
-			// Check if last piece is purely numeric (original timestamp format).
-			if ( is_numeric( $last_piece ) ) {
-				$basename_without_suffix = str_replace( '-' . $last_piece, '', $basename );
-				$version_string          = $last_piece; // Store as string for comparison.
-			} elseif ( preg_match( '/^(\d+(?:\.\d+)*)/', $last_piece, $matches ) ) {
-				// Handle version numbers like "8.6.1" in "jetpack-8.6.1.zip".
-				$basename_without_suffix = str_replace( '-' . $last_piece, '', $basename );
-				$version_string          = $matches[0]; // Store the version string.
-			}
+		$files_to_delete = [];
 
-			// Store file info: path, modification time, and optional version string.
-			if ( ! isset( $files_by_base[ $basename_without_suffix ] ) ) {
-				$files_by_base[ $basename_without_suffix ] = [];
-			}
+		foreach ( $finder as $file ) {
+			$pieces    = explode( '-', $file->getBasename( $file->getExtension() ) );
+			$timestamp = end( $pieces );
 
-			$files_by_base[ $basename_without_suffix ][] = [
-				'path'    => $file->getRealPath(),
-				'mtime'   => $file->getMTime(),
-				'version' => $version_string,
-			];
-		}
-
-		// For each group, keep only the newest file and delete the rest.
-		foreach ( $files_by_base as $files ) {
-			if ( count( $files ) <= 1 ) {
+			// No way to compare versions, do nothing.
+			if ( ! is_numeric( $timestamp ) ) {
 				continue;
 			}
 
-			// Sort files: prefer version comparison if available, otherwise use mtime.
-			usort(
-				$files,
-				static function ( $a, $b ) {
-					// If both have version strings, use version_compare().
-					if ( null !== $a['version'] && null !== $b['version'] ) {
-						$cmp = version_compare( $b['version'], $a['version'] );
-						if ( 0 !== $cmp ) {
-							return $cmp;
-						}
-						// If versions are equal, fall through to mtime comparison.
-					}
-					// Otherwise, compare by modification time.
-					return $b['mtime'] <=> $a['mtime'];
-				}
-			);
+			$basename_without_timestamp = str_replace( '-' . $timestamp, '', $file->getBasename() );
 
-			// Delete all except the first (newest).
-			$total = count( $files );
-			for ( $i = 1; $i < $total; $i++ ) {
-				unlink( $files[ $i ]['path'] );
+			// There's a file with an older timestamp, delete it.
+			if ( isset( $files_to_delete[ $basename_without_timestamp ] ) ) {
+				unlink( $files_to_delete[ $basename_without_timestamp ] );
 			}
+
+			$files_to_delete[ $basename_without_timestamp ] = $file->getRealPath();
 		}
 
 		return true;
@@ -414,7 +343,7 @@ class FileCache {
 	 * Prepare cache write
 	 *
 	 * @param string $key cache key
-	 * @return false|string The destination filename or false when cache disabled or directory creation fails.
+	 * @return bool|string The destination filename or false when cache disabled or directory creation fails.
 	 */
 	protected function prepare_write( $key ) {
 		if ( ! $this->enabled ) {
@@ -438,7 +367,7 @@ class FileCache {
 	 */
 	protected function validate_key( $key ) {
 		$url_parts = Utils\parse_url( $key, -1, false );
-		if ( $url_parts && array_key_exists( 'path', $url_parts ) && ! empty( $url_parts['scheme'] ) ) { // is url
+		if ( array_key_exists( 'path', $url_parts ) && ! empty( $url_parts['scheme'] ) ) { // is url
 			$parts   = [ 'misc' ];
 			$parts[] = $url_parts['scheme'] .
 				( empty( $url_parts['host'] ) ? '' : '-' . $url_parts['host'] ) .
@@ -466,42 +395,11 @@ class FileCache {
 	}
 
 	/**
-	 * Get all files in the cache directory recursively
+	 * Get a Finder that iterates in cache root only the files
 	 *
-	 * @return SplFileInfo[]
+	 * @return Finder
 	 */
-	protected function get_cache_files() {
-		$files = [];
-
-		if ( ! is_dir( $this->root ) ) {
-			return $files;
-		}
-
-		try {
-			// Match Symfony Finder behavior: do not follow symlinks.
-			// We explicitly do NOT include FilesystemIterator::FOLLOW_SYMLINKS flag.
-			// This prevents the iterator from traversing into symlinked directories.
-			// We also filter out symlink files themselves with !isLink() check.
-			$iterator = new RecursiveIteratorIterator(
-				new RecursiveDirectoryIterator(
-					$this->root,
-					FilesystemIterator::SKIP_DOTS | FilesystemIterator::UNIX_PATHS
-				),
-				RecursiveIteratorIterator::LEAVES_ONLY
-			);
-
-			foreach ( $iterator as $file ) {
-				if ( $file instanceof SplFileInfo && $file->isFile() && ! $file->isLink() ) {
-					$files[] = $file;
-				}
-			}
-		} catch ( Exception $e ) {
-			// If directory iteration fails (e.g., permissions issue, directory deleted),
-			// return empty array. This matches the behavior of Symfony Finder which
-			// would also return an empty result for inaccessible directories.
-			return [];
-		}
-
-		return $files;
+	protected function get_finder() {
+		return Finder::create()->in( $this->root )->files();
 	}
 }