Allow to initialise objects

Author: cv65kr

src/zend/handlers.rs

@@ -85,7 +85,7 @@ impl ZendObjectHandlers {
             let prop_name = member
                 .as_ref()
                 .ok_or("Invalid property name pointer given")?;
-            let self_ = &mut **obj;
+            let self_ = &mut *obj;
             let props = T::get_metadata().get_properties();
             let prop = props.get(prop_name.as_str()?);
 
@@ -132,7 +132,8 @@ impl ZendObjectHandlers {
             let prop_name = member
                 .as_ref()
                 .ok_or("Invalid property name pointer given")?;
-            let self_ = &mut **obj;
+
+            let self_ = &mut *obj;
             let props = T::get_metadata().get_properties();
             let prop = props.get(prop_name.as_str()?);
             let value_mut = value.as_mut().ok_or("Invalid return zval given")?;

tests/src/integration/_utils.php

@@ -7,5 +7,18 @@ function assert_exception_thrown(callable $callback): void
     } catch (\Throwable $th) {
         return;
     }
-    throw new Exception("Excption was not thrown", 255);
+    throw new Exception("Exception was not thrown", 255);
+}
+
+
+function assert_specific_exception_thrown(callable $callback, string $expectedExpectionFqcn): void
+{
+    try {
+        call_user_func($callback);
+    } catch (\Throwable $e) {
+        if ($e instanceof $expectedExpectionFqcn) {
+            return;
+        }
+    }
+    throw new Exception("Exception was not thrown", 255);
 }

tests/src/integration/exception.php

@@ -0,0 +1,14 @@
+<?php
+
+require('_utils.php');
+
+assert_specific_exception_thrown(fn() => throw throw_default_exception(), \Exception::class);
+
+assert_specific_exception_thrown(fn() => throw throw_custom_exception(), \Test\TestException::class);
+
+try {
+    throw throw_custom_exception();
+} catch (\Throwable $e) {
+    // Check if object is initiated
+    assert("Not good custom!" === $e->getMessage());
+}

tests/src/integration/exception.rs

@@ -0,0 +1,4 @@
+#[test]
+fn exception_works() {
+    assert!(crate::integration::run_php("exception.php"));
+}

tests/src/lib.rs

@@ -1,5 +1,5 @@
 #![cfg_attr(windows, feature(abi_vectorcall))]
-use ext_php_rs::{binary::Binary, prelude::*, types::ZendObject, types::Zval};
+use ext_php_rs::{binary::Binary, prelude::*, types::ZendObject, types::Zval, exception::PhpException, zend::ce};
 use std::collections::HashMap;
 
 #[php_function]
@@ -112,6 +112,21 @@ pub fn test_class(string: String, number: i32) -> TestClass {
     }
 }
 
+#[php_class(name = "Test\\TestException")]
+#[extends(ce::exception())]
+#[derive(Debug)]
+pub struct TestException;
+
+#[php_function]
+pub fn throw_custom_exception() -> PhpResult<i32> {
+    Err(PhpException::from_class::<TestException>("Not good custom!".into()))
+}
+
+#[php_function]
+pub fn throw_default_exception() -> PhpResult<i32> {
+    Err(PhpException::default("Not good!".into()))
+}
+
 #[php_module]
 pub fn get_module(module: ModuleBuilder) -> ModuleBuilder {
     module
@@ -179,6 +194,7 @@ mod integration {
     mod callable;
     mod class;
     mod closure;
+    mod exception;
     mod nullable;
     mod number;
     mod object;