Merge branch 'kirtangajjar-fix_cli_update_bug' into develop-v4

mbtamuli · mbtamuli · commit 00412666451e · 2018-06-27T12:59:03.000+05:30
diff --git a/php/commands/src/CLI_Command.php b/php/commands/src/CLI_Command.php
@@ -259,7 +259,8 @@ public function update( $_, $assoc_args ) {
 		if ( false === chmod( $temp, $mode ) ) {
 			EE::error( sprintf( 'Cannot chmod %s.', $temp ) );
 		}
-		class_exists( '\cli\Colors' ); // This autoloads \cli\Colors - after we move the file we no longer have access to this class.
+		class_exists( '\cli\Streams' ); // This autoloads \cli\Streams - after we move the file we no longer have access to this class.
+		class_exists( '\cli\Colors' ); // This autoloads \cli\Colors
 		if ( false === rename( $temp, $old_phar ) ) {
 			EE::error( sprintf( 'Cannot move %s to %s', $temp, $old_phar ) );
 		}

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,8 @@ public function update( $_, $assoc_args ) {`
`259`	`259`	`if ( false === chmod( $temp, $mode ) ) {`
`260`	`260`	`EE::error( sprintf( 'Cannot chmod %s.', $temp ) );`
`261`	`261`	`}`
`262`		`- class_exists( '\cli\Colors' ); // This autoloads \cli\Colors - after we move the file we no longer have access to this class.`
	`262`	`+ class_exists( '\cli\Streams' ); // This autoloads \cli\Streams - after we move the file we no longer have access to this class.`
	`263`	`+ class_exists( '\cli\Colors' ); // This autoloads \cli\Colors`
`263`	`264`	`if ( false === rename( $temp, $old_phar ) ) {`
`264`	`265`	`EE::error( sprintf( 'Cannot move %s to %s', $temp, $old_phar ) );`
`265`	`266`	`}`