100% code coverage for dir handle seeking, remove error log (not used in dir seeking...

diff --git a/ext/phar/dirstream.c b/ext/phar/dirstream.c
index ce398d0bc8a348b7a75c5d13512f3a084890be57..0143fa96849291ca9ab52cd164b47b78f20f3960 100644 (file)
--- a/ext/phar/dirstream.c
+++ b/ext/phar/dirstream.c
@@ -74,7 +74,6 @@ static int phar_dir_seek(php_stream *stream, off_t offset, int whence, off_t *ne
                }
 
                if (offset < 0) {
-                       php_stream_wrapper_log_error(stream->wrapper, stream->flags TSRMLS_CC, "phar error: cannot seek because the resulting seek is negative");
                        return -1;
                } else {
                        *newoffset = 0;

diff --git a/ext/phar/tests/027.phpt b/ext/phar/tests/027.phpt
index 28174c8e762847ac373684dcbc8d14c61a81bad3..83d66b0f08469a29597a6b9ac4dc0700b8364647 100755 (executable)
--- a/ext/phar/tests/027.phpt
+++ b/ext/phar/tests/027.phpt
@@ -40,6 +40,12 @@ function dump($phar, $base)
 
 dump($pname, '/');
 
+$a = opendir($pname);
+// this may stop working in future versions, but is here for code coverage purposes
+echo "fseek on dir handle\n";
+var_dump(fseek($a, 0, SEEK_END), ftell($a));
+var_dump(fseek($a, -1), ftell($a));
+var_dump(fseek($a, 1), ftell($a));
 ?>
 ===DONE===
 --CLEAN--
@@ -59,4 +65,11 @@ string(6) "/b.php"
 bool(false)
 string(6) "/e.php"
 bool(false)
+fseek on dir handle
+int(0)
+int(4)
+int(-1)
+int(4)
+int(0)
+int(1)
 ===DONE===