Skip to content

Commit a093f4a

Browse files
committed
Merge branch '3.1'
* 3.1: added a comment about a workaround [Finder] no PHP warning on empty directory iteration [HttpKernel] Fixed the nullable support for php 7.1 and below fixed CS [Form] Fix typo in doc comment Fix version constraint [Config] Handle open_basedir restrictions in FileLocator Fixed bad merge [DoctrineBridge][PropertyInfo] Treat Doctrine decimal type as string [bugfix] [Console] Set `Input::$interactive` to `false` when command is executed with `--quiet` as verbosity level Use JSON_UNESCAPED_SLASHES for lint commands output Fixed collapsed ChoiceType options attributes [FrameworkBundle] Remove cache clearer default value in config Consider the umask setting when dumping a file. Fixed the nullable support for php 7.1 and below Make ReflectionExtractor compatible with ReflectionType changes in PHP 7.1
2 parents 6853173 + 54b1059 commit a093f4a

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Iterator/RecursiveDirectoryIterator.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,11 @@ public function isRewindable()
137137
return $this->rewindable;
138138
}
139139

140+
// workaround for an HHVM bug, should be removed when https://github.com/facebook/hhvm/issues/7281 is fixed
141+
if ('' === $this->getPath()) {
142+
return $this->rewindable = false;
143+
}
144+
140145
if (false !== $stream = @opendir($this->getPath())) {
141146
$infos = stream_get_meta_data($stream);
142147
closedir($stream);

0 commit comments

Comments
 (0)