test: scope changelog cleanup during random tests

Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>

Author: memleakd

tests/system/AutoReview/CreateNewChangelogTest.php

@@ -48,56 +48,71 @@ protected function setUp(): void
     #[DataProvider('provideCreateNewChangelog')]
     public function testCreateNewChangelog(string $mode): void
     {
-        $output = exec('git status --porcelain | wc -l');
-
-        if ($output !== '0') {
+        $currentVersion     = $this->currentVersion;
+        $newVersion         = $this->incrementVersion($currentVersion, $mode);
+        $versionWithoutDots = str_replace('.', '', $newVersion);
+        $changelogPath      = "./user_guide_src/source/changelogs/v{$newVersion}.rst";
+        $upgradePath        = "./user_guide_src/source/installation/upgrade_{$versionWithoutDots}.rst";
+        $trackedPathArgs    = implode(' ', array_map(escapeshellarg(...), [
+            './system/CodeIgniter.php',
+            './user_guide_src/source/changelogs/index.rst',
+            './user_guide_src/source/installation/upgrading.rst',
+        ]));
+        $generatedPathArgs = implode(' ', array_map(escapeshellarg(...), [
+            $changelogPath,
+            $upgradePath,
+        ]));
+        $statusCount = trim((string) exec(
+            "git status --porcelain -- {$trackedPathArgs} {$generatedPathArgs} | wc -l",
+        ));
+
+        if ($statusCount !== '0') {
             $this->markTestSkipped('You have uncommitted operations that will be erased by this test.');
         }
 
-        $currentVersion = $this->currentVersion;
-        $newVersion     = $this->incrementVersion($currentVersion, $mode);
-
-        exec(
-            sprintf('php ./admin/create-new-changelog.php %s %s --dry-run', $currentVersion, $newVersion),
-            $output,
-            $exitCode,
-        );
-
-        $this->assertSame(0, $exitCode, "Script exited with code {$exitCode}. Output: " . implode("\n", $output));
-
-        $this->assertStringContainsString(
-            "public const CI_VERSION = '{$newVersion}-dev';",
-            $this->getContents('./system/CodeIgniter.php'),
-        );
-
-        $this->assertFileExists("./user_guide_src/source/changelogs/v{$newVersion}.rst");
-        $this->assertStringContainsString(
-            "Version {$newVersion}",
-            $this->getContents("./user_guide_src/source/changelogs/v{$newVersion}.rst"),
-        );
-        $this->assertStringContainsString(
-            "**{$newVersion} release of CodeIgniter4**",
-            $this->getContents("./user_guide_src/source/changelogs/v{$newVersion}.rst"),
-        );
-        $this->assertStringContainsString(
-            $newVersion,
-            $this->getContents('./user_guide_src/source/changelogs/index.rst'),
-        );
-
-        $versionWithoutDots = str_replace('.', '', $newVersion);
-        $this->assertFileExists("./user_guide_src/source/installation/upgrade_{$versionWithoutDots}.rst");
-        $this->assertStringContainsString(
-            "Upgrading from {$currentVersion} to {$newVersion}",
-            $this->getContents("./user_guide_src/source/installation/upgrade_{$versionWithoutDots}.rst"),
-        );
-        $this->assertStringContainsString(
-            "upgrade_{$versionWithoutDots}",
-            $this->getContents('./user_guide_src/source/installation/upgrading.rst'),
-        );
-
-        // cleanup added and modified files
-        exec('git restore .');
-        exec('git clean -fd');
+        try {
+            $output = [];
+
+            exec(
+                sprintf('php ./admin/create-new-changelog.php %s %s --dry-run', $currentVersion, $newVersion),
+                $output,
+                $exitCode,
+            );
+
+            $this->assertSame(0, $exitCode, "Script exited with code {$exitCode}. Output: " . implode("\n", $output));
+
+            $this->assertStringContainsString(
+                "public const CI_VERSION = '{$newVersion}-dev';",
+                $this->getContents('./system/CodeIgniter.php'),
+            );
+
+            $this->assertFileExists($changelogPath);
+            $this->assertStringContainsString(
+                "Version {$newVersion}",
+                $this->getContents($changelogPath),
+            );
+            $this->assertStringContainsString(
+                "**{$newVersion} release of CodeIgniter4**",
+                $this->getContents($changelogPath),
+            );
+            $this->assertStringContainsString(
+                $newVersion,
+                $this->getContents('./user_guide_src/source/changelogs/index.rst'),
+            );
+
+            $this->assertFileExists($upgradePath);
+            $this->assertStringContainsString(
+                "Upgrading from {$currentVersion} to {$newVersion}",
+                $this->getContents($upgradePath),
+            );
+            $this->assertStringContainsString(
+                "upgrade_{$versionWithoutDots}",
+                $this->getContents('./user_guide_src/source/installation/upgrading.rst'),
+            );
+        } finally {
+            exec("git restore -- {$trackedPathArgs}");
+            exec("git clean -f -- {$generatedPathArgs}");
+        }
     }
 
     /**