bug #23878 [VarDumper] play nice with open_basedir when looking for composer.json (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit be7751aba749 · 2017-08-16T18:04:18.000+02:00
This PR was merged into the 3.3 branch. Discussion ---------- [VarDumper] play nice with open_basedir when looking for composer.json | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #23661 | License | MIT | Doc PR | - ping @pounard, can you please confirm this fixes the issue you reported? Commits ------- 1bea774 [VarDumper] play nice with open_basedir when looking for composer.json
diff --git a/src/Symfony/Component/VarDumper/Caster/LinkStub.php b/src/Symfony/Component/VarDumper/Caster/LinkStub.php
@@ -89,7 +89,11 @@ private function getComposerRoot($file, &$inVendor)
         }
 
         $parent = $dir;
-        while (!file_exists($parent.'/composer.json')) {
+        while (!@file_exists($parent.'/composer.json')) {
+            if (!@file_exists($parent)) {
+                // open_basedir restriction in effect
+                break;
+            }
             if ($parent === dirname($parent)) {
                 return self::$composerRoots[$dir] = false;
             }

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,11 @@ private function getComposerRoot($file, &$inVendor)`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`$parent = $dir;`
`92`		`- while (!file_exists($parent.'/composer.json')) {`
	`92`	`+ while (!@file_exists($parent.'/composer.json')) {`
	`93`	`+ if (!@file_exists($parent)) {`
	`94`	`+ // open_basedir restriction in effect`
	`95`	`+ break;`
	`96`	`+ }`
`93`	`97`	`if ($parent === dirname($parent)) {`
`94`	`98`	`return self::$composerRoots[$dir] = false;`
`95`	`99`	`}`