Add V8\FunctionTemplate signature support in ctor (simplified to $receiver)

Author: pinepain

src/php_v8_function_template.cc

@@ -131,15 +131,16 @@ static PHP_METHOD(V8FunctionTemplate, __construct) {
     zend_fcall_info fci = empty_fcall_info;
     zend_fcall_info_cache fci_cache = empty_fcall_info_cache;
 
+    zval *php_v8_receiver_zv = NULL;
+
     zend_long length = 0;
     zend_long behavior = static_cast<zend_long>(v8::ConstructorBehavior::kAllow);
 
     v8::FunctionCallback callback = 0;
     v8::Local<v8::External> data;
     v8::Local<v8::Signature> signature;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "o|f!ll", &php_v8_isolate_zv, &fci, &fci_cache, &length, &behavior) ==
-        FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "o|f!o!ll", &php_v8_isolate_zv, &fci, &fci_cache, &php_v8_receiver_zv, &length, &behavior) == FAILURE) {
         return;
     }
 
@@ -155,6 +156,13 @@ static PHP_METHOD(V8FunctionTemplate, __construct) {
 
     PHP_V8_ENTER_ISOLATE(php_v8_isolate);
 
+    if (php_v8_receiver_zv) {
+        PHP_V8_FETCH_FUNCTION_TEMPLATE_WITH_CHECK(php_v8_receiver_zv, php_v8_receiver);
+        PHP_V8_DATA_ISOLATES_CHECK(php_v8_function_template, php_v8_receiver);
+
+        signature = v8::Signature::New(isolate, php_v8_function_template_get_local(php_v8_receiver));
+    }
+
     if (fci.size) {
         phpv8::CallbacksBucket *bucket= php_v8_function_template->persistent_data->bucket("callback");
         data = v8::External::New(isolate, bucket);
@@ -445,6 +453,7 @@ static PHP_METHOD(V8FunctionTemplate, GetExternalAllocatedMemory) {
 ZEND_BEGIN_ARG_INFO_EX(arginfo_v8_function_template___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
                 ZEND_ARG_OBJ_INFO(0, isolate, V8\\Isolate, 0)
                 ZEND_ARG_CALLABLE_INFO(0, callback, 1)
+                ZEND_ARG_OBJ_INFO(0, receiver, V8\\FunctionTemplate, 1)
                 ZEND_ARG_TYPE_INFO(0, length, IS_LONG, 0)
                 ZEND_ARG_TYPE_INFO(0, behavior, IS_LONG, 0)
 ZEND_END_ARG_INFO()

stubs/src/FunctionTemplate.php

@@ -118,13 +118,19 @@
 class FunctionTemplate extends Template implements AdjustableExternalMemoryInterface
 {
     /**
-     * @param Isolate       $isolate
-     * @param callable|null $callback
-     * @param int           $length
-     * @param int           $behavior
+     * @param Isolate               $isolate
+     * @param callable|null         $callback
+     * @param FunctionTemplate|null $receiver Specifies which receiver is valid for a function
+     * @param int                   $length
+     * @param int                   $behavior
      */
-    public function __construct(Isolate $isolate, callable $callback = null, int $length = 0, int $behavior = ConstructorBehavior::kAllow)
-    {
+    public function __construct(
+        Isolate $isolate,
+        callable $callback = null,
+        FunctionTemplate $receiver = null,
+        int $length = 0,
+        int $behavior = ConstructorBehavior::kAllow
+    ) {
         parent::__construct($isolate);
     }
 

tests/.testsuite.php

@@ -128,6 +128,10 @@ public function assert($message, $actual, $expected = true, $identical = true)
         }
     }
 
+    public function fail($message = null) {
+        echo $message ?: 'Should fail', PHP_EOL;
+    }
+
     public function value_matches($expected, $actual, $identical = true)
     {
         if ($identical) {

tests/V8FunctionTemplate_constructor_behavior.phpt

@@ -25,7 +25,7 @@ $ftpl_allow = new \V8\FunctionTemplate($isolate, function () {
 
 $ftpl_throw = new \V8\FunctionTemplate($isolate, function () {
     echo 'Throw', PHP_EOL;
-}, 0, \V8\ConstructorBehavior::kThrow);
+}, null, 0, \V8\ConstructorBehavior::kThrow);
 
 $context->GlobalObject()->Set($context, new \V8\StringValue($isolate, 'f_allow'), $ftpl_allow->GetFunction($context));
 $context->GlobalObject()->Set($context, new \V8\StringValue($isolate, 'f_throw'), $ftpl_throw->GetFunction($context));

tests/V8FunctionTemplate_constructor_receiver.phpt

@@ -0,0 +1,65 @@
+--TEST--
+V8\FunctionTemplate - constructor receiver
+--SKIPIF--
+<?php if (!extension_loaded("v8")) {
+    print "skip";
+} ?>
+--FILE--
+<?php
+/** @var \Phpv8Testsuite $helper */
+$helper = require '.testsuite.php';
+require '.v8-helpers.php';
+$v8_helper = new PhpV8Helpers($helper);
+
+require '.tracking_dtors.php';
+
+// Tests:
+
+$isolate = new \V8\Isolate();
+$context = new \V8\Context($isolate);
+$v8_helper->injectConsoleLog($context);
+
+
+$cb = function (\V8\FunctionCallbackInfo $args) {
+    echo 'Callback', PHP_EOL;
+    $args->GetReturnValue()->Set(new \V8\IntegerValue($args->GetIsolate(), 42));
+};
+
+$sig_obj = new \V8\FunctionTemplate($isolate);
+
+$x = new \V8\FunctionTemplate($isolate, $cb, $sig_obj);
+
+$context->GlobalObject()->Set($context, new \V8\StringValue($isolate, 'sig_obj'), $sig_obj->GetFunction($context));
+$context->GlobalObject()->Set($context, new \V8\StringValue($isolate, 'x'), $x->GetFunction($context));
+
+$v8_helper->CompileRun($context, "var s = new sig_obj();");
+
+try {
+    $v8_helper->CompileRun($context, "x()");
+    $helper->fail();
+}catch (\V8\Exceptions\TryCatchException $e) {
+    $helper->exception_export($e);
+}
+
+try {
+    $v8_helper->CompileRun($context, "x.call(1)");
+    $helper->fail();
+}catch (\V8\Exceptions\TryCatchException $e) {
+    $helper->exception_export($e);
+}
+
+$res = $v8_helper->CompileRun($context, "s.x = x; s.x()");
+$v8_helper->CHECK_EQ(42, $res->Value());
+
+$res = $v8_helper->CompileRun($context, "x.call(s)");
+$v8_helper->CHECK_EQ(42, $res->Value());
+
+
+?>
+--EXPECT--
+V8\Exceptions\TryCatchException: TypeError: Illegal invocation
+V8\Exceptions\TryCatchException: TypeError: Illegal invocation
+Callback
+CHECK_EQ: OK
+Callback
+CHECK_EQ: OK