Add Message::getErrorLevel() method, closes #52

Author: pinepain

src/php_v8_message.cc

@@ -101,6 +101,8 @@ void php_v8_message_create_from_message(zval *return_value, php_v8_isolate_t *ph
     if (v8::Message::kNoColumnInfo != end_column) {
         zend_update_property_long(this_ce, return_value, ZEND_STRL("end_column"), static_cast<zend_long>(end_column));
     }
+
+    zend_update_property_long(this_ce, return_value, ZEND_STRL("error_level"), static_cast<zend_long>(message->ErrorLevel()));
 }
 
 
@@ -117,10 +119,11 @@ static PHP_METHOD(Message, __construct) {
     zend_long end_position   = -1;
     zend_long start_column   = -1;
     zend_long end_column     = -1;
+    zend_long error_level    = -1;
 
-    if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSoSo|lllll",
+    if (zend_parse_parameters(ZEND_NUM_ARGS(), "SSoSo|llllll",
                               &message, &source_line, &script_origin, &resource_name, &stack_trace,
-                              &line_number, &start_position, &end_position, &start_column, &end_column) == FAILURE) {
+                              &line_number, &start_position, &end_position, &start_column, &end_column, &error_level) == FAILURE) {
         return;
     }
 
@@ -145,6 +148,9 @@ static PHP_METHOD(Message, __construct) {
     if (end_column > 0) {
         zend_update_property_long(this_ce, getThis(), ZEND_STRL("end_column"), end_column);
     }
+    if (end_column > 0) {
+        zend_update_property_long(this_ce, getThis(), ZEND_STRL("error_level"), error_level);
+    }
 }
 
 static PHP_METHOD(Message, get)
@@ -257,6 +263,18 @@ static PHP_METHOD(Message, getEndColumn)
     RETVAL_ZVAL(zend_read_property(this_ce, getThis(), ZEND_STRL("end_column"), 0, &rv), 1, 0);
 }
 
+static PHP_METHOD(Message, getErrorLevel)
+{
+    zval rv;
+
+    if (zend_parse_parameters_none() == FAILURE) {
+        return;
+    }
+
+    RETVAL_ZVAL(zend_read_property(this_ce, getThis(), ZEND_STRL("error_level"), 0, &rv), 1, 0);
+}
+
+
 PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 5)
                 ZEND_ARG_TYPE_INFO(0, message, IS_STRING, 0)
                 ZEND_ARG_TYPE_INFO(0, source_line, IS_STRING, 0)
@@ -268,6 +286,7 @@ PHP_V8_ZEND_BEGIN_ARG_WITH_CONSTRUCTOR_INFO_EX(arginfo___construct, 5)
                 ZEND_ARG_TYPE_INFO(0, end_position, IS_LONG, 1)
                 ZEND_ARG_TYPE_INFO(0, start_column, IS_LONG, 1)
                 ZEND_ARG_TYPE_INFO(0, end_column, IS_LONG, 1)
+                ZEND_ARG_TYPE_INFO(0, error_level, IS_LONG, 1)
 ZEND_END_ARG_INFO()
 
 PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_get, ZEND_RETURN_VALUE, 0, IS_STRING, 0)
@@ -300,6 +319,9 @@ ZEND_END_ARG_INFO()
 PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_getEndColumn, ZEND_RETURN_VALUE, 0, IS_LONG, 1)
 ZEND_END_ARG_INFO()
 
+PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_getErrorLevel, ZEND_RETURN_VALUE, 0, IS_LONG, 1)
+ZEND_END_ARG_INFO()
+
 
 static const zend_function_entry php_v8_message_methods[] = {
         PHP_V8_ME(Message, __construct,           ZEND_ACC_PUBLIC | ZEND_ACC_CTOR)
@@ -313,15 +335,24 @@ static const zend_function_entry php_v8_message_methods[] = {
         PHP_V8_ME(Message, getEndPosition,        ZEND_ACC_PUBLIC)
         PHP_V8_ME(Message, getStartColumn,        ZEND_ACC_PUBLIC)
         PHP_V8_ME(Message, getEndColumn,          ZEND_ACC_PUBLIC)
+        PHP_V8_ME(Message, getErrorLevel,         ZEND_ACC_PUBLIC)
 
         PHP_FE_END
 };
 
+
 PHP_MINIT_FUNCTION (php_v8_message) {
     zend_class_entry ce;
     INIT_NS_CLASS_ENTRY(ce, PHP_V8_NS, "Message", php_v8_message_methods);
     this_ce = zend_register_internal_class(&ce);
 
+    zend_declare_class_constant_long(this_ce, ZEND_STRL("ERROR_LEVEL_LOG"),     v8::Isolate::MessageErrorLevel::kMessageLog);
+    zend_declare_class_constant_long(this_ce, ZEND_STRL("ERROR_LEVEL_DEBUG"),   v8::Isolate::MessageErrorLevel::kMessageDebug);
+    zend_declare_class_constant_long(this_ce, ZEND_STRL("ERROR_LEVEL_INFO"),    v8::Isolate::MessageErrorLevel::kMessageInfo);
+    zend_declare_class_constant_long(this_ce, ZEND_STRL("ERROR_LEVEL_ERROR"),   v8::Isolate::MessageErrorLevel::kMessageError);
+    zend_declare_class_constant_long(this_ce, ZEND_STRL("ERROR_LEVEL_WARNING"), v8::Isolate::MessageErrorLevel::kMessageWarning);
+    zend_declare_class_constant_long(this_ce, ZEND_STRL("ERROR_LEVEL_ALL"),     v8::Isolate::MessageErrorLevel::kMessageAll);
+
     zend_declare_property_string(this_ce, ZEND_STRL("message"),       "", ZEND_ACC_PRIVATE);
     zend_declare_property_null(this_ce,   ZEND_STRL("script_origin"),     ZEND_ACC_PRIVATE);
     zend_declare_property_string(this_ce, ZEND_STRL("source_line"),   "", ZEND_ACC_PRIVATE);
@@ -334,6 +365,7 @@ PHP_MINIT_FUNCTION (php_v8_message) {
 
     zend_declare_property_null(this_ce, ZEND_STRL("start_column"), ZEND_ACC_PRIVATE);
     zend_declare_property_null(this_ce, ZEND_STRL("end_column"),   ZEND_ACC_PRIVATE);
+    zend_declare_property_null(this_ce, ZEND_STRL("error_level"),  ZEND_ACC_PRIVATE);
 
     return SUCCESS;
 }

stubs/src/Message.php

@@ -20,6 +20,13 @@
  */
 class Message
 {
+    const ERROR_LEVEL_LOG     = 1;
+    const ERROR_LEVEL_DEBUG   = 2;
+    const ERROR_LEVEL_INFO    = 4;
+    const ERROR_LEVEL_ERROR   = 8;
+    const ERROR_LEVEL_WARNING = 16;
+    const ERROR_LEVEL_ALL     = 31;
+
     /**
      * @var ScriptOrigin
      */
@@ -60,6 +67,10 @@ class Message
      * @var int|null
      */
     private $end_column;
+    /**
+     * @var int|null
+     */
+    private $error_level;
 
     /**
      * @param string       $message
@@ -72,6 +83,7 @@ class Message
      * @param int          $end_position
      * @param int          $start_column
      * @param int          $end_column
+     * @param int|null     $error_level
      */
     public function __construct(
         string $message,
@@ -83,7 +95,8 @@ public function __construct(
         ?int $start_position = null,
         ?int $end_position = null,
         ?int $start_column = null,
-        ?int $end_column = null
+        ?int $end_column = null,
+        ?int $error_level = null
     ) {
     }
 
@@ -181,4 +194,13 @@ public function getStartColumn(): ?int
     public function getEndColumn(): ?int
     {
     }
+
+    /**
+     * Returns the error level of the message.
+     *
+     * @return int|null
+     */
+    public function getErrorLevel(): ?int
+    {
+    }
 }

tests/001-verify_extension_entities.phpt

@@ -440,6 +440,12 @@ class V8\TryCatch
     public function getExternalException(): ?Throwable
 
 class V8\Message
+    const ERROR_LEVEL_LOG = 1
+    const ERROR_LEVEL_DEBUG = 2
+    const ERROR_LEVEL_INFO = 4
+    const ERROR_LEVEL_ERROR = 8
+    const ERROR_LEVEL_WARNING = 16
+    const ERROR_LEVEL_ALL = 31
     private $message
     private $script_origin
     private $source_line
@@ -450,7 +456,8 @@ class V8\Message
     private $end_position
     private $start_column
     private $end_column
-    public function __construct(string $message, string $source_line, V8\ScriptOrigin $script_origin, string $resource_name, V8\StackTrace $stack_trace, ?int $line_number, ?int $start_position, ?int $end_position, ?int $start_column, ?int $end_column)
+    private $error_level
+    public function __construct(string $message, string $source_line, V8\ScriptOrigin $script_origin, string $resource_name, V8\StackTrace $stack_trace, ?int $line_number, ?int $start_position, ?int $end_position, ?int $start_column, ?int $end_column, ?int $error_level)
     public function get(): string
     public function getSourceLine(): string
     public function getScriptOrigin(): V8\ScriptOrigin
@@ -461,6 +468,7 @@ class V8\Message
     public function getEndPosition(): ?int
     public function getStartColumn(): ?int
     public function getEndColumn(): ?int
+    public function getErrorLevel(): ?int
 
 class V8\StackFrame
     private $line_number

tests/ExceptionManager_createCreateMessage.phpt

@@ -114,13 +114,14 @@ V8\Message->getStartPosition(): int(231)
 V8\Message->getEndPosition(): int(232)
 V8\Message->getStartColumn(): int(8)
 V8\Message->getEndColumn(): int(9)
+V8\Message->getErrorLevel(): int(8)
 
 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)#33 (6) {
+    object(V8\ScriptOrigin)#34 (6) {
       ["resource_name":"V8\ScriptOrigin":private]=>
       string(7) "test.js"
       ["resource_line_offset":"V8\ScriptOrigin":private]=>
@@ -132,7 +133,7 @@ V8\Message->getScriptOrigin():
       ["source_map_url":"V8\ScriptOrigin":private]=>
       string(0) ""
       ["options":"V8\ScriptOrigin":private]=>
-      object(V8\ScriptOriginOptions)#32 (1) {
+      object(V8\ScriptOriginOptions)#33 (1) {
         ["flags":"V8\ScriptOriginOptions":private]=>
         int(0)
       }
@@ -144,6 +145,7 @@ V8\Message->getStartPosition(): int(231)
 V8\Message->getEndPosition(): int(232)
 V8\Message->getStartColumn(): int(8)
 V8\Message->getEndColumn(): int(9)
+V8\Message->getErrorLevel(): int(8)
 
 
 Checks on V8\ObjectValue:

tests/Message.phpt

@@ -22,6 +22,10 @@ $helper->header('Object representation (default)');
 $helper->dump($obj);
 $helper->space();
 
+$helper->header('Class constants');
+$helper->dump_object_constants($obj);
+$helper->space();
+
 $helper->header('Test getters (default)');
 $helper->method_matches_with_output($obj, 'get', 'message');
 $helper->method_matches_with_output($obj, 'getSourceLine', 'source_line');
@@ -36,7 +40,7 @@ $helper->method_matches_with_output($obj, 'getEndColumn', null);
 $helper->space();
 
 
-$obj = new V8\Message('message', 'source_line', $origin, 'resource_name', $trace, 1, 2, 3, 4, 5);
+$obj = new V8\Message('message', 'source_line', $origin, 'resource_name', $trace, 1, 2, 3, 4, 5, 7);
 
 $helper->header('Object representation');
 $helper->dump($obj);
@@ -59,7 +63,7 @@ $helper->space();
 --EXPECT--
 Object representation (default):
 --------------------------------
-object(V8\Message)#7 (10) {
+object(V8\Message)#7 (11) {
   ["message":"V8\Message":private]=>
   string(7) "message"
   ["script_origin":"V8\Message":private]=>
@@ -100,9 +104,21 @@ object(V8\Message)#7 (10) {
   NULL
   ["end_column":"V8\Message":private]=>
   NULL
+  ["error_level":"V8\Message":private]=>
+  NULL
 }
 
 
+Class constants:
+----------------
+V8\Message::ERROR_LEVEL_LOG = 1
+V8\Message::ERROR_LEVEL_DEBUG = 2
+V8\Message::ERROR_LEVEL_INFO = 4
+V8\Message::ERROR_LEVEL_ERROR = 8
+V8\Message::ERROR_LEVEL_WARNING = 16
+V8\Message::ERROR_LEVEL_ALL = 31
+
+
 Test getters (default):
 -----------------------
 V8\Message::get() matches expected 'message'
@@ -119,7 +135,7 @@ V8\Message::getEndColumn() matches expected NULL
 
 Object representation:
 ----------------------
-object(V8\Message)#8 (10) {
+object(V8\Message)#8 (11) {
   ["message":"V8\Message":private]=>
   string(7) "message"
   ["script_origin":"V8\Message":private]=>
@@ -160,6 +176,8 @@ object(V8\Message)#8 (10) {
   int(4)
   ["end_column":"V8\Message":private]=>
   int(5)
+  ["error_level":"V8\Message":private]=>
+  int(7)
 }
 
 

tests/TryCatch.phpt

@@ -142,7 +142,7 @@ object(V8\TryCatch)#11 (8) {
     }
   }
   ["message":"V8\TryCatch":private]=>
-  object(V8\Message)#6 (10) {
+  object(V8\Message)#6 (11) {
     ["message":"V8\Message":private]=>
     string(7) "message"
     ["script_origin":"V8\Message":private]=>
@@ -183,6 +183,8 @@ object(V8\TryCatch)#11 (8) {
     NULL
     ["end_column":"V8\Message":private]=>
     NULL
+    ["error_level":"V8\Message":private]=>
+    NULL
   }
   ["can_continue":"V8\TryCatch":private]=>
   bool(true)