Remove non-standard V8\Scrip::{getSource,getOrigin}, add script builder function

Author: pinepain

src/php_v8_script.cc

@@ -34,6 +34,23 @@ php_v8_script_t * php_v8_script_fetch_object(zend_object *obj) {
     return (php_v8_script_t *)((char *)obj - XtOffsetOf(php_v8_script_t, std));
 }
 
+php_v8_script_t *php_v8_create_script(zval *return_value, v8::Local<v8::Script> local_script, php_v8_context_t *php_v8_context) {
+    assert(!local_script.IsEmpty());
+
+    PHP_V8_DECLARE_ISOLATE(php_v8_context->php_v8_isolate);
+
+    object_init_ex(return_value, this_ce);
+
+    PHP_V8_FETCH_SCRIPT_INTO(return_value, php_v8_script);
+
+    PHP_V8_STORE_POINTER_TO_ISOLATE(php_v8_script, php_v8_context->php_v8_isolate);
+    PHP_V8_STORE_POINTER_TO_CONTEXT(php_v8_script, php_v8_context);
+
+    php_v8_script->persistent->Reset(isolate, local_script);
+
+    return php_v8_script;
+}
+
 static void php_v8_script_free(zend_object *object)
 {
     php_v8_script_t *php_v8_script = php_v8_script_fetch_object(object);
@@ -92,28 +109,16 @@ static PHP_METHOD(V8Script, __construct)
     PHP_V8_SCRIPT_STORE_CONTEXT(getThis(), php_v8_context_zv);
     PHP_V8_SCRIPT_STORE_ISOLATE(getThis(), PHP_V8_CONTEXT_READ_ISOLATE(php_v8_context_zv));
 
-    zend_update_property(this_ce, getThis(), ZEND_STRL("source"), php_v8_string_zv);
-
     PHP_V8_ENTER_STORED_ISOLATE(php_v8_script);
     PHP_V8_ENTER_STORED_CONTEXT(php_v8_script);
 
-    if (php_v8_origin_zv == NULL) {
-        origin = new v8::ScriptOrigin(v8::Undefined(isolate));
-
-        zval origin_zv;
-        php_v8_create_script_origin(&origin_zv, context, *origin);
-        zend_update_property(this_ce, getThis(), ZEND_STRL("origin"), &origin_zv);
-
-        zval_ptr_dtor(&origin_zv);
-    } else {
+    if (php_v8_origin_zv != NULL) {
         origin = php_v8_create_script_origin_from_zval(php_v8_origin_zv, isolate);
 
         if (!origin) {
             /* exception was already thrown, here we just silently exit */
             return;
         }
-
-        zend_update_property(this_ce, getThis(), ZEND_STRL("origin"), php_v8_origin_zv);
     }
 
     v8::Local<v8::String> local_source =  php_v8_value_get_string_local(isolate, php_v8_string);
@@ -157,32 +162,6 @@ static PHP_METHOD(V8Script, GetContext)
     RETVAL_ZVAL(PHP_V8_SCRIPT_READ_CONTEXT(getThis()), 1, 0);
 }
 
-static PHP_METHOD(V8Script, getSource)
-{
-    zval rv;
-
-    if (zend_parse_parameters_none() == FAILURE) {
-        return;
-    }
-
-    PHP_V8_FETCH_SCRIPT_WITH_CHECK(getThis(), php_v8_script);
-
-    RETURN_ZVAL(zend_read_property(this_ce, getThis(), ZEND_STRL("source"), 0, &rv), 1, 0);
-}
-
-static PHP_METHOD(V8Script, getOrigin)
-{
-    zval rv;
-
-    if (zend_parse_parameters_none() == FAILURE) {
-        return;
-    }
-
-    PHP_V8_FETCH_SCRIPT_WITH_CHECK(getThis(), php_v8_script);
-
-    RETURN_ZVAL(zend_read_property(this_ce, getThis(), ZEND_STRL("origin"), 0, &rv), 1, 0);
-}
-
 static PHP_METHOD(V8Script, Run)
 {
     zval *php_v8_context_zv;
@@ -227,13 +206,7 @@ ZEND_END_ARG_INFO()
 PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_v8_script_GetContext, ZEND_RETURN_VALUE, 0, V8\\Context, 0)
 ZEND_END_ARG_INFO()
 
-PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_v8_script_getSource, ZEND_RETURN_VALUE, 0, V8\\StringValue, 0)
-ZEND_END_ARG_INFO()
-
-PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_v8_script_getOrigin, ZEND_RETURN_VALUE, 0, V8\\ScriptOrigin, 0)
-ZEND_END_ARG_INFO()
-
-PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_v8_script_Run, ZEND_RETURN_VALUE, 0, V8\\Value, 1)
+PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_v8_script_Run, ZEND_RETURN_VALUE, 1, V8\\Value, 0)
                 ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
 ZEND_END_ARG_INFO()
 
@@ -242,8 +215,6 @@ static const zend_function_entry php_v8_script_methods[] = {
     PHP_ME(V8Script, __construct, arginfo_v8_script___construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
     PHP_ME(V8Script, GetIsolate, arginfo_v8_script_GetIsolate, ZEND_ACC_PUBLIC)
     PHP_ME(V8Script, GetContext, arginfo_v8_script_GetContext, ZEND_ACC_PUBLIC)
-    PHP_ME(V8Script, getSource, arginfo_v8_script_getSource, ZEND_ACC_PUBLIC)
-    PHP_ME(V8Script, getOrigin, arginfo_v8_script_getOrigin, ZEND_ACC_PUBLIC)
 
     PHP_ME(V8Script, Run, arginfo_v8_script_Run, ZEND_ACC_PUBLIC)
 
@@ -261,8 +232,6 @@ PHP_MINIT_FUNCTION(php_v8_script)
 
     zend_declare_property_null(this_ce, ZEND_STRL("isolate"), ZEND_ACC_PRIVATE);
     zend_declare_property_null(this_ce, ZEND_STRL("context"), ZEND_ACC_PRIVATE);
-    zend_declare_property_null(this_ce, ZEND_STRL("source"), ZEND_ACC_PRIVATE);
-    zend_declare_property_null(this_ce, ZEND_STRL("origin"), ZEND_ACC_PRIVATE);
 
     memcpy(&php_v8_script_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 

src/php_v8_script.h

@@ -32,7 +32,7 @@ extern zend_class_entry *php_v8_script_class_entry;
 
 extern v8::Local<v8::Script> php_v8_script_get_local(v8::Isolate *isolate, php_v8_script_t *php_v8_script);
 extern php_v8_script_t * php_v8_script_fetch_object(zend_object *obj);
-
+extern php_v8_script_t *php_v8_create_script(zval *return_value, v8::Local<v8::Script> local_script, php_v8_context_t *php_v8_context);
 
 #define PHP_V8_FETCH_SCRIPT(zv) php_v8_script_fetch_object(Z_OBJ_P(zv))
 #define PHP_V8_FETCH_SCRIPT_INTO(pzval, into) php_v8_script_t *(into) = PHP_V8_FETCH_SCRIPT((pzval))

stubs/src/Script.php

@@ -16,10 +16,8 @@
 
 class Script
 {
-    private $isolate;
+    //private $isolate;
     private $context;
-    private $source;
-    private $origin;
 
     /**
      * @param Context      $context
@@ -30,40 +28,22 @@ public function __construct(Context $context, StringValue $source, ScriptOrigin
     {
         // $this->isolate = $context->isolate;
         $this->context = $context;
-        $this->source = $source;
-        $this->origin = $origin;
     }
 
     /**
      * @return Isolate
      */
-    public function GetIsolate() : Isolate
+    public function GetIsolate(): Isolate
     {
     }
 
     /**
      * @return \V8\Context
      */
-    public function GetContext() : Context
+    public function GetContext(): Context
     {
     }
 
-    /**
-     * @return StringValue
-     */
-    public function getSource() : StringValue
-    {
-        return $this->source;
-    }
-
-    /**
-     * @return ScriptOrigin
-     */
-    public function getOrigin() : ScriptOrigin
-    {
-        return $this->origin;
-    }
-
     /**
      * Runs the script returning the resulting value. It will be run in the
      * context in which it was created (ScriptCompiler::CompileBound or
@@ -73,12 +53,7 @@ public function getOrigin() : ScriptOrigin
      *
      * @return BooleanValue|FunctionObject|NumberValue|ObjectValue|StringValue|Value
      */
-    public function Run(Context $context) : Value
+    public function Run(Context $context): Value
     {
     }
-
-    /**
-     * Returns the corresponding context-unbound script.
-     */
-    //Local<UnboundScript> GetUnboundScript();
 }

tests/V8Exception_CreateMessage.phpt

@@ -85,15 +85,15 @@ Message created from thrown value:
 V8\Message->Get(): string(18) "Uncaught #<Object>"
 V8\Message->GetSourceLine(): string(24) "        test(exception);"
 V8\Message->GetScriptOrigin():
-    object(V8\ScriptOrigin)#22 (6) {
+    object(V8\ScriptOrigin)#19 (6) {
       ["resource_name":"V8\ScriptOrigin":private]=>
       string(7) "test.js"
       ["resource_line_offset":"V8\ScriptOrigin":private]=>
       int(0)
       ["resource_column_offset":"V8\ScriptOrigin":private]=>
       int(0)
       ["options":"V8\ScriptOrigin":private]=>
-      object(V8\ScriptOriginOptions)#18 (4) {
+      object(V8\ScriptOriginOptions)#15 (4) {
         ["is_shared_cross_origin":"V8\ScriptOriginOptions":private]=>
         bool(false)
         ["is_opaque":"V8\ScriptOriginOptions":private]=>
@@ -123,15 +123,15 @@ Message created from created value:
 V8\Message->Get(): string(13) "Uncaught test"
 V8\Message->GetSourceLine(): string(24) "        test(exception);"
 V8\Message->GetScriptOrigin():
-    object(V8\ScriptOrigin)#36 (6) {
+    object(V8\ScriptOrigin)#33 (6) {
       ["resource_name":"V8\ScriptOrigin":private]=>
       string(7) "test.js"
       ["resource_line_offset":"V8\ScriptOrigin":private]=>
       int(0)
       ["resource_column_offset":"V8\ScriptOrigin":private]=>
       int(0)
       ["options":"V8\ScriptOrigin":private]=>
-      object(V8\ScriptOriginOptions)#35 (4) {
+      object(V8\ScriptOriginOptions)#32 (4) {
         ["is_shared_cross_origin":"V8\ScriptOriginOptions":private]=>
         bool(false)
         ["is_opaque":"V8\ScriptOriginOptions":private]=>

tests/V8Exception_GetStackTrace.phpt

@@ -112,7 +112,7 @@ Stack trace created from thrown value:
 V8\StackTrace->getFrames():
     array(1) {
       [0]=>
-      object(V8\StackFrame)#20 (8) {
+      object(V8\StackFrame)#17 (8) {
         ["line_number":"V8\StackFrame":private]=>
         int(5)
         ["column":"V8\StackFrame":private]=>
@@ -133,7 +133,7 @@ V8\StackTrace->getFrames():
     }
 V8\StackTrace->GetFrameCount(): int(1)
 V8\StackTrace->AsArray():
-    object(V8\ArrayObject)#18 (2) {
+    object(V8\ArrayObject)#15 (2) {
       ["isolate":"V8\Value":private]=>
       object(V8\Isolate)#3 (5) {
         ["snapshot":"V8\Isolate":private]=>

tests/V8FunctionCallbackInfo.phpt

@@ -81,7 +81,7 @@ echo 'We are done for now', PHP_EOL;
 Function called
 Object representation:
 ----------------------
-object(V8\FunctionCallbackInfo)#13 (0) {
+object(V8\FunctionCallbackInfo)#10 (0) {
 }
 
 
@@ -99,7 +99,7 @@ V8\Exceptions\GenericException: Attempt to use callback info object out of callb
 
 Object representation (outside of context):
 -------------------------------------------
-object(V8\FunctionCallbackInfo)#13 (0) {
+object(V8\FunctionCallbackInfo)#10 (0) {
 }
 
 

tests/V8FunctionObject.phpt

@@ -176,15 +176,15 @@ Should output Hello World string
 string(11) "Script done"
 
 v8Tests\TrackingDtors\FunctionObject(V8\FunctionObject)->GetScriptOrigin():
-    object(V8\ScriptOrigin)#133 (6) {
+    object(V8\ScriptOrigin)#127 (6) {
       ["resource_name":"V8\ScriptOrigin":private]=>
       string(0) ""
       ["resource_line_offset":"V8\ScriptOrigin":private]=>
       int(0)
       ["resource_column_offset":"V8\ScriptOrigin":private]=>
       int(0)
       ["options":"V8\ScriptOrigin":private]=>
-      object(V8\ScriptOriginOptions)#134 (4) {
+      object(V8\ScriptOriginOptions)#131 (4) {
         ["is_shared_cross_origin":"V8\ScriptOriginOptions":private]=>
         bool(false)
         ["is_opaque":"V8\ScriptOriginOptions":private]=>

tests/V8Isolate_limit_memory.phpt

@@ -91,7 +91,7 @@ object(V8\Isolate)#3 (5) {
   ["memory_limit_hit":"V8\Isolate":private]=>
   bool(true)
 }
-object(V8\HeapStatistics)#14 (9) {
+object(V8\HeapStatistics)#11 (9) {
   ["total_heap_size":"V8\HeapStatistics":private]=>
   float(%d)
   ["total_heap_size_executable":"V8\HeapStatistics":private]=>

tests/V8ReturnValue_context.phpt

@@ -73,7 +73,7 @@ $helper->space();
 --EXPECT--
 Object representation:
 ----------------------
-object(V8\ReturnValue)#14 (0) {
+object(V8\ReturnValue)#11 (0) {
 }
 
 
@@ -89,5 +89,5 @@ V8\Exceptions\GenericException: Attempt to use return value out of calling funct
 
 Object representation (outside of context):
 -------------------------------------------
-object(V8\ReturnValue)#14 (0) {
+object(V8\ReturnValue)#11 (0) {
 }

tests/V8Script.phpt

@@ -47,7 +47,7 @@ $helper->space();
 $v8_helper->run_checks($res, 'Checkers');
 ?>
 --EXPECT--
-object(V8\Script)#7 (4) {
+object(V8\Script)#7 (2) {
   ["isolate":"V8\Script":private]=>
   object(V8\Isolate)#3 (5) {
     ["snapshot":"V8\Isolate":private]=>
@@ -98,46 +98,6 @@ object(V8\Script)#7 (4) {
     ["global_object":"V8\Context":private]=>
     NULL
   }
-  ["source":"V8\Script":private]=>
-  object(V8\StringValue)#8 (1) {
-    ["isolate":"V8\Value":private]=>
-    object(V8\Isolate)#3 (5) {
-      ["snapshot":"V8\Isolate":private]=>
-      NULL
-      ["time_limit":"V8\Isolate":private]=>
-      float(0)
-      ["time_limit_hit":"V8\Isolate":private]=>
-      bool(false)
-      ["memory_limit":"V8\Isolate":private]=>
-      int(0)
-      ["memory_limit_hit":"V8\Isolate":private]=>
-      bool(false)
-    }
-  }
-  ["origin":"V8\Script":private]=>
-  object(V8\ScriptOrigin)#9 (6) {
-    ["resource_name":"V8\ScriptOrigin":private]=>
-    string(7) "test.js"
-    ["resource_line_offset":"V8\ScriptOrigin":private]=>
-    int(0)
-    ["resource_column_offset":"V8\ScriptOrigin":private]=>
-    int(0)
-    ["options":"V8\ScriptOrigin":private]=>
-    object(V8\ScriptOriginOptions)#10 (4) {
-      ["is_shared_cross_origin":"V8\ScriptOriginOptions":private]=>
-      bool(false)
-      ["is_opaque":"V8\ScriptOriginOptions":private]=>
-      bool(false)
-      ["is_wasm":"V8\ScriptOriginOptions":private]=>
-      bool(false)
-      ["is_module":"V8\ScriptOriginOptions":private]=>
-      bool(false)
-    }
-    ["script_id":"V8\ScriptOrigin":private]=>
-    int(0)
-    ["source_map_url":"V8\ScriptOrigin":private]=>
-    string(0) ""
-  }
 }
 Accessors:
 ----------