Unify ext/random unserialize errors with ext/date (php#9185)

* Unify ext/random unserialize errors with ext/date

- Use `Error` instead of `Exception`.
- Adjust wording.

* Make `zend_read_property` silent in `Randomizer::__unserialize()`

Having:

> Error: Typed property Random\Randomizer::$engine must not be accessed before
> initialization

is not a value-add in this case.

* Insert the actual class name in the unserialization error of Engines

* Revert unserialization failure back to Exception from Error

see https://news-web.php.net/php.internals/118311

Author: TimWolla

ext/random/engine_mt19937.c

@@ -357,19 +357,19 @@ PHP_METHOD(Random_Engine_Mt19937, __unserialize)
 	/* members */
 	t = zend_hash_index_find(d, 0);
 	if (!t || Z_TYPE_P(t) != IS_ARRAY) {
-		zend_throw_exception(NULL, "Incomplete or ill-formed serialization data", 0);
+		zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(engine->std.ce->name));
 		RETURN_THROWS();
 	}
 	object_properties_load(&engine->std, Z_ARRVAL_P(t));
 
 	/* state */
 	t = zend_hash_index_find(d, 1);
 	if (!t || Z_TYPE_P(t) != IS_ARRAY) {
-		zend_throw_exception(NULL, "Incomplete or ill-formed serialization data", 0);
+		zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(engine->std.ce->name));
 		RETURN_THROWS();
 	}
 	if (!engine->algo->unserialize(engine->status, Z_ARRVAL_P(t))) {
-		zend_throw_exception(NULL, "Engine unserialize failed", 0);
+		zend_throw_exception_ex(NULL, 0, "Invalid serialization data for %s object", ZSTR_VAL(engine->std.ce->name));
 		RETURN_THROWS();
 	}
 }

ext/random/randomizer.c

@@ -282,14 +282,14 @@ PHP_METHOD(Random_Randomizer, __unserialize)
 
 	members_zv = zend_hash_index_find(d, 0);
 	if (!members_zv || Z_TYPE_P(members_zv) != IS_ARRAY) {
-		zend_throw_exception(NULL, "Incomplete or ill-formed serialization data", 0);
+		zend_throw_exception(NULL, "Invalid serialization data for Random\\Randomizer object", 0);
 		RETURN_THROWS();
 	}
 	object_properties_load(&randomizer->std, Z_ARRVAL_P(members_zv));
 
-	zengine = zend_read_property(randomizer->std.ce, &randomizer->std, "engine", strlen("engine"), 0, NULL);
+	zengine = zend_read_property(randomizer->std.ce, &randomizer->std, "engine", strlen("engine"), 1, NULL);
 	if (Z_TYPE_P(zengine) != IS_OBJECT || !instanceof_function(Z_OBJCE_P(zengine), random_ce_Random_Engine)) {
-		zend_throw_exception(NULL, "Incomplete or ill-formed serialization data", 0);
+		zend_throw_exception(NULL, "Invalid serialization data for Random\\Randomizer object", 0);
 		RETURN_THROWS();
 	}
 

ext/random/tests/02_engine/all_serialize_error.phpt

@@ -65,13 +65,13 @@ try {
 ?>
 --EXPECT--
 Random\Engine\Mt19937
-Engine unserialize failed
-Engine unserialize failed
-Engine unserialize failed
-Engine unserialize failed
+Invalid serialization data for Random\Engine\Mt19937 object
+Invalid serialization data for Random\Engine\Mt19937 object
+Invalid serialization data for Random\Engine\Mt19937 object
+Invalid serialization data for Random\Engine\Mt19937 object
 Random\Engine\PcgOneseq128XslRr64
-Engine unserialize failed
-Engine unserialize failed
+Invalid serialization data for Random\Engine\PcgOneseq128XslRr64 object
+Invalid serialization data for Random\Engine\PcgOneseq128XslRr64 object
 Random\Engine\Xoshiro256StarStar
-Engine unserialize failed
-Engine unserialize failed
+Invalid serialization data for Random\Engine\Xoshiro256StarStar object
+Invalid serialization data for Random\Engine\Xoshiro256StarStar object