Merge pull request #26 from pinepain/fix-template-set

Fix Template::Set()

Author: pinepain

config.m4

@@ -175,6 +175,7 @@ if test "$PHP_V8" != "no"; then
     src/php_v8_data.cc                                    \
     src/php_v8_value.cc                                   \
     src/php_v8_primitive.cc                               \
+    src/php_v8_undefined.cc                               \
     src/php_v8_null.cc                                    \
     src/php_v8_boolean.cc                                 \
     src/php_v8_name.cc                                    \

php_v8.h

@@ -71,6 +71,10 @@ ZEND_END_MODULE_GLOBALS(v8)
         ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(name, return_reference, required_num_args, type, NULL, allow_null)
 #endif
 
+#if PHP_VERSION_ID < 70100
+    #define zend_get_executed_scope() EG(scope)
+#endif
+
 
 /* Always refer to the globals in your function as PHP_V8_G(variable).
    You are encouraged to rename these macros something shorter, see

src/php_v8_function.cc

@@ -47,16 +47,12 @@ bool php_v8_function_unpack_args(zval *arguments_zv, int arg_position, v8::Isola
 
     char *exception_message;
 
-    #if PHP_VERSION_ID >= 70100
     zend_string *ce_name = zend_get_executed_scope()->name;
-    #else
-    zend_string *ce_name = EG(scope)->name;
-    #endif
 
     ZEND_HASH_FOREACH_VAL(myht, pzval) {
         if (Z_TYPE_P(pzval) != IS_OBJECT) {
             zend_throw_error(zend_ce_type_error,
-                             "Argument %d passed to %s::%s() should be array of \\V8\\Value objects, %s given at %d offset",
+                             "Argument %d passed to %s::%s() must be an array of \\V8\\Value objects, %s given at %d offset",
                              arg_position, ZSTR_VAL(ce_name), get_active_function_name(),
                              zend_zval_type_name(pzval), i);
 
@@ -66,7 +62,7 @@ bool php_v8_function_unpack_args(zval *arguments_zv, int arg_position, v8::Isola
 
         if (!instanceof_function(Z_OBJCE_P(pzval), php_v8_value_class_entry)) {
             zend_throw_error(zend_ce_type_error,
-                             "Argument %d passed to %s::%s() should be array of \\V8\\Value objects, instance of %s given at %d offset",
+                             "Argument %d passed to %s::%s() must be an array of \\V8\\Value objects, instance of %s given at %d offset",
                              arg_position, ZSTR_VAL(ce_name), get_active_function_name(),
                              ZSTR_VAL(Z_OBJCE_P(pzval)->name), i);
 
@@ -136,16 +132,12 @@ bool php_v8_function_unpack_string_args(zval* arguments_zv, int arg_position, v8
 
     char *exception_message;
 
-    #if PHP_VERSION_ID >= 70100
-        zend_string *ce_name = zend_get_executed_scope()->name;
-    #else
-        zend_string *ce_name = EG(scope)->name;
-    #endif
+    zend_string *ce_name = zend_get_executed_scope()->name;
 
     ZEND_HASH_FOREACH_VAL(myht, pzval) {
                 if (Z_TYPE_P(pzval) != IS_OBJECT) {
                     zend_throw_error(zend_ce_type_error,
-                                     "Argument %d passed to %s::%s() should be array of \\V8\\StringValue objects, %s given at %d offset",
+                                     "Argument %d passed to %s::%s() must be an array of \\V8\\StringValue objects, %s given at %d offset",
                                      arg_position, ZSTR_VAL(ce_name), get_active_function_name(),
                                      zend_zval_type_name(pzval), i);
 
@@ -155,7 +147,7 @@ bool php_v8_function_unpack_string_args(zval* arguments_zv, int arg_position, v8
 
                 if (!instanceof_function(Z_OBJCE_P(pzval), php_v8_string_class_entry)) {
                     zend_throw_error(zend_ce_type_error,
-                                     "Argument %d passed to %s::%s() should be array of \\V8\\StringValue, instance of %s given at %d offset",
+                                     "Argument %d passed to %s::%s() must be an array of \\V8\\StringValue, instance of %s given at %d offset",
                                      arg_position, ZSTR_VAL(ce_name), get_active_function_name(),
                                      ZSTR_VAL(Z_OBJCE_P(pzval)->name), i);
 
@@ -225,16 +217,12 @@ bool php_v8_function_unpack_object_args(zval* arguments_zv, int arg_position, v8
 
     char *exception_message;
 
-    #if PHP_VERSION_ID >= 70100
     zend_string *ce_name = zend_get_executed_scope()->name;
-    #else
-    zend_string *ce_name = EG(scope)->name;
-    #endif
 
     ZEND_HASH_FOREACH_VAL(myht, pzval) {
                 if (Z_TYPE_P(pzval) != IS_OBJECT) {
                     zend_throw_error(zend_ce_type_error,
-                                     "Argument %d passed to %s::%s() should be array of \\V8\\ObjectValue objects, %s given at %d offset",
+                                     "Argument %d passed to %s::%s() must be an array of \\V8\\ObjectValue objects, %s given at %d offset",
                                      arg_position, ZSTR_VAL(ce_name), get_active_function_name(),
                                      zend_zval_type_name(pzval), i);
 
@@ -244,7 +232,7 @@ bool php_v8_function_unpack_object_args(zval* arguments_zv, int arg_position, v8
 
                 if (!instanceof_function(Z_OBJCE_P(pzval), php_v8_object_class_entry)) {
                     zend_throw_error(zend_ce_type_error,
-                                     "Argument %d passed to %s::%s() should be array of \\V8\\ObjectValue, instance of %s given at %d offset",
+                                     "Argument %d passed to %s::%s() must be an array of \\V8\\ObjectValue, instance of %s given at %d offset",
                                      arg_position, ZSTR_VAL(ce_name), get_active_function_name(),
                                      ZSTR_VAL(Z_OBJCE_P(pzval)->name), i);
 

src/php_v8_name.cc

@@ -58,6 +58,7 @@ PHP_MINIT_FUNCTION(php_v8_name)
     zend_class_entry ce;
     INIT_NS_CLASS_ENTRY(ce, PHP_V8_NS, "NameValue", php_v8_name_methods);
     this_ce = zend_register_internal_class_ex(&ce, php_v8_primitive_class_entry);
+    this_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
 
     return SUCCESS;
 }

src/php_v8_primitive.cc

@@ -32,6 +32,7 @@ PHP_MINIT_FUNCTION(php_v8_primitive)
     zend_class_entry ce;
     INIT_NS_CLASS_ENTRY(ce, PHP_V8_NS, "PrimitiveValue", php_v8_primitive_methods);
     this_ce = zend_register_internal_class_ex(&ce, php_v8_value_class_entry);
+    this_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
 
     return SUCCESS;
 }

src/php_v8_template.cc

@@ -140,7 +140,19 @@ void php_v8_template_Set(v8::Isolate *isolate, v8::Local<T> local_template, N* p
 
         PHP_V8_DATA_ISOLATES_CHECK(php_v8_template, php_v8_value_to_set);
 
-        local_template->Set(local_name, php_v8_value_get_local(php_v8_value_to_set), static_cast<v8::PropertyAttribute>(attributes));
+        v8::Local<v8::Value> local_value = php_v8_value_get_local(php_v8_value_to_set);
+
+        if (local_value->IsObject()) {
+            int arg_position = 3;
+            zend_string *ce_name = zend_get_executed_scope()->name;
+
+            zend_throw_error(zend_ce_type_error,
+                             "Argument %d passed to %s::%s() must be an instance of \\V8\\PrimitiveValue or \\V8\\Template, instance of %s given",
+                             arg_position, ZSTR_VAL(ce_name), get_active_function_name(), ZSTR_VAL(Z_OBJCE_P(php_v8_value_zv)->name));
+            return;
+        }
+
+        local_template->Set(local_name, local_value, static_cast<v8::PropertyAttribute>(attributes));
     } else if (instanceof_function(Z_OBJCE_P(php_v8_value_zv), php_v8_object_template_class_entry)) {
         // set object template
         PHP_V8_FETCH_OBJECT_TEMPLATE_WITH_CHECK(php_v8_value_zv, php_v8_object_template_to_set);

src/php_v8_undefined.cc

@@ -0,0 +1,56 @@
+/*
+ * This file is part of the pinepain/php-v8 PHP extension.
+ *
+ * Copyright (c) 2015-2017 Bogdan Padalko <[email protected]>
+ *
+ * Licensed under the MIT license: http://opensource.org/licenses/MIT
+ *
+ * For the full copyright and license information, please view the
+ * LICENSE file that was distributed with this source or visit
+ * http://opensource.org/licenses/MIT
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php_v8_undefined.h"
+#include "php_v8_primitive.h"
+#include "php_v8_value.h"
+#include "php_v8.h"
+
+zend_class_entry *php_v8_undefined_class_entry;
+#define this_ce php_v8_undefined_class_entry
+
+
+static PHP_METHOD(V8Undefined, __construct) {
+    zval *php_v8_isolate_zv;
+
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &php_v8_isolate_zv) == FAILURE) {
+        return;
+    }
+
+    PHP_V8_VALUE_CONSTRUCT(getThis(), php_v8_isolate_zv, php_v8_isolate, php_v8_value);
+
+    php_v8_value->persistent->Reset(isolate, v8::Undefined(isolate));
+}
+
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_v8_undefined___construct, ZEND_SEND_BY_VAL, ZEND_RETURN_VALUE, 1)
+                ZEND_ARG_OBJ_INFO(0, isolate, V8\\Isolate, 0)
+ZEND_END_ARG_INFO()
+
+
+static const zend_function_entry php_v8_undefined_methods[] = {
+        PHP_ME(V8Undefined, __construct, arginfo_v8_undefined___construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
+        PHP_FE_END
+};
+
+
+PHP_MINIT_FUNCTION(php_v8_undefined) {
+    zend_class_entry ce;
+    INIT_NS_CLASS_ENTRY(ce, PHP_V8_NS, "UndefinedValue", php_v8_undefined_methods);
+    this_ce = zend_register_internal_class_ex(&ce, php_v8_primitive_class_entry);
+
+    return SUCCESS;
+}

src/php_v8_undefined.h

@@ -0,0 +1,29 @@
+/*
+ * This file is part of the pinepain/php-v8 PHP extension.
+ *
+ * Copyright (c) 2015-2017 Bogdan Padalko <[email protected]>
+ *
+ * Licensed under the MIT license: http://opensource.org/licenses/MIT
+ *
+ * For the full copyright and license information, please view the
+ * LICENSE file that was distributed with this source or visit
+ * http://opensource.org/licenses/MIT
+ */
+
+#ifndef PHP_V8_UNDEFINED_H
+#define PHP_V8_UNDEFINED_H
+
+extern "C" {
+#include "php.h"
+
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+}
+
+extern zend_class_entry* php_v8_undefined_class_entry;
+
+
+PHP_MINIT_FUNCTION(php_v8_undefined);
+
+#endif //PHP_V8_UNDEFINED_H

src/php_v8_value.cc

@@ -38,6 +38,7 @@
 #include "php_v8_uint32.h"
 #include "php_v8_integer.h"
 #include "php_v8_number.h"
+#include "php_v8_undefined.h"
 /* end of type listing */
 
 #include "php_v8_data.h"
@@ -231,7 +232,7 @@ zend_class_entry *php_v8_get_class_entry_from_value(v8::Local<v8::Value> value)
     // working with scalars
 
     if (value->IsUndefined()) {
-        return php_v8_value_class_entry;
+        return php_v8_undefined_class_entry;
     }
 
     if (value->IsNull()) {
@@ -313,17 +314,15 @@ php_v8_value_t *php_v8_get_or_create_value(zval *return_value, v8::Local<v8::Val
 }
 
 
-static PHP_METHOD (V8Value, __construct) {
-    zval *php_v8_isolate_zv;
-
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &php_v8_isolate_zv) == FAILURE) {
-        return;
-    }
-
-    PHP_V8_VALUE_CONSTRUCT(getThis(), php_v8_isolate_zv, php_v8_isolate, php_v8_value);
-
-    php_v8_value->persistent->Reset(isolate, v8::Undefined(isolate));
-}
+//static PHP_METHOD (V8Value, __construct) {
+//    zval *php_v8_isolate_zv;
+//
+//    if (zend_parse_parameters(ZEND_NUM_ARGS(), "o", &php_v8_isolate_zv) == FAILURE) {
+//        return;
+//    }
+//
+//    PHP_V8_THROW_EXCEPTION("V8\\Value::__construct() should not be called. Use specific values instead.")
+//}
 
 static PHP_METHOD(V8Value, GetIsolate) {
     zval rv;
@@ -1062,7 +1061,8 @@ ZEND_END_ARG_INFO()
 
 
 static const zend_function_entry php_v8_value_methods[] = {
-        PHP_ME(V8Value, __construct, arginfo_v8_value___construct, ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
+//        PHP_ME(V8Value, __construct, arginfo_v8_value___construct, ZEND_ACC_PRIVATE | ZEND_ACC_CTOR)
+
         PHP_ME(V8Value, GetIsolate, arginfo_v8_value_GetIsolate, ZEND_ACC_PUBLIC)
 
         PHP_ME(V8Value, IsUndefined,                    arginfo_v8_value_IsUndefined,                   ZEND_ACC_PUBLIC)
@@ -1146,6 +1146,7 @@ PHP_MINIT_FUNCTION (php_v8_value) {
     INIT_NS_CLASS_ENTRY(ce, PHP_V8_NS, "Value", php_v8_value_methods);
     this_ce = zend_register_internal_class_ex(&ce, php_v8_data_class_entry);
     this_ce->create_object = php_v8_value_ctor;
+    this_ce->ce_flags |= ZEND_ACC_EXPLICIT_ABSTRACT_CLASS;
 
     zend_declare_property_null(this_ce, ZEND_STRL("isolate"), ZEND_ACC_PRIVATE);
 

stubs/src/ArrayObject.php

@@ -30,7 +30,6 @@ class ArrayObject extends ObjectValue
      */
     public function __construct(Context $context, int $length = 0)
     {
-        parent::__construct($context);
     }
 
     /**