Rename V8\Exceptions\GenericException to V8\Exceptions\Exception

pinepain · pinepain · commit 7e996c751637 · 2017-04-09T22:01:47.000+03:00
diff --git a/src/php_v8_exceptions.cc b/src/php_v8_exceptions.cc
@@ -215,7 +215,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);
diff --git a/src/php_v8_script_origin.cc b/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;
         }
 
diff --git a/src/php_v8_stack_trace.cc b/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;
     }
 
diff --git a/src/php_v8_startup_data.cc b/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;
     }
 
diff --git a/stubs/src/Exceptions/Exception.php b/stubs/src/Exceptions/Exception.php
@@ -16,6 +16,6 @@
 namespace V8\Exceptions;
 
 
-class GenericException extends \Exception
+class Exception extends \Exception
 {
 }
diff --git a/stubs/src/Exceptions/TryCatchException.php b/stubs/src/Exceptions/TryCatchException.php
@@ -20,7 +20,7 @@
 use V8\Isolate;
 use V8\TryCatch;
 
-class TryCatchException extends GenericException
+class TryCatchException extends Exception
 {
     /**
      * @var Isolate
diff --git a/stubs/src/Exceptions/ValueException.php b/stubs/src/Exceptions/ValueException.php
@@ -15,6 +15,6 @@
 namespace V8\Exceptions;
 
 
-class ValueException extends GenericException
+class ValueException extends Exception
 {
 }
diff --git a/stubs/src/StackTrace.php b/stubs/src/StackTrace.php
@@ -16,7 +16,7 @@
 namespace V8;
 
 
-use V8\Exceptions\GenericException;
+use V8\Exceptions\Exception;
 use V8\StackTrace\StackTraceOptions;
 
 
@@ -67,12 +67,12 @@ public function GetFrames() : array
      *
      * @return StackFrame
      *
-     * @throws GenericException When index is out of range
+     * @throws Exception When index is out of range
      */
     public function GetFrame(int $index) : StackFrame
     {
         if ($index < 0 || !isset($this->frames[$index])) {
-            throw new GenericException('Frame index is out of range');
+            throw new Exception('Frame index is out of range');
         }
 
         return $this->frames[$index];
diff --git a/tests/003-V8ObjectTemplate_recursive_chain.phpt b/tests/003-V8ObjectTemplate_recursive_chain.phpt
@@ -5,7 +5,7 @@ V8\ObjectTemplate - recursive 2
 --FILE--
 <?php
 
-use V8\Exceptions\GenericException;
+use V8\Exceptions\Exception;
 
 /** @var \Phpv8Testsuite $helper */
 $helper = require '.testsuite.php';
@@ -26,7 +26,7 @@ $template2->Set(new \V8\StringValue($isolate, 'that3'), $template3);
 
 try {
     $template3->Set(new \V8\StringValue($isolate, 'that1'), $template2);
-} catch (GenericException $e) {
+} catch (Exception $e) {
     $helper->exception_export($e);
 }
 
@@ -36,4 +36,4 @@ $context->GlobalObject()->Set($context, new \V8\StringValue($isolate, 'test'), $
 
 ?>
 --EXPECT--
-V8\Exceptions\GenericException: Can't set: recursion detected
+V8\Exceptions\Exception: Can't set: recursion detected
diff --git a/tests/003-V8ObjectTemplate_recursive_global.phpt b/tests/003-V8ObjectTemplate_recursive_global.phpt
@@ -5,7 +5,7 @@ V8\ObjectTemplate
 --FILE--
 <?php
 
-use V8\Exceptions\GenericException;
+use V8\Exceptions\Exception;
 
 /** @var \Phpv8Testsuite $helper */
 $helper = require '.testsuite.php';
@@ -21,7 +21,7 @@ $template = new \V8\ObjectTemplate($isolate);
 
 try {
     $template->Set(new \V8\StringValue($isolate, 'self'), $template);
-} catch (GenericException $e) {
+} catch (Exception $e) {
     $helper->exception_export($e);
 }
 
@@ -30,4 +30,4 @@ $context = new \V8\Context($isolate, $template);
 
 ?>
 --EXPECT--
-V8\Exceptions\GenericException: Can't set: recursion detected
+V8\Exceptions\Exception: Can't set: recursion detected
diff --git a/tests/003-V8ObjectTemplate_recursive_self.phpt b/tests/003-V8ObjectTemplate_recursive_self.phpt
@@ -5,7 +5,7 @@ V8\ObjectTemplate::Set() - recursive self
 --FILE--
 <?php
 
-use V8\Exceptions\GenericException;
+use V8\Exceptions\Exception;
 
 /** @var \Phpv8Testsuite $helper */
 $helper = require '.testsuite.php';
@@ -21,7 +21,7 @@ $template = new \V8\ObjectTemplate($isolate);
 
 try {
     $template->Set(new \V8\StringValue($isolate, 'self'), $template);
-} catch (GenericException $e) {
+} catch (Exception $e) {
     $helper->exception_export($e);
 }
 
@@ -30,4 +30,4 @@ $context->GlobalObject()->Set($context, new \V8\StringValue($isolate, 'test'), $
 
 ?>
 --EXPECT--
-V8\Exceptions\GenericException: Can't set: recursion detected
+V8\Exceptions\Exception: Can't set: recursion detected
diff --git a/tests/003-V8ObjectTemplate_recursive_tree.phpt b/tests/003-V8ObjectTemplate_recursive_tree.phpt
@@ -48,22 +48,22 @@ $t7->Set($s9, $t9);
 
 try {
     $t9->Set($s1, $t1);
-} catch (\V8\Exceptions\GenericException $e) {
+} catch (\V8\Exceptions\Exception $e) {
     $helper->exception_export($e);
 }
 
 
 try {
     $t7->Set($s1, $t1);
-} catch (\V8\Exceptions\GenericException $e) {
+} catch (\V8\Exceptions\Exception $e) {
     $helper->exception_export($e);
 }
 
 $t4->Set($s6, $t6);
 
 try {
     $t6->Set($s4, $t4);
-} catch (\V8\Exceptions\GenericException $e) {
+} catch (\V8\Exceptions\Exception $e) {
     $helper->exception_export($e);
 }
 
@@ -72,6 +72,6 @@ $context->GlobalObject()->Set($context, new \V8\StringValue($isolate, 'test'), $
 
 ?>
 --EXPECT--
-V8\Exceptions\GenericException: Can't set: recursion detected
-V8\Exceptions\GenericException: Can't set: recursion detected
-V8\Exceptions\GenericException: Can't set: recursion detected
+V8\Exceptions\Exception: Can't set: recursion detected
+V8\Exceptions\Exception: Can't set: recursion detected
+V8\Exceptions\Exception: Can't set: recursion detected
diff --git a/tests/V8ArrayObject.phpt b/tests/V8ArrayObject.phpt
@@ -307,7 +307,7 @@ V8\ArrayObject(V8\Value)->ToInt32():
         bool(false)
       }
     }
-V8\ArrayObject(V8\Value)->ToArrayIndex(): V8\Exceptions\GenericException: Failed to convert
+V8\ArrayObject(V8\Value)->ToArrayIndex(): V8\Exceptions\Exception: Failed to convert
 
 
 typeof arr: object
diff --git a/tests/V8FunctionObject_Call_bad_args.phpt b/tests/V8FunctionObject_Call_bad_args.phpt
@@ -58,5 +58,5 @@ try {
 --EXPECT--
 TypeError: Argument 3 passed to V8\FunctionObject::Call() should be array of \V8\Value objects, integer given at 0 offset
 TypeError: Argument 3 passed to V8\FunctionObject::Call() should be array of \V8\Value objects, instance of stdClass given at 0 offset
-V8\Exceptions\GenericException: Value is empty. Forgot to call parent::__construct()?: argument 3 passed to V8\FunctionObject::Call() at 0 offset
-V8\Exceptions\GenericException: Isolates mismatch: argument 3 passed to V8\FunctionObject::Call() at 0 offset
+V8\Exceptions\Exception: Value is empty. Forgot to call parent::__construct()?: argument 3 passed to V8\FunctionObject::Call() at 0 offset
+V8\Exceptions\Exception: Isolates mismatch: argument 3 passed to V8\FunctionObject::Call() at 0 offset
diff --git a/tests/V8FunctionTemplate.phpt b/tests/V8FunctionTemplate.phpt
@@ -209,8 +209,8 @@ object(V8\ObjectTemplate)#8 (1) {
 V8\FunctionTemplate::InstanceTemplate() doesn't match expected value
 
 
-V8\Exceptions\GenericException: Isolates mismatch
-V8\Exceptions\GenericException: Isolates mismatch
+V8\Exceptions\Exception: Isolates mismatch
+V8\Exceptions\Exception: Isolates mismatch
 Expected value matches actual value
 Expected value is not identical to actual value
 Hello, world!
diff --git a/tests/V8FunctionTemplate_SetCallHandler.phpt b/tests/V8FunctionTemplate_SetCallHandler.phpt
@@ -55,6 +55,6 @@ EOF
 TypeError: Argument 1 passed to V8\FunctionTemplate::SetCallHandler() must be callable, null given
 
 callback test()
-V8\Exceptions\GenericException: v8::FunctionTemplate::SetCallHandler FunctionTemplate already instantiated
+V8\Exceptions\Exception: v8::FunctionTemplate::SetCallHandler FunctionTemplate already instantiated
 We are done for now
 EOF
diff --git a/tests/V8Isolate.phpt b/tests/V8Isolate.phpt
@@ -43,7 +43,7 @@ object(V8\Isolate)#2 (5) {
   bool(false)
 }
 
-V8\Exceptions\GenericException: Not in context!
+V8\Exceptions\Exception: Not in context!
 
 V8\Isolate->GetHeapStatistics():
     object(V8\HeapStatistics)#29 (9) {
diff --git a/tests/V8MapObject.phpt b/tests/V8MapObject.phpt
@@ -349,7 +349,7 @@ V8\MapObject(V8\Value)->ToInt32():
         bool(false)
       }
     }
-V8\MapObject(V8\Value)->ToArrayIndex(): V8\Exceptions\GenericException: Failed to convert
+V8\MapObject(V8\Value)->ToArrayIndex(): V8\Exceptions\Exception: Failed to convert
 
 
 New value creation from V8 runtime:
diff --git a/tests/V8ObjectValue.phpt b/tests/V8ObjectValue.phpt
@@ -296,4 +296,4 @@ V8\ObjectValue(V8\Value)->ToInt32():
         bool(false)
       }
     }
-V8\ObjectValue(V8\Value)->ToArrayIndex(): V8\Exceptions\GenericException: Failed to convert
+V8\ObjectValue(V8\Value)->ToArrayIndex(): V8\Exceptions\Exception: Failed to convert
diff --git a/tests/V8ReturnValue_context.phpt b/tests/V8ReturnValue_context.phpt
@@ -114,7 +114,7 @@ Return value holds value: 42
 
 
 Return value object is out of context: ok
-V8\Exceptions\GenericException: Attempt to use return value out of calling function context
+V8\Exceptions\Exception: Attempt to use return value out of calling function context
 
 Object representation (outside of context):
 -------------------------------------------
diff --git a/tests/V8ScriptCompiler_Compile.phpt b/tests/V8ScriptCompiler_Compile.phpt
@@ -44,7 +44,7 @@ $cache_data = null;
         $source_string = new V8\StringValue($isolate, '"test"');
         $source        = new \V8\ScriptCompiler\Source($source_string, $origin);
         $script        = V8\ScriptCompiler::Compile($context, $source);
-    } catch (\V8\Exceptions\GenericException $e) {
+    } catch (\V8\Exceptions\Exception $e) {
         $helper->exception_export($e);
     }
 
@@ -72,7 +72,7 @@ $cache_data = null;
     $helper->assert('Source cache data is not set', $source->GetCachedData() === null);
     try {
         $script = V8\ScriptCompiler::Compile($context, $source, V8\ScriptCompiler\CompileOptions::kConsumeParserCache);
-    } catch (\V8\Exceptions\GenericException $e) {
+    } catch (\V8\Exceptions\Exception $e) {
         $helper->exception_export($e);
     }
 }
@@ -266,7 +266,7 @@ Compiling:
 Compile script: ok
 Compile script: ok
 V8\Exceptions\TryCatchException: SyntaxError: Unexpected identifier
-V8\Exceptions\GenericException: Unable to compile module as script
+V8\Exceptions\Exception: Unable to compile module as script
 
 
 Testing:
@@ -277,7 +277,7 @@ string(11) "test passed"
 Test cache when no cache set:
 -----------------------------
 Source cache data is not set: ok
-V8\Exceptions\GenericException: Unable to consume cache when it's not set
+V8\Exceptions\Exception: Unable to consume cache when it's not set
 Test generating code cache:
 ---------------------------
 Source cache data is NULL: ok
diff --git a/tests/V8ScriptCompiler_CompileUnbound.phpt b/tests/V8ScriptCompiler_CompileUnbound.phpt
@@ -44,7 +44,7 @@ $cache_data = null;
         $source_string = new V8\StringValue($isolate, '"test"');
         $source        = new \V8\ScriptCompiler\Source($source_string, $origin);
         $unbound        = V8\ScriptCompiler::CompileUnboundScript($context, $source);
-    } catch (\V8\Exceptions\GenericException $e) {
+    } catch (\V8\Exceptions\Exception $e) {
         $helper->exception_export($e);
     }
 
@@ -80,7 +80,7 @@ $cache_data = null;
     $helper->assert('Source cache data is not set', $source->GetCachedData() === null);
     try {
         $unbound = V8\ScriptCompiler::CompileUnboundScript($context, $source, V8\ScriptCompiler\CompileOptions::kConsumeParserCache);
-    } catch (\V8\Exceptions\GenericException $e) {
+    } catch (\V8\Exceptions\Exception $e) {
         $helper->exception_export($e);
     }
 }
@@ -221,7 +221,7 @@ Compiling:
 Compile script: ok
 Compile script: ok
 V8\Exceptions\TryCatchException: SyntaxError: Unexpected identifier
-V8\Exceptions\GenericException: Unable to compile module as unbound script
+V8\Exceptions\Exception: Unable to compile module as unbound script
 
 
 Testing:
@@ -235,7 +235,7 @@ string(11) "test passed"
 Test cache when no cache set:
 -----------------------------
 Source cache data is not set: ok
-V8\Exceptions\GenericException: Unable to consume cache when it's not set
+V8\Exceptions\Exception: Unable to consume cache when it's not set
 Test generating code cache:
 ---------------------------
 Source cache data is NULL: ok
diff --git a/tests/V8SetObject.phpt b/tests/V8SetObject.phpt
@@ -356,7 +356,7 @@ V8\SetObject(V8\Value)->ToInt32():
         bool(false)
       }
     }
-V8\SetObject(V8\Value)->ToArrayIndex(): V8\Exceptions\GenericException: Failed to convert
+V8\SetObject(V8\Value)->ToArrayIndex(): V8\Exceptions\Exception: Failed to convert
 
 
 New value creation from V8 runtime:
diff --git a/tests/V8StartupData_CreateFromSource.phpt b/tests/V8StartupData_CreateFromSource.phpt
@@ -51,4 +51,4 @@ Snapshot raw_size is the same as binary_string length: ok
 Context global is affected by snapshot blob: ok
 
 
-V8\Exceptions\GenericException: Failed to create startup blob
+V8\Exceptions\Exception: Failed to create startup blob
diff --git a/tests/V8Value_empty.phpt b/tests/V8Value_empty.phpt
@@ -38,5 +38,5 @@ try {
 
 ?>
 --EXPECT--
-V8\Exceptions\GenericException: Value is empty. Forgot to call parent::__construct()?
-V8\Exceptions\GenericException: Value is empty. Forgot to call parent::__construct()?
+V8\Exceptions\Exception: Value is empty. Forgot to call parent::__construct()?
+V8\Exceptions\Exception: Value is empty. Forgot to call parent::__construct()?

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ v8::ScriptOrigin php_v8_create_script_origin_from_zval(zval value, v8::Isolate`
`83`	`83`	`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));`
`84`	`84`
`85`	`85`	`if (local_resource_name.IsEmpty()) {`
`86`		`- zend_throw_exception(php_v8_generic_exception_class_entry, "Invalid resource name", 0);`
	`86`	`+ PHP_V8_THROW_EXCEPTION("Invalid resource name");`
`87`	`87`	`return nullptr;`
`88`	`88`	`}`
`89`	`89`
`@@ -113,7 +113,7 @@ v8::ScriptOrigin php_v8_create_script_origin_from_zval(zval value, v8::Isolate`
`113`	`113`	`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));`
`114`	`114`
`115`	`115`	`if (local_source_map_url.IsEmpty()) {`
`116`		`- zend_throw_exception(php_v8_generic_exception_class_entry, "Invalid source map url", 0);`
	`116`	`+ PHP_V8_THROW_EXCEPTION("Invalid source map url");`
`117`	`117`	`return nullptr;`
`118`	`118`	`}`
`119`	`119`
Original file line number	Diff line number	Diff line change
`@@ -99,14 +99,14 @@ static PHP_METHOD(V8StackTrace, GetFrame)`
`99`	`99`	`frames = zend_read_property(this_ce, getThis(), ZEND_STRL("frames"), 0, &rv);`
`100`	`100`
`101`	`101`	`if (index < 0) {`
`102`		`- zend_throw_exception(php_v8_generic_exception_class_entry, "Fame index is out of range", 0);`
	`102`	`+ PHP_V8_THROW_EXCEPTION("Fame index is out of range");`
`103`	`103`	`return;`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`frame = zend_hash_index_find(Z_ARRVAL_P(frames), static_cast<zend_ulong>(index));`
`107`	`107`
`108`	`108`	`if (frame == NULL) {`
`109`		`- zend_throw_exception(php_v8_generic_exception_class_entry, "Fame index is out of range", 0);`
	`109`	`+ PHP_V8_THROW_EXCEPTION("Fame index is out of range");`
`110`	`110`	`return;`
`111`	`111`	`}`
`112`	`112`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ static PHP_METHOD(V8StartupData, __construct) {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`if (ZSTR_LEN(blob) > INT_MAX) {`
`71`		`- zend_throw_exception(php_v8_generic_exception_class_entry, "Failed to create startup blob due to blob size integer overflow", 0);`
	`71`	`+ PHP_V8_THROW_EXCEPTION("Failed to create startup blob due to blob size integer overflow");`
`72`	`72`	`return;`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@`
`16`	`16`	`namespace V8\Exceptions;`
`17`	`17`
`18`	`18`
`19`		`-class GenericException extends \Exception`
	`19`	`+class Exception extends \Exception`
`20`	`20`	`{`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`use V8\Isolate;`
`21`	`21`	`use V8\TryCatch;`
`22`	`22`
`23`		`-class TryCatchException extends GenericException`
	`23`	`+class TryCatchException extends Exception`
`24`	`24`	`{`
`25`	`25`	`/**`
`26`	`26`	`* @var Isolate`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@`
`15`	`15`	`namespace V8\Exceptions;`
`16`	`16`
`17`	`17`
`18`		`-class ValueException extends GenericException`
	`18`	`+class ValueException extends Exception`
`19`	`19`	`{`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`namespace V8;`
`17`	`17`
`18`	`18`
`19`		`-use V8\Exceptions\GenericException;`
	`19`	`+use V8\Exceptions\Exception;`
`20`	`20`	`use V8\StackTrace\StackTraceOptions;`
`21`	`21`
`22`	`22`
`@@ -67,12 +67,12 @@ public function GetFrames() : array`
`67`	`67`	`*`
`68`	`68`	`* @return StackFrame`
`69`	`69`	`*`
`70`		`- * @throws GenericException When index is out of range`
	`70`	`+ * @throws Exception When index is out of range`
`71`	`71`	`*/`
`72`	`72`	`public function GetFrame(int $index) : StackFrame`
`73`	`73`	`{`
`74`	`74`	`if ($index < 0 \|\| !isset($this->frames[$index])) {`
`75`		`- throw new GenericException('Frame index is out of range');`
	`75`	`+ throw new Exception('Frame index is out of range');`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`return $this->frames[$index];`