Merge pull request #7052 from jozefrebjak/fix-define-stdout-in-cli

kenjis · web-flow · commit e9da4604e091 · 2023-01-06T08:48:55.000+09:00
fix: define of STDOUT in CLI init() method
diff --git a/system/CLI/CLI.php b/system/CLI/CLI.php
@@ -161,9 +161,10 @@ public static function init()
             static::parseCommandLine();
 
             static::$initialized = true;
-        } else {
+        } elseif (! defined('STDOUT')) {
             // If the command is being called from a controller
             // we need to define STDOUT ourselves
+            // For "! defined('STDOUT')" see: https://github.com/codeigniter4/CodeIgniter4/issues/7047
             define('STDOUT', 'php://output'); // @codeCoverageIgnore
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -161,9 +161,10 @@ public static function init()`
`161`	`161`	`static::parseCommandLine();`
`162`	`162`
`163`	`163`	`static::$initialized = true;`
`164`		`- } else {`
	`164`	`+ } elseif (! defined('STDOUT')) {`
`165`	`165`	`// If the command is being called from a controller`
`166`	`166`	`// we need to define STDOUT ourselves`
	`167`	`+ // For "! defined('STDOUT')" see: https://github.com/codeigniter4/CodeIgniter4/issues/7047`
`167`	`168`	`define('STDOUT', 'php://output'); // @codeCoverageIgnore`
`168`	`169`	`}`
`169`	`170`	`}`