Add support of php 8.4 to cloud-patches

Author: glo42671

src/Test/Unit/Command/Process/ShowStatusTest.php

@@ -194,9 +194,6 @@ private function createPatch(string $id, bool $isDeprecated, string $replacedWit
         $patch->method('isDeprecated')->willReturn($isDeprecated);
         $patch->method('getReplacedWith')->willReturn($replacedWith);
 
-        // To make mock object unique for assertions and array operations.
-        $patch->id = microtime();
-
         return $patch;
     }
 }

src/Test/Unit/Patch/AggregatorTest.php

@@ -89,10 +89,7 @@ private function createPatch(string $id, string $title)
         $patch = $this->createMock(Patch::class);
         $patch->method('getId')->willReturn($id);
         $patch->method('getTitle')->willReturn($title);
-
-        // To make mock object unique for assertions and array operations.
-        $patch->id = microtime();
-        $patch->method('__toString')->willReturn($patch->id);
+        $patch->method('__toString')->willReturn(microtime());
 
         return $patch;
     }

src/Test/Unit/Patch/Collector/CloudCollectorTest.php

@@ -191,7 +191,7 @@ public function testCollectSuccessful(bool $isCloud, string $expectedType)
     /**
      * @return array
      */
-    public function collectDataProvider(): array
+    public static function collectDataProvider(): array
     {
         return [
             ['isCloud' => false, 'expectedType' => PatchInterface::TYPE_OPTIONAL],
@@ -221,13 +221,13 @@ public function testInvalidConfigurationPatchFilename(array $invalidConfig)
     /**
      * @return array
      */
-    public function invalidPatchFilenameDataProvider(): array
+    public static function invalidPatchFilenameDataProvider(): array
     {
         return [
-            [$this->createConfig('fix_asset_locking_race_condition__2.1.4.patch')],
-            [$this->createConfig('MDVA-2470__fix_asset_locking_race_condition.patch')],
-            [$this->createConfig('MDVA-2470_fix_asset_locking_race_condition__2.1.4.patch')],
-            [$this->createConfig('MDVA-2470__fix_asset_locking_race_condition_2.1.4.patch')],
+            [self::createConfig('fix_asset_locking_race_condition__2.1.4.patch')],
+            [self::createConfig('MDVA-2470__fix_asset_locking_race_condition.patch')],
+            [self::createConfig('MDVA-2470_fix_asset_locking_race_condition__2.1.4.patch')],
+            [self::createConfig('MDVA-2470__fix_asset_locking_race_condition_2.1.4.patch')],
         ];
     }
 
@@ -237,7 +237,7 @@ public function invalidPatchFilenameDataProvider(): array
      * @param string $filename
      * @return array
      */
-    private function createConfig(string $filename): array
+    private static function createConfig(string $filename): array
     {
         return [
             'magento/magento2-base' => [
@@ -270,7 +270,7 @@ public function testInvalidConfigurationTitleSection(array $config)
     /**
      * @return array
      */
-    public function invalidTitleSectionDataProvider(): array
+    public static function invalidTitleSectionDataProvider(): array
     {
         return [
             [

src/Test/Unit/Patch/Conflict/AnalyzerTest.php

@@ -107,7 +107,7 @@ public function testAnalyze(array $checkApplyMap, string $expectedMessage)
     /**
      * @return array
      */
-    public function analyzeDataProvider(): array
+    public static function analyzeDataProvider(): array
     {
         return [
             [

src/Test/Unit/Patch/FilterFactoryTest.php

@@ -46,7 +46,7 @@ public function testCreateApplyFilter(array $inputArgument, $expectedValue)
     /**
      * @return array
      */
-    public function createApplyFilterDataProvider(): array
+    public static function createApplyFilterDataProvider(): array
     {
         return [
             ['inputArgument' => [], 'expectedValue' => null],
@@ -75,7 +75,7 @@ public function testCreateRevertFilter(array $inputArgument, bool $optAll, $expe
     /**
      * @return array
      */
-    public function createRevertFilterDataProvider(): array
+    public static function createRevertFilterDataProvider(): array
     {
         return [
             ['inputArgument' => [], 'optAll' => false, 'expectedValue' => null],

src/Test/Unit/Patch/GitConverterTest.php

@@ -47,7 +47,7 @@ public function testConvert(string $composerContent, string $expectedContent)
      * phpcs:disable
      * @return array
      */
-    public function convertDataProvider()
+    public static function convertDataProvider()
     {
         return [
             [

src/Test/Unit/Patch/Status/OptionalResolverTest.php

@@ -248,9 +248,6 @@ private function createPatch(string $id, array $require = [])
         $aggregatedPatch->method('getRequire')->willReturn($require);
         $aggregatedPatch->method('getItems')->willReturn([$patch]);
 
-        // To make mock object unique for assertions and array operations.
-        $aggregatedPatch->id = microtime();
-
         return $aggregatedPatch;
     }
 }