Handle V8\IntegerValue sub-types when returning values from V8, fixes #19

Author: pinepain

src/php_v8_value.cc

@@ -262,19 +262,15 @@ zend_class_entry *php_v8_get_class_entry_from_value(v8::Local<v8::Value> value)
         return php_v8_symbol_class_entry;
     }
 
-    /* currently we ignore detectind v8::Number sub-types */
-
-    /*
-    if (value->IsUint32()) {
-        return php_v8_uint32_class_entry;
-    }
+    if (value->IsNumber()) {
+        if (value->IsInt32()) {
+            return php_v8_int32_class_entry;
+        }
 
-    if (value->IsInt32()) {
-        return php_v8_int32_class_entry;
-    }
-    */
+        if (value->IsUint32()) {
+            return php_v8_uint32_class_entry;
+        }
 
-    if (value->IsNumber()) {
         return php_v8_number_class_entry;
     }
 

tests/V8ArrayObject.phpt

@@ -204,7 +204,7 @@ V8\ArrayObject(V8\Value)->ToBoolean():
       }
     }
 V8\ArrayObject(V8\Value)->ToNumber():
-    object(V8\NumberValue)#118 (1) {
+    object(V8\Int32Value)#118 (1) {
       ["isolate":"V8\Value":private]=>
       object(V8\Isolate)#3 (5) {
         ["snapshot":"V8\Isolate":private]=>
@@ -305,7 +305,7 @@ V8\ArrayObject(V8\Value)->ToObject():
       }
     }
 V8\ArrayObject(V8\Value)->ToInteger():
-    object(V8\NumberValue)#118 (1) {
+    object(V8\Int32Value)#118 (1) {
       ["isolate":"V8\Value":private]=>
       object(V8\Isolate)#3 (5) {
         ["snapshot":"V8\Isolate":private]=>
@@ -321,7 +321,7 @@ V8\ArrayObject(V8\Value)->ToInteger():
       }
     }
 V8\ArrayObject(V8\Value)->ToUint32():
-    object(V8\NumberValue)#118 (1) {
+    object(V8\Int32Value)#118 (1) {
       ["isolate":"V8\Value":private]=>
       object(V8\Isolate)#3 (5) {
         ["snapshot":"V8\Isolate":private]=>
@@ -337,7 +337,7 @@ V8\ArrayObject(V8\Value)->ToUint32():
       }
     }
 V8\ArrayObject(V8\Value)->ToInt32():
-    object(V8\NumberValue)#118 (1) {
+    object(V8\Int32Value)#118 (1) {
       ["isolate":"V8\Value":private]=>
       object(V8\Isolate)#3 (5) {
         ["snapshot":"V8\Isolate":private]=>

tests/V8MapObject.phpt

@@ -347,7 +347,7 @@ V8\MapObject(V8\Value)->ToObject():
       }
     }
 V8\MapObject(V8\Value)->ToInteger():
-    object(V8\NumberValue)#119 (1) {
+    object(V8\Int32Value)#119 (1) {
       ["isolate":"V8\Value":private]=>
       object(V8\Isolate)#3 (5) {
         ["snapshot":"V8\Isolate":private]=>
@@ -363,7 +363,7 @@ V8\MapObject(V8\Value)->ToInteger():
       }
     }
 V8\MapObject(V8\Value)->ToUint32():
-    object(V8\NumberValue)#119 (1) {
+    object(V8\Int32Value)#119 (1) {
       ["isolate":"V8\Value":private]=>
       object(V8\Isolate)#3 (5) {
         ["snapshot":"V8\Isolate":private]=>
@@ -379,7 +379,7 @@ V8\MapObject(V8\Value)->ToUint32():
       }
     }
 V8\MapObject(V8\Value)->ToInt32():
-    object(V8\NumberValue)#119 (1) {
+    object(V8\Int32Value)#119 (1) {
       ["isolate":"V8\Value":private]=>
       object(V8\Isolate)#3 (5) {
         ["snapshot":"V8\Isolate":private]=>

tests/V8ObjectValue.phpt

@@ -294,7 +294,7 @@ V8\ObjectValue(V8\Value)->ToObject():
       }
     }
 V8\ObjectValue(V8\Value)->ToInteger():
-    object(V8\NumberValue)#116 (1) {
+    object(V8\Int32Value)#116 (1) {
       ["isolate":"V8\Value":private]=>
       object(V8\Isolate)#3 (5) {
         ["snapshot":"V8\Isolate":private]=>
@@ -310,7 +310,7 @@ V8\ObjectValue(V8\Value)->ToInteger():
       }
     }
 V8\ObjectValue(V8\Value)->ToUint32():
-    object(V8\NumberValue)#116 (1) {
+    object(V8\Int32Value)#116 (1) {
       ["isolate":"V8\Value":private]=>
       object(V8\Isolate)#3 (5) {
         ["snapshot":"V8\Isolate":private]=>
@@ -326,7 +326,7 @@ V8\ObjectValue(V8\Value)->ToUint32():
       }
     }
 V8\ObjectValue(V8\Value)->ToInt32():
-    object(V8\NumberValue)#116 (1) {
+    object(V8\Int32Value)#116 (1) {
       ["isolate":"V8\Value":private]=>
       object(V8\Isolate)#3 (5) {
         ["snapshot":"V8\Isolate":private]=>

tests/V8Script_Run.phpt

@@ -33,7 +33,7 @@ $helper->dump($res->Value());
 
 $helper->space();
 
-$scalar = new V8\NumberValue($isolate, 123);
+$scalar = new V8\Int32Value($isolate, 123);
 $obj    = new V8\ObjectValue($context);
 $context->GlobalObject()->Set($context, new \V8\StringValue($isolate, 'scalar'), $scalar);
 $context->GlobalObject()->Set($context, new \V8\StringValue($isolate, 'obj'), $obj);
@@ -114,7 +114,7 @@ string(25) "TEST VALUE 111, confirmed"
 
 Scalar:
 -------
-Expected 123.0 value is identical to actual value 123.0
+Expected 123 value is identical to actual value 123
 Expected value is not identical to actual value
 
 

tests/V8SetObject.phpt

@@ -354,7 +354,7 @@ V8\SetObject(V8\Value)->ToObject():
       }
     }
 V8\SetObject(V8\Value)->ToInteger():
-    object(V8\NumberValue)#120 (1) {
+    object(V8\Int32Value)#120 (1) {
       ["isolate":"V8\Value":private]=>
       object(V8\Isolate)#3 (5) {
         ["snapshot":"V8\Isolate":private]=>
@@ -370,7 +370,7 @@ V8\SetObject(V8\Value)->ToInteger():
       }
     }
 V8\SetObject(V8\Value)->ToUint32():
-    object(V8\NumberValue)#120 (1) {
+    object(V8\Int32Value)#120 (1) {
       ["isolate":"V8\Value":private]=>
       object(V8\Isolate)#3 (5) {
         ["snapshot":"V8\Isolate":private]=>
@@ -386,7 +386,7 @@ V8\SetObject(V8\Value)->ToUint32():
       }
     }
 V8\SetObject(V8\Value)->ToInt32():
-    object(V8\NumberValue)#120 (1) {
+    object(V8\Int32Value)#120 (1) {
       ["isolate":"V8\Value":private]=>
       object(V8\Isolate)#3 (5) {
         ["snapshot":"V8\Isolate":private]=>