Skip to content

Commit 4702ed4

Browse files
committed
Merge branch '4.2'
* 4.2: (45 commits) [Form] various minor fixes Ensure the parent process is always killed 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() [Routing] Fix: annotation loader ignores method's default values [HttpKernel] Fix DebugHandlersListener constructor docblock Skip Glob brace test when GLOB_BRACE is unavailable bumped Symfony version to 4.2.6 updated VERSION for 4.2.5 updated CHANGELOG for 4.2.5 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 fix testIgnoredAttributesInContext Re-generate icu 64.1 data Improve PHPdoc / IDE autocomplete for config tree builder [Bridge][Twig] DebugCommand - fix escaping and filter ...
2 parents 7632b55 + 2c5f43a commit 4702ed4

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
@@ -924,6 +924,10 @@ public function testInWithNonDirectoryGlob()
924924

925925
public function testInWithGlobBrace()
926926
{
927+
if (!\defined('GLOB_BRACE')) {
928+
$this->markTestSkipped('Glob brace is not supported on this system.');
929+
}
930+
927931
$finder = $this->buildFinder();
928932
$finder->in([__DIR__.'/Fixtures/{A,copy/A}/B/C'])->getIterator();
929933

0 commit comments

Comments
 (0)