MCLOUD-13149: Add support of php 8.4 to cloud-patches

Author: glo42671

composer.json

@@ -13,15 +13,15 @@
     "require": {
         "php": "^8.0",
         "ext-json": "*",
-        "composer/composer": "^1.9 || ^2.0",
+        "composer/composer": "^1.9 || ^2.8 || !=2.2.16",
         "composer/semver": "@stable",
-        "monolog/monolog": "^1.25||^2.3||^2.7|| ^3.6",
-        "symfony/config": "^3.3||^4.4||^5.0||^6.0",
-        "symfony/console": "^2.8 || ^4.0 || ^5.1 || ^5.4 || ^6.4",
-        "symfony/dependency-injection": "^3.3||^4.3||^5.0||^6.0",
-        "symfony/process": "^2.1 || ^4.1 || ^5.1 || ^5.4 || ^6.4",
+        "monolog/monolog": "^2.3 || ^2.7 || ^3.6",
+        "symfony/config": "^4.4 || ^5.1 || ^5.4 || ^6.4",
+        "symfony/console": "^4.4 || ^5.1 || ^5.4 || ^6.4",
+        "symfony/dependency-injection": "^4.4 || ^5.1 || ^5.4 || ^6.4",
+        "symfony/process": "^4.4 || ^5.1 || ^5.4 || ^6.4",
         "symfony/proxy-manager-bridge": "^3.3||^4.3||^5.0||^6.0",
-        "symfony/yaml": "^3.3||^4.0||^5.0||^6.0||^7.0",
+        "symfony/yaml": "^4.4 || ^5.1 || ^5.4 || ^6.4",
         "magento/quality-patches": "^1.1.0"
     },
     "require-dev": {
@@ -32,7 +32,7 @@
         "codeception/module-rest": "^1.2 || ^3.0",
         "consolidation/robo": "^1.2 || ^3.0 || ^5.0",
         "phpmd/phpmd": "@stable",
-        "phpunit/phpunit": "^8.5 || ^9.5",
+        "phpunit/phpunit": "^9.5.10 || ^10",
         "squizlabs/php_codesniffer": "^3.0"
     },
     "bin": [

src/App/GenericException.php

@@ -19,7 +19,7 @@ class GenericException extends \Exception
      * @param int $code
      * @param Throwable|null $previous
      */
-    public function __construct(string $message, int $code = 0, Throwable $previous = null)
+    public function __construct(string $message ="", int $code = 0, ?Throwable $previous = null)
     {
         parent::__construct($message, $code, $previous);
     }

src/Console/QuestionFactory.php

@@ -22,7 +22,7 @@ class QuestionFactory
      *
      * @return Question
      */
-    public function create(string $question, string $default = null): Question
+    public function create(string $question, ?string $default = null): Question
     {
         return new Question($question, $default);
     }

src/Patch/Data/Patch.php

@@ -148,6 +148,14 @@ public function getId(): string
         return $this->id;
     }
 
+    /**
+    * @inheritDoc
+    */
+    public function setId(): string
+    {
+        return $this->id;
+    }
+
     /**
      * @inheritDoc
      */

src/Shell/ProcessFactory.php

@@ -49,7 +49,7 @@ public function __construct(DirectoryList $directoryList, Composer $composer)
      * @return Process
      * @throws PackageNotFoundException
      */
-    public function create(array $cmd, string $input = null): Process
+    public function create(array $cmd, ?string $input = null): Process
     {
         return new Process(
             $this->processSupportsArrayParam() ? $cmd : implode(' ', $cmd),

src/Test/Unit/Command/Process/Action/RevertActionTest.php

@@ -56,12 +56,19 @@ class RevertActionTest extends TestCase
      * @var RevertValidator|MockObject
      */
     private $revertValidator;
+    
+    /**
+    * @var revertAction|MockObject
+    */
+    protected $revertAction;
 
     /**
      * @inheritdoc
      */
     protected function setUp(): void
     {
+        // Initialize the $revertAction property
+        $this->revertAction = $this->createMock(RevertAction::class);
         $this->applier = $this->createMock(Applier::class);
         $this->revertValidator = $this->createMock(RevertValidator::class);
         $this->statusPool = $this->createMock(StatusPool::class);

src/Test/Unit/Shell/Command/PatchDriverTest.php

@@ -36,12 +36,13 @@ class PatchDriverTest extends TestCase
      */
     protected function setUp(): void
     {
+        parent::setUp();
         $this->baseDir = dirname(__DIR__, 5) . '/tests/unit/';
         $this->cwd = $this->baseDir . 'var/';
         $processFactory = $this->createMock(ProcessFactory::class);
         $processFactory->method('create')
             ->willReturnCallback(
-                function (array $cmd, string $input = null) {
+                function (array $cmd, ?string $input = null) {
                     return new Process(
                         $cmd,
                         $this->cwd,
@@ -179,7 +180,7 @@ private function getFileContent(string $path): string
      * @param string $path
      * @param string|null $name
      */
-    private function copyFileToWorkingDir(string $path, string $name = null)
+    private function copyFileToWorkingDir(string $path, ?string $name = null)
     {
         $name = $name ?? basename($path);
         copy($path, $this->getVarFile($name));