fmt, clippy

Author: brettmc

tests/integration/src/typehints.rs

@@ -28,19 +28,44 @@ pub fn integrate(module: &mut Module) {
     module.add_class(make_arg_typehint_class());
     module.add_class(make_return_typehint_class());
     module.add_class(make_arg_default_value_class());
-    module.add_function("integration_function_return_bool", |_| -> Result<bool, Infallible> { Ok(true)} )
+    module
+        .add_function(
+            "integration_function_return_bool",
+            |_| -> Result<bool, Infallible> { Ok(true) },
+        )
         .return_type(ReturnType::new(ReturnTypeHint::Bool));
-    module.add_function("integration_function_return_int", |_| -> Result<i64, Infallible> { Ok(42)} )
+    module
+        .add_function(
+            "integration_function_return_int",
+            |_| -> Result<i64, Infallible> { Ok(42) },
+        )
         .return_type(ReturnType::new(ReturnTypeHint::Int));
-    module.add_function("integration_function_return_float", |_| -> Result<f64, Infallible> { Ok(3.14)} )
+    module
+        .add_function(
+            "integration_function_return_float",
+            |_| -> Result<f64, Infallible> { Ok(1.234) },
+        )
         .return_type(ReturnType::new(ReturnTypeHint::Float));
-    module.add_function("integration_function_return_string", |_| -> Result<&'static str, Infallible> { Ok("phper")} )
+    module
+        .add_function(
+            "integration_function_return_string",
+            |_| -> Result<&'static str, Infallible> { Ok("phper") },
+        )
         .return_type(ReturnType::new(ReturnTypeHint::String));
-    module.add_function("integration_function_return_array", |_| -> Result<ZArray, Infallible> { Ok(ZArray::new()) } )
+    module
+        .add_function(
+            "integration_function_return_array",
+            |_| -> Result<ZArray, Infallible> { Ok(ZArray::new()) },
+        )
         .return_type(ReturnType::new(ReturnTypeHint::Array));
-    module.add_function("integration_function_return_mixed", |_| -> Result<ZVal, Infallible> { Ok(ZVal::from(1.23))} )
+    module
+        .add_function(
+            "integration_function_return_mixed",
+            |_| -> Result<ZVal, Infallible> { Ok(ZVal::from(1.23)) },
+        )
         .return_type(ReturnType::new(ReturnTypeHint::Mixed));
-    module.add_function("integration_function_return_void", |_| phper::ok(()))
+    module
+        .add_function("integration_function_return_void", |_| phper::ok(()))
         .return_type(ReturnType::new(ReturnTypeHint::Void));
     module
         .add_function("integration_function_typehints", |_| phper::ok(()))
@@ -471,11 +496,9 @@ fn make_return_typehint_class() -> ClassEntity<()> {
         .return_type(ReturnType::new(ReturnTypeHint::Null));
 
     class
-        .add_method(
-            "returnString",
-            Visibility::Public,
-            move |_, _| phper::ok("phper"),
-        )
+        .add_method("returnString", Visibility::Public, move |_, _| {
+            phper::ok("phper")
+        })
         .return_type(ReturnType::new(ReturnTypeHint::String));
 
     class
@@ -485,7 +508,9 @@ fn make_return_typehint_class() -> ClassEntity<()> {
         .return_type(ReturnType::new(ReturnTypeHint::String).allow_null());
 
     class
-        .add_method("returnBool", Visibility::Public, move |_, _| phper::ok(true))
+        .add_method("returnBool", Visibility::Public, move |_, _| {
+            phper::ok(true)
+        })
         .return_type(ReturnType::new(ReturnTypeHint::Bool));
 
     class
@@ -505,7 +530,9 @@ fn make_return_typehint_class() -> ClassEntity<()> {
         .return_type(ReturnType::new(ReturnTypeHint::Int).allow_null());
 
     class
-        .add_method("returnFloat", Visibility::Public, move |_, _| phper::ok(3.14))
+        .add_method("returnFloat", Visibility::Public, move |_, _| {
+            phper::ok(1.234)
+        })
         .return_type(ReturnType::new(ReturnTypeHint::Float));
 
     class
@@ -515,7 +542,9 @@ fn make_return_typehint_class() -> ClassEntity<()> {
         .return_type(ReturnType::new(ReturnTypeHint::Float).allow_null());
 
     class
-        .add_method("returnArray", Visibility::Public, move |_, _| phper::ok(ZArray::new()))
+        .add_method("returnArray", Visibility::Public, move |_, _| {
+            phper::ok(ZArray::new())
+        })
         .return_type(ReturnType::new(ReturnTypeHint::Array));
 
     class

tests/integration/tests/php/typehints.php

@@ -215,7 +215,7 @@ public function setValue($value): void {
 echo PHP_EOL . 'Testing return type-hinted function invocation' . PHP_EOL;
 assert_true(integration_function_return_bool());
 assert_eq(42, integration_function_return_int());
-assert_eq(3.14, integration_function_return_float());
+assert_eq(1.234, integration_function_return_float());
 assert_eq('phper', integration_function_return_string());
 assert_eq(array(), integration_function_return_array());
 assert_eq(1.23, integration_function_return_mixed());
@@ -227,7 +227,7 @@ public function setValue($value): void {
 assert_eq(null, $cls->returnBoolNullable(), 'returnBoolNullable');
 assert_eq(42, $cls->returnInt(), 'returnInt');
 assert_eq(null, $cls->returnIntNullable(), 'returnIntNullable');
-assert_eq(3.14, $cls->returnFloat(), 'returnFloat');
+assert_eq(1.234, $cls->returnFloat(), 'returnFloat');
 assert_eq(null, $cls->returnFloatNullable(), 'returnFloatNullable');
 assert_eq('phper', $cls->returnString(), 'returnString');
 assert_eq(null, $cls->returnStringNullable(), 'returnStringNullable');