[php] check feof after reading (see #4082)

HaxeFoundation · Mar 26, 2015 · 3135ba4 · 3135ba4
1 parent 5e4b7f9
commit 3135ba4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/std/php/_std/sys/io/FileInput.hx b/std/php/_std/sys/io/FileInput.hx
@@ -32,8 +32,8 @@ class FileInput extends haxe.io.Input {
 	}
 
 	public override function readByte() : Int {
-		if(untyped __call__('feof', __f)) return throw new haxe.io.Eof();
 		var r = untyped __call__('fread', __f, 1);
+		if(untyped __call__('feof', __f)) return throw new haxe.io.Eof();
 		if(untyped __physeq__(r, false)) return throw haxe.io.Error.Custom('An error occurred');
 		return untyped __call__('ord', r);
 	}

diff --git a/tests/sys/src/io/TestFileInput.hx b/tests/sys/src/io/TestFileInput.hx
@@ -129,7 +129,6 @@ class TestFileInput extends haxe.unit.TestCase {
 		file.close();
 	}
 
-	#if !php
 	public function testSeekEofLast() {
 		var file : FileInput = File.read(path);
 		assertEquals(116, file.readByte());
@@ -214,7 +213,5 @@ class TestFileInput extends haxe.unit.TestCase {
 		}
 		file.close();
 	}
-	#end
-
 }