Merge branch '5.x' into 6.x

Author: LordSimal

README.md

@@ -1,7 +1,7 @@
 # CakePHP Upgrade tool
 
 [![CI](https://github.com/cakephp/upgrade/actions/workflows/ci.yml/badge.svg)](https://github.com/cakephp/upgrade/actions/workflows/ci.yml)
-[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.1-8892BF.svg)](https://php.net/)
+[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.2-8892BF.svg)](https://php.net/)
 [![License](https://poser.pugx.org/cakephp/upgrade/license.svg)](LICENSE)
 
 Upgrade tools for CakePHP meant to facilitate migrating between CakePHP 4.x

src/Command/FileRenameCommand.php

@@ -21,6 +21,7 @@
 use Cake\Console\ConsoleIo;
 use Cake\Console\ConsoleOptionParser;
 use Cake\Core\Configure;
+use Cake\Core\Exception\CakeException;
 use DirectoryIterator;
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
@@ -309,7 +310,7 @@ protected function renameWithCasing(string $source, string $dest): void
      * @param string $source Source path.
      * @param string $dest Destination path.
      * @return void
-     * @throws \Cake\Error\FatalErrorException When we're unable to move the folder via git.
+     * @throws \Cake\Core\Exception\CakeException When we're unable to move the folder via git.
      */
     protected function rename(string $source, string $dest): void
     {
@@ -332,7 +333,7 @@ protected function rename(string $source, string $dest): void
             $returnVar = null;
             $lastLine = exec("git mv $source $dest", $gitOutput, $returnVar);
             if ($returnVar) {
-                throw new FatalErrorException(sprintf(
+                throw new CakeException(sprintf(
                     'Unable to move: %s to : %s - Reason: %s - Hint: Maybe you have uncommited changes in git.',
                     $source,
                     $dest,