update to 3.1.0RC1

build out of sources tree

4 files changed, 291 insertions, 289 deletions

diff --git a/.gitignore b/.gitignore
index 1ab5c4f..01f0400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+clog
 package-*.xml
 *.tgz
+*.tar.bz2
 *.tar.gz
 *.tar.xz
 *.tar.xz.asc
diff --git a/PHPINFO b/PHPINFO
index 081f08c..29dfa36 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -3,4 +3,4 @@ eio
 
 eio support => enabled
 Debug support => disabled
-Version => 3.0.0RC4
+Version => 3.1.0RC1
diff --git a/REFLECTION b/REFLECTION
index 8f8ca2c..f3445da 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #124 eio version 3.0.0RC4 ] {
+Extension [ <persistent> extension #122 eio version 3.1.0RC1 ] {
 
   - Dependencies {
     Dependency [ sockets (Optional) ]
@@ -61,423 +61,414 @@ Extension [ <persistent> extension #124 eio version 3.0.0RC4 ] {
   }
 
   - Functions {
-    Function [ <internal:eio> function eio_init ] {
+    Function [ <internal:eio> function eio_event_loop ] {
 
       - Parameters [0] {
       }
+      - Return [ bool ]
     }
     Function [ <internal:eio> function eio_poll ] {
 
       - Parameters [0] {
       }
-    }
-    Function [ <internal:eio> function eio_event_loop ] {
-
-      - Parameters [0] {
-      }
-    }
-    Function [ <internal:eio> function eio_get_last_error ] {
-
-      - Parameters [1] {
-        Parameter #0 [ <required> $req ]
-      }
+      - Return [ int ]
     }
     Function [ <internal:eio> function eio_open ] {
 
       - Parameters [6] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $flags ]
-        Parameter #2 [ <required> $mode ]
-        Parameter #3 [ <required> $pri ]
-        Parameter #4 [ <required> $callback ]
-        Parameter #5 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> int $flags ]
+        Parameter #2 [ <required> int $mode ]
+        Parameter #3 [ <required> int $pri ]
+        Parameter #4 [ <required> mixed $callback ]
+        Parameter #5 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_truncate ] {
 
       - Parameters [5] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $offset ]
-        Parameter #2 [ <optional> $pri ]
-        Parameter #3 [ <optional> $callback ]
-        Parameter #4 [ <optional> $data ]
-      }
-    }
-    Function [ <internal:eio> function eio_chown ] {
-
-      - Parameters [6] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $uid ]
-        Parameter #2 [ <optional> $gid ]
-        Parameter #3 [ <optional> $pri ]
-        Parameter #4 [ <optional> $callback ]
-        Parameter #5 [ <optional> $data ]
-      }
-    }
-    Function [ <internal:eio> function eio_chmod ] {
-
-      - Parameters [5] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $mode ]
-        Parameter #2 [ <optional> $pri ]
-        Parameter #3 [ <optional> $callback ]
-        Parameter #4 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <optional> int $offset = 0 ]
+        Parameter #2 [ <optional> int $pri = 0 ]
+        Parameter #3 [ <optional> mixed $callback = null ]
+        Parameter #4 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_mkdir ] {
 
       - Parameters [5] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $mode ]
-        Parameter #2 [ <optional> $pri ]
-        Parameter #3 [ <optional> $callback ]
-        Parameter #4 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> int $mode ]
+        Parameter #2 [ <optional> int $pri = 0 ]
+        Parameter #3 [ <optional> mixed $callback = null ]
+        Parameter #4 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_rmdir ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <optional> $pri ]
-        Parameter #2 [ <optional> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <optional> int $pri = 0 ]
+        Parameter #2 [ <optional> mixed $callback = null ]
+        Parameter #3 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_unlink ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <optional> $pri ]
-        Parameter #2 [ <optional> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <optional> int $pri = 0 ]
+        Parameter #2 [ <optional> mixed $callback = null ]
+        Parameter #3 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_utime ] {
 
       - Parameters [6] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $atime ]
-        Parameter #2 [ <required> $mtime ]
-        Parameter #3 [ <optional> $pri ]
-        Parameter #4 [ <optional> $callback ]
-        Parameter #5 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> float $atime ]
+        Parameter #2 [ <required> float $mtime ]
+        Parameter #3 [ <optional> int $pri = 0 ]
+        Parameter #4 [ <optional> mixed $callback = null ]
+        Parameter #5 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_mknod ] {
 
       - Parameters [6] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $mode ]
-        Parameter #2 [ <required> $dev ]
-        Parameter #3 [ <optional> $pri ]
-        Parameter #4 [ <optional> $callback ]
-        Parameter #5 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> int $mode ]
+        Parameter #2 [ <required> int $dev ]
+        Parameter #3 [ <optional> int $pri = 0 ]
+        Parameter #4 [ <optional> mixed $callback = null ]
+        Parameter #5 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_link ] {
 
       - Parameters [5] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $new_path ]
-        Parameter #2 [ <optional> $pri ]
-        Parameter #3 [ <optional> $callback ]
-        Parameter #4 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> string $new_path ]
+        Parameter #2 [ <optional> int $pri = 0 ]
+        Parameter #3 [ <optional> mixed $callback = null ]
+        Parameter #4 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_symlink ] {
 
       - Parameters [5] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $new_path ]
-        Parameter #2 [ <optional> $pri ]
-        Parameter #3 [ <optional> $callback ]
-        Parameter #4 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> string $new_path ]
+        Parameter #2 [ <optional> int $pri = 0 ]
+        Parameter #3 [ <optional> mixed $callback = null ]
+        Parameter #4 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_rename ] {
 
       - Parameters [5] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $new_path ]
-        Parameter #2 [ <optional> $pri ]
-        Parameter #3 [ <optional> $callback ]
-        Parameter #4 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> string $new_path ]
+        Parameter #2 [ <optional> int $pri = 0 ]
+        Parameter #3 [ <optional> mixed $callback = null ]
+        Parameter #4 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_close ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <optional> $pri ]
-        Parameter #2 [ <optional> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <optional> int $pri = 0 ]
+        Parameter #2 [ <optional> mixed $callback = null ]
+        Parameter #3 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_sync ] {
 
       - Parameters [3] {
-        Parameter #0 [ <optional> $pri ]
-        Parameter #1 [ <optional> $callback ]
-        Parameter #2 [ <optional> $data ]
+        Parameter #0 [ <optional> int $pri = 0 ]
+        Parameter #1 [ <optional> mixed $callback = null ]
+        Parameter #2 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_fsync ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <optional> $pri ]
-        Parameter #2 [ <optional> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <optional> int $pri = 0 ]
+        Parameter #2 [ <optional> mixed $callback = null ]
+        Parameter #3 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_fdatasync ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <optional> $pri ]
-        Parameter #2 [ <optional> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <optional> int $pri = 0 ]
+        Parameter #2 [ <optional> mixed $callback = null ]
+        Parameter #3 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_futime ] {
 
       - Parameters [6] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <required> $atime ]
-        Parameter #2 [ <required> $mtime ]
-        Parameter #3 [ <optional> $pri ]
-        Parameter #4 [ <optional> $callback ]
-        Parameter #5 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <required> float $atime ]
+        Parameter #2 [ <required> float $mtime ]
+        Parameter #3 [ <optional> int $pri = 0 ]
+        Parameter #4 [ <optional> mixed $callback = null ]
+        Parameter #5 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_ftruncate ] {
 
       - Parameters [5] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <required> $offset ]
-        Parameter #2 [ <optional> $pri ]
-        Parameter #3 [ <optional> $callback ]
-        Parameter #4 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <optional> int $offset = 0 ]
+        Parameter #2 [ <optional> int $pri = 0 ]
+        Parameter #3 [ <optional> mixed $callback = null ]
+        Parameter #4 [ <optional> mixed $data = null ]
+      }
+    }
+    Function [ <internal:eio> function eio_chmod ] {
+
+      - Parameters [5] {
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> int $mode ]
+        Parameter #2 [ <optional> int $pri = 0 ]
+        Parameter #3 [ <optional> mixed $callback = null ]
+        Parameter #4 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_fchmod ] {
 
       - Parameters [5] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <required> $mode ]
-        Parameter #2 [ <optional> $pri ]
-        Parameter #3 [ <optional> $callback ]
-        Parameter #4 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <required> int $mode ]
+        Parameter #2 [ <optional> int $pri = 0 ]
+        Parameter #3 [ <optional> mixed $callback = null ]
+        Parameter #4 [ <optional> mixed $data = null ]
+      }
+    }
+    Function [ <internal:eio> function eio_chown ] {
+
+      - Parameters [6] {
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> int $uid ]
+        Parameter #2 [ <optional> int $gid = -1 ]
+        Parameter #3 [ <optional> int $pri = 0 ]
+        Parameter #4 [ <optional> mixed $callback = null ]
+        Parameter #5 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_fchown ] {
 
       - Parameters [6] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <required> $uid ]
-        Parameter #2 [ <optional> $gid ]
-        Parameter #3 [ <optional> $pri ]
-        Parameter #4 [ <optional> $callback ]
-        Parameter #5 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <required> int $uid ]
+        Parameter #2 [ <optional> int $gid = -1 ]
+        Parameter #3 [ <optional> int $pri = 0 ]
+        Parameter #4 [ <optional> mixed $callback = null ]
+        Parameter #5 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_dup2 ] {
 
       - Parameters [5] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <required> $fd2 ]
-        Parameter #2 [ <optional> $pri ]
-        Parameter #3 [ <optional> $callback ]
-        Parameter #4 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <required> mixed $fd2 ]
+        Parameter #2 [ <optional> int $pri = 0 ]
+        Parameter #3 [ <optional> mixed $callback = null ]
+        Parameter #4 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_read ] {
 
       - Parameters [6] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <required> $length ]
-        Parameter #2 [ <required> $offset ]
-        Parameter #3 [ <required> $pri ]
-        Parameter #4 [ <required> $callback ]
-        Parameter #5 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <required> int $length ]
+        Parameter #2 [ <required> int $offset ]
+        Parameter #3 [ <required> int $pri ]
+        Parameter #4 [ <required> mixed $callback ]
+        Parameter #5 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_write ] {
 
       - Parameters [7] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <required> $str ]
-        Parameter #2 [ <optional> $length ]
-        Parameter #3 [ <optional> $offset ]
-        Parameter #4 [ <optional> $pri ]
-        Parameter #5 [ <optional> $callback ]
-        Parameter #6 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <required> mixed $str ]
+        Parameter #2 [ <optional> int $length = 0 ]
+        Parameter #3 [ <optional> int $offset = 0 ]
+        Parameter #4 [ <optional> int $pri = 0 ]
+        Parameter #5 [ <optional> mixed $callback = null ]
+        Parameter #6 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_readlink ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $pri ]
-        Parameter #2 [ <required> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> int $pri ]
+        Parameter #2 [ <required> mixed $callback ]
+        Parameter #3 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_realpath ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $pri ]
-        Parameter #2 [ <required> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> int $pri ]
+        Parameter #2 [ <required> mixed $callback ]
+        Parameter #3 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_stat ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $pri ]
-        Parameter #2 [ <required> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> int $pri ]
+        Parameter #2 [ <required> mixed $callback ]
+        Parameter #3 [ <optional> mixed $data = NULL ]
       }
     }
     Function [ <internal:eio> function eio_lstat ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $pri ]
-        Parameter #2 [ <required> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> int $pri ]
+        Parameter #2 [ <required> mixed $callback ]
+        Parameter #3 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_fstat ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <required> $pri ]
-        Parameter #2 [ <required> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <required> int $pri ]
+        Parameter #2 [ <required> mixed $callback ]
+        Parameter #3 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_statvfs ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $pri ]
-        Parameter #2 [ <required> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> int $pri ]
+        Parameter #2 [ <required> mixed $callback ]
+        Parameter #3 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_fstatvfs ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <required> $pri ]
-        Parameter #2 [ <required> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <required> int $pri ]
+        Parameter #2 [ <required> mixed $callback ]
+        Parameter #3 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_readdir ] {
 
       - Parameters [5] {
-        Parameter #0 [ <required> $path ]
-        Parameter #1 [ <required> $flags ]
-        Parameter #2 [ <required> $pri ]
-        Parameter #3 [ <required> $callback ]
-        Parameter #4 [ <optional> $data ]
+        Parameter #0 [ <required> string $path ]
+        Parameter #1 [ <required> int $flags ]
+        Parameter #2 [ <required> int $pri ]
+        Parameter #3 [ <required> mixed $callback ]
+        Parameter #4 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_sendfile ] {
 
       - Parameters [7] {
-        Parameter #0 [ <required> $out_fd ]
-        Parameter #1 [ <required> $in_fd ]
-        Parameter #2 [ <required> $offset ]
-        Parameter #3 [ <required> $length ]
-        Parameter #4 [ <optional> $pri ]
-        Parameter #5 [ <optional> $callback ]
-        Parameter #6 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $out_fd ]
+        Parameter #1 [ <required> mixed $in_fd ]
+        Parameter #2 [ <required> int $offset ]
+        Parameter #3 [ <required> int $length ]
+        Parameter #4 [ <required> int $pri ]
+        Parameter #5 [ <required> mixed $callback ]
+        Parameter #6 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_readahead ] {
 
       - Parameters [6] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <required> $offset ]
-        Parameter #2 [ <required> $length ]
-        Parameter #3 [ <optional> $pri ]
-        Parameter #4 [ <optional> $callback ]
-        Parameter #5 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <required> int $offset ]
+        Parameter #2 [ <required> int $length ]
+        Parameter #3 [ <optional> int $pri = EIO_PRI_DEFAULT ]
+        Parameter #4 [ <optional> mixed $callback = null ]
+        Parameter #5 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_seek ] {
 
       - Parameters [6] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <required> $offset ]
-        Parameter #2 [ <required> $whence ]
-        Parameter #3 [ <optional> $pri ]
-        Parameter #4 [ <optional> $callback ]
-        Parameter #5 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <required> int $offset ]
+        Parameter #2 [ <required> int $whence ]
+        Parameter #3 [ <optional> int $pri = EIO_PRI_DEFAULT ]
+        Parameter #4 [ <optional> mixed $callback = null ]
+        Parameter #5 [ <optional> mixed $data = NULL ]
       }
     }
     Function [ <internal:eio> function eio_syncfs ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <optional> $pri ]
-        Parameter #2 [ <optional> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <optional> int $pri = EIO_PRI_DEFAULT ]
+        Parameter #2 [ <optional> mixed $callback = null ]
+        Parameter #3 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_sync_file_range ] {
 
       - Parameters [7] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <required> $offset ]
-        Parameter #2 [ <required> $nbytes ]
-        Parameter #3 [ <required> $flags ]
-        Parameter #4 [ <optional> $pri ]
-        Parameter #5 [ <optional> $callback ]
-        Parameter #6 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <required> int $offset ]
+        Parameter #2 [ <required> int $nbytes ]
+        Parameter #3 [ <required> int $flags ]
+        Parameter #4 [ <optional> int $pri = EIO_PRI_DEFAULT ]
+        Parameter #5 [ <optional> mixed $callback = null ]
+        Parameter #6 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_fallocate ] {
 
       - Parameters [7] {
-        Parameter #0 [ <required> $fd ]
-        Parameter #1 [ <required> $mode ]
-        Parameter #2 [ <required> $offset ]
-        Parameter #3 [ <required> $length ]
-        Parameter #4 [ <optional> $pri ]
-        Parameter #5 [ <optional> $callback ]
-        Parameter #6 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $fd ]
+        Parameter #1 [ <required> int $mode ]
+        Parameter #2 [ <required> int $offset ]
+        Parameter #3 [ <required> int $length ]
+        Parameter #4 [ <optional> int $pri = EIO_PRI_DEFAULT ]
+        Parameter #5 [ <optional> mixed $callback = null ]
+        Parameter #6 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_custom ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $execute ]
-        Parameter #1 [ <required> $pri ]
-        Parameter #2 [ <required> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $execute ]
+        Parameter #1 [ <required> int $pri ]
+        Parameter #2 [ <required> mixed $callback ]
+        Parameter #3 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_busy ] {
 
       - Parameters [4] {
-        Parameter #0 [ <required> $delay ]
-        Parameter #1 [ <optional> $pri ]
-        Parameter #2 [ <optional> $callback ]
-        Parameter #3 [ <optional> $data ]
+        Parameter #0 [ <required> int $delay ]
+        Parameter #1 [ <optional> int $pri = EIO_PRI_DEFAULT ]
+        Parameter #2 [ <optional> mixed $callback = null ]
+        Parameter #3 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_nop ] {
 
       - Parameters [3] {
-        Parameter #0 [ <optional> $pri ]
-        Parameter #1 [ <optional> $callback ]
-        Parameter #2 [ <optional> $data ]
+        Parameter #0 [ <optional> int $pri = EIO_PRI_DEFAULT ]
+        Parameter #1 [ <optional> mixed $callback = null ]
+        Parameter #2 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_cancel ] {
@@ -485,12 +476,13 @@ Extension [ <persistent> extension #124 eio version 3.0.0RC4 ] {
       - Parameters [1] {
         Parameter #0 [ <required> $req ]
       }
+      - Return [ void ]
     }
     Function [ <internal:eio> function eio_grp ] {
 
       - Parameters [2] {
-        Parameter #0 [ <required> $callback ]
-        Parameter #1 [ <optional> $data ]
+        Parameter #0 [ <required> mixed $callback ]
+        Parameter #1 [ <optional> mixed $data = null ]
       }
     }
     Function [ <internal:eio> function eio_grp_add ] {
@@ -499,75 +491,94 @@ Extension [ <persistent> extension #124 eio version 3.0.0RC4 ] {
         Parameter #0 [ <required> $grp ]
         Parameter #1 [ <required> $req ]
       }
+      - Return [ void ]
     }
-    Function [ <internal:eio> function eio_grp_cancel ] {
+    Function [ <internal:eio> function eio_grp_limit ] {
 
-      - Parameters [1] {
+      - Parameters [2] {
         Parameter #0 [ <required> $grp ]
+        Parameter #1 [ <required> int $limit ]
       }
+      - Return [ void ]
     }
-    Function [ <internal:eio> function eio_grp_limit ] {
+    Function [ <internal:eio> function eio_grp_cancel ] {
 
-      - Parameters [2] {
+      - Parameters [1] {
         Parameter #0 [ <required> $grp ]
-        Parameter #1 [ <required> $limit ]
       }
+      - Return [ void ]
     }
     Function [ <internal:eio> function eio_set_max_poll_time ] {
 
       - Parameters [1] {
-        Parameter #0 [ <required> $nseconds ]
+        Parameter #0 [ <required> float $nseconds ]
       }
+      - Return [ void ]
     }
     Function [ <internal:eio> function eio_set_max_poll_reqs ] {
 
       - Parameters [1] {
-        Parameter #0 [ <required> $nreqs ]
+        Parameter #0 [ <required> int $value ]
       }
+      - Return [ void ]
     }
     Function [ <internal:eio> function eio_set_min_parallel ] {
 
       - Parameters [1] {
-        Parameter #0 [ <required> $nthreads ]
+        Parameter #0 [ <required> int $value ]
       }
+      - Return [ void ]
     }
     Function [ <internal:eio> function eio_set_max_parallel ] {
 
       - Parameters [1] {
-        Parameter #0 [ <required> $nthreads ]
+        Parameter #0 [ <required> int $value ]
       }
+      - Return [ void ]
     }
     Function [ <internal:eio> function eio_set_max_idle ] {
 
       - Parameters [1] {
-        Parameter #0 [ <required> $nthreads ]
+        Parameter #0 [ <required> int $value ]
       }
+      - Return [ void ]
     }
     Function [ <internal:eio> function eio_nthreads ] {
 
       - Parameters [0] {
       }
+      - Return [ int ]
     }
     Function [ <internal:eio> function eio_nreqs ] {
 
       - Parameters [0] {
       }
+      - Return [ int ]
     }
     Function [ <internal:eio> function eio_nready ] {
 
       - Parameters [0] {
       }
+      - Return [ int ]
     }
     Function [ <internal:eio> function eio_npending ] {
 
       - Parameters [0] {
       }
+      - Return [ int ]
     }
     Function [ <internal:eio> function eio_get_event_stream ] {
 
       - Parameters [0] {
       }
     }
+    Function [ <internal:eio> function eio_get_last_error ] {
+
+      - Parameters [1] {
+        Parameter #0 [ <required> $req ]
+      }
+      - Return [ string ]
+    }
   }
 }
 
diff --git a/php-pecl-eio.spec b/php-pecl-eio.spec
index f616311..d7e7017 100644
--- a/php-pecl-eio.spec
+++ b/php-pecl-eio.spec
@@ -1,15 +1,20 @@
 # remirepo spec file for php-pecl-eio
 #
-# Copyright (c) 2013-2021 Remi Collet
-# License: CC-BY-SA
+# Copyright (c) 2013-2023 Remi Collet
+# License: CC-BY-SA-4.0
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
-%scl_package       php-pecl-eio
-%endif
+%{?scl:%scl_package php-pecl-eio}
+
+# Defined in Fedora >= 37 and RHEL >= 10, in PHP >= 7.4 for remirepo
+%{!?__phpize:      %global __phpize       %{_bindir}/phpize}
+%{!?__ztsphpize:   %global __ztsphpize    %{_bindir}/zts-phpize}
+%{!?__phpconfig:   %global __phpconfig    %{_bindir}/php-config}
+%{!?__ztsphpconfig:%global __ztsphpconfig %{_bindir}/zts-php-config}
+
+%bcond_without    tests
 
 %global pecl_name eio
 %global with_zts  0%{!?_without_zts:%{?__ztsphp:1}}
@@ -21,18 +26,21 @@
 %global ini_name  40-%{pecl_name}.ini
 %endif
 
-%global upstream_version 3.0.0
-%global upstream_prever  RC4
+%global upstream_version 3.1.0
+%global upstream_prever  RC1
+%global sources          %{pecl_name}-%{upstream_version}%{?upstream_prever}
+%global _configure       ../%{sources}/configure
 
 #
 # NOTE: bundled libeio (which is retired from Fedora)
 #
 
 Summary:        Provides interface to the libeio library
-Name:           %{?sub_prefix}php-pecl-%{pecl_name}
+Name:           %{?scl_prefix}php-pecl-%{pecl_name}
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
 Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-License:        PHP
+# Extension is PHP-3.01, library is BSD-2-Clause (or GPL-2.0-or-later)
+License:        PHP-3.01 AND BSD-2-Clause
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
@@ -46,39 +54,15 @@ BuildRequires:  %{?scl_prefix}php-posix
 
 Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires:       %{?scl_prefix}php(api) = %{php_core_api}
-%if "%{php_version}" < "5.4"
-# php 5.3.3 in EL-6 don't use arched virtual provides
-# so only requires real packages instead
-Requires:       %{?scl_prefix}php-common%{?_isa}
-%else
 Requires:       %{?scl_prefix}php-sockets%{?_isa}
-%endif
 %{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
 
 Provides:       %{?scl_prefix}php-%{pecl_name} = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-%if "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release}
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
-%endif
 
-%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-%if "%{php_version}" > "7.3"
-Obsoletes:      php73-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.4"
-Obsoletes:      php74-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "8.0"
-Obsoletes:      php80-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "8.1"
-Obsoletes:      php81-pecl-%{pecl_name} <= %{version}
-%endif
-%endif
+Provides:       bundled(libeio)
 
 
 %description
@@ -96,14 +80,15 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 %prep
 %setup -q -c
-mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS
-
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
     %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
     -i package.xml
 
-cd NTS
+cd %{sources}
+
+sed -e 's/3.0.0RC5/%{upstream_version}%{?upstream_prever}/' -i php%(%{__php} -r 'echo PHP_MAJOR_VERSION;')/php_eio.h
+
 # Sanity check, really often broken
 extver=$(sed -n '/define PHP_EIO_VERSION/{s/.* "//;s/".*$//;p}' php%(%{__php} -r 'echo PHP_MAJOR_VERSION;')/php_eio.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -112,9 +97,9 @@ if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
 fi
 cd ..
 
+mkdir NTS
 %if %{with_zts}
-# Duplicate source tree for NTS / ZTS build
-cp -pr NTS ZTS
+mkdir ZTS
 %endif
 
 # Create configuration file
@@ -127,20 +112,21 @@ EOF
 %build
 %{?dtsenable}
 
-cd NTS
-%{_bindir}/phpize
+cd %{sources}
+%{__phpize}
+
+cd ../NTS
 %configure \
     --with-libdir=%{_lib} \
-    --with-php-config=%{_bindir}/php-config
+    --with-php-config=%{__phpconfig}
 
 make %{?_smp_mflags}
 
 %if %{with_zts}
 cd ../ZTS
-%{_bindir}/zts-phpize
 %configure \
     --with-libdir=%{_lib} \
-    --with-php-config=%{_bindir}/zts-php-config
+    --with-php-config=%{__ztsphpconfig}
 
 make %{?_smp_mflags}
 %endif
@@ -164,7 +150,7 @@ install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 %endif
 
 # Documentation
-cd NTS
+cd %{sources}
 for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
 do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
 done
@@ -191,36 +177,34 @@ fi
 
 
 %check
-# Need investigation (output order, erratic results)
-rm ?TS/tests/eio_custom_basic.phpt
-
 DEPMOD=
 [ -f %{php_extdir}/sockets.so ] && DEPMOD="$DEPMOD -d extension=sockets.so"
 [ -f %{php_extdir}/posix.so ]   && DEPMOD="$DEPMOD -d extension=posix.so"
 
 : Minimal load test for NTS extension
-cd NTS
+cd %{sources}
 %{_bindir}/php --no-php-ini \
     $DEPMOD \
     --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
     --modules | grep %{pecl_name}
 
+%if %{with tests}
 : Upstream test suite for NTS extension
-TEST_PHP_EXECUTABLE=%{_bindir}/php \
+TEST_PHP_EXECUTABLE=%{__php} \
 TEST_PHP_ARGS="-n $DEPMOD -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
 NO_INTERACTION=1 \
 REPORT_EXIT_STATUS=1 \
-%{_bindir}/php -n run-tests.php --show-diff
-
+%{__php} -n run-tests.php --show-diff
+%endif
 
 %if %{with_zts}
 : Minimal load test for ZTS extension
-cd ../ZTS
 %{__ztsphp} --no-php-ini \
     $DEPMOD \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
     --modules | grep %{pecl_name}
 
+%if %{with tests}
 : Upstream test suite for ZTS extension
 TEST_PHP_EXECUTABLE=%{__ztsphp} \
 TEST_PHP_ARGS="-n $DEPMOD -d extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so" \
@@ -228,10 +212,11 @@ NO_INTERACTION=1 \
 REPORT_EXIT_STATUS=1 \
 %{__ztsphp} -n run-tests.php --show-diff
 %endif
+%endif
 
 
 %files
-%{?_licensedir:%license NTS/LICENSE}
+%{?_licensedir:%license %{sources}/LICENSE}
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -245,6 +230,10 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Thu Jun  1 2023 Remi Collet <remi@remirepo.net> - 3.1.0~RC1-1
+- update to 3.1.0RC1
+- build out of sources tree
+
 * Tue Sep 21 2021 Remi Collet <remi@remirepo.net> - 3.0.0~RC4-1
 - update to 3.0.0RC4 (no change)
 - drop patch merged upstream