From 9cfc49a40233f0e2d3d21cc04410bb5fe13a72ff Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 16 Dec 2021 08:45:28 +0100
Subject: update to 3.3.4

drop patch merged upstream
---
 PHPINFO           |   2 +-
 REFLECTION        | 869 ++++++++++++++++++++++++++++++++++++------------------
 php-pecl-yaf.spec |  25 +-
 yaf-php81.patch   | 559 -----------------------------------
 4 files changed, 584 insertions(+), 871 deletions(-)
 delete mode 100644 yaf-php81.patch

diff --git a/PHPINFO b/PHPINFO
index fe57f36..ef065c8 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 yaf
 
 yaf support => enabled
-Version => 3.3.3
+Version => 3.3.4
 Supports => http://pecl.php.net/package/yaf
 
 Directive => Local Value => Master Value
diff --git a/REFLECTION b/REFLECTION
index 0d8a3f4..d8cd5cd 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
+Extension [ <persistent> extension #120 yaf version 3.3.4 ] {
 
   - Dependencies {
     Dependency [ spl (Required) ]
@@ -37,7 +37,7 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
   }
 
   - Constants [13] {
-    Constant [ string YAF_VERSION ] { 3.3.3 }
+    Constant [ string YAF_VERSION ] { 3.3.4 }
     Constant [ string YAF_ENVIRON ] { product }
     Constant [ int YAF_ERR_STARTUP_FAILED ] { 512 }
     Constant [ int YAF_ERR_ROUTE_FAILED ] { 513 }
@@ -66,6 +66,7 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
       }
 
@@ -76,8 +77,8 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf, ctor> public method __construct ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $config ]
-            Parameter #1 [ <optional> $environ = <default> ]
+            Parameter #0 [ <required> array|string $config ]
+            Parameter #1 [ <optional> string $environ = NULL ]
           }
         }
 
@@ -85,82 +86,93 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [0] {
           }
+          - Return [ object|false ]
         }
 
         Method [ <internal:yaf> public method execute ] {
 
-          - Parameters [2] {
-            Parameter #0 [ <required> $entry ]
-            Parameter #1 [ <required> $... ]
+          - Parameters [1] {
+            Parameter #0 [ <required> mixed $callback ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method environ ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method bootstrap ] {
 
-          - Parameters [1] {
-            Parameter #0 [ <optional> $bootstrap = <default> ]
+          - Parameters [0] {
           }
+          - Return [ object|false|null ]
         }
 
         Method [ <internal:yaf> public method getConfig ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method getModules ] {
 
           - Parameters [0] {
           }
+          - Return [ ?array ]
         }
 
         Method [ <internal:yaf> public method getDispatcher ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method setAppDirectory ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $directory ]
+            Parameter #0 [ <required> string $directory ]
           }
+          - Return [ object|false|null ]
         }
 
         Method [ <internal:yaf> public method getAppDirectory ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method getLastErrorNo ] {
 
           - Parameters [0] {
           }
+          - Return [ ?int ]
         }
 
         Method [ <internal:yaf> public method getLastErrorMsg ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method clearLastError ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method getInstance ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
       }
     }
@@ -196,6 +208,7 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
       }
 
@@ -213,161 +226,185 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method disableView ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method initView ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $templates_dir ]
-            Parameter #1 [ <optional> ?array $options = <default> ]
+            Parameter #0 [ <required> string $templates_dir ]
+            Parameter #1 [ <optional> array $options = NULL ]
           }
+          - Return [ object|false|null ]
         }
 
         Method [ <internal:yaf> public method setView ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $view ]
+            Parameter #0 [ <required> object $view ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method setRequest ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $request ]
+            Parameter #0 [ <required> object $request ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method setResponse ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $response ]
+            Parameter #0 [ <required> object $response ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method getApplication ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method getRouter ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method getResponse ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method getRequest ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method getDefaultModule ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method getDefaultController ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method getDefaultAction ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method setErrorHandler ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $callback ]
-            Parameter #1 [ <optional> $error_types = <default> ]
+            Parameter #0 [ <required> mixed $callback ]
+            Parameter #1 [ <optional> int $error_types = 0 ]
           }
+          - Return [ object|false|null ]
         }
 
         Method [ <internal:yaf> public method setDefaultModule ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $module ]
+            Parameter #0 [ <required> string $module ]
           }
+          - Return [ object|false|null ]
         }
 
         Method [ <internal:yaf> public method setDefaultController ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $controller ]
+            Parameter #0 [ <required> string $controller ]
           }
+          - Return [ object|false|null ]
         }
 
         Method [ <internal:yaf> public method setDefaultAction ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $action ]
+            Parameter #0 [ <required> string $action ]
           }
+          - Return [ object|false|null ]
         }
 
         Method [ <internal:yaf> public method returnResponse ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $flag ]
+            Parameter #0 [ <optional> bool $flag = false ]
           }
+          - Return [ object|false|null ]
         }
 
         Method [ <internal:yaf> public method autoRender ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $flag = <default> ]
+            Parameter #0 [ <optional> ?bool $flag = NULL ]
           }
+          - Return [ object|bool|null ]
         }
 
         Method [ <internal:yaf> public method flushInstantly ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $flag = <default> ]
+            Parameter #0 [ <optional> ?bool $flag = NULL ]
           }
+          - Return [ object|bool|null ]
         }
 
         Method [ <internal:yaf> public method dispatch ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $request ]
+            Parameter #0 [ <required> object $request ]
           }
+          - Return [ object|false|null ]
         }
 
         Method [ <internal:yaf> public method throwException ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $flag = <default> ]
+            Parameter #0 [ <optional> ?bool $flag = NULL ]
           }
+          - Return [ object|bool|null ]
         }
 
         Method [ <internal:yaf> public method catchException ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $flag = <default> ]
+            Parameter #0 [ <optional> ?bool $flag = NULL ]
           }
+          - Return [ object|bool|null ]
         }
 
         Method [ <internal:yaf> public method registerPlugin ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $plugin ]
+            Parameter #0 [ <required> object $plugin ]
           }
+          - Return [ object|false|null ]
         }
       }
     }
@@ -500,264 +537,303 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> public method isPost ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> public method isDelete ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> public method isPatch ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> public method isPut ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> public method isHead ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> public method isOptions ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> public method isCli ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> public method isXmlHttpRequest ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> public method getQuery ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method getRequest ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method getPost ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method getCookie ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method getRaw ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method getFiles ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method get ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method getServer ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method getEnv ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method setParam ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <optional> $value = <default> ]
+            Parameter #0 [ <required> mixed $name ]
+            Parameter #1 [ <optional> mixed $value = NULL ]
           }
+          - Return [ object|bool|null ]
         }
 
         Method [ <internal:yaf> public method getParam ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method getParams ] {
 
           - Parameters [0] {
           }
+          - Return [ ?array ]
         }
 
         Method [ <internal:yaf> public method clearParams ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method getException ] {
 
           - Parameters [0] {
           }
+          - Return [ ?Exception ]
         }
 
         Method [ <internal:yaf> public method getModuleName ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method getControllerName ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method getActionName ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method setModuleName ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $module ]
-            Parameter #1 [ <optional> $format_name = <default> ]
+            Parameter #0 [ <required> string $module ]
+            Parameter #1 [ <optional> bool $format_name = true ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method setControllerName ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $controller ]
-            Parameter #1 [ <optional> $format_name = <default> ]
+            Parameter #0 [ <required> string $controller ]
+            Parameter #1 [ <optional> bool $format_name = true ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method setActionName ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $action ]
-            Parameter #1 [ <optional> $format_name = <default> ]
+            Parameter #0 [ <required> string $action ]
+            Parameter #1 [ <optional> bool $format_name = true ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method getMethod ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method getLanguage ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method setBaseUri ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $uri ]
+            Parameter #0 [ <required> string $uir ]
           }
+          - Return [ object|false ]
         }
 
         Method [ <internal:yaf> public method getBaseUri ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method getRequestUri ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method setRequestUri ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $uri ]
+            Parameter #0 [ <required> string $uir ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> final public method isDispatched ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> final public method setDispatched ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $dispatched ]
+            Parameter #0 [ <optional> bool $flag = true ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> final public method isRouted ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> final public method setRouted ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $flag ]
+            Parameter #0 [ <optional> bool $flag = true ]
           }
+          - Return [ ?object ]
         }
       }
     }
@@ -780,8 +856,8 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf, ctor> public method __construct ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $request_uri = <default> ]
-            Parameter #1 [ <optional> $base_uri = <default> ]
+            Parameter #0 [ <optional> ?string $requestUri = NULL ]
+            Parameter #1 [ <optional> ?string $baseUri = NULL ]
           }
         }
 
@@ -789,264 +865,303 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isPost ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isDelete ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isPatch ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isPut ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isHead ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isOptions ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isCli ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isXmlHttpRequest ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getQuery ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getRequest ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getPost ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getCookie ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getRaw ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getFiles ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method get ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getServer ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getEnv ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method setParam ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <optional> $value = <default> ]
+            Parameter #0 [ <required> mixed $name ]
+            Parameter #1 [ <optional> mixed $value = NULL ]
           }
+          - Return [ object|bool|null ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getParam ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getParams ] {
 
           - Parameters [0] {
           }
+          - Return [ ?array ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method clearParams ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getException ] {
 
           - Parameters [0] {
           }
+          - Return [ ?Exception ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getModuleName ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getControllerName ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getActionName ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method setModuleName ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $module ]
-            Parameter #1 [ <optional> $format_name = <default> ]
+            Parameter #0 [ <required> string $module ]
+            Parameter #1 [ <optional> bool $format_name = true ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method setControllerName ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $controller ]
-            Parameter #1 [ <optional> $format_name = <default> ]
+            Parameter #0 [ <required> string $controller ]
+            Parameter #1 [ <optional> bool $format_name = true ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method setActionName ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $action ]
-            Parameter #1 [ <optional> $format_name = <default> ]
+            Parameter #0 [ <required> string $action ]
+            Parameter #1 [ <optional> bool $format_name = true ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getMethod ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getLanguage ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method setBaseUri ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $uri ]
+            Parameter #0 [ <required> string $uir ]
           }
+          - Return [ object|false ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getBaseUri ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getRequestUri ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method setRequestUri ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $uri ]
+            Parameter #0 [ <required> string $uir ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> final public method isDispatched ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> final public method setDispatched ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $dispatched ]
+            Parameter #0 [ <optional> bool $flag = true ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> final public method isRouted ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> final public method setRouted ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $flag ]
+            Parameter #0 [ <optional> bool $flag = true ]
           }
+          - Return [ ?object ]
         }
       }
     }
@@ -1071,11 +1186,11 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf, ctor> public method __construct ] {
 
           - Parameters [5] {
-            Parameter #0 [ <optional> $method = <default> ]
-            Parameter #1 [ <optional> $module = <default> ]
-            Parameter #2 [ <optional> $controller = <default> ]
-            Parameter #3 [ <optional> $action = <default> ]
-            Parameter #4 [ <optional> $params = <default> ]
+            Parameter #0 [ <optional> ?string $method = NULL ]
+            Parameter #1 [ <optional> ?string $module = NULL ]
+            Parameter #2 [ <optional> ?string $controller = NULL ]
+            Parameter #3 [ <optional> ?string $action = NULL ]
+            Parameter #4 [ <optional> ?array $params = NULL ]
           }
         }
 
@@ -1083,264 +1198,303 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isGet ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isPost ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isDelete ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isPatch ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isPut ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isHead ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isOptions ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method isCli ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getQuery ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getRequest ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getPost ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getCookie ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getRaw ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getFiles ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method get ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getServer ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getEnv ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method setParam ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <optional> $value = <default> ]
+            Parameter #0 [ <required> mixed $name ]
+            Parameter #1 [ <optional> mixed $value = NULL ]
           }
+          - Return [ object|bool|null ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getParam ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $name = <default> ]
-            Parameter #1 [ <optional> $default = <default> ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getParams ] {
 
           - Parameters [0] {
           }
+          - Return [ ?array ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method clearParams ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getException ] {
 
           - Parameters [0] {
           }
+          - Return [ ?Exception ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getModuleName ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getControllerName ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getActionName ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method setModuleName ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $module ]
-            Parameter #1 [ <optional> $format_name = <default> ]
+            Parameter #0 [ <required> string $module ]
+            Parameter #1 [ <optional> bool $format_name = true ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method setControllerName ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $controller ]
-            Parameter #1 [ <optional> $format_name = <default> ]
+            Parameter #0 [ <required> string $controller ]
+            Parameter #1 [ <optional> bool $format_name = true ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method setActionName ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $action ]
-            Parameter #1 [ <optional> $format_name = <default> ]
+            Parameter #0 [ <required> string $action ]
+            Parameter #1 [ <optional> bool $format_name = true ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getMethod ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getLanguage ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method setBaseUri ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $uri ]
+            Parameter #0 [ <required> string $uir ]
           }
+          - Return [ object|false ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getBaseUri ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method getRequestUri ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> public method setRequestUri ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $uri ]
+            Parameter #0 [ <required> string $uir ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> final public method isDispatched ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> final public method setDispatched ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $dispatched ]
+            Parameter #0 [ <optional> bool $flag = true ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> final public method isRouted ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Request_Abstract> final public method setRouted ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $flag ]
+            Parameter #0 [ <optional> bool $flag = true ]
           }
+          - Return [ ?object ]
         }
       }
     }
@@ -1378,7 +1532,7 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> $body ]
-            Parameter #1 [ <optional> $name = <default> ]
+            Parameter #1 [ <optional> $name = NULL ]
           }
         }
 
@@ -1386,7 +1540,7 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> $body ]
-            Parameter #1 [ <optional> $name = <default> ]
+            Parameter #1 [ <optional> $name = NULL ]
           }
         }
 
@@ -1394,22 +1548,23 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> $body ]
-            Parameter #1 [ <optional> $name = <default> ]
+            Parameter #1 [ <optional> $name = NULL ]
           }
         }
 
         Method [ <internal:yaf> public method clearBody ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <optional> $name = NULL ]
           }
         }
 
         Method [ <internal:yaf> public method getBody ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method response ] {
@@ -1439,44 +1594,50 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf> public method setHeader ] {
 
           - Parameters [4] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
-            Parameter #2 [ <optional> $rep = <default> ]
-            Parameter #3 [ <optional> $response_code = <default> ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> string $value ]
+            Parameter #2 [ <optional> bool $replace = 0 ]
+            Parameter #3 [ <optional> int $response_code = 0 ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf> public method setAllHeaders ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $headers ]
+            Parameter #0 [ <required> array $headers ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf> public method getHeader ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method clearHeaders ] {
 
           - Parameters [0] {
           }
+          - Return [ object|false|null ]
         }
 
         Method [ <internal:yaf> public method setRedirect ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $url ]
+            Parameter #0 [ <required> string $url ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf, overwrites Yaf_Response_Abstract, prototype Yaf_Response_Abstract> public method response ] {
 
           - Parameters [0] {
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Response_Abstract, ctor> public method __construct ] {
@@ -1496,7 +1657,7 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> $body ]
-            Parameter #1 [ <optional> $name = <default> ]
+            Parameter #1 [ <optional> $name = NULL ]
           }
         }
 
@@ -1504,7 +1665,7 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> $body ]
-            Parameter #1 [ <optional> $name = <default> ]
+            Parameter #1 [ <optional> $name = NULL ]
           }
         }
 
@@ -1512,22 +1673,23 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> $body ]
-            Parameter #1 [ <optional> $name = <default> ]
+            Parameter #1 [ <optional> $name = NULL ]
           }
         }
 
         Method [ <internal:yaf, inherits Yaf_Response_Abstract> public method clearBody ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <optional> $name = NULL ]
           }
         }
 
         Method [ <internal:yaf, inherits Yaf_Response_Abstract> public method getBody ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
           }
+          - Return [ mixed ]
         }
       }
     }
@@ -1565,7 +1727,7 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> $body ]
-            Parameter #1 [ <optional> $name = <default> ]
+            Parameter #1 [ <optional> $name = NULL ]
           }
         }
 
@@ -1573,7 +1735,7 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> $body ]
-            Parameter #1 [ <optional> $name = <default> ]
+            Parameter #1 [ <optional> $name = NULL ]
           }
         }
 
@@ -1581,22 +1743,23 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> $body ]
-            Parameter #1 [ <optional> $name = <default> ]
+            Parameter #1 [ <optional> $name = NULL ]
           }
         }
 
         Method [ <internal:yaf, inherits Yaf_Response_Abstract> public method clearBody ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <optional> $name = NULL ]
           }
         }
 
         Method [ <internal:yaf, inherits Yaf_Response_Abstract> public method getBody ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Response_Abstract> public method response ] {
@@ -1624,108 +1787,118 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
       - Methods [15] {
         Method [ <internal:yaf, ctor> public method __construct ] {
 
-          - Parameters [4] {
-            Parameter #0 [ <required> $request ]
-            Parameter #1 [ <required> $response ]
-            Parameter #2 [ <required> $view ]
-            Parameter #3 [ <optional> ?array $args = <default> ]
+          - Parameters [0] {
           }
         }
 
         Method [ <internal:yaf> protected method render ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $tpl ]
-            Parameter #1 [ <optional> ?array $parameters = <default> ]
+            Parameter #0 [ <required> string $tpl ]
+            Parameter #1 [ <optional> array $parameters = NULL ]
           }
+          - Return [ string|bool|null ]
         }
 
         Method [ <internal:yaf> protected method display ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $tpl ]
-            Parameter #1 [ <optional> ?array $parameters = <default> ]
+            Parameter #0 [ <required> string $tpl ]
+            Parameter #1 [ <optional> array $parameters = NULL ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf> public method getRequest ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method getResponse ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method getView ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method getName ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method getModuleName ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method initView ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> ?array $options = <default> ]
+            Parameter #0 [ <optional> array $options = NULL ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method setViewpath ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $view_directory ]
+            Parameter #0 [ <required> string $view_directory ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf> public method getViewpath ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method forward ] {
 
           - Parameters [4] {
-            Parameter #0 [ <required> $module ]
-            Parameter #1 [ <optional> $controller = <default> ]
-            Parameter #2 [ <optional> $action = <default> ]
-            Parameter #3 [ <optional> ?array $parameters = <default> ]
+            Parameter #0 [ <required> mixed $args1 ]
+            Parameter #1 [ <optional> mixed $args2 = NULL ]
+            Parameter #2 [ <optional> mixed $args3 = NULL ]
+            Parameter #3 [ <optional> mixed $args4 = NULL ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf> public method redirect ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $url ]
+            Parameter #0 [ <required> string $url ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf> public method getInvokeArgs ] {
 
           - Parameters [0] {
           }
+          - Return [ ?array ]
         }
 
         Method [ <internal:yaf> public method getInvokeArg ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ ?string ]
         }
       }
     }
@@ -1756,118 +1929,130 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method getControllerName ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract, ctor> public method __construct ] {
 
-          - Parameters [4] {
-            Parameter #0 [ <required> $request ]
-            Parameter #1 [ <required> $response ]
-            Parameter #2 [ <required> $view ]
-            Parameter #3 [ <optional> ?array $args = <default> ]
+          - Parameters [0] {
           }
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract> protected method render ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $tpl ]
-            Parameter #1 [ <optional> ?array $parameters = <default> ]
+            Parameter #0 [ <required> string $tpl ]
+            Parameter #1 [ <optional> array $parameters = NULL ]
           }
+          - Return [ string|bool|null ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract> protected method display ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $tpl ]
-            Parameter #1 [ <optional> ?array $parameters = <default> ]
+            Parameter #0 [ <required> string $tpl ]
+            Parameter #1 [ <optional> array $parameters = NULL ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract> public method getRequest ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract> public method getResponse ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract> public method getView ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract> public method getName ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract> public method getModuleName ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract> public method initView ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> ?array $options = <default> ]
+            Parameter #0 [ <optional> array $options = NULL ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract> public method setViewpath ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $view_directory ]
+            Parameter #0 [ <required> string $view_directory ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract> public method getViewpath ] {
 
           - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract> public method forward ] {
 
           - Parameters [4] {
-            Parameter #0 [ <required> $module ]
-            Parameter #1 [ <optional> $controller = <default> ]
-            Parameter #2 [ <optional> $action = <default> ]
-            Parameter #3 [ <optional> ?array $parameters = <default> ]
+            Parameter #0 [ <required> mixed $args1 ]
+            Parameter #1 [ <optional> mixed $args2 = NULL ]
+            Parameter #2 [ <optional> mixed $args3 = NULL ]
+            Parameter #3 [ <optional> mixed $args4 = NULL ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract> public method redirect ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $url ]
+            Parameter #0 [ <required> string $url ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract> public method getInvokeArgs ] {
 
           - Parameters [0] {
           }
+          - Return [ ?array ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Controller_Abstract> public method getInvokeArg ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ ?string ]
         }
       }
     }
@@ -1890,107 +2075,123 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf> public method get ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <optional> ?string $name = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, prototype Countable> public method count ] {
 
           - Parameters [0] {
           }
+          - Return [ int ]
         }
 
         Method [ <internal:yaf> public method toArray ] {
 
           - Parameters [0] {
           }
+          - Return [ array ]
         }
 
         Method [ <internal:yaf, prototype ArrayAccess> public method offsetUnset ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> mixed $name ]
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf, prototype Iterator> public method rewind ] {
 
           - Parameters [0] {
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf, prototype Iterator> public method current ] {
 
           - Parameters [0] {
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, prototype Iterator> public method key ] {
 
           - Parameters [0] {
           }
+          - Return [ string|int|bool|null ]
         }
 
         Method [ <internal:yaf, prototype Iterator> public method next ] {
 
           - Parameters [0] {
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf, prototype Iterator> public method valid ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> public method __isset ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> public method __get ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, prototype ArrayAccess> public method offsetGet ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <required> mixed $name ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, prototype ArrayAccess> public method offsetExists ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> mixed $name ]
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, prototype ArrayAccess> abstract public method offsetSet ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
+            Parameter #0 [ <required> mixed $name ]
+            Parameter #1 [ <required> mixed $value ]
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf> abstract public method set ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> mixed $value ]
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> abstract public method readonly ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
       }
     }
@@ -2013,123 +2214,140 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf, ctor> public method __construct ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $config_file ]
-            Parameter #1 [ <optional> $section = <default> ]
+            Parameter #0 [ <required> array|string $config_file ]
+            Parameter #1 [ <optional> ?string $section = NULL ]
           }
         }
 
         Method [ <internal:yaf, overwrites Yaf_Config_Abstract, prototype Yaf_Config_Abstract> public method get ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <optional> ?string $name = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, overwrites Yaf_Config_Abstract, prototype Yaf_Config_Abstract> public method set ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> mixed $value ]
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, overwrites Yaf_Config_Abstract, prototype Yaf_Config_Abstract> public method readonly ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, overwrites Yaf_Config_Abstract, prototype ArrayAccess> public method offsetGet ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <required> mixed $name ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, overwrites Yaf_Config_Abstract, prototype ArrayAccess> public method offsetSet ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
+            Parameter #0 [ <required> mixed $name ]
+            Parameter #1 [ <required> mixed $value ]
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf> public method __set ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
+            Parameter #0 [ <required> mixed $name ]
+            Parameter #1 [ <required> mixed $value ]
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype Countable> public method count ] {
 
           - Parameters [0] {
           }
+          - Return [ int ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract> public method toArray ] {
 
           - Parameters [0] {
           }
+          - Return [ array ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype ArrayAccess> public method offsetUnset ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> mixed $name ]
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype Iterator> public method rewind ] {
 
           - Parameters [0] {
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype Iterator> public method current ] {
 
           - Parameters [0] {
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype Iterator> public method key ] {
 
           - Parameters [0] {
           }
+          - Return [ string|int|bool|null ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype Iterator> public method next ] {
 
           - Parameters [0] {
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype Iterator> public method valid ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract> public method __isset ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract> public method __get ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype ArrayAccess> public method offsetExists ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> mixed $name ]
           }
+          - Return [ bool ]
         }
       }
     }
@@ -2152,123 +2370,140 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf, ctor> public method __construct ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $config ]
-            Parameter #1 [ <optional> $readonly = <default> ]
+            Parameter #0 [ <required> array|string $config_file ]
+            Parameter #1 [ <optional> ?string $section = NULL ]
           }
         }
 
         Method [ <internal:yaf, overwrites Yaf_Config_Abstract, prototype Yaf_Config_Abstract> public method set ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> mixed $value ]
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, overwrites Yaf_Config_Abstract, prototype Yaf_Config_Abstract> public method readonly ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, overwrites Yaf_Config_Abstract, prototype ArrayAccess> public method offsetUnset ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> mixed $name ]
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf> public method __set ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> mixed $value ]
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf, overwrites Yaf_Config_Abstract, prototype ArrayAccess> public method offsetSet ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
+            Parameter #0 [ <required> mixed $name ]
+            Parameter #1 [ <required> mixed $value ]
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract> public method get ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <optional> ?string $name = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype Countable> public method count ] {
 
           - Parameters [0] {
           }
+          - Return [ int ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract> public method toArray ] {
 
           - Parameters [0] {
           }
+          - Return [ array ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype Iterator> public method rewind ] {
 
           - Parameters [0] {
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype Iterator> public method current ] {
 
           - Parameters [0] {
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype Iterator> public method key ] {
 
           - Parameters [0] {
           }
+          - Return [ string|int|bool|null ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype Iterator> public method next ] {
 
           - Parameters [0] {
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype Iterator> public method valid ] {
 
           - Parameters [0] {
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract> public method __isset ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract> public method __get ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype ArrayAccess> public method offsetGet ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <required> mixed $name ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, inherits Yaf_Config_Abstract, prototype ArrayAccess> public method offsetExists ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> mixed $name ]
           }
+          - Return [ bool ]
         }
       }
     }
@@ -2291,38 +2526,37 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf> abstract public method assign ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <optional> $value = <default> ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <optional> mixed $value = NULL ]
           }
         }
 
         Method [ <internal:yaf> abstract public method display ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $tpl ]
-            Parameter #1 [ <optional> $tpl_vars = <default> ]
+            Parameter #0 [ <required> string $tpl ]
+            Parameter #1 [ <optional> array $tpl_vars = NULL ]
           }
         }
 
         Method [ <internal:yaf> abstract public method render ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $tpl ]
-            Parameter #1 [ <optional> $tpl_vars = <default> ]
+            Parameter #0 [ <required> string $tpl ]
+            Parameter #1 [ <optional> array $tpl_vars = NULL ]
           }
         }
 
         Method [ <internal:yaf> abstract public method setScriptPath ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $template_dir ]
+            Parameter #0 [ <required> string $template_dir ]
           }
         }
 
         Method [ <internal:yaf> abstract public method getScriptPath ] {
 
-          - Parameters [1] {
-            Parameter #0 [ <optional> $request = <default> ]
+          - Parameters [0] {
           }
         }
       }
@@ -2346,92 +2580,102 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf, ctor> final public method __construct ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $template_dir ]
-            Parameter #1 [ <optional> ?array $options = <default> ]
+            Parameter #0 [ <required> string $tempalte_dir ]
+            Parameter #1 [ <optional> array $options = NULL ]
           }
         }
 
         Method [ <internal:yaf> public method get ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, prototype Yaf_View_Interface> public method assign ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <optional> $value = <default> ]
+            Parameter #0 [ <optional> mixed $name = NULL ]
+            Parameter #1 [ <optional> mixed $default = NULL ]
           }
+          - Return [ object|false|null ]
         }
 
         Method [ <internal:yaf, prototype Yaf_View_Interface> public method render ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $tpl ]
-            Parameter #1 [ <optional> $tpl_vars = <default> ]
+            Parameter #0 [ <required> string $tpl ]
+            Parameter #1 [ <optional> ?array $tpl_vars = NULL ]
           }
+          - Return [ string|false|null ]
         }
 
         Method [ <internal:yaf> public method eval ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $tpl_str ]
-            Parameter #1 [ <optional> $vars = <default> ]
+            Parameter #0 [ <required> string $tpl_str ]
+            Parameter #1 [ <optional> ?array $vars = NULL ]
           }
+          - Return [ string|false|null ]
         }
 
         Method [ <internal:yaf, prototype Yaf_View_Interface> public method display ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $tpl ]
-            Parameter #1 [ <optional> $tpl_vars = <default> ]
+            Parameter #0 [ <required> string $tpl ]
+            Parameter #1 [ <optional> ?array $tpl_vars = NULL ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf> public method assignRef ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> &$value ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> mixed &$value ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method clear ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf, prototype Yaf_View_Interface> public method setScriptPath ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $template_dir ]
+            Parameter #0 [ <required> string $template_dir ]
           }
+          - Return [ object|bool|null ]
         }
 
         Method [ <internal:yaf, prototype Yaf_View_Interface> public method getScriptPath ] {
 
-          - Parameters [1] {
-            Parameter #0 [ <optional> $request = <default> ]
+          - Parameters [0] {
           }
+          - Return [ ?string ]
         }
 
         Method [ <internal:yaf> public method __get ] {
 
           - Parameters [1] {
-            Parameter #0 [ <optional> $name = <default> ]
+            Parameter #0 [ <optional> string $name = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method __set ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <optional> $value = <default> ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> mixed $value ]
           }
+          - Return [ void ]
         }
       }
     }
@@ -2460,42 +2704,48 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf> public method addRoute ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $route ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> object $route ]
           }
+          - Return [ ?object ]
         }
 
         Method [ <internal:yaf> public method addConfig ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $config ]
+            Parameter #0 [ <required> object|array $config ]
           }
+          - Return [ object|false|null ]
         }
 
         Method [ <internal:yaf> public method route ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $request ]
+            Parameter #0 [ <required> object $request ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf> public method getRoute ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ object|false|null ]
         }
 
         Method [ <internal:yaf> public method getRoutes ] {
 
           - Parameters [0] {
           }
+          - Return [ ?array ]
         }
 
         Method [ <internal:yaf> public method getCurrentRoute ] {
 
           - Parameters [0] {
           }
+          - Return [ string|int|null ]
         }
       }
     }
@@ -2526,7 +2776,7 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> array $info ]
-            Parameter #1 [ <optional> ?array $query = <default> ]
+            Parameter #1 [ <optional> array $query = NULL ]
           }
         }
       }
@@ -2550,8 +2800,9 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf> public method match ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $uri ]
+            Parameter #0 [ <required> string $uri ]
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf, prototype Yaf_Route_Interface> public method route ] {
@@ -2565,8 +2816,9 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> array $info ]
-            Parameter #1 [ <optional> ?array $query = <default> ]
+            Parameter #1 [ <optional> array $query = NULL ]
           }
+          - Return [ string|false|null ]
         }
       }
     }
@@ -2589,9 +2841,9 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf, ctor> public method __construct ] {
 
           - Parameters [3] {
-            Parameter #0 [ <required> $module_name ]
-            Parameter #1 [ <required> $controller_name ]
-            Parameter #2 [ <required> $action_name ]
+            Parameter #0 [ <required> string $module_name ]
+            Parameter #1 [ <required> string $controller_name ]
+            Parameter #2 [ <required> string $action_name ]
           }
         }
 
@@ -2606,8 +2858,9 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> array $info ]
-            Parameter #1 [ <optional> ?array $query = <default> ]
+            Parameter #1 [ <optional> array $query = NULL ]
           }
+          - Return [ string|false|null ]
         }
       }
     }
@@ -2630,7 +2883,7 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf, ctor> public method __construct ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $supervar_name ]
+            Parameter #0 [ <required> string $supervar_name ]
           }
         }
 
@@ -2645,8 +2898,9 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> array $info ]
-            Parameter #1 [ <optional> ?array $query = <default> ]
+            Parameter #1 [ <optional> array $query = NULL ]
           }
+          - Return [ string|false|null ]
         }
       }
     }
@@ -2669,17 +2923,18 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf, ctor> public method __construct ] {
 
           - Parameters [3] {
-            Parameter #0 [ <required> $match ]
+            Parameter #0 [ <required> string $match ]
             Parameter #1 [ <required> array $route ]
-            Parameter #2 [ <optional> ?array $verify = <default> ]
+            Parameter #2 [ <optional> array $verify = NULL ]
           }
         }
 
         Method [ <internal:yaf> public method match ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $uri ]
+            Parameter #0 [ <required> string $uri ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf, prototype Yaf_Route_Interface> public method route ] {
@@ -2693,8 +2948,9 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> array $info ]
-            Parameter #1 [ <optional> ?array $query = <default> ]
+            Parameter #1 [ <optional> array $query = NULL ]
           }
+          - Return [ string|false|null ]
         }
       }
     }
@@ -2717,19 +2973,20 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf, ctor> public method __construct ] {
 
           - Parameters [5] {
-            Parameter #0 [ <required> $match ]
+            Parameter #0 [ <required> string $match ]
             Parameter #1 [ <required> array $route ]
-            Parameter #2 [ <optional> ?array $map = <default> ]
-            Parameter #3 [ <optional> ?array $verify = <default> ]
-            Parameter #4 [ <optional> $reverse = <default> ]
+            Parameter #2 [ <optional> array $map = NULL ]
+            Parameter #3 [ <optional> array $verify = NULL ]
+            Parameter #4 [ <optional> string $reverse = NULL ]
           }
         }
 
         Method [ <internal:yaf> public method match ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $uri ]
+            Parameter #0 [ <required> string $uri ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf, prototype Yaf_Route_Interface> public method route ] {
@@ -2743,8 +3000,9 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> array $info ]
-            Parameter #1 [ <optional> ?array $query = <default> ]
+            Parameter #1 [ <optional> array $query = NULL ]
           }
+          - Return [ string|false|null ]
         }
       }
     }
@@ -2767,8 +3025,8 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf, ctor> public method __construct ] {
 
           - Parameters [2] {
-            Parameter #0 [ <optional> $controller_prefer = <default> ]
-            Parameter #1 [ <optional> $delimiter = <default> ]
+            Parameter #0 [ <optional> bool $controller_prefer = 1 ]
+            Parameter #1 [ <optional> string $delimiter = "" ]
           }
         }
 
@@ -2783,8 +3041,9 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [2] {
             Parameter #0 [ <required> array $info ]
-            Parameter #1 [ <optional> ?array $query = <default> ]
+            Parameter #1 [ <optional> array $query = NULL ]
           }
+          - Return [ string|false|null ]
         }
       }
     }
@@ -2874,30 +3133,34 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
         Method [ <internal:yaf> static public method get ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> static public method has ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf> static public method set ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> mixed $value ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf> static public method del ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ ?bool ]
         }
       }
 
@@ -2926,6 +3189,7 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [0] {
           }
+          - Return [ ?object ]
         }
       }
 
@@ -2943,105 +3207,120 @@ Extension [ <persistent> extension #120 yaf version 3.3.3 ] {
 
           - Parameters [0] {
           }
+          - Return [ object ]
         }
 
         Method [ <internal:yaf> public method get ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <optional> string $name = NULL ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method has ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf> public method set ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> mixed $value ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf> public method del ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ ?bool ]
         }
 
         Method [ <internal:yaf, prototype Countable> public method count ] {
 
           - Parameters [0] {
           }
+          - Return [ int ]
         }
 
         Method [ <internal:yaf> public method clear ] {
 
           - Parameters [0] {
           }
+          - Return [ object|false|null ]
         }
 
         Method [ <internal:yaf, prototype ArrayAccess> public method offsetGet ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> mixed $name ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf, prototype ArrayAccess> public method offsetSet ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
+            Parameter #0 [ <required> mixed $name ]
+            Parameter #1 [ <required> mixed $value ]
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf, prototype ArrayAccess> public method offsetExists ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> mixed $name ]
           }
+          - Return [ bool ]
         }
 
-        Method [ <internal:yaf, prototype ArrayAccess> public method offsetUnset ] {
+        Method [ <internal:yaf, prototype ArrayAccess> public method offsetUnSet ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> mixed $name ]
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf> public method __get ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ mixed ]
         }
 
         Method [ <internal:yaf> public method __isset ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ bool ]
         }
 
         Method [ <internal:yaf> public method __set ] {
 
           - Parameters [2] {
-            Parameter #0 [ <required> $name ]
-            Parameter #1 [ <required> $value ]
+            Parameter #0 [ <required> string $name ]
+            Parameter #1 [ <required> mixed $value ]
           }
+          - Return [ void ]
         }
 
         Method [ <internal:yaf> public method __unset ] {
 
           - Parameters [1] {
-            Parameter #0 [ <required> $name ]
+            Parameter #0 [ <required> string $name ]
           }
+          - Return [ void ]
         }
 
         Method [ <internal:Core, inherits Iterator> abstract public method current ] {
diff --git a/php-pecl-yaf.spec b/php-pecl-yaf.spec
index 73adad2..9ae4bc9 100644
--- a/php-pecl-yaf.spec
+++ b/php-pecl-yaf.spec
@@ -11,7 +11,6 @@
 %undefine _strict_symbol_defs_build
 
 %if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
 %scl_package       php-pecl-yaf
 %endif
 
@@ -25,21 +24,19 @@
 %global ini_name    40-%{pecl_name}.ini
 
 Summary:       Yet Another Framework
-Name:          %{?sub_prefix}php-pecl-yaf
-Version:       3.3.3
+Name:          %{?scl_prefix}php-pecl-yaf
+Version:       3.3.4
 %if 0%{?gh_date:1}
 Release:       0.13.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:       https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz
 %else
-Release:       3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source:        https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 %endif
 License:       PHP
 URL:           https://pecl.php.net/package/yaf
 Source1:       %{pecl_name}.ini
 
-Patch0:        %{pecl_name}-php81.patch
-
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 7.0
@@ -56,10 +53,6 @@ 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
@@ -100,8 +93,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1 -b .pr548
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_YAF_VERSION/{s/.*\t"//;s/".*$//;p}' php_yaf.h )
 if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then
@@ -167,9 +158,8 @@ cd NTS
 : Upstream test suite  for NTS extension
 TEST_PHP_EXECUTABLE=%{__php} \
 TEST_PHP_ARGS="$OPTS -d extension=$PWD/modules/%{pecl_name}.so" \
-NO_INTERACTION=1 \
 REPORT_EXIT_STATUS=1 \
-%{__php} -n run-tests.php --show-diff
+%{__php} -n run-tests.php -q --show-diff
 
 %if %{with_zts}
 cd ../ZTS
@@ -182,9 +172,8 @@ cd ../ZTS
 : Upstream test suite  for NTS extension
 TEST_PHP_EXECUTABLE=%{__ztsphp} \
 TEST_PHP_ARGS="$OPTS -d extension=$PWD/modules/%{pecl_name}.so" \
-NO_INTERACTION=1 \
 REPORT_EXIT_STATUS=1 \
-%{__ztsphp} -n run-tests.php --show-diff
+%{__ztsphp} -n run-tests.php -q --show-diff
 %endif
 
 
@@ -223,6 +212,10 @@ fi
 
 
 %changelog
+* Thu Dec 16 2021 Remi Collet <remi@remirepo.net> - 3.3.4-1
+- update to 3.3.4
+- drop patch merged upstream
+
 * Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 3.3.3-3
 - rebuild for 8.1.0RC1
 
diff --git a/yaf-php81.patch b/yaf-php81.patch
deleted file mode 100644
index 8f15974..0000000
--- a/yaf-php81.patch
+++ /dev/null
@@ -1,559 +0,0 @@
-From 36bbd32afac5c2a38ec409b33505352262acefd7 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 21 Jul 2021 08:08:39 +0200
-Subject: [PATCH] fix for 8.1.0beta1 - use ZEND_ACC_NOT_SERIALIZABLE instead of
- zend_class_serialize_deny - add return type for Iterators
-
----
- configs/yaf_config_ini.c    | 18 ++++++++-
- configs/yaf_config_simple.c | 18 ++++++++-
- routes/yaf_route_map.c      |  4 ++
- routes/yaf_route_regex.c    |  4 ++
- routes/yaf_route_rewrite.c  |  6 ++-
- routes/yaf_route_simple.c   |  4 ++
- routes/yaf_route_supervar.c |  7 +++-
- views/yaf_view_simple.c     |  5 ++-
- yaf_application.c           |  6 ++-
- yaf_config.c                | 73 ++++++++++++++++++++++++++++++-------
- yaf_controller.c            |  7 +++-
- yaf_dispatcher.c            |  5 ++-
- yaf_loader.c                |  4 ++
- yaf_registry.c              |  4 ++
- yaf_request.c               |  7 +++-
- yaf_response.c              |  7 +++-
- yaf_router.c                |  6 ++-
- yaf_session.c               | 45 +++++++++++++++++++----
- 18 files changed, 193 insertions(+), 37 deletions(-)
-
-diff --git a/configs/yaf_config_ini.c b/configs/yaf_config_ini.c
-index c94f85a8..8ede29c0 100644
---- a/configs/yaf_config_ini.c
-+++ b/configs/yaf_config_ini.c
-@@ -53,6 +53,20 @@ ZEND_BEGIN_ARG_INFO_EX(yaf_config_ini_set_arginfo, 0, 0, 2)
- 	ZEND_ARG_INFO(0, name)
- 	ZEND_ARG_INFO(0, value)
- ZEND_END_ARG_INFO()
-+
-+#if PHP_VERSION_ID < 80100
-+#define yaf_config_ini_oget_arginfo yaf_config_ini_get_arginfo
-+#define yaf_config_ini_oset_arginfo yaf_config_ini_set_arginfo
-+#else
-+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(yaf_config_ini_oget_arginfo, 0, 1, IS_MIXED, 0)
-+	ZEND_ARG_INFO(0, name)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(yaf_config_ini_oset_arginfo, 0, 2, IS_VOID, 0)
-+	ZEND_ARG_INFO(0, name)
-+	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
-+ZEND_END_ARG_INFO()
-+#endif
- /* }}} */
- 
- static inline void yaf_deep_copy_section(zval *dst, zval *src) /* {{{ */ {
-@@ -508,8 +522,8 @@ zend_function_entry yaf_config_ini_methods[] = {
- 	PHP_ME(yaf_config_ini, get, yaf_config_ini_get_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_ME(yaf_config_ini, set, yaf_config_ini_set_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_ME(yaf_config_ini, readonly, yaf_config_ini_void_arginfo, ZEND_ACC_PUBLIC)
--	PHP_MALIAS(yaf_config_ini, offsetGet, get, yaf_config_ini_get_arginfo, ZEND_ACC_PUBLIC)
--	PHP_MALIAS(yaf_config_ini, offsetSet, set, yaf_config_ini_set_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_MALIAS(yaf_config_ini, offsetGet, get, yaf_config_ini_oget_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_MALIAS(yaf_config_ini, offsetSet, set, yaf_config_ini_oset_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_MALIAS(yaf_config_ini, __set, set, yaf_config_ini_set_arginfo, ZEND_ACC_PUBLIC)
- 	{NULL, NULL, NULL}
- };
-diff --git a/configs/yaf_config_simple.c b/configs/yaf_config_simple.c
-index 191f356e..a6d26834 100644
---- a/configs/yaf_config_simple.c
-+++ b/configs/yaf_config_simple.c
-@@ -47,6 +47,20 @@ ZEND_END_ARG_INFO()
- ZEND_BEGIN_ARG_INFO_EX(yaf_config_simple_unset_arginfo, 0, 0, 1)
- 	ZEND_ARG_INFO(0, name)
- ZEND_END_ARG_INFO()
-+
-+#if PHP_VERSION_ID < 80100
-+#define yaf_config_simple_oset_arginfo   yaf_config_simple_set_arginfo
-+#define yaf_config_simple_ounset_arginfo yaf_config_simple_unset_arginfo
-+#else
-+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(yaf_config_simple_oset_arginfo, 0, 2, IS_VOID, 0)
-+	ZEND_ARG_INFO(0, name)
-+	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(yaf_config_simple_ounset_arginfo, 0, 1, IS_VOID, 0)
-+	ZEND_ARG_INFO(0, name)
-+ZEND_END_ARG_INFO()
-+#endif
- /* }}} */
- 
- void yaf_config_simple_init(yaf_config_object *conf, zval *val, int readonly) /* {{{ */ {
-@@ -158,9 +172,9 @@ zend_function_entry yaf_config_simple_methods[] = {
- 	PHP_ME(yaf_config_simple,     __construct, yaf_config_simple_construct_arginfo, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
- 	PHP_ME(yaf_config_simple,     set, yaf_config_simple_set_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_ME(yaf_config_simple,     readonly,	yaf_config_simple_void_arginfo, ZEND_ACC_PUBLIC)
--	PHP_ME(yaf_config_simple,     offsetUnset, yaf_config_simple_unset_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_ME(yaf_config_simple,     offsetUnset, yaf_config_simple_ounset_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_MALIAS(yaf_config_simple, __set, set, yaf_config_simple_set_arginfo, ZEND_ACC_PUBLIC)
--	PHP_MALIAS(yaf_config_simple, offsetSet, set, yaf_config_simple_set_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_MALIAS(yaf_config_simple, offsetSet, set, yaf_config_simple_oset_arginfo, ZEND_ACC_PUBLIC)
- 	{NULL, NULL, NULL}
- };
- /* }}} */
-diff --git a/routes/yaf_route_map.c b/routes/yaf_route_map.c
-index 85ec4602..41a7439b 100644
---- a/routes/yaf_route_map.c
-+++ b/routes/yaf_route_map.c
-@@ -363,9 +363,13 @@ YAF_STARTUP_FUNCTION(route_map) {
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Route_Map", "Yaf\\Route\\Map", yaf_route_map_methods);
- 	yaf_route_map_ce = zend_register_internal_class(&ce);
- 	yaf_route_map_ce->create_object = yaf_route_map_new;
-+#if PHP_VERSION_ID < 80100
- 	yaf_route_map_ce->ce_flags |= ZEND_ACC_FINAL;
- 	yaf_route_map_ce->serialize = zend_class_serialize_deny;
- 	yaf_route_map_ce->unserialize = zend_class_unserialize_deny;
-+#else
-+	yaf_route_map_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 
- 	zend_class_implements(yaf_route_map_ce, 1, yaf_route_ce);
- 
-diff --git a/routes/yaf_route_regex.c b/routes/yaf_route_regex.c
-index 7e2647e6..fb63a78e 100644
---- a/routes/yaf_route_regex.c
-+++ b/routes/yaf_route_regex.c
-@@ -466,9 +466,13 @@ YAF_STARTUP_FUNCTION(route_regex) {
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Route_Regex", "Yaf\\Route\\Regex", yaf_route_regex_methods);
- 	yaf_route_regex_ce = zend_register_internal_class(&ce);
- 	yaf_route_regex_ce->create_object = yaf_route_regex_new;
-+#if PHP_VERSION_ID < 80100
- 	yaf_route_regex_ce->ce_flags |= ZEND_ACC_FINAL;
- 	yaf_route_regex_ce->serialize = zend_class_serialize_deny;
- 	yaf_route_regex_ce->unserialize = zend_class_unserialize_deny;
-+#else
-+	yaf_route_regex_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 
- 	zend_class_implements(yaf_route_regex_ce, 1, yaf_route_ce);
- 
-diff --git a/routes/yaf_route_rewrite.c b/routes/yaf_route_rewrite.c
-index 624e4f1b..2bac1b0b 100644
---- a/routes/yaf_route_rewrite.c
-+++ b/routes/yaf_route_rewrite.c
-@@ -489,10 +489,14 @@ YAF_STARTUP_FUNCTION(route_rewrite) {
- 	zend_class_entry ce;
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Route_Rewrite", "Yaf\\Route\\Rewrite", yaf_route_rewrite_methods);
- 	yaf_route_rewrite_ce = zend_register_internal_class_ex(&ce, NULL);
--	yaf_route_rewrite_ce->ce_flags |= ZEND_ACC_FINAL;
- 	yaf_route_rewrite_ce->create_object = yaf_route_rewrite_new;
-+#if PHP_VERSION_ID < 80100
-+	yaf_route_rewrite_ce->ce_flags |= ZEND_ACC_FINAL;
- 	yaf_route_rewrite_ce->serialize = zend_class_serialize_deny;
- 	yaf_route_rewrite_ce->unserialize = zend_class_unserialize_deny;
-+#else
-+	yaf_route_rewrite_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 
- 	zend_class_implements(yaf_route_rewrite_ce, 1, yaf_route_ce);
- 
-diff --git a/routes/yaf_route_simple.c b/routes/yaf_route_simple.c
-index da5498f1..f042d895 100644
---- a/routes/yaf_route_simple.c
-+++ b/routes/yaf_route_simple.c
-@@ -275,9 +275,13 @@ YAF_STARTUP_FUNCTION(route_simple) {
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Route_Simple", "Yaf\\Route\\Simple", yaf_route_simple_methods);
- 	yaf_route_simple_ce = zend_register_internal_class(&ce);
- 	yaf_route_simple_ce->create_object = yaf_route_simple_new;
-+#if PHP_VERSION_ID < 80100
- 	yaf_route_simple_ce->ce_flags |= ZEND_ACC_FINAL;
- 	yaf_route_simple_ce->serialize = zend_class_serialize_deny;
- 	yaf_route_simple_ce->unserialize = zend_class_unserialize_deny;
-+#else
-+	yaf_route_simple_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 
- 	zend_class_implements(yaf_route_simple_ce, 1, yaf_route_ce);
- 
-diff --git a/routes/yaf_route_supervar.c b/routes/yaf_route_supervar.c
-index 21bff266..946a7a65 100644
---- a/routes/yaf_route_supervar.c
-+++ b/routes/yaf_route_supervar.c
-@@ -234,11 +234,14 @@ YAF_STARTUP_FUNCTION(route_supervar) {
- 	zend_class_entry ce;
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Route_Supervar", "Yaf\\Route\\Supervar", yaf_route_supervar_methods);
- 	yaf_route_supervar_ce = zend_register_internal_class(&ce);
--	yaf_route_supervar_ce->ce_flags |= ZEND_ACC_FINAL;
--
- 	yaf_route_supervar_ce->create_object = yaf_route_supervar_new;
-+#if PHP_VERSION_ID < 80100
-+	yaf_route_supervar_ce->ce_flags |= ZEND_ACC_FINAL;
- 	yaf_route_supervar_ce->serialize = zend_class_serialize_deny;
- 	yaf_route_supervar_ce->unserialize = zend_class_unserialize_deny;
-+#else
-+	yaf_route_supervar_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 
- 	zend_class_implements(yaf_route_supervar_ce, 1, yaf_route_ce);
- 
-diff --git a/views/yaf_view_simple.c b/views/yaf_view_simple.c
-index 12419883..4abc383a 100755
---- a/views/yaf_view_simple.c
-+++ b/views/yaf_view_simple.c
-@@ -673,9 +673,12 @@ YAF_STARTUP_FUNCTION(view_simple) {
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_View_Simple", "Yaf\\View\\Simple", yaf_view_simple_methods);
- 	yaf_view_simple_ce = zend_register_internal_class_ex(&ce, NULL);
- 	yaf_view_simple_ce->create_object = yaf_view_simple_new;
-+#if PHP_VERSION_ID < 80100
- 	yaf_view_simple_ce->serialize = zend_class_serialize_deny;
- 	yaf_view_simple_ce->unserialize = zend_class_unserialize_deny;
--
-+#else
-+	yaf_view_simple_ce->ce_flags |= ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 	zend_class_implements(yaf_view_simple_ce, 1, yaf_view_interface_ce);
- 
- 	memcpy(&yaf_view_simple_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
-diff --git a/yaf_application.c b/yaf_application.c
-index f3e52114..e3233267 100644
---- a/yaf_application.c
-+++ b/yaf_application.c
-@@ -1084,10 +1084,14 @@ YAF_STARTUP_FUNCTION(application) {
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Application", "Yaf\\Application", yaf_application_methods);
- 
- 	yaf_application_ce = zend_register_internal_class_ex(&ce, NULL);
--	yaf_application_ce->ce_flags |= ZEND_ACC_FINAL;
- 	yaf_application_ce->create_object = yaf_application_new;
-+#if PHP_VERSION_ID < 80100
-+	yaf_application_ce->ce_flags |= ZEND_ACC_FINAL;
- 	yaf_application_ce->serialize = zend_class_serialize_deny;
- 	yaf_application_ce->unserialize = zend_class_unserialize_deny;
-+#else
-+	yaf_application_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 
- 	memcpy(&yaf_application_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
- 	yaf_application_obj_handlers.offset = XtOffsetOf(yaf_application_object, std);
-diff --git a/yaf_config.c b/yaf_config.c
-index 8668734e..a02334b8 100644
---- a/yaf_config.c
-+++ b/yaf_config.c
-@@ -47,18 +47,61 @@ ZEND_BEGIN_ARG_INFO_EX(yaf_config_get_arginfo, 0, 0, 0)
- 	ZEND_ARG_INFO(0, name)
- ZEND_END_ARG_INFO()
- 
-+ZEND_BEGIN_ARG_INFO_EX(yaf_config_set_arginfo, 0, 0, 2)
-+	ZEND_ARG_INFO(0, name)
-+	ZEND_ARG_INFO(0, value)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_INFO_EX(yaf_config_isset_arginfo, 0, 0, 1)
-+	ZEND_ARG_INFO(0, name)
-+ZEND_END_ARG_INFO()
-+
-+#if PHP_VERSION_ID < 80100
- ZEND_BEGIN_ARG_INFO_EX(yaf_config_unset_arginfo, 0, 0, 1)
- 	ZEND_ARG_INFO(0, name)
- ZEND_END_ARG_INFO()
- 
--ZEND_BEGIN_ARG_INFO_EX(yaf_config_set_arginfo, 0, 0, 2)
-+#define yaf_config_current_arginfo yaf_config_void_arginfo
-+#define yaf_config_next_arginfo    yaf_config_void_arginfo
-+#define yaf_config_valid_arginfo   yaf_config_void_arginfo
-+#define yaf_config_key_arginfo     yaf_config_current_arginfo
-+#define yaf_config_rewind_arginfo  yaf_config_void_arginfo
-+#define yaf_config_exists_arginfo  yaf_config_isset_arginfo
-+#define yaf_config_oget_arginfo    yaf_config_get_arginfo
-+#define yaf_config_oset_arginfo    yaf_config_set_arginfo
-+#define yaf_config_count_arginfo   yaf_config_void_arginfo
-+#else
-+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(yaf_config_current_arginfo, 0, 0, IS_MIXED, 0)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(yaf_config_next_arginfo, 0, 0, IS_VOID, 0)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(yaf_config_valid_arginfo, 0, 0, _IS_BOOL, 0)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(yaf_config_exists_arginfo, 0, 1, _IS_BOOL, 0)
- 	ZEND_ARG_INFO(0, name)
--	ZEND_ARG_INFO(0, value)
- ZEND_END_ARG_INFO()
- 
--ZEND_BEGIN_ARG_INFO_EX(yaf_config_isset_arginfo, 0, 0, 1)
-+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(yaf_config_oget_arginfo, 0, 1, IS_MIXED, 0)
-+	ZEND_ARG_INFO(0, name)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(yaf_config_oset_arginfo, 0, 2, IS_VOID, 0)
-+	ZEND_ARG_INFO(0, name)
-+	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(yaf_config_unset_arginfo, 0, 1, IS_VOID, 0)
- 	ZEND_ARG_INFO(0, name)
- ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(yaf_config_count_arginfo, 0, 0, IS_LONG, 0)
-+ZEND_END_ARG_INFO()
-+#define yaf_config_key_arginfo      yaf_config_current_arginfo
-+#define yaf_config_rewind_arginfo   yaf_config_next_arginfo
-+#endif
- /* }}} */
- 
- static HashTable *yaf_config_get_gc(yaf_object *obj, zval **table, int *n) /* {{{ */ {
-@@ -387,19 +430,19 @@ PHP_METHOD(yaf_config, valid) {
- */
- zend_function_entry yaf_config_methods[] = {
- 	PHP_ME(yaf_config, get, yaf_config_get_arginfo, ZEND_ACC_PUBLIC)
--	PHP_ME(yaf_config, count, yaf_config_void_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_ME(yaf_config, count, yaf_config_count_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_ME(yaf_config, toArray, yaf_config_void_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_ME(yaf_config, offsetUnset, yaf_config_unset_arginfo, ZEND_ACC_PUBLIC)
--	PHP_ME(yaf_config, rewind, yaf_config_void_arginfo, ZEND_ACC_PUBLIC)
--	PHP_ME(yaf_config, current, yaf_config_void_arginfo, ZEND_ACC_PUBLIC)
--	PHP_ME(yaf_config, key, yaf_config_void_arginfo, ZEND_ACC_PUBLIC)
--	PHP_ME(yaf_config, next, yaf_config_void_arginfo, ZEND_ACC_PUBLIC)
--	PHP_ME(yaf_config, valid, yaf_config_void_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_ME(yaf_config, rewind, yaf_config_rewind_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_ME(yaf_config, current, yaf_config_current_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_ME(yaf_config, key, yaf_config_key_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_ME(yaf_config, next, yaf_config_next_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_ME(yaf_config, valid, yaf_config_valid_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_ME(yaf_config, __isset, yaf_config_isset_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_MALIAS(yaf_config, __get, get, yaf_config_get_arginfo, ZEND_ACC_PUBLIC)
--	PHP_MALIAS(yaf_config, offsetGet, get, yaf_config_get_arginfo, ZEND_ACC_PUBLIC)
--	PHP_MALIAS(yaf_config, offsetExists, __isset, yaf_config_isset_arginfo, ZEND_ACC_PUBLIC)
--	PHP_ABSTRACT_ME(yaf_config, offsetSet, yaf_config_set_arginfo)
-+	PHP_MALIAS(yaf_config, offsetGet, get, yaf_config_oget_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_MALIAS(yaf_config, offsetExists, __isset, yaf_config_exists_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_ABSTRACT_ME(yaf_config, offsetSet, yaf_config_oset_arginfo)
- 	PHP_ABSTRACT_ME(yaf_config, set, yaf_config_set_arginfo)
- 	PHP_ABSTRACT_ME(yaf_config, readonly, yaf_config_void_arginfo)
- 	{NULL, NULL, NULL}
-@@ -413,10 +456,14 @@ YAF_STARTUP_FUNCTION(config) {
- 
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Config_Abstract", "Yaf\\Config_Abstract", yaf_config_methods);
- 	yaf_config_ce = zend_register_internal_class_ex(&ce, NULL);
--	yaf_config_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
- 	yaf_config_ce->create_object = yaf_config_new;
-+#if PHP_VERSION_ID < 80100
-+	yaf_config_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
- 	yaf_config_ce->serialize = zend_class_serialize_deny;
- 	yaf_config_ce->unserialize = zend_class_unserialize_deny;
-+#else
-+	yaf_config_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 	
- 	memcpy(&yaf_config_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
- 	yaf_config_obj_handlers.offset = XtOffsetOf(yaf_config_object, std);
-diff --git a/yaf_controller.c b/yaf_controller.c
-index 1f7e2303..248965f7 100644
---- a/yaf_controller.c
-+++ b/yaf_controller.c
-@@ -845,11 +845,14 @@ YAF_STARTUP_FUNCTION(controller) {
- 	zend_class_entry ce;
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Controller_Abstract", "Yaf\\Controller_Abstract", yaf_controller_methods);
- 	yaf_controller_ce = zend_register_internal_class_ex(&ce, NULL);
--	yaf_controller_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
--
- 	yaf_controller_ce->create_object = yaf_controller_new;
-+#if PHP_VERSION_ID < 80100
-+	yaf_controller_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
- 	yaf_controller_ce->serialize = zend_class_serialize_deny;
- 	yaf_controller_ce->unserialize = zend_class_unserialize_deny;
-+#else
-+	yaf_controller_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 
- 	memcpy(&yaf_controller_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
- 	yaf_controller_obj_handlers.offset = XtOffsetOf(yaf_controller_object, std);
-diff --git a/yaf_dispatcher.c b/yaf_dispatcher.c
-index 8183de42..20a4887a 100644
---- a/yaf_dispatcher.c
-+++ b/yaf_dispatcher.c
-@@ -1340,10 +1340,13 @@ YAF_STARTUP_FUNCTION(dispatcher) {
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Dispatcher", "Yaf\\Dispatcher", yaf_dispatcher_methods);
- 
- 	yaf_dispatcher_ce = zend_register_internal_class_ex(&ce, NULL);
-+#if PHP_VERSION_ID < 80100
- 	yaf_dispatcher_ce->ce_flags |= ZEND_ACC_FINAL;
- 	yaf_dispatcher_ce->serialize = zend_class_serialize_deny;
- 	yaf_dispatcher_ce->unserialize = zend_class_unserialize_deny;
--
-+#else
-+	yaf_dispatcher_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 	memcpy(&yaf_dispatcher_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
- 	yaf_dispatcher_obj_handlers.offset = XtOffsetOf(yaf_dispatcher_object, std);
- 	yaf_dispatcher_obj_handlers.free_obj = yaf_dispatcher_obj_free;
-diff --git a/yaf_loader.c b/yaf_loader.c
-index 67a5cb69..e0faefeb 100644
---- a/yaf_loader.c
-+++ b/yaf_loader.c
-@@ -994,9 +994,13 @@ YAF_STARTUP_FUNCTION(loader) {
- 
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Loader",  "Yaf\\Loader", yaf_loader_methods);
- 	yaf_loader_ce = zend_register_internal_class_ex(&ce, NULL);
-+#if PHP_VERSION_ID < 80100
- 	yaf_loader_ce->ce_flags |= ZEND_ACC_FINAL;
- 	yaf_loader_ce->serialize = zend_class_serialize_deny;
- 	yaf_loader_ce->unserialize = zend_class_unserialize_deny;
-+#else
-+	yaf_loader_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 
- 	memcpy(&yaf_loader_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
- 	yaf_loader_obj_handlers.clone_obj = NULL;
-diff --git a/yaf_registry.c b/yaf_registry.c
-index ac9030ac..36c3a50e 100644
---- a/yaf_registry.c
-+++ b/yaf_registry.c
-@@ -233,9 +233,13 @@ YAF_STARTUP_FUNCTION(registry) {
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Registry", "Yaf\\Registry", yaf_registry_methods);
- 
- 	yaf_registry_ce = zend_register_internal_class_ex(&ce, NULL);
-+#if PHP_VERSION_ID < 80100
- 	yaf_registry_ce->ce_flags |= ZEND_ACC_FINAL;
- 	yaf_registry_ce->serialize = zend_class_serialize_deny;
- 	yaf_registry_ce->unserialize = zend_class_unserialize_deny;
-+#else
-+	yaf_registry_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 
- 	memcpy(&yaf_registry_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
- 	yaf_registry_obj_handlers.offset = XtOffsetOf(yaf_registry_object, std);
-diff --git a/yaf_request.c b/yaf_request.c
-index 3a4aca50..6e758848 100644
---- a/yaf_request.c
-+++ b/yaf_request.c
-@@ -1437,11 +1437,14 @@ YAF_STARTUP_FUNCTION(request){
- 
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Request_Abstract", "Yaf\\Request_Abstract", yaf_request_methods);
- 	yaf_request_ce	= zend_register_internal_class_ex(&ce, NULL);
--	yaf_request_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
--
- 	yaf_request_ce->create_object = yaf_request_new;
-+#if PHP_VERSION_ID < 80100
-+	yaf_request_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
- 	yaf_request_ce->serialize = zend_class_serialize_deny;
- 	yaf_request_ce->unserialize = zend_class_unserialize_deny;
-+#else
-+	yaf_request_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 
- 	memcpy(&yaf_request_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
- 	yaf_request_obj_handlers.offset = XtOffsetOf(yaf_request_object, std);
-diff --git a/yaf_response.c b/yaf_response.c
-index dc521584..0aea6775 100755
---- a/yaf_response.c
-+++ b/yaf_response.c
-@@ -577,11 +577,14 @@ YAF_STARTUP_FUNCTION(response) {
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Response_Abstract", "Yaf\\Response_Abstract", yaf_response_methods);
- 
- 	yaf_response_ce = zend_register_internal_class_ex(&ce, NULL);
--	yaf_response_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
--
- 	yaf_response_ce->create_object = yaf_response_new;
-+#if PHP_VERSION_ID < 80100
-+	yaf_response_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
- 	yaf_response_ce->serialize = zend_class_serialize_deny;
- 	yaf_response_ce->unserialize = zend_class_unserialize_deny;
-+#else
-+	yaf_response_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 
- 	memcpy(&yaf_response_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
- 	yaf_response_obj_handlers.offset = XtOffsetOf(yaf_response_object, std);
-diff --git a/yaf_router.c b/yaf_router.c
-index 4d3e9d91..3cf6deda 100644
---- a/yaf_router.c
-+++ b/yaf_router.c
-@@ -424,10 +424,14 @@ YAF_STARTUP_FUNCTION(router) {
- 
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Router", "Yaf\\Router", yaf_router_methods);
- 	yaf_router_ce = zend_register_internal_class_ex(&ce, NULL);
--	yaf_router_ce->ce_flags |= ZEND_ACC_FINAL;
- 	yaf_router_ce->create_object = yaf_router_new;
-+#if PHP_VERSION_ID < 80100
-+	yaf_router_ce->ce_flags |= ZEND_ACC_FINAL;
- 	yaf_router_ce->serialize = zend_class_serialize_deny;
- 	yaf_router_ce->unserialize = zend_class_unserialize_deny;
-+#else
-+	yaf_router_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 
- 	memcpy(&yaf_router_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
- 	yaf_router_obj_handlers.offset = XtOffsetOf(yaf_router_object, std);
-diff --git a/yaf_session.c b/yaf_session.c
-index 3dd7c9e5..4e04def4 100644
---- a/yaf_session.c
-+++ b/yaf_session.c
-@@ -54,6 +54,34 @@ ZEND_BEGIN_ARG_INFO_EX(yaf_session_set_arginfo, 0, 0, 2)
- 	ZEND_ARG_INFO(0, name)
- 	ZEND_ARG_INFO(0, value)
- ZEND_END_ARG_INFO()
-+
-+#if PHP_VERSION_ID < 80100
-+#define yaf_session_oexists_arginfo yaf_session_has_arginfo
-+#define yaf_session_oget_arginfo yaf_session_get_arginfo
-+#define yaf_session_oset_arginfo yaf_session_set_arginfo
-+#define yaf_session_ounset_arginfo yaf_session_del_arginfo
-+#define yaf_session_count_arginfo yaf_session_void_arginfo
-+#else
-+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(yaf_session_oexists_arginfo, 0, 1, _IS_BOOL, 0)
-+	ZEND_ARG_INFO(0, name)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(yaf_session_oget_arginfo, 0, 1, IS_MIXED, 0)
-+	ZEND_ARG_INFO(0, name)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(yaf_session_oset_arginfo, 0, 2, IS_VOID, 0)
-+	ZEND_ARG_INFO(0, name)
-+	ZEND_ARG_TYPE_INFO(0, value, IS_MIXED, 0)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(yaf_session_ounset_arginfo, 0, 1, IS_VOID, 0)
-+	ZEND_ARG_INFO(0, name)
-+ZEND_END_ARG_INFO()
-+
-+ZEND_BEGIN_ARG_WITH_TENTATIVE_RETURN_TYPE_INFO_EX(yaf_session_count_arginfo, 0, 0, IS_LONG, 0)
-+ZEND_END_ARG_INFO()
-+#endif
- /* }}} */
- 
- static inline void yaf_session_start(yaf_session_object *session) /* {{{ */ {
-@@ -318,12 +346,12 @@ zend_function_entry yaf_session_methods[] = {
- 	PHP_ME(yaf_session, has, yaf_session_has_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_ME(yaf_session, set, yaf_session_set_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_ME(yaf_session, del, yaf_session_del_arginfo, ZEND_ACC_PUBLIC)
--	PHP_ME(yaf_session, count, yaf_session_void_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_ME(yaf_session, count, yaf_session_count_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_ME(yaf_session, clear, yaf_session_void_arginfo, ZEND_ACC_PUBLIC)
--	PHP_MALIAS(yaf_session, offsetGet, get, yaf_session_get_arginfo, ZEND_ACC_PUBLIC)
--	PHP_MALIAS(yaf_session, offsetSet, set, yaf_session_set_arginfo, ZEND_ACC_PUBLIC)
--	PHP_MALIAS(yaf_session, offsetExists, has, yaf_session_has_arginfo, ZEND_ACC_PUBLIC)
--	PHP_MALIAS(yaf_session, offsetUnset, del, yaf_session_del_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_MALIAS(yaf_session, offsetGet, get, yaf_session_oget_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_MALIAS(yaf_session, offsetSet, set, yaf_session_oset_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_MALIAS(yaf_session, offsetExists, has, yaf_session_oexists_arginfo, ZEND_ACC_PUBLIC)
-+	PHP_MALIAS(yaf_session, offsetUnset, del, yaf_session_ounset_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_MALIAS(yaf_session, __get, get, yaf_session_get_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_MALIAS(yaf_session, __isset, has, yaf_session_has_arginfo, ZEND_ACC_PUBLIC)
- 	PHP_MALIAS(yaf_session, __set, set, yaf_session_set_arginfo, ZEND_ACC_PUBLIC)
-@@ -340,11 +368,14 @@ YAF_STARTUP_FUNCTION(session) {
- 	YAF_INIT_CLASS_ENTRY(ce, "Yaf_Session", "Yaf\\Session", yaf_session_methods);
- 
- 	yaf_session_ce = zend_register_internal_class_ex(&ce, NULL);
--	yaf_session_ce->ce_flags |= ZEND_ACC_FINAL;
--
- 	yaf_session_ce->get_iterator = yaf_session_get_iterator;
-+#if PHP_VERSION_ID < 80100
-+	yaf_session_ce->ce_flags |= ZEND_ACC_FINAL;
- 	yaf_session_ce->serialize = zend_class_serialize_deny;
- 	yaf_session_ce->unserialize = zend_class_unserialize_deny;
-+#else
-+	yaf_session_ce->ce_flags |= ZEND_ACC_FINAL | ZEND_ACC_NOT_SERIALIZABLE;
-+#endif
- 
- 	memcpy(&yaf_session_obj_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
- 	yaf_session_obj_handlers.offset = XtOffsetOf(yaf_session_object, std);
-- 
cgit