Remove UnboundScript::kNoScriptId const and return null in getId() on no data, leftover from #40

Author: pinepain

src/php_v8_unbound_script.cc

@@ -130,6 +130,10 @@ static PHP_METHOD(UnboundScript, getId)
 
     v8::Local<v8::UnboundScript> local_unbound_script = php_v8_unbound_script_get_local(php_v8_unbound_script);
 
+    if (v8::UnboundScript::kNoScriptId == local_unbound_script->GetId()) {
+        RETURN_NULL();
+    }
+
     RETURN_LONG(static_cast<zend_long>(local_unbound_script->GetId()));
 }
 
@@ -204,7 +208,7 @@ PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_bindToContext, ZEND_RETURN
                 ZEND_ARG_OBJ_INFO(0, context, V8\\Context, 0)
 ZEND_END_ARG_INFO()
 
-PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_getId, ZEND_RETURN_VALUE, 0, IS_LONG, 0)
+PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_getId, ZEND_RETURN_VALUE, 0, IS_LONG, 1)
 ZEND_END_ARG_INFO()
 
 PHP_V8_ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_getScriptName, ZEND_RETURN_VALUE, 0, V8\\Value, 0)
@@ -244,7 +248,6 @@ PHP_MINIT_FUNCTION(php_v8_unbound_script)
     this_ce->create_object = php_v8_unbound_script_ctor;
 
     zend_declare_property_null(this_ce, ZEND_STRL("isolate"), ZEND_ACC_PRIVATE);
-    zend_declare_class_constant_long(this_ce, ZEND_STRL("kNoScriptId"), v8::UnboundScript::kNoScriptId);
 
     memcpy(&php_v8_unbound_script_object_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 

stubs/src/UnboundScript.php

@@ -8,8 +8,6 @@
  */
 class UnboundScript
 {
-    const kNoScriptId = 0;
-
     private function __construct()
     {
     }
@@ -26,9 +24,9 @@ public function bindToContext(Context $context): Script
     }
 
     /**
-     * @return int
+     * @return null|int
      */
-    public function getId(): int
+    public function getId(): ?int
     {
     }
 

tests/001-verify_extension_entities.phpt

@@ -376,12 +376,11 @@ class V8\Script
     public function getUnboundScript(): V8\UnboundScript
 
 class V8\UnboundScript
-    const kNoScriptId = 0
     private $isolate
     private function __construct()
     public function getIsolate(): V8\Isolate
     public function bindToContext(V8\Context $context): V8\Script
-    public function getId(): int
+    public function getId(): ?int
     public function getScriptName(): V8\Value
     public function getSourceURL(): V8\Value
     public function getSourceMappingURL(): V8\Value

tests/UnboundScript.phpt

@@ -32,10 +32,6 @@ $helper->header('UnboundScript representation');
 $helper->dump($unbound);
 $helper->space();
 
-$helper->header('Class constants');
-$helper->dump_object_constants($unbound);
-$helper->space();
-
 $helper->header('Accessors');
 $helper->method_matches($unbound, 'getIsolate', $isolate);
 $helper->method_matches_instanceof($unbound, 'bindToContext', V8\Script::class, [$context]);
@@ -77,11 +73,6 @@ object(V8\UnboundScript)#6 (1) {
 }
 
 
-Class constants:
-----------------
-V8\UnboundScript::kNoScriptId = 0
-
-
 Accessors:
 ----------
 V8\UnboundScript::getIsolate() matches expected value