wp-studio 1.7.8-beta2 → 1.7.8-beta4

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

@@ -19,7 +19,7 @@ class Process {
 	private $cwd;
 
 	/**
-	 * @var array|null Environment variables to set when running the command.
+	 * @var array Environment variables to set when running the command.
 	 */
 	private $env;
 
@@ -71,49 +71,16 @@ class Process {
 
 		$start_time = microtime( true );
 
-		/**
-		 * @var array<int, resource> $pipes
-		 */
 		$pipes = [];
-		if ( Utils\is_windows() ) {
-			// On Windows, leaving pipes open can cause hangs.
-			// Redirect output to files and close stdin.
-			$stdout_file = tempnam( sys_get_temp_dir(), 'behat-stdout-' );
-			$stderr_file = tempnam( sys_get_temp_dir(), 'behat-stderr-' );
-			$descriptors = [
-				0 => [ 'pipe', 'r' ],
-				1 => [ 'file', $stdout_file, 'a' ],
-				2 => [ 'file', $stderr_file, 'a' ],
-			];
-			$proc        = Utils\proc_open_compat( $this->command, $descriptors, $pipes, $this->cwd, $this->env );
-			if ( $proc && isset( $pipes[0] ) ) {
-				fclose( $pipes[0] );
-			}
-		} else {
-			$proc = Utils\proc_open_compat( $this->command, self::$descriptors, $pipes, $this->cwd, $this->env );
-			if ( $proc ) {
-				$stdout = stream_get_contents( $pipes[1] );
-				fclose( $pipes[1] );
-				$stderr = stream_get_contents( $pipes[2] );
-				fclose( $pipes[2] );
-			} else {
-				$stdout = '';
-				$stderr = '';
-			}
-		}
+		$proc  = Utils\proc_open_compat( $this->command, self::$descriptors, $pipes, $this->cwd, $this->env );
 
-		$return_code = $proc ? proc_close( $proc ) : -1;
+		$stdout = stream_get_contents( $pipes[1] );
+		fclose( $pipes[1] );
 
-		if ( Utils\is_windows() ) {
-			$stdout = (string) file_get_contents( $stdout_file );
-			$stderr = (string) file_get_contents( $stderr_file );
-			unlink( $stdout_file );
-			unlink( $stderr_file );
+		$stderr = stream_get_contents( $pipes[2] );
+		fclose( $pipes[2] );
 
-			// Normalize line endings.
-			$stdout = str_replace( "\r\n", "\n", $stdout );
-			$stderr = str_replace( "\r\n", "\n", $stderr );
-		}
+		$return_code = proc_close( $proc );
 
 		$run_time = microtime( true ) - $start_time;
 

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

@@ -225,10 +225,8 @@ final class RequestsLibrary {
 	 * classes with PHP 5.6. Because of that, we catch generic exceptions, check if
 	 * they match the Requests library, and re-throw them if they do not.
 	 *
-	 * @param \Exception|\Requests_Exception|\WpOrg\Requests\Exception $exception Exception to check.
+	 * @param Exception $exception Exception to check.
 	 * @return bool Whether the provided exception was issued by the Requests library.
-	 *
-	 * @phpstan-assert-if-true \Requests_Exception|\WpOrg\Requests\Exception $exception
 	 */
 	public static function is_requests_exception( Exception $exception ) {
 		return is_a( $exception, '\Requests_Exception' )
@@ -250,7 +248,6 @@ final class RequestsLibrary {
 			} else {
 				require_once WP_CLI_VENDOR_DIR . '/rmccue/requests/library/Requests.php';
 			}
-			// @phpstan-ignore staticMethod.deprecatedClass
 			\Requests::register_autoloader();
 		}