Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update upgrade to 5.0 #291

Merged
merged 4 commits into from
Aug 29, 2024
Merged

Update upgrade to 5.0 #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c7dccdb
Update help instructions
markstory Aug 28, 2024
fc34bf6
Change default version to cakephp5 and add 51 cleanup
markstory Aug 28, 2024
6babf7f
Fix phpcs
markstory Aug 28, 2024
10dded7
Fix phpcs
markstory Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/Command/RectorCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,21 +173,16 @@ protected function buildOptionParser(ConsoleOptionParser $parser): ConsoleOption
->setDescription([
'Apply rector refactoring rules',
'',
'Run rector rules against `path`. By default the <info>cakephp40</info> ' .
'Run rector rules against `path`. By default the <info>cakephp50</info> ' .
'rules are run.',
'',
'You will want to run the <info>cakephp40</info> rules multiple times on ' .
'You will want to run the <info>cakephp50</info> rules multiple times on ' .
'subdirectories of your application:',
'',
'<info>bin/cake upgrade rector ~/app/src</info>',
'<info>bin/cake upgrade rector ~/app/config</info>',
'<info>bin/cake upgrade rector ~/app/templates</info>',
'<info>bin/cake upgrade rector ~/app/tests</info>',
'',
'You should run the <info>phpunit80</info> ruleset to automate ' .
'updating your test cases:',
'',
'<info>bin/cake upgrade rector --rules phpunit80 ~/app/tests</info>',
])
->addArgument('path', [
'help' => 'The path to the application or plugin.',
Expand Down
49 changes: 33 additions & 16 deletions src/Command/UpgradeCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,33 +46,51 @@ public function execute(Arguments $args, ConsoleIo $io): ?int
$withDryRun = function (array $params) use ($args): array {
if ($args->getOption('dry-run')) {
array_unshift($params, '--dry-run');

return $params;
}

return $params;
};

$io->out('<info>Moving templates</info>');
$this->executeCommand(FileRenameCommand::class, $withDryRun(['templates', $path]), $io);
$io->out('<info>Applying cakephp50 Rector rules</info>');
$this->mapCommand($io, $paths, fn ($directory) => $this->executeCommand(
RectorCommand::class,
$withDryRun(['--rules', 'cakephp50', $directory]),
$io
));

$io->out('<info>Applying cakephp51 Rector rules</info>');
$this->mapCommand($io, $paths, fn ($directory) => $this->executeCommand(
RectorCommand::class,
$withDryRun(['--rules', 'cakephp51', $directory]),
$io
));

$io->out('Next upgrade your <info>composer.json</info>.');
$version = '5.0';
$io->out("Run <info>composer requires -W 'cakephp/cakephp:^{$version}'</info>.");

$io->out('<info>Moving locale files</info>');
$this->executeCommand(FileRenameCommand::class, $withDryRun(['locales', $path]), $io);
return static::CODE_SUCCESS;
}

$io->out('<info>Applying cakephp40 Rector rules</info>');
/**
* Map a command over a list of paths.
*
* Useful for invoking sub-commands like rector.
*
* @param \Cake\Console\ConsoleIo $io The io
* @param array $paths List of path strings to enumerate
* @param callable $fn The function to invoke for each directory
* @return void
*/
protected function mapCommand(ConsoleIo $io, array $paths, callable $fn): void
{
foreach ($paths as $directory) {
if (!is_dir($directory)) {
$io->warning("{$directory} does not exist, skipping.");
continue;
}
$this->executeCommand(RectorCommand::class, $withDryRun(['--rules', 'cakephp40', $directory]), $io);
$fn($directory);
}
$io->out('<info>Applying phpunit80 Rector rules</info>');
$this->executeCommand(RectorCommand::class, $withDryRun(['--rules', 'phpunit80', $paths['tests']]), $io);

$io->out('Next upgrade your <info>composer.json</info>.');

return static::CODE_SUCCESS;
}

/**
Expand All @@ -85,7 +103,7 @@ protected function buildOptionParser(ConsoleOptionParser $parser): ConsoleOption
{
$parser
->setDescription([
'<question>Upgrade tool for CakePHP 4.0</question>',
'<question>Upgrade tool for CakePHP 5.x</question>',
'',
'Runs all of the sub commands on an application/plugin. The <info>path</info> ' .
'argument should be the application or plugin root directory.',
Expand All @@ -94,7 +112,6 @@ protected function buildOptionParser(ConsoleOptionParser $parser): ConsoleOption
'',
'<info>Sub-Commands</info>',
'',
'- file_rename Rename template and locale files',
'- rector Apply rector rules for phpunit80 and cakephp40',
])
->addArgument('path', [
Expand Down
Loading