Fix creating a FileSystem iterator from a non-string arg

Summary: Used by parts of symfony that composer users when creating zips/tars/phars refs #7869 Depends on D5202473 Reviewed By: paulbiss Differential Revision: D5202739 fbshipit-source-id: b0a935bb56ec41425fefad6aa87be7a28fc3a4ec
facebook · Jun 8, 2017 · 6bad26b · 6bad26b
1 parent af3471b
commit 6bad26b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 7 deletions.
diff --git a/hphp/system/php/spl/iterators/FilesystemIterator.php b/hphp/system/php/spl/iterators/FilesystemIterator.php
@@ -40,7 +40,7 @@ class FilesystemIterator extends DirectoryIterator {
    * @return     mixed   No value is returned.
    */
   public function __construct($path, $flags = null) {
-    parent::__construct($path);
+    parent::__construct((string) $path);
     if ($flags === null) {
       $flags = FilesystemIterator::KEY_AS_PATHNAME |
                FilesystemIterator::CURRENT_AS_FILEINFO |

diff --git a/hphp/test/frameworks/results/composer_php7.expect b/hphp/test/frameworks/results/composer_php7.expect
@@ -1095,13 +1095,13 @@ Composer\Test\Json\JsonValidationExceptionTest::testGetErrors with data set #1
 Composer\Test\Json\JsonValidationExceptionTest::testGetErrorsWhenNoErrorsProvided
 .
 Composer\Test\Package\Archiver\ArchivableFilesFinderTest::testGitExcludes
-E
+.
 Composer\Test\Package\Archiver\ArchivableFilesFinderTest::testHgExcludes
-E
+F
 Composer\Test\Package\Archiver\ArchivableFilesFinderTest::testManualExcludes
-E
+.
 Composer\Test\Package\Archiver\ArchivableFilesFinderTest::testSkipExcludes
-E
+.
 Composer\Test\Package\Archiver\ArchiveManagerTest::testArchiveCustomFileName
 E
 Composer\Test\Package\Archiver\ArchiveManagerTest::testArchiveTar
@@ -1125,9 +1125,9 @@ Composer\Test\Package\Archiver\HgExcludeFilterTest::testPatternEscape with data
 Composer\Test\Package\Archiver\PharArchiverTest::testTarArchive
 E
 Composer\Test\Package\Archiver\PharArchiverTest::testZipArchive
-E
+.
 Composer\Test\Package\Archiver\ZipArchiverTest::testZipArchive
-E
+.
 Composer\Test\Package\BasePackageTest::testFormatVersionForDevPackage with data set #0
 .
 Composer\Test\Package\BasePackageTest::testFormatVersionForDevPackage with data set #1

diff --git a/hphp/test/slow/ext_spl_iterators/iterator_of_object.php b/hphp/test/slow/ext_spl_iterators/iterator_of_object.php
@@ -0,0 +1,5 @@
+<?php
+
+$info = new SplFileInfo(sys_get_temp_dir());
+$it = new FilesystemIterator($info);
+var_dump($it->getPath() === sys_get_temp_dir());
diff --git a/hphp/test/slow/ext_spl_iterators/iterator_of_object.php.expect b/hphp/test/slow/ext_spl_iterators/iterator_of_object.php.expect
@@ -0,0 +1 @@
+bool(true)
diff --git a/hphp/test/slow/ext_spl_iterators/iterator_of_object.php.ini b/hphp/test/slow/ext_spl_iterators/iterator_of_object.php.ini
@@ -0,0 +1 @@
+hhvm.php7.all