Fix test with open_basedir

julienfalque · julienfalque · commit 08ebeab6a48a · 2021-12-19T17:21:04.000+01:00
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -460,6 +460,9 @@ public function testIgnoreVCSIgnoredUpToFirstGitRepositoryRoot()
         ]), $finder->in(self::toAbsolute('gitignore/git_root/search_root'))->getIterator());
     }
 
+    /**
+     * @runInSeparateProcess
+     */
     public function testIgnoreVCSIgnoredWithOpenBasedir()
     {
         if (ini_get('open_basedir')) {
@@ -1503,4 +1506,13 @@ protected function buildFinder()
     {
         return Finder::create()->exclude('gitignore');
     }
+
+    protected function iniSet(string $varName, string $newValue): void
+    {
+        if ('open_basedir' === $varName && $deprecationsFile = getenv('SYMFONY_DEPRECATIONS_SERIALIZE')) {
+            $newValue .= \PATH_SEPARATOR.$deprecationsFile;
+        }
+
+        parent::iniSet('open_basedir', $newValue);
+    }
 }
diff --git a/src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php b/src/Symfony/Component/Finder/Tests/Iterator/RealIteratorTestCase.php
@@ -90,10 +90,15 @@ public static function setUpBeforeClass(): void
 
     public static function tearDownAfterClass(): void
     {
-        $paths = new \RecursiveIteratorIterator(
-             new \RecursiveDirectoryIterator(self::$tmpDir, \RecursiveDirectoryIterator::SKIP_DOTS),
-             \RecursiveIteratorIterator::CHILD_FIRST
-         );
+        try {
+            $paths = new \RecursiveIteratorIterator(
+                 new \RecursiveDirectoryIterator(self::$tmpDir, \RecursiveDirectoryIterator::SKIP_DOTS),
+                 \RecursiveIteratorIterator::CHILD_FIRST
+            );
+        } catch (\UnexpectedValueException $exception) {
+            // open_basedir restriction in effect
+            return;
+        }
 
         foreach ($paths as $path) {
             if ($path->isDir()) {

Original file line number	Diff line number	Diff line change
`@@ -460,6 +460,9 @@ public function testIgnoreVCSIgnoredUpToFirstGitRepositoryRoot()`
`460`	`460`	`]), $finder->in(self::toAbsolute('gitignore/git_root/search_root'))->getIterator());`
`461`	`461`	`}`
`462`	`462`
	`463`	`+ /**`
	`464`	`+ * @runInSeparateProcess`
	`465`	`+ */`
`463`	`466`	`public function testIgnoreVCSIgnoredWithOpenBasedir()`
`464`	`467`	`{`
`465`	`468`	`if (ini_get('open_basedir')) {`
`@@ -1503,4 +1506,13 @@ protected function buildFinder()`
`1503`	`1506`	`{`
`1504`	`1507`	`return Finder::create()->exclude('gitignore');`
`1505`	`1508`	`}`
	`1509`	`+`
	`1510`	`+ protected function iniSet(string $varName, string $newValue): void`
	`1511`	`+ {`
	`1512`	`+ if ('open_basedir' === $varName && $deprecationsFile = getenv('SYMFONY_DEPRECATIONS_SERIALIZE')) {`
	`1513`	`+ $newValue .= \PATH_SEPARATOR.$deprecationsFile;`
	`1514`	`+ }`
	`1515`	`+`
	`1516`	`+ parent::iniSet('open_basedir', $newValue);`
	`1517`	`+ }`
`1506`	`1518`	`}`