Skip to content

Commit 2c5f43a

Browse files
committed
Merge branch '3.4' into 4.2
* 3.4: [Form] various minor fixes bugfix: the terminal state was wrong and not reseted [Console] Fix inconsistent result for choice questions in non-interactive mode Define null return type for Constraint::getDefaultOption() [HttpKernel] Fix DebugHandlersListener constructor docblock Skip Glob brace test when GLOB_BRACE is unavailable bumped Symfony version to 3.4.25 updated VERSION for 3.4.24 update CONTRIBUTORS for 3.4.24 updated CHANGELOG for 3.4.24 [EventDispatcher] cleanup
2 parents a87752d + 8e16e6b commit 2c5f43a

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Tests/FinderTest.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -883,6 +883,10 @@ public function testInWithNonDirectoryGlob()
883883

884884
public function testInWithGlobBrace()
885885
{
886+
if (!\defined('GLOB_BRACE')) {
887+
$this->markTestSkipped('Glob brace is not supported on this system.');
888+
}
889+
886890
$finder = $this->buildFinder();
887891
$finder->in([__DIR__.'/Fixtures/{A,copy/A}/B/C'])->getIterator();
888892

0 commit comments

Comments
 (0)