Replace Isolate::GetCurrentContext() with Isolate::GetEnteredContext()

Author: pinepain

src/php_v8_context.cc

@@ -30,10 +30,14 @@ static void php_v8_context_free(zend_object *object)
 {
     php_v8_context_t *php_v8_context = php_v8_context_fetch_object(object);
 
-    // TODO: if we become weak, don't forget to remove stored `zval* this_ptr` to Context object
-
     if (php_v8_context->context) {
         if (PHP_V8_ISOLATE_HAS_VALID_HANDLE(php_v8_context)) {
+            {
+                PHP_V8_ENTER_STORED_ISOLATE(php_v8_context);
+                PHP_V8_DECLARE_CONTEXT(php_v8_context);
+                php_v8_context_store_reference(isolate, context, nullptr);
+            }
+
             php_v8_context->context->Reset();
         }
 

src/php_v8_function_callback_info.cc

@@ -32,7 +32,7 @@ php_v8_return_value_t * php_v8_callback_info_create_from_info(zval *return_value
     v8::Local<v8::Value> local_value;
 
     v8::Isolate *isolate = args.GetIsolate();
-    v8::Local<v8::Context> context = isolate->GetCurrentContext();
+    v8::Local<v8::Context> context = isolate->GetEnteredContext();
 
     if (context.IsEmpty()) {
         PHP_V8_THROW_EXCEPTION("Internal exception: no calling context found");

src/php_v8_isolate.cc

@@ -360,7 +360,7 @@ static PHP_METHOD(V8Isolate, InContext) {
     RETURN_BOOL(php_v8_isolate->isolate->InContext())
 }
 
-static PHP_METHOD(V8Isolate, GetCurrentContext) {
+static PHP_METHOD(V8Isolate, GetEnteredContext) {
     if (zend_parse_parameters_none() == FAILURE) {
         return;
     }
@@ -370,8 +370,8 @@ static PHP_METHOD(V8Isolate, GetCurrentContext) {
 
     PHP_V8_ISOLATE_REQUIRE_IN_CONTEXT(isolate);
 
-    v8::Local<v8::Context> local_context = php_v8_isolate->isolate->GetCurrentContext();
-
+    v8::Local<v8::Context> local_context = php_v8_isolate->isolate->GetEnteredContext();
+    
     php_v8_context_t *php_v8_context = php_v8_context_get_reference(local_context);
 
     ZVAL_OBJ(return_value, &php_v8_context->std);
@@ -551,7 +551,7 @@ ZEND_END_ARG_INFO()
 PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_v8_isolate_InContext, ZEND_RETURN_VALUE, 0, _IS_BOOL, 0)
 ZEND_END_ARG_INFO()
 
-PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_v8_isolate_GetCurrentContext, ZEND_RETURN_VALUE, 0, V8\\Context, 0)
+PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_v8_isolate_GetEnteredContext, ZEND_RETURN_VALUE, 0, V8\\Context, 0)
 ZEND_END_ARG_INFO()
 
 PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_v8_isolate_ThrowException, ZEND_RETURN_VALUE, 1, V8\\Value, 0)
@@ -610,7 +610,7 @@ static const zend_function_entry php_v8_isolate_methods[] = {
         PHP_ME(V8Isolate, GetHeapStatistics, arginfo_v8_isolate_GetHeapStatistics, ZEND_ACC_PUBLIC)
 
         PHP_ME(V8Isolate, InContext, arginfo_v8_isolate_InContext, ZEND_ACC_PUBLIC)
-        PHP_ME(V8Isolate, GetCurrentContext, arginfo_v8_isolate_GetCurrentContext, ZEND_ACC_PUBLIC)
+        PHP_ME(V8Isolate, GetEnteredContext, arginfo_v8_isolate_GetEnteredContext, ZEND_ACC_PUBLIC)
 
         PHP_ME(V8Isolate, ThrowException, arginfo_v8_isolate_ThrowException, ZEND_ACC_PUBLIC)
         PHP_ME(V8Isolate, IdleNotificationDeadline, arginfo_v8_isolate_IdleNotificationDeadline, ZEND_ACC_PUBLIC)

src/php_v8_message.cc

@@ -30,7 +30,7 @@ void php_v8_message_create_from_message(zval *return_value, php_v8_isolate_t *ph
     object_init_ex(return_value, this_ce);
 
     v8::Isolate *isolate = php_v8_isolate->isolate;
-    v8::Local<v8::Context> context = isolate->GetCurrentContext();
+    v8::Local<v8::Context> context = isolate->GetEnteredContext();
 
     /* v8::Message::Get */
     if (!message->Get().IsEmpty()) {

src/php_v8_property_callback_info.cc

@@ -54,7 +54,7 @@ php_v8_return_value_t *php_v8_callback_info_create_from_info_meta(zval *return_v
     php_v8_return_value_t *php_v8_return_value;
 
     v8::Isolate *isolate = args.GetIsolate();
-    v8::Local<v8::Context> context = isolate->GetCurrentContext();
+    v8::Local<v8::Context> context = isolate->GetEnteredContext();
 
     if (context.IsEmpty()) {
         PHP_V8_THROW_EXCEPTION("Internal exception: no calling context found");

src/php_v8_try_catch.cc

@@ -30,7 +30,7 @@ void php_v8_try_catch_create_from_try_catch(zval *return_value, php_v8_isolate_t
     object_init_ex(return_value, this_ce);
 
     PHP_V8_DECLARE_ISOLATE(php_v8_isolate);
-    v8::Local<v8::Context> context = isolate->GetCurrentContext();
+    v8::Local<v8::Context> context = isolate->GetEnteredContext();
 
     ZVAL_OBJ(&isolate_zv, &php_v8_isolate->std);
     ZVAL_OBJ(&context_zv, &php_v8_context->std);

stubs/src/Isolate.php

@@ -82,11 +82,11 @@ public function InContext() : bool
     }
 
     /**
-     * Returns the context that is on the top of the stack.
+     * Returns the last entered context.
      *
      * @return \V8\Context
      */
-    public function GetCurrentContext() : Context
+    public function GetEnteredContext() : Context
     {
     }
 

stubs/src/Script.php

@@ -51,7 +51,7 @@ public function GetContext(): Context
      *
      * @param \V8\Context $context
      *
-     * @return BooleanValue|FunctionObject|NumberValue|ObjectValue|StringValue|Value
+     * @return BooleanValue | FunctionObject | NumberValue | ObjectValue | StringValue | Value
      */
     public function Run(Context $context): Value
     {

tests/V8Isolate.phpt

@@ -17,7 +17,7 @@ $helper->dump($isolate);
 $helper->line();
 
 try {
-  $isolate->GetCurrentContext();
+  $isolate->GetEnteredContext();
 } catch (Exception $e) {
   $helper->exception_export($e);
 }

tests/V8ObjectTemplate_SetAccessCheckCallback.phpt

@@ -48,7 +48,7 @@ $AccessBlocker = function (\V8\Context $context, \V8\ObjectValue $object) use (&
     echo 'AccessBlocker called', PHP_EOL;
 //    echo '    access ', ($allowed_access ? 'allowed' : 'denied'), PHP_EOL;
 
-    //return $isolate->GetCurrentContext()->GlobalObject()->Equals($isolate->GetCurrentContext(), $object) || $allowed_access;
+    //return $isolate->GetEnteredContext()->GlobalObject()->Equals($isolate->GetCurrentContext(), $object) || $allowed_access;
     return true;
 };