fix(tests): Refactor ignore platform requirements data provider and update restore tests.

Author: terabytesoftw

src/Fallback/ComposerFallback.php

@@ -179,8 +179,7 @@ private function restorePreviousLockFile(): void
         $installer->setPlatformRequirementFilter(PlatformRequirementFilterFactory::fromBoolOrList($ignorePlatformReqs));
         $runScripts = $isOptionTrue($this->input->getOption('no-scripts')) === false;
         $dispatcher = $this->composer->getEventDispatcher();
-        $dispatcher->setRunScripts(false);
-        $installer->run();
         $dispatcher->setRunScripts($runScripts);
+        $installer->run();
     }
 }

tests/Fallback/ComposerFallbackTest.php

@@ -39,19 +39,19 @@ final class ComposerFallbackTest extends TestCase
     private string|null $oldCwd = '';
     private \Symfony\Component\Filesystem\Filesystem|null $sfs = null;
 
-    public static function getIgnorePlatformReqsData(): array
+    public static function getIgnorePlatformReqData(): array
     {
         return [
-            'ignore-platform-reqs is true' => ['ignore-platform-reqs', true],
-            'ignore-platform-reqs is array' => ['ignore-platform-reqs', ['php', 'ext-json']],
+            'ignore-platform-req is true' => ['ignore-platform-req', true],
+            'ignore-platform-req is array' => ['ignore-platform-req', ['php', 'ext-json']],
         ];
     }
 
-    public static function getIgnorePlatformReqData(): array
+    public static function getIgnorePlatformReqsData(): array
     {
         return [
-            'ignore-platform-req is true' => ['ignore-platform-req', true],
-            'ignore-platform-req is array' => ['ignore-platform-req', ['php', 'ext-json']],
+            'ignore-platform-reqs is true' => ['ignore-platform-reqs', true],
+            'ignore-platform-reqs is array' => ['ignore-platform-reqs', ['php', 'ext-json']],
         ];
     }
 
@@ -66,17 +66,16 @@ public static function getSaveData(): array
     }
 
     /**
-     * @dataProvider getIgnorePlatformReqsData
+     * @dataProvider getRestoreData
      *
      * @throws Exception|JsonException
      */
-    public function testRestoreWithIgnorePlatformReqs(string $optionName, mixed $optionValue): void
+    public function testRestore(array $packages): void
     {
         $composerFile = 'composer.json';
         $composerContent = '{}';
         $lockFile = 'composer.lock';
         $vendorDir = $this->cwd . '/vendor/';
-        $packages = [['name' => 'foo/bar', 'version' => '1.0.0.0']];
 
         file_put_contents($this->cwd . '/' . $composerFile, $composerContent);
         file_put_contents(
@@ -95,13 +94,7 @@ public function testRestoreWithIgnorePlatformReqs(string $optionName, mixed $opt
         $this->input
             ->expects(self::any())
             ->method('getOption')
-            ->willReturnCallback(
-                fn($option): mixed => match ($option) {
-                    $optionName => $optionValue,
-                    'verbose' => false,
-                    default => null,
-                }
-            );
+            ->willReturnCallback(fn($option): bool|null => 'verbose' === $option ? false : null);
 
         $ed = $this->createMock(EventDispatcher::class);
 
@@ -132,12 +125,30 @@ public function testRestoreWithIgnorePlatformReqs(string $optionName, mixed $opt
             ->method('get')
             ->willReturnCallback(fn($key, $default = null) => 'vendor-dir' === $key ? $vendorDir : $default);
 
-        $this->installer->expects(self::once())->method('run');
+        if (0 === count($packages)) {
+            $this->fs->expects(self::once())->method('remove')->with($vendorDir);
+        } else {
+            $this->fs->expects(self::never())->method('remove');
+            $this->installer->expects(self::once())->method('run');
+        }
 
         $this->composerFallback->save();
         $this->composerFallback->restore();
     }
 
+    /**
+     * @throws Exception
+     */
+    public function testRestoreWithDisableOption(): void
+    {
+        $config = new Config(['fallback-composer' => false]);
+        $composerFallback = new ComposerFallback($this->composer, $this->io, $config, $this->input);
+
+        $this->io->expects(self::never())->method('write');
+
+        $composerFallback->restore();
+    }
+
     /**
      * @dataProvider getIgnorePlatformReqData
      *
@@ -174,7 +185,7 @@ public function testRestoreWithIgnorePlatformReq(string $optionName, mixed $opti
                     $optionName => $optionValue,
                     'verbose' => false,
                     default => null,
-                }
+                },
             );
 
         $ed = $this->createMock(EventDispatcher::class);
@@ -213,16 +224,17 @@ public function testRestoreWithIgnorePlatformReq(string $optionName, mixed $opti
     }
 
     /**
-     * @dataProvider getRestoreData
+     * @dataProvider getIgnorePlatformReqsData
      *
      * @throws Exception|JsonException
      */
-    public function testRestore(array $packages): void
+    public function testRestoreWithIgnorePlatformReqs(string $optionName, mixed $optionValue): void
     {
         $composerFile = 'composer.json';
         $composerContent = '{}';
         $lockFile = 'composer.lock';
         $vendorDir = $this->cwd . '/vendor/';
+        $packages = [['name' => 'foo/bar', 'version' => '1.0.0.0']];
 
         file_put_contents($this->cwd . '/' . $composerFile, $composerContent);
         file_put_contents(
@@ -241,7 +253,13 @@ public function testRestore(array $packages): void
         $this->input
             ->expects(self::any())
             ->method('getOption')
-            ->willReturnCallback(fn($option): bool|null => 'verbose' === $option ? false : null);
+            ->willReturnCallback(
+                fn($option): mixed => match ($option) {
+                    $optionName => $optionValue,
+                    'verbose' => false,
+                    default => null,
+                },
+            );
 
         $ed = $this->createMock(EventDispatcher::class);
 
@@ -272,30 +290,12 @@ public function testRestore(array $packages): void
             ->method('get')
             ->willReturnCallback(fn($key, $default = null) => 'vendor-dir' === $key ? $vendorDir : $default);
 
-        if (0 === count($packages)) {
-            $this->fs->expects(self::once())->method('remove')->with($vendorDir);
-        } else {
-            $this->fs->expects(self::never())->method('remove');
-            $this->installer->expects(self::once())->method('run');
-        }
+        $this->installer->expects(self::once())->method('run');
 
         $this->composerFallback->save();
         $this->composerFallback->restore();
     }
 
-    /**
-     * @throws Exception
-     */
-    public function testRestoreWithDisableOption(): void
-    {
-        $config = new Config(['fallback-composer' => false]);
-        $composerFallback = new ComposerFallback($this->composer, $this->io, $config, $this->input);
-
-        $this->io->expects(self::never())->method('write');
-
-        $composerFallback->restore();
-    }
-
     /**
      * @dataProvider getSaveData
      *