Fixup

Author: danog

src/args.rs

@@ -87,7 +87,7 @@ impl<'a> Arg<'a> {
     {
         self.zval
             .as_mut()
-            .and_then(|zv| T::from_zval_mut(zv))
+            .and_then(|zv| T::from_zval_mut(zv.dereference_mut()))
             .ok_or(self)
     }
 
@@ -98,7 +98,7 @@ impl<'a> Arg<'a> {
     where
         T: FromZvalMut<'a>,
     {
-        self.zval.as_mut().and_then(|zv| T::from_zval_mut(zv))
+        self.zval.as_mut().and_then(|zv| T::from_zval_mut(zv.dereference_mut()))
     }
 
     /// Attempts to return a reference to the arguments internal Zval.

src/types/zval.rs

@@ -51,6 +51,26 @@ impl Zval {
         }
     }
 
+    /// Dereference the zval, if it is a reference.
+    pub fn dereference(&self) -> &Self {
+        return self
+            .reference()
+            .or_else(|| self.indirect())
+            .or(Some(self))
+            .unwrap();
+    }
+
+    /// Dereference the zval mutable, if it is a reference.
+    pub fn dereference_mut(&mut self) -> &mut Self {
+        if self.is_reference() {
+            return self.reference_mut().unwrap();
+        }
+        if self.is_indirect() {
+            return self.indirect_mut().unwrap();
+        }
+        return self;
+    }
+
     /// Returns the value of the zval if it is a long.
     pub fn long(&self) -> Option<ZendLong> {
         if self.is_long() {

tests/src/integration/closure.php

@@ -1,12 +1,18 @@
 <?php
 
+var_dump(get_declared_classes);
+/*
+die;
 require('_utils.php');
 
+$v = test_closure();
+
 // Closure
-assert(test_closure()('works') === 'works');
+assert($closure('works') === 'works');
 
 // Closure once
 $closure = test_closure_once('test');
 
 assert(call_user_func($closure) === 'test');
 assert_exception_thrown($closure);
+*/