fix 8.4 deprecation notices, 7.0 compiler warnings

Author: brettmc

phper-sys/php_wrapper.c

@@ -484,6 +484,8 @@ zend_internal_arg_info
 phper_zend_begin_arg_with_return_type_info_ex(bool return_reference,
                                               uintptr_t required_num_args,
                                               uint32_t typ, bool allow_null) {
+(void)typ;
+(void)allow_null;
 #define static
 #define const
 #if PHP_VERSION_ID >= 70400
@@ -505,6 +507,8 @@ phper_zend_begin_arg_with_return_obj_info_ex(bool return_reference,
                                              uintptr_t required_num_args,
                                              const char* class_name,
                                              bool allow_null) {
+(void)class_name;
+(void)allow_null;
 #define static
 #define const
 #if PHP_VERSION_ID >= 80000
@@ -529,6 +533,7 @@ zend_internal_arg_info phper_zend_arg_info_with_type(bool pass_by_ref,
                                                     uint32_t type_hint,
                                                     bool allow_null,
                                                     const char *default_value) {
+(void)default_value;
 #if PHP_VERSION_ID >= 80000
     zend_internal_arg_info info[] = {
         ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, type_hint, allow_null, default_value)
@@ -546,6 +551,10 @@ zend_internal_arg_info phper_zend_arg_obj_info(bool pass_by_ref,
                                                const char *name,
                                                const char *class_name,
                                                bool allow_null) {
+// suppress "unused parameter" warnings.
+(void)name;
+(void)class_name;
+(void)allow_null;
 #if PHP_VERSION_ID >= 80000
     zend_internal_arg_info info[] = {
         ZEND_ARG_OBJ_INFO_WITH_DEFAULT_VALUE(pass_by_ref, name, class_name, allow_null, NULL)

tests/integration/src/classes.rs

@@ -13,8 +13,9 @@ use phper::{
     classes::{
         ClassEntity, ClassEntry, InterfaceEntity, Visibility, array_access_class, iterator_class,
     },
-    functions::Argument,
+    functions::{Argument, ReturnType},
     modules::Module,
+    types::{ArgumentTypeHint, ReturnTypeHint},
     values::ZVal,
 };
 use std::{collections::HashMap, convert::Infallible};
@@ -86,28 +87,39 @@ fn integrate_foo(module: &mut Module) {
     class.implements(array_access_class);
 
     // Implement Iterator interface.
-    class.add_method("current", Visibility::Public, |this, _arguments| {
-        let state = this.as_state();
-        Ok::<_, phper::Error>(format!("Current: {}", state.position))
-    });
-    class.add_method("key", Visibility::Public, |this, _arguments| {
-        let state = this.as_state();
-        Ok::<_, phper::Error>(state.position as i64)
-    });
-    class.add_method("next", Visibility::Public, |this, _arguments| {
-        let state = this.as_mut_state();
-        state.position += 1;
-        Ok::<_, Infallible>(())
-    });
-    class.add_method("rewind", Visibility::Public, |this, _arguments| {
-        let state = this.as_mut_state();
-        state.position = 0;
-        Ok::<_, Infallible>(())
-    });
-    class.add_method("valid", Visibility::Public, |this, _arguments| {
-        let state = this.as_state();
-        Ok::<_, Infallible>(state.position < 3)
-    });
+    class
+        .add_method("current", Visibility::Public, |this, _arguments| {
+            let state = this.as_state();
+            Ok::<_, phper::Error>(format!("Current: {}", state.position))
+        })
+        .return_type(ReturnType::by_val(ReturnTypeHint::Mixed));
+
+    class
+        .add_method("key", Visibility::Public, |this, _arguments| {
+            let state = this.as_state();
+            Ok::<_, phper::Error>(state.position as i64)
+        }).return_type(ReturnType::by_val(ReturnTypeHint::Mixed));
+
+    class
+        .add_method("next", Visibility::Public, |this, _arguments| {
+            let state = this.as_mut_state();
+            state.position += 1;
+            Ok::<_, Infallible>(())
+        }).return_type(ReturnType::by_val(ReturnTypeHint::Void));
+
+    class
+        .add_method("rewind", Visibility::Public, |this, _arguments| {
+            let state = this.as_mut_state();
+            state.position = 0;
+            Ok::<_, Infallible>(())
+        }).return_type(ReturnType::by_val(ReturnTypeHint::Void));
+
+    class
+        .add_method("valid", Visibility::Public, |this, _arguments| {
+            let state = this.as_state();
+            Ok::<_, Infallible>(state.position < 3)
+        })
+        .return_type(ReturnType::by_val(ReturnTypeHint::Bool));
 
     // Implement ArrayAccess interface.
     class
@@ -116,7 +128,8 @@ fn integrate_foo(module: &mut Module) {
             let state = this.as_state();
             Ok::<_, phper::Error>(state.array.contains_key(&offset))
         })
-        .argument(Argument::by_val("offset"));
+        .argument(Argument::by_val("offset").with_type_hint(ArgumentTypeHint::Mixed))
+        .return_type(ReturnType::by_val(ReturnTypeHint::Bool));
 
     class
         .add_method("offsetGet", Visibility::Public, |this, arguments| {
@@ -125,7 +138,8 @@ fn integrate_foo(module: &mut Module) {
             let val = state.array.get_mut(&offset).map(|val| val.ref_clone());
             Ok::<_, phper::Error>(val)
         })
-        .argument(Argument::by_val("offset"));
+        .argument(Argument::by_val("offset").with_type_hint(ArgumentTypeHint::Mixed))
+        .return_type(ReturnType::by_val(ReturnTypeHint::Mixed));
 
     class
         .add_method("offsetSet", Visibility::Public, |this, arguments| {
@@ -135,7 +149,11 @@ fn integrate_foo(module: &mut Module) {
             state.array.insert(offset, value);
             Ok::<_, phper::Error>(())
         })
-        .arguments([Argument::by_val("offset"), Argument::by_val("value")]);
+        .arguments([
+            Argument::by_val("offset").with_type_hint(ArgumentTypeHint::Mixed),
+            Argument::by_val("value").with_type_hint(ArgumentTypeHint::Mixed),
+        ])
+        .return_type(ReturnType::by_val(ReturnTypeHint::Void));
 
     class
         .add_method("offsetUnset", Visibility::Public, |this, arguments| {
@@ -144,7 +162,8 @@ fn integrate_foo(module: &mut Module) {
             state.array.remove(&offset);
             Ok::<_, phper::Error>(())
         })
-        .argument(Argument::by_val("offset"));
+        .argument(Argument::by_val("offset").with_type_hint(ArgumentTypeHint::Mixed))
+        .return_type(ReturnType::by_val(ReturnTypeHint::Void));
 
     module.add_class(class);
 }