PHPUnit & Travis failures due to new version of vfsStream.
Merge pull request #2526 from cryode/bug/vfsstream

Fix PHPUnit & Travis failures due to new version of vfsStream.