Skip to content

Commit e5b9bb9

Browse files
committed
Merge branch '5.next' into 6.x
2 parents 7c8e190 + 66103f7 commit e5b9bb9

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

docs/en/appendices/5-4-migration-guide.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ bin/cake upgrade rector --rules cakephp54 <path/to/app/src>
3838

3939
## Deprecations
4040

41+
### Command Helpers
42+
43+
- Command helpers under the `Cake\Command\Helper` namespace have been deprecated.
44+
Instead they have been moved under the `Cake\Console\Helper` namespace.
45+
4146
### Mailer
4247

4348
- The `Mailer::$name` property is unused and has been deprecated.

docs/en/console-commands/input-output.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ $progress->draw();
3939

4040
While CakePHP comes with a few command helpers you can create more in your
4141
application or plugins. As an example, we'll create a simple helper to generate
42-
fancy headings. First create the **src/Command/Helper/HeadingHelper.php** and put
42+
fancy headings. First create the **src/Console/Helper/HeadingHelper.php** and put
4343
the following in it:
4444

4545
```php
4646
<?php
47-
namespace App\Command\Helper;
47+
namespace App\Console\Helper;
4848

4949
use Cake\Console\Helper;
5050

@@ -74,7 +74,8 @@ parameters. However, because Console Helpers are vanilla classes they can
7474
implement additional methods that take any form of arguments.
7575

7676
> [!NOTE]
77-
> Helpers can also live in `src/Shell/Helper` for backwards compatibility.
77+
> Helpers can also live in `src/Command/Helper` for backwards compatibility with
78+
> CakePHP 5.3 and below.
7879
7980
## Built-In Helpers
8081

docs/ja/console-commands/commands.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ class UserCommand extends Command
196196
public function execute(Arguments $args, ConsoleIo $io)
197197
{
198198
$name = $args->getArgument('name');
199-
if (strlen($name) < 5) {
199+
if (strlen($name) < 4) {
200200
// 実行を停止し、標準エラーに出力し、終了コードを 1 に設定
201201
$io->error('Name must be at least 4 characters long.');
202202
$this->abort();
@@ -210,7 +210,7 @@ public function execute(Arguments $args, ConsoleIo $io)
210210
public function execute(Arguments $args, ConsoleIo $io)
211211
{
212212
$name = $args->getArgument('name');
213-
if (strlen($name) < 5) {
213+
if (strlen($name) < 4) {
214214
// 実行を停止しstderrに出力し、終了コードを99に設定します
215215
$io->abort('名前は4文字以上にする必要があります。', 99);
216216
}

0 commit comments

Comments
 (0)