minor symfony#30839 Skip Glob brace test when GLOB_BRACE is unavailable (wouterj)

fabpot · fabpot · commit 3f75092a7409 · 2019-04-03T11:53:01.000+02:00
This PR was merged into the 3.4 branch. Discussion ---------- Skip Glob brace test when GLOB_BRACE is unavailable | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | n/a From [PHP.net](https://www.php.net/glob): > Note: The GLOB_BRACE flag is not available on some non GNU systems, like Solaris. This means running the testsuite in e.g. a php-alpine container fails atm. This test should be skipped in these environments. Commits ------- ce38fe3 Skip Glob brace test when GLOB_BRACE is unavailable
diff --git a/src/Symfony/Component/Finder/Tests/FinderTest.php b/src/Symfony/Component/Finder/Tests/FinderTest.php
@@ -339,6 +339,10 @@ public function testInWithNonDirectoryGlob()
 
     public function testInWithGlobBrace()
     {
+        if (!\defined('GLOB_BRACE')) {
+            $this->markTestSkipped('Glob brace is not supported on this system.');
+        }
+
         $finder = $this->buildFinder();
         $finder->in([__DIR__.'/Fixtures/{A,copy/A}/B/C'])->getIterator();
 

Original file line number	Diff line number	Diff line change
`@@ -339,6 +339,10 @@ public function testInWithNonDirectoryGlob()`
`339`	`339`
`340`	`340`	`public function testInWithGlobBrace()`
`341`	`341`	`{`
	`342`	`+ if (!\defined('GLOB_BRACE')) {`
	`343`	`+ $this->markTestSkipped('Glob brace is not supported on this system.');`
	`344`	`+ }`
	`345`	`+`
`342`	`346`	`$finder = $this->buildFinder();`
`343`	`347`	`$finder->in([__DIR__.'/Fixtures/{A,copy/A}/B/C'])->getIterator();`
`344`	`348`