Merge pull request #24 from pinepain/require_context

Improve exceptions handling

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_callbacks.cc

@@ -239,7 +239,7 @@ void php_v8_callback_call_from_bucket_with_zargs(size_t index, v8::Local<v8::Val
     phpv8::CallbacksBucket *bucket;
 
     if (data.IsEmpty() || !data->IsExternal()) {
-        PHP_V8_THROW_EXCEPTION("Callback has no stored callback function");
+        PHP_V8_THROW_EXCEPTION("Callback doesn't have stored callback function");
         return;
     }
 
@@ -249,7 +249,7 @@ void php_v8_callback_call_from_bucket_with_zargs(size_t index, v8::Local<v8::Val
 
     // highly unlikely, but to play safe
     if (!cb) {
-        PHP_V8_THROW_EXCEPTION("Callback has no stored callback function");
+        PHP_V8_THROW_EXCEPTION("Callback doesn't have stored callback function");
         return;
     }
 

src/php_v8_exceptions.cc

@@ -22,7 +22,7 @@
 zend_class_entry* php_v8_generic_exception_class_entry;
 zend_class_entry* php_v8_try_catch_exception_class_entry;
 zend_class_entry* php_v8_termination_exception_class_entry;
-zend_class_entry* php_v8_abstract_resource_limit_exception_class_entry;
+zend_class_entry* php_v8_resource_limit_exception_class_entry;
 zend_class_entry* php_v8_time_limit_exception_class_entry;
 zend_class_entry* php_v8_memory_limit_exception_class_entry;
 
@@ -190,7 +190,7 @@ static const zend_function_entry php_v8_termination_exception_methods[] = {
         PHP_FE_END
 };
 
-static const zend_function_entry php_v8_abstract_resource_limit_exception_methods[] = {
+static const zend_function_entry php_v8_resource_limit_exception_methods[] = {
         PHP_FE_END
 };
 
@@ -202,11 +202,6 @@ static const zend_function_entry php_v8_memory_limit_exception_methods[] = {
         PHP_FE_END
 };
 
-static const zend_function_entry php_v8_script_exception_methods[] = {
-        PHP_FE_END
-};
-
-
 static const zend_function_entry php_v8_value_exception_methods[] = {
         PHP_FE_END
 };
@@ -215,7 +210,7 @@ static const zend_function_entry php_v8_value_exception_methods[] = {
 PHP_MINIT_FUNCTION(php_v8_exceptions) {
     zend_class_entry ce;
 
-    INIT_NS_CLASS_ENTRY(ce, "V8\\Exceptions", "GenericException", php_v8_exception_methods);
+    INIT_NS_CLASS_ENTRY(ce, "V8\\Exceptions", "Exception", php_v8_exception_methods);
     php_v8_generic_exception_class_entry = zend_register_internal_class_ex(&ce, zend_exception_get_default());
 
     INIT_NS_CLASS_ENTRY(ce, "V8\\Exceptions", "TryCatchException", php_v8_try_catch_exception_methods);
@@ -229,15 +224,14 @@ PHP_MINIT_FUNCTION(php_v8_exceptions) {
     INIT_NS_CLASS_ENTRY(ce, "V8\\Exceptions", "TerminationException", php_v8_termination_exception_methods);
     php_v8_termination_exception_class_entry = zend_register_internal_class_ex(&ce, php_v8_try_catch_exception_class_entry);
 
-    INIT_NS_CLASS_ENTRY(ce, "V8\\Exceptions", "AbstractResourceLimitException", php_v8_abstract_resource_limit_exception_methods);
-    php_v8_abstract_resource_limit_exception_class_entry = zend_register_internal_class_ex(&ce, php_v8_termination_exception_class_entry);
-    php_v8_abstract_resource_limit_exception_class_entry->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
+    INIT_NS_CLASS_ENTRY(ce, "V8\\Exceptions", "ResourceLimitException", php_v8_resource_limit_exception_methods);
+    php_v8_resource_limit_exception_class_entry = zend_register_internal_class_ex(&ce, php_v8_termination_exception_class_entry);
 
     INIT_NS_CLASS_ENTRY(ce, "V8\\Exceptions", "TimeLimitException", php_v8_time_limit_exception_methods);
-    php_v8_time_limit_exception_class_entry = zend_register_internal_class_ex(&ce, php_v8_abstract_resource_limit_exception_class_entry);
+    php_v8_time_limit_exception_class_entry = zend_register_internal_class_ex(&ce, php_v8_resource_limit_exception_class_entry);
 
     INIT_NS_CLASS_ENTRY(ce, "V8\\Exceptions", "MemoryLimitException", php_v8_memory_limit_exception_methods);
-    php_v8_memory_limit_exception_class_entry = zend_register_internal_class_ex(&ce, php_v8_abstract_resource_limit_exception_class_entry);
+    php_v8_memory_limit_exception_class_entry = zend_register_internal_class_ex(&ce, php_v8_resource_limit_exception_class_entry);
 
     INIT_NS_CLASS_ENTRY(ce, "V8\\Exceptions", "ValueException", php_v8_value_exception_methods);
     php_v8_value_exception_class_entry = zend_register_internal_class_ex(&ce, php_v8_generic_exception_class_entry);

src/php_v8_exceptions.h

@@ -30,7 +30,7 @@ extern "C" {
 extern zend_class_entry* php_v8_generic_exception_class_entry;
 extern zend_class_entry* php_v8_try_catch_exception_class_entry;
 extern zend_class_entry* php_v8_termination_exception_class_entry;
-extern zend_class_entry* php_v8_abstract_resource_limit_exception_class_entry;
+extern zend_class_entry* php_v8_resource_limit_exception_class_entry;
 extern zend_class_entry* php_v8_time_limit_exception_class_entry;
 extern zend_class_entry* php_v8_memory_limit_exception_class_entry;
 

src/php_v8_isolate.cc

@@ -363,31 +363,37 @@ 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);
     Z_ADDREF_P(return_value);
 }
 
 static PHP_METHOD(V8Isolate, ThrowException) {
+    zval *php_v8_context_zv;
     zval *php_v8_value_zv;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &php_v8_value_zv) == FAILURE) {
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "oo", &php_v8_context_zv, &php_v8_value_zv) == FAILURE) {
         return;
     }
 
     PHP_V8_ISOLATE_FETCH_WITH_CHECK(getThis(), php_v8_isolate);
+
+    PHP_V8_CONTEXT_FETCH_WITH_CHECK(php_v8_context_zv, php_v8_context);
     PHP_V8_VALUE_FETCH_WITH_CHECK(php_v8_value_zv, php_v8_value);
 
+    PHP_V8_DATA_ISOLATES_CHECK_USING(php_v8_context, php_v8_isolate);
     PHP_V8_DATA_ISOLATES_CHECK_USING(php_v8_value, php_v8_isolate);
 
-    PHP_V8_ENTER_ISOLATE(php_v8_isolate);
-
-    PHP_V8_ISOLATE_REQUIRE_IN_CONTEXT(isolate);
+    PHP_V8_ENTER_STORED_ISOLATE(php_v8_context);
+    PHP_V8_ENTER_CONTEXT(php_v8_context);
 
     v8::Local<v8::Value> local_value = php_v8_value_get_local(php_v8_value);
     v8::Local<v8::Value> local_return_value = isolate->ThrowException(local_value);
@@ -549,7 +555,8 @@ ZEND_END_ARG_INFO()
 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)
+PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_v8_isolate_ThrowException, ZEND_RETURN_VALUE, 2, V8\\Value, 0)
+                ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
                 ZEND_ARG_OBJ_INFO(0, value, V8\\Value, 0)
 ZEND_END_ARG_INFO()
 

src/php_v8_script_origin.cc

@@ -83,7 +83,7 @@ v8::ScriptOrigin *php_v8_create_script_origin_from_zval(zval *value, v8::Isolate
         v8::MaybeLocal<v8::String> local_resource_name =  v8::String::NewFromUtf8(isolate, Z_STRVAL_P(resource_name_zv), v8::NewStringType::kNormal, (int)Z_STRLEN_P(resource_name_zv));
 
         if (local_resource_name.IsEmpty()) {
-            zend_throw_exception(php_v8_generic_exception_class_entry, "Invalid resource name", 0);
+            PHP_V8_THROW_EXCEPTION("Invalid resource name");
             return nullptr;
         }
 
@@ -113,7 +113,7 @@ v8::ScriptOrigin *php_v8_create_script_origin_from_zval(zval *value, v8::Isolate
         v8::MaybeLocal<v8::String> local_source_map_url =  v8::String::NewFromUtf8(isolate, Z_STRVAL_P(source_map_url_zv), v8::NewStringType::kNormal, (int)Z_STRLEN_P(source_map_url_zv));
 
         if (local_source_map_url.IsEmpty()) {
-            zend_throw_exception(php_v8_generic_exception_class_entry, "Invalid source map url", 0);
+            PHP_V8_THROW_EXCEPTION("Invalid source map url");
             return nullptr;
         }
 

src/php_v8_stack_trace.cc

@@ -99,14 +99,14 @@ static PHP_METHOD(V8StackTrace, GetFrame)
     frames = zend_read_property(this_ce, getThis(), ZEND_STRL("frames"), 0, &rv);
 
     if (index < 0) {
-        zend_throw_exception(php_v8_generic_exception_class_entry, "Fame index is out of range", 0);
+        PHP_V8_THROW_EXCEPTION("Fame index is out of range");
         return;
     }
 
     frame = zend_hash_index_find(Z_ARRVAL_P(frames), static_cast<zend_ulong>(index));
 
     if (frame == NULL) {
-        zend_throw_exception(php_v8_generic_exception_class_entry, "Fame index is out of range", 0);
+        PHP_V8_THROW_EXCEPTION("Fame index is out of range");
         return;
     }
 

src/php_v8_startup_data.cc

@@ -68,7 +68,7 @@ static PHP_METHOD(V8StartupData, __construct) {
     }
 
     if (ZSTR_LEN(blob) > INT_MAX) {
-        zend_throw_exception(php_v8_generic_exception_class_entry, "Failed to create startup blob due to blob size integer overflow", 0);
+        PHP_V8_THROW_EXCEPTION("Failed to create startup blob due to blob size integer overflow");
         return;
     }
 

stubs/src/Exceptions/GenericException.php renamed to stubs/src/Exceptions/Exception.php

@@ -16,6 +16,6 @@
 namespace V8\Exceptions;
 
 
-class GenericException extends \Exception
+class Exception extends \Exception
 {
 }