Add more tests

Author: Girgias

ext/reflection/php_reflection.c

@@ -1518,7 +1518,6 @@ static void reflection_method_factory(zend_class_entry *ce, zend_function *metho
 	intern->ref_type = REF_TYPE_FUNCTION;
 	intern->ce = ce;
 	if (closure_object) {
-		intern->ce = zend_ce_closure;
 		ZVAL_OBJ_COPY(&intern->obj, closure_object);
 	}
 

ext/reflection/tests/types/relative_class_types/closure_automatic_bound_class.phpt

@@ -0,0 +1,54 @@
+--TEST--
+ReflectionTypes of relative class types (self, parent) in Closure bound to class automatically
+--FILE--
+<?php
+
+class A {}
+class B extends A {
+    public function test() {
+        $fnSelf = function (): self { };
+        $fnParent = function (): parent {};
+        $fnStatic = function (): static {};
+        test_scopes($fnSelf, $fnParent, $fnStatic);
+    }
+}
+class C extends B {}
+
+function test_scopes(Closure ...$fns) {
+    foreach ($fns as $fn) {
+        $rc = new ReflectionFunction($fn);
+        echo "Bound to: ", $rc->getClosureCalledClass()->name, PHP_EOL;
+        $type = $rc->getReturnType();
+        echo "Type: ", $type, PHP_EOL;
+        echo "Instance of: ", $type::class, PHP_EOL;
+        try {
+            $resolvedType = $type->resolveToNamedType();
+            echo "\tResolved Type: ", $resolvedType, PHP_EOL;
+            echo "\tInstance of: ", $resolvedType::class, PHP_EOL;
+        } catch (\Throwable $e) {
+            echo $e::class, ': ', $e->getMessage(), PHP_EOL;
+        }
+    }
+}
+
+$b = new C();
+$b->test();
+
+
+?>
+--EXPECT--
+Bound to: C
+Type: self
+Instance of: ReflectionRelativeClassType
+	Resolved Type: B
+	Instance of: ReflectionNamedType
+Bound to: C
+Type: parent
+Instance of: ReflectionRelativeClassType
+	Resolved Type: A
+	Instance of: ReflectionNamedType
+Bound to: C
+Type: static
+Instance of: ReflectionRelativeClassType
+	Resolved Type: C
+	Instance of: ReflectionNamedType

ext/reflection/tests/types/relative_class_types/closures_bound_getDeclaringFunction_type_resolution.phpt

@@ -0,0 +1,58 @@
+--TEST--
+Check that a bound Closure retrieved via getDeclaringFunction() can still resolve types
+--FILE--
+<?php
+
+class A {}
+class B extends A {}
+class C extends B {}
+
+$closureSelf = function($op1, $op2 = 0): self { };
+$closureParent = function($op1, $op2 = 0): parent { };
+$closureStatic = function($op1, $op2 = 0): static { };
+
+const CLOSURE_SELF_NAME = '{closure:' . __FILE__ . ':7}';
+const CLOSURE_PARENT_NAME = '{closure:' . __FILE__ . ':8}';
+const CLOSURE_STATIC_NAME = '{closure:' . __FILE__ . ':9}';
+
+$cases = [
+    [$closureSelf, CLOSURE_SELF_NAME],
+    [$closureParent, CLOSURE_PARENT_NAME],
+    [$closureStatic, CLOSURE_STATIC_NAME],
+];
+
+$c = new C();
+foreach ($cases as [$unboundFn, $name]) {
+    $fn = $unboundFn->bindTo($c, B::class);
+    $rClosure = new ReflectionFunction($fn);
+    var_dump($rClosure->name == $name);
+
+    $params = $rClosure->getParameters();
+    unset ($rClosure);
+
+    $closureFromParam = $params[0]->getDeclaringFunction();
+    var_dump($closureFromParam->name == $name);
+    var_dump($closureFromParam::class);
+    $type = $closureFromParam->getReturnType();
+    var_dump((string) $type);
+    $resolvedType = $type->resolveToNamedType();
+    var_dump((string) $resolvedType);
+}
+
+?>
+--EXPECT--
+bool(true)
+bool(true)
+string(16) "ReflectionMethod"
+string(4) "self"
+string(1) "B"
+bool(true)
+bool(true)
+string(16) "ReflectionMethod"
+string(6) "parent"
+string(1) "A"
+bool(true)
+bool(true)
+string(16) "ReflectionMethod"
+string(6) "static"
+string(1) "C"