Redirect stderr to stdout in original proc_open() command

Author: AndrewKostka

dist-persist/wbstack/src/Internal/PreApiWbStackUpdate.php

@@ -18,7 +18,7 @@ public function execute() {
 		// Run update.php
 		$domain = $GLOBALS[WBSTACK_INFO_GLOBAL]->requestDomain;
 		$mwPath = realpath( __DIR__ . '/../../../' );
-		$cmd = 'WBS_DOMAIN=' . $domain . ' php ' . $mwPath . '/maintenance/update.php --quick';
+		$cmd = 'WBS_DOMAIN=' . $domain . ' php ' . $mwPath . '/maintenance/update.php --quick 2>&1';
 
 		$stdout = fopen( 'php://stdout', 'w' );
 
@@ -42,12 +42,6 @@ public function execute() {
 			array_push( $out, $line );
 		}
 
-		while( $line = fgets( $stderrProc ) ) {
-			$line = rtrim( $line );
-			fwrite( $stdout, $line . PHP_EOL ); // effectively redirecting stdErr to stdOut
-			array_push( $out, $line );
-		}
-
 		fclose( $stdinProc );
 		fclose( $stdoutProc );
 		fclose( $stderrProc );

dist/wbstack/src/Internal/PreApiWbStackUpdate.php

@@ -18,7 +18,7 @@ public function execute() {
 		// Run update.php
 		$domain = $GLOBALS[WBSTACK_INFO_GLOBAL]->requestDomain;
 		$mwPath = realpath( __DIR__ . '/../../../' );
-		$cmd = 'WBS_DOMAIN=' . $domain . ' php ' . $mwPath . '/maintenance/update.php --quick';
+		$cmd = 'WBS_DOMAIN=' . $domain . ' php ' . $mwPath . '/maintenance/update.php --quick 2>&1';
 
 		$stdout = fopen( 'php://stdout', 'w' );
 
@@ -42,12 +42,6 @@ public function execute() {
 			array_push( $out, $line );
 		}
 
-		while( $line = fgets( $stderrProc ) ) {
-			$line = rtrim( $line );
-			fwrite( $stdout, $line . PHP_EOL ); // effectively redirecting stdErr to stdOut
-			array_push( $out, $line );
-		}
-
 		fclose( $stdinProc );
 		fclose( $stdoutProc );
 		fclose( $stderrProc );