Check whether returned context is empty in V8\Isolate\GetEnteredContext() instead of checking InContext()

Author: pinepain

CMakeLists.txt

@@ -3,8 +3,8 @@ project(php_v8)
 
 # NOTE: This CMake file is just for syntax highlighting in CLion
 
-include_directories(/usr/local/opt/v8@5.8/include)
-include_directories(/usr/local/opt/v8@5.8/include/libplatform)
+include_directories(/usr/local/opt/v8@5.9/include)
+include_directories(/usr/local/opt/v8@5.9/include/libplatform)
 
 include_directories(/usr/local/include/php)
 include_directories(/usr/local/include/php/TSRM)

Vagrantfile

@@ -0,0 +1,81 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
+VAGRANTFILE_API_VERSION = "2"
+
+Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
+  config.ssh.shell = "bash -c 'BASH_ENV=/etc/profile exec bash'" # Prevent TTY Errors
+
+  config.vm.box = "bento/ubuntu-16.04"
+
+  # config.vm.box_check_update = false
+
+  config.vm.network  "private_network", ip: "192.168.33.44"
+  # config.vm.network "public_network"
+
+  # If true, then any SSH connections made will enable agent forwarding.
+  # Default value: false
+  # config.ssh.forward_agent = true
+
+  config.vm.synced_folder ".", "/home/vagrant/php-v8"
+
+  # Provider-specific configuration so you can fine-tune various
+  # backing providers for Vagrant. These expose provider-specific options.
+  # Example for VirtualBox:
+  #
+  config.vm.provider "virtualbox" do |vb|
+     # Don't boot with headless mode
+     # vb.gui = true
+
+     # Use VBoxManage to customize the VM. For example to change memory:
+     vb.customize ["modifyvm", :id, "--memory", 2048]
+     vb.customize ["modifyvm", :id, "--cpus", 2]
+  end
+  #
+  # View the documentation for the provider you're using for more
+  # information on available options.
+
+  # Enable provisioning with CFEngine. CFEngine Community packages are
+  # automatically installed. For example, configure the host as a
+  # policy server and optionally a policy file to run:
+  #
+  # config.vm.provision "cfengine" do |cf|
+  #   cf.am_policy_hub = true
+  #   # cf.run_file = "motd.cf"
+  # end
+  #
+  # You can also configure and bootstrap a client to an existing
+  # policy server:
+  #
+  # config.vm.provision "cfengine" do |cf|
+  #   cf.policy_server_address = "10.0.2.15"
+  # end
+
+  # Enable provisioning with Puppet stand alone.  Puppet manifests
+  # are contained in a directory path relative to this Vagrantfile.
+  # You will need to create the manifests directory and a manifest in
+  # the file default.pp in the manifests_path directory.
+  #
+  # config.vm.provision "puppet" do |puppet|
+  #   puppet.manifests_path = "manifests"
+  #   puppet.manifest_file  = "default.pp"
+  # end
+
+  # Enable provisioning with chef solo, specifying a cookbooks path, roles
+  # path, and data_bags path (all relative to this Vagrantfile), and adding
+  # some recipes and/or roles.
+  #
+  # config.vm.provision "chef_solo" do |chef|
+  #   chef.cookbooks_path = "../my-recipes/cookbooks"
+  #   chef.roles_path = "../my-recipes/roles"
+  #   chef.data_bags_path = "../my-recipes/data_bags"
+  #   chef.add_recipe "mysql"
+  #   chef.add_role "web"
+  #
+  #   # You may also specify custom JSON attributes:
+  #   chef.json = { mysql_password: "foo" }
+  # end
+
+  #config.vm.provision "shell", path: './provision/provision.sh', privileged: false
+end

src/php_v8_isolate.cc

@@ -363,10 +363,13 @@ static PHP_METHOD(V8Isolate, GetEnteredContext) {
     PHP_V8_ISOLATE_FETCH_WITH_CHECK(getThis(), php_v8_isolate);
     PHP_V8_ENTER_ISOLATE(php_v8_isolate)
 
-    PHP_V8_ISOLATE_REQUIRE_IN_CONTEXT(isolate);
-
     v8::Local<v8::Context> local_context = php_v8_isolate->isolate->GetEnteredContext();
 
+    if (local_context.IsEmpty()) {
+        PHP_V8_THROW_EXCEPTION("Isolate doesn't have entered context");
+        return;
+    }
+
     php_v8_context_t *php_v8_context = php_v8_context_get_reference(local_context);
 
     ZVAL_OBJ(return_value, &php_v8_context->std);

tests/V8Isolate.phpt

@@ -16,13 +16,6 @@ $helper->header('Object representation');
 $helper->dump($isolate);
 $helper->line();
 
-try {
-  $isolate->GetEnteredContext();
-} catch (Exception $e) {
-  $helper->exception_export($e);
-}
-
-$helper->line();
 $helper->method_export($isolate, 'GetHeapStatistics');
 
 $isolate = null;
@@ -43,10 +36,8 @@ object(V8\Isolate)#2 (5) {
   bool(false)
 }
 
-V8\Exceptions\Exception: Not in context!
-
 V8\Isolate->GetHeapStatistics():
-    object(V8\HeapStatistics)#29 (9) {
+    object(V8\HeapStatistics)#28 (9) {
       ["total_heap_size":"V8\HeapStatistics":private]=>
       float(%d)
       ["total_heap_size_executable":"V8\HeapStatistics":private]=>

tests/V8Isolate_GetEnteredContext.phpt

@@ -0,0 +1,43 @@
+--TEST--
+V8\Isolate::GetEnteredContext()
+--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);
+
+
+$isolate = new \V8\Isolate();
+
+try {
+    $isolate->GetEnteredContext();
+}catch (\V8\Exceptions\Exception $e) {
+    $helper->exception_export($e);
+}
+
+
+$helper->line();
+
+$func_tpl = new \V8\FunctionTemplate($isolate, function (\V8\FunctionCallbackInfo $info) use ($helper) {
+    $helper->assert('Isolate has entered context', $info->GetIsolate()->GetEnteredContext() === $info->GetContext());
+});
+
+
+$global_tpl = new \V8\ObjectTemplate($isolate);
+$global_tpl->Set(new \V8\StringValue($isolate, 'test'), $func_tpl);
+
+$context = new \V8\Context($isolate, $global_tpl);
+
+$v8_helper->CompileTryRun($context, 'test()');
+
+
+
+?>
+--EXPECT--
+V8\Exceptions\Exception: Isolate doesn't have entered context
+
+Isolate has entered context: ok

tests/V8Isolate_ThrowException.phpt

@@ -13,8 +13,6 @@ $v8_helper = new PhpV8Helpers($helper);
 
 $isolate = new \V8\Isolate();
 
-$helper->line();
-
 $func_tpl = new \V8\FunctionTemplate($isolate, function (\V8\FunctionCallbackInfo $info) {
     $value = count($info->Arguments()) ? $info->Arguments()[0] : new \V8\StringValue($info->GetIsolate(), "exception");