Revert "merged branch gajdaw/finder_splfileinfo_fpassthu (PR #4751)" (closes #6224)

fabpot · fabpot · commit a1734ddf72d9 · 2012-12-10T13:46:54.000+01:00
This reverts commit 5608c0c, reversing changes made to 38c30b7. Conflicts: src/Symfony/Component/Finder/SplFileInfo.php
diff --git a/src/Symfony/Component/Finder/SplFileInfo.php b/src/Symfony/Component/Finder/SplFileInfo.php
@@ -62,10 +62,14 @@ public function getRelativePathname()
      */
     public function getContents()
     {
-        $file = new \SplFileObject($this->getRealpath(), 'rb');
-        ob_start();
-        $file->fpassthru();
+        $level = error_reporting(0);
+        $content = file_get_contents($this->getRealpath());
+        error_reporting($level);
+        if (false === $content) {
+            $error = error_get_last();
+            throw new \RuntimeException($error['message']);
+        }
 
-        return ob_get_clean();
+        return $content;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -62,10 +62,14 @@ public function getRelativePathname()`
`62`	`62`	`*/`
`63`	`63`	`public function getContents()`
`64`	`64`	`{`
`65`		`- $file = new \SplFileObject($this->getRealpath(), 'rb');`
`66`		`- ob_start();`
`67`		`- $file->fpassthru();`
	`65`	`+ $level = error_reporting(0);`
	`66`	`+ $content = file_get_contents($this->getRealpath());`
	`67`	`+ error_reporting($level);`
	`68`	`+ if (false === $content) {`
	`69`	`+ $error = error_get_last();`
	`70`	`+ throw new \RuntimeException($error['message']);`
	`71`	`+ }`
`68`	`72`
`69`		`- return ob_get_clean();`
	`73`	`+ return $content;`
`70`	`74`	`}`
`71`	`75`	`}`