Merge pull request #1045 from cakephp/3.x-cleanup-io

markstory · web-flow · commit 6fd15ae509ca · 2025-07-15T10:42:05.000-04:00
Fix up wrapper usage for io.
diff --git a/composer.json b/composer.json
@@ -31,7 +31,7 @@
     "require-dev": {
         "cakephp/cakephp-codesniffer": "^5.0.0",
         "cakephp/debug_kit": "^5.0.0",
-        "phpunit/phpunit": "^10.5.5 || ^11.1.3"
+        "phpunit/phpunit": "^10.5.40 || ^11.5.20 || ^12.2.4"
     },
     "autoload": {
         "psr-4": {
diff --git a/src/Command/AllCommand.php b/src/Command/AllCommand.php
@@ -124,16 +124,16 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
                     }
 
                     $message = sprintf('Error generating %s for %s: %s', $commandName, $table, $e->getMessage());
-                    $io->err('<error>' . $message . '</error>');
+                    $io->error($message);
                     $errors++;
                 }
             }
         }
 
         if ($errors) {
-            $io->out(sprintf('<warning>Bake All completed, but with %s errors.</warning>', $errors), 1, ConsoleIo::NORMAL);
+            $io->warning(sprintf('Bake All completed, but with %s errors.', $errors));
         } else {
-            $io->out('<success>Bake All complete.</success>', 1, ConsoleIo::NORMAL);
+            $io->success('Bake All complete.');
         }
 
         return $errors ? static::CODE_ERROR : static::CODE_SUCCESS;
diff --git a/src/Command/BakeCommand.php b/src/Command/BakeCommand.php
@@ -180,7 +180,7 @@ protected function deleteEmptyFile(string $path, ConsoleIo $io): void
     {
         if (file_exists($path)) {
             unlink($path);
-            $io->out(sprintf('<success>Deleted</success> `%s`', $path), 1, ConsoleIo::NORMAL);
+            $io->out(sprintf('<success>Deleted</success> `%s`', $path));
         }
     }
 
diff --git a/src/Command/EntryCommand.php b/src/Command/EntryCommand.php
@@ -82,7 +82,7 @@ public function run(array $argv, ConsoleIo $io): ?int
                 $parser->argumentNames(),
             );
         } catch (ConsoleException $e) {
-            $io->err('Error: ' . $e->getMessage());
+            $io->error('Error: ' . $e->getMessage());
 
             return static::CODE_ERROR;
         }
@@ -109,14 +109,14 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
     {
         if ($args->hasArgumentAt(0)) {
             $name = $args->getArgumentAt(0);
-            $io->err(
-                "<error>Could not find bake command named `$name`."
-                . ' Run `bake --help` to get a list of commands.</error>',
+            $io->error(
+                "Could not find bake command named `$name`."
+                . ' Run `bake --help` to get a list of commands.',
             );
 
             return static::CODE_ERROR;
         }
-        $io->err('<warning>No command provided. Run `bake --help` to get a list of commands.</warning>');
+        $io->warning('No command provided. Run `bake --help` to get a list of commands.');
 
         return static::CODE_ERROR;
     }
diff --git a/src/Command/FixtureCommand.php b/src/Command/FixtureCommand.php
@@ -269,7 +269,7 @@ public function generateFixtureFile(Arguments $args, ConsoleIo $io, string $mode
             ->set($vars)
             ->generate('Bake.tests/fixture');
 
-        $io->out("\n" . sprintf('Baking test fixture for %s...', $model), 1, ConsoleIo::NORMAL);
+        $io->out("\n" . sprintf('Baking test fixture for %s...', $model));
         $io->createFile($path . $filename, $contents, $this->force);
         $emptyFile = $path . '.gitkeep';
         $this->deleteEmptyFile($emptyFile, $io);
diff --git a/src/Command/ModelCommand.php b/src/Command/ModelCommand.php
@@ -1146,7 +1146,7 @@ public function bakeEntity(Table $model, array $data, Arguments $args, ConsoleIo
         }
 
         $name = $this->_entityName($model->getAlias());
-        $io->out("\n" . sprintf('Baking entity class for %s...', $name), 1, ConsoleIo::NORMAL);
+        $io->out("\n" . sprintf('Baking entity class for %s...', $name));
 
         $namespace = Configure::read('App.namespace');
         $pluginPath = '';
@@ -1198,7 +1198,7 @@ public function bakeTable(Table $model, array $data, Arguments $args, ConsoleIo
         }
 
         $name = $model->getAlias();
-        $io->out("\n" . sprintf('Baking table class for %s...', $name), 1, ConsoleIo::NORMAL);
+        $io->out("\n" . sprintf('Baking table class for %s...', $name));
 
         $namespace = Configure::read('App.namespace');
         $pluginPath = '';
diff --git a/src/Command/PluginCommand.php b/src/Command/PluginCommand.php
@@ -56,8 +56,8 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
     {
         $name = $args->getArgument('name');
         if (empty($name)) {
-            $io->err('<error>You must provide a plugin name in CamelCase format.</error>');
-            $io->err('To make an "MyExample" plugin, run <info>`cake bake plugin MyExample`</info>.');
+            $io->error('You must provide a plugin name in CamelCase format.');
+            $io->out('To make an "MyExample" plugin, run <info>`cake bake plugin MyExample`</info>.');
 
             return static::CODE_ERROR;
         }
@@ -70,7 +70,7 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
             $this->isVendor = true;
 
             if (!is_dir($this->path)) {
-                $io->err(sprintf('Path `%s` does not exist.', $this->path));
+                $io->error(sprintf('Path `%s` does not exist.', $this->path));
 
                 return static::CODE_ERROR;
             }
diff --git a/src/Command/SimpleBakeCommand.php b/src/Command/SimpleBakeCommand.php
@@ -78,7 +78,7 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
         $this->extractCommonProperties($args);
         $name = $args->getArgumentAt(0);
         if (empty($name)) {
-            $io->err('You must provide a name to bake a ' . $this->name());
+            $io->error('You must provide a name to bake a ' . $this->name());
             $this->abort();
         }
         $name = $this->_getName($name);
diff --git a/src/Command/TemplateCommand.php b/src/Command/TemplateCommand.php
@@ -360,14 +360,14 @@ public function bake(
         }
         if (empty($content)) {
             // phpcs:ignore Generic.Files.LineLength
-            $io->err("<warning>No generated content for '{$template}.{$this->ext}', not generating template.</warning>");
+            $io->warning("No generated content for '{$template}.{$this->ext}', not generating template.");
 
             return;
         }
         $path = $this->getTemplatePath($args);
         $filename = $path . Inflector::underscore($outputFile) . '.' . $this->ext;
 
-        $io->out("\n" . sprintf('Baking `%s` view template file...', $outputFile), 1, ConsoleIo::NORMAL);
+        $io->out("\n" . sprintf('Baking `%s` view template file...', $outputFile));
         $io->createFile($filename, $content, $this->force);
     }
 
diff --git a/src/Command/TestCommand.php b/src/Command/TestCommand.php
@@ -124,7 +124,7 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
         $name = $this->_getName($name);
 
         if ($this->bake($type, $name, $args, $io)) {
-            $io->out('<success>Done</success>');
+            $io->success('Done');
         }
 
         return static::CODE_SUCCESS;
@@ -188,13 +188,13 @@ protected function _bakeAll(string $type, Arguments $args, ConsoleIo $io): void
 
         foreach ($classes as $class) {
             if ($this->bake($type, $class, $args, $io)) {
-                $io->out('<success>Done - ' . $class . '</success>');
+                $io->success('Done - ' . $class);
             } else {
-                $io->out('<error>Failed - ' . $class . '</error>');
+                $io->error('Failed - ' . $class);
             }
         }
 
-        $io->out('<info>Bake finished</info>');
+        $io->info('Bake finished');
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -124,16 +124,16 @@ public function execute(Arguments $args, ConsoleIo $io): ?int`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`$message = sprintf('Error generating %s for %s: %s', $commandName, $table, $e->getMessage());`
`127`		`- $io->err('<error>' . $message . '</error>');`
	`127`	`+ $io->error($message);`
`128`	`128`	`$errors++;`
`129`	`129`	`}`
`130`	`130`	`}`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`if ($errors) {`
`134`		`- $io->out(sprintf('<warning>Bake All completed, but with %s errors.</warning>', $errors), 1, ConsoleIo::NORMAL);`
	`134`	`+ $io->warning(sprintf('Bake All completed, but with %s errors.', $errors));`
`135`	`135`	`} else {`
`136`		`- $io->out('<success>Bake All complete.</success>', 1, ConsoleIo::NORMAL);`
	`136`	`+ $io->success('Bake All complete.');`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`return $errors ? static::CODE_ERROR : static::CODE_SUCCESS;`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ protected function deleteEmptyFile(string $path, ConsoleIo $io): void`
`180`	`180`	`{`
`181`	`181`	`if (file_exists($path)) {`
`182`	`182`	`unlink($path);`
`183`		- $io->out(sprintf('<success>Deleted</success> `%s`', $path), 1, ConsoleIo::NORMAL);
	`183`	+ $io->out(sprintf('<success>Deleted</success> `%s`', $path));
`184`	`184`	`}`
`185`	`185`	`}`
`186`	`186`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public function run(array $argv, ConsoleIo $io): ?int`
`82`	`82`	`$parser->argumentNames(),`
`83`	`83`	`);`
`84`	`84`	`} catch (ConsoleException $e) {`
`85`		`- $io->err('Error: ' . $e->getMessage());`
	`85`	`+ $io->error('Error: ' . $e->getMessage());`
`86`	`86`
`87`	`87`	`return static::CODE_ERROR;`
`88`	`88`	`}`
`@@ -109,14 +109,14 @@ public function execute(Arguments $args, ConsoleIo $io): ?int`
`109`	`109`	`{`
`110`	`110`	`if ($args->hasArgumentAt(0)) {`
`111`	`111`	`$name = $args->getArgumentAt(0);`
`112`		`- $io->err(`
`113`		- "<error>Could not find bake command named `$name`."
`114`		- . ' Run `bake --help` to get a list of commands.</error>',
	`112`	`+ $io->error(`
	`113`	+ "Could not find bake command named `$name`."
	`114`	+ . ' Run `bake --help` to get a list of commands.',
`115`	`115`	`);`
`116`	`116`
`117`	`117`	`return static::CODE_ERROR;`
`118`	`118`	`}`
`119`		- $io->err('<warning>No command provided. Run `bake --help` to get a list of commands.</warning>');
	`119`	+ $io->warning('No command provided. Run `bake --help` to get a list of commands.');
`120`	`120`
`121`	`121`	`return static::CODE_ERROR;`
`122`	`122`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1146,7 +1146,7 @@ public function bakeEntity(Table $model, array $data, Arguments $args, ConsoleIo`
`1146`	`1146`	`}`
`1147`	`1147`
`1148`	`1148`	`$name = $this->_entityName($model->getAlias());`
`1149`		`- $io->out("\n" . sprintf('Baking entity class for %s...', $name), 1, ConsoleIo::NORMAL);`
	`1149`	`+ $io->out("\n" . sprintf('Baking entity class for %s...', $name));`
`1150`	`1150`
`1151`	`1151`	`$namespace = Configure::read('App.namespace');`
`1152`	`1152`	`$pluginPath = '';`
`@@ -1198,7 +1198,7 @@ public function bakeTable(Table $model, array $data, Arguments $args, ConsoleIo`
`1198`	`1198`	`}`
`1199`	`1199`
`1200`	`1200`	`$name = $model->getAlias();`
`1201`		`- $io->out("\n" . sprintf('Baking table class for %s...', $name), 1, ConsoleIo::NORMAL);`
	`1201`	`+ $io->out("\n" . sprintf('Baking table class for %s...', $name));`
`1202`	`1202`
`1203`	`1203`	`$namespace = Configure::read('App.namespace');`
`1204`	`1204`	`$pluginPath = '';`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,8 @@ public function execute(Arguments $args, ConsoleIo $io): ?int`
`56`	`56`	`{`
`57`	`57`	`$name = $args->getArgument('name');`
`58`	`58`	`if (empty($name)) {`
`59`		`- $io->err('<error>You must provide a plugin name in CamelCase format.</error>');`
`60`		- $io->err('To make an "MyExample" plugin, run <info>`cake bake plugin MyExample`</info>.');
	`59`	`+ $io->error('You must provide a plugin name in CamelCase format.');`
	`60`	+ $io->out('To make an "MyExample" plugin, run <info>`cake bake plugin MyExample`</info>.');
`61`	`61`
`62`	`62`	`return static::CODE_ERROR;`
`63`	`63`	`}`
`@@ -70,7 +70,7 @@ public function execute(Arguments $args, ConsoleIo $io): ?int`
`70`	`70`	`$this->isVendor = true;`
`71`	`71`
`72`	`72`	`if (!is_dir($this->path)) {`
`73`		- $io->err(sprintf('Path `%s` does not exist.', $this->path));
	`73`	+ $io->error(sprintf('Path `%s` does not exist.', $this->path));
`74`	`74`
`75`	`75`	`return static::CODE_ERROR;`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public function execute(Arguments $args, ConsoleIo $io): ?int`
`78`	`78`	`$this->extractCommonProperties($args);`
`79`	`79`	`$name = $args->getArgumentAt(0);`
`80`	`80`	`if (empty($name)) {`
`81`		`- $io->err('You must provide a name to bake a ' . $this->name());`
	`81`	`+ $io->error('You must provide a name to bake a ' . $this->name());`
`82`	`82`	`$this->abort();`
`83`	`83`	`}`
`84`	`84`	`$name = $this->_getName($name);`
Original file line number	Diff line number	Diff line change
`@@ -360,14 +360,14 @@ public function bake(`
`360`	`360`	`}`
`361`	`361`	`if (empty($content)) {`
`362`	`362`	`// phpcs:ignore Generic.Files.LineLength`
`363`		`- $io->err("<warning>No generated content for '{$template}.{$this->ext}', not generating template.</warning>");`
	`363`	`+ $io->warning("No generated content for '{$template}.{$this->ext}', not generating template.");`
`364`	`364`
`365`	`365`	`return;`
`366`	`366`	`}`
`367`	`367`	`$path = $this->getTemplatePath($args);`
`368`	`368`	`$filename = $path . Inflector::underscore($outputFile) . '.' . $this->ext;`
`369`	`369`
`370`		- $io->out("\n" . sprintf('Baking `%s` view template file...', $outputFile), 1, ConsoleIo::NORMAL);
	`370`	+ $io->out("\n" . sprintf('Baking `%s` view template file...', $outputFile));
`371`	`371`	`$io->createFile($filename, $content, $this->force);`
`372`	`372`	`}`
`373`	`373`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public function execute(Arguments $args, ConsoleIo $io): ?int`
`124`	`124`	`$name = $this->_getName($name);`
`125`	`125`
`126`	`126`	`if ($this->bake($type, $name, $args, $io)) {`
`127`		`- $io->out('<success>Done</success>');`
	`127`	`+ $io->success('Done');`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`return static::CODE_SUCCESS;`
`@@ -188,13 +188,13 @@ protected function _bakeAll(string $type, Arguments $args, ConsoleIo $io): void`
`188`	`188`
`189`	`189`	`foreach ($classes as $class) {`
`190`	`190`	`if ($this->bake($type, $class, $args, $io)) {`
`191`		`- $io->out('<success>Done - ' . $class . '</success>');`
	`191`	`+ $io->success('Done - ' . $class);`
`192`	`192`	`} else {`
`193`		`- $io->out('<error>Failed - ' . $class . '</error>');`
	`193`	`+ $io->error('Failed - ' . $class);`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`
`197`		`- $io->out('<info>Bake finished</info>');`
	`197`	`+ $io->info('Bake finished');`
`198`	`198`	`}`
`199`	`199`
`200`	`200`	`/**`