Throw exception for unconstructed intl objects

Author: kocsismate

ext/intl/breakiterator/breakiterator_class.h

@@ -58,8 +58,8 @@ static inline BreakIterator_object *php_intl_breakiterator_fetch_object(zend_obj
 	BREAKITER_METHOD_FETCH_OBJECT_NO_CHECK; \
 	if (bio->biter == NULL) \
 	{ \
-		intl_errors_set(&bio->err, U_ILLEGAL_ARGUMENT_ERROR, "Found unconstructed BreakIterator", 0); \
-		RETURN_FALSE; \
+		zend_throw_error(NULL, "Found unconstructed BreakIterator"); \
+		RETURN_THROWS(); \
 	}
 
 void breakiterator_object_create(zval *object, BreakIterator *break_iter, int brand_new);

ext/intl/calendar/calendar_class.h

@@ -55,8 +55,8 @@ static inline Calendar_object *php_intl_calendar_fetch_object(zend_object *obj)
 	CALENDAR_METHOD_FETCH_OBJECT_NO_CHECK; \
 	if (co->ucal == NULL) \
 	{ \
-		intl_errors_set(&co->err, U_ILLEGAL_ARGUMENT_ERROR, "Found unconstructed IntlCalendar", 0); \
-		RETURN_FALSE; \
+		zend_throw_error(NULL, "Found unconstructed IntlCalendar"); \
+		RETURN_THROWS(); \
 	}
 
 void calendar_object_create(zval *object, Calendar *calendar);

ext/intl/common/common_enum.h

@@ -41,8 +41,8 @@ extern "C" {
 	object = ZEND_THIS; \
 	INTLITERATOR_METHOD_FETCH_OBJECT_NO_CHECK; \
 	if (ii->iterator == NULL) { \
-		intl_errors_set(&ii->err, U_ILLEGAL_ARGUMENT_ERROR, "Found unconstructed IntlIterator", 0); \
-		RETURN_FALSE; \
+		zend_throw_error(NULL, "Found unconstructed IntlIterator"); \
+		RETURN_THROWS(); \
 	}
 
 typedef struct {

ext/intl/dateformat/dateformat_class.h

@@ -46,8 +46,8 @@ extern zend_class_entry *IntlDateFormatter_ce_ptr;
 		DATE_FORMAT_METHOD_FETCH_OBJECT_NO_CHECK;	\
 	if (dfo->datef_data.udatf == NULL)				\
 	{												\
-		intl_errors_set(&dfo->datef_data.error, U_ILLEGAL_ARGUMENT_ERROR, "Found unconstructed IntlDateFormatter", 0); \
-		RETURN_FALSE;								\
+		zend_throw_error(NULL, "Found unconstructed IntlDateFormatter"); \
+		RETURN_THROWS();								\
 	}
 
 #define DATE_FORMAT_OBJECT(dfo)		(dfo)->datef_data.udatf

ext/intl/formatter/formatter_class.h

@@ -44,9 +44,8 @@ extern zend_class_entry *NumberFormatter_ce_ptr;
 	FORMATTER_METHOD_FETCH_OBJECT_NO_CHECK; \
 	if (FORMATTER_OBJECT(nfo) == NULL) \
 	{ \
-		intl_errors_set(&nfo->nf_data.error, U_ILLEGAL_ARGUMENT_ERROR, \
-				"Found unconstructed NumberFormatter", 0); \
-		RETURN_FALSE; \
+		zend_throw_error(NULL, "Found unconstructed NumberFormatter"); \
+		RETURN_THROWS(); \
 	}
 
 

ext/intl/msgformat/msgformat_class.h

@@ -46,9 +46,8 @@ extern zend_class_entry *MessageFormatter_ce_ptr;
 #define MSG_FORMAT_METHOD_FETCH_OBJECT									\
 	MSG_FORMAT_METHOD_FETCH_OBJECT_NO_CHECK;							\
 	if (MSG_FORMAT_OBJECT(mfo) == NULL)	{								\
-		intl_errors_set(&mfo->mf_data.error, U_ILLEGAL_ARGUMENT_ERROR,	\
-				"Found unconstructed MessageFormatter", 0);	\
-		RETURN_FALSE;													\
+		zend_throw_error(NULL, "Found unconstructed MessageFormatter");	\
+		RETURN_THROWS();												\
 	}
 
 #define MSG_FORMAT_OBJECT(mfo)			(mfo)->mf_data.umsgf

ext/intl/resourcebundle/resourcebundle.stub.php

@@ -13,7 +13,7 @@ public static function create(?string $locale, ?string $bundlename, bool $fallba
      */
     public function get($index, bool $fallback = true) {}
 
-    /** @return int|false */
+    /** @return int */
     public function count() {}
 
     /** @return array|false */
@@ -34,7 +34,7 @@ function resourcebundle_create(?string $locale, ?string $bundlename, bool $fallb
  */
 function resourcebundle_get(ResourceBundle $bundle, $index) {}
 
-function resourcebundle_count(ResourceBundle $bundle): int|false {}
+function resourcebundle_count(ResourceBundle $bundle): int {}
 
 function resourcebundle_locales(string $bundlename): array|false {}
 

ext/intl/resourcebundle/resourcebundle_arginfo.h

@@ -35,17 +35,15 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_resourcebundle_get, 0, 0, 2)
 	ZEND_ARG_INFO(0, index)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_resourcebundle_count, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_resourcebundle_count, 0, 1, IS_LONG, 0)
 	ZEND_ARG_OBJ_INFO(0, bundle, ResourceBundle, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_resourcebundle_locales, 0, 1, MAY_BE_ARRAY|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, bundlename, IS_STRING, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_resourcebundle_get_error_code, 0, 1, IS_LONG, 0)
-	ZEND_ARG_OBJ_INFO(0, bundle, ResourceBundle, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_resourcebundle_get_error_code arginfo_resourcebundle_count
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_resourcebundle_get_error_message, 0, 1, IS_STRING, 0)
 	ZEND_ARG_OBJ_INFO(0, bundle, ResourceBundle, 0)

ext/intl/resourcebundle/resourcebundle_class.h

@@ -38,14 +38,12 @@ static inline ResourceBundle_object *php_intl_resourcebundle_fetch_object(zend_o
 #define RESOURCEBUNDLE_METHOD_INIT_VARS		INTL_METHOD_INIT_VARS(ResourceBundle, rb)
 #define RESOURCEBUNDLE_METHOD_FETCH_OBJECT_NO_CHECK	INTL_METHOD_FETCH_OBJECT(INTL_RESOURCEBUNDLE, rb)
 #define RESOURCEBUNDLE_METHOD_FETCH_OBJECT							\
-	INTL_METHOD_FETCH_OBJECT(INTL_RESOURCEBUNDLE, rb);					\
+	INTL_METHOD_FETCH_OBJECT(INTL_RESOURCEBUNDLE, rb);				\
 	if (RESOURCEBUNDLE_OBJECT(rb) == NULL) {						\
-		intl_errors_set(&rb->error, U_ILLEGAL_ARGUMENT_ERROR,		\
-				"Found unconstructed ResourceBundle", 0);	\
-		RETURN_FALSE;												\
+		zend_throw_error(NULL, "Found unconstructed ResourceBundle");	\
+		RETURN_THROWS();											\
 	}
 
-
 #define RESOURCEBUNDLE_OBJECT(rb)			(rb)->me
 
 void resourcebundle_register_class( void );

ext/intl/spoofchecker/spoofchecker.stub.php

@@ -10,14 +10,14 @@ public function isSuspicious(string $text, &$error = null) {}
     /** @return bool */
     public function areConfusable(string $s1, string $s2, &$error = null) {}
 
-    /** @return null|false */
+    /** @return void */
     public function setAllowedLocales(string $locale_list) {}
 
-    /** @return null|false */
+    /** @return void */
     public function setChecks(int $checks) {}
 
 #if U_ICU_VERSION_MAJOR_NUM >= 58
-    /** @return null|false */
+    /** @return void */
     public function setRestrictionLevel(int $level) {}
 #endif
 }

ext/intl/spoofchecker/spoofchecker_class.h

@@ -63,9 +63,8 @@ extern zend_class_entry *Spoofchecker_ce_ptr;
 #define SPOOFCHECKER_METHOD_FETCH_OBJECT							\
 	SPOOFCHECKER_METHOD_FETCH_OBJECT_NO_CHECK;						\
 	if (co->uspoof == NULL)	{										\
-		intl_errors_set(&co->err, U_ILLEGAL_ARGUMENT_ERROR,			\
-				"Found unconstructed Spoofchecker", 0);	\
-		RETURN_FALSE;												\
+		zend_throw_error(NULL, "Found unconstructed Spoofchecker");	\
+		RETURN_THROWS();											\
 	}
 
 // Macro to check return value of a ucol_* function call.

ext/intl/timezone/timezone_class.h

@@ -60,8 +60,8 @@ static inline TimeZone_object *php_intl_timezone_fetch_object(zend_object *obj)
 #define TIMEZONE_METHOD_FETCH_OBJECT\
 	TIMEZONE_METHOD_FETCH_OBJECT_NO_CHECK; \
 	if (to->utimezone == NULL) { \
-		intl_errors_set(&to->err, U_ILLEGAL_ARGUMENT_ERROR, "Found unconstructed IntlTimeZone", 0); \
-		RETURN_FALSE; \
+		zend_throw_error(NULL, "Found unconstructed IntlTimeZone"); \
+		RETURN_THROWS(); \
 	}
 
 zval *timezone_convert_to_datetimezone(const TimeZone *timeZone, intl_error *outside_error, const char *func, zval *ret);

ext/intl/transliterator/transliterator_class.h

@@ -52,8 +52,8 @@ static inline Transliterator_object *php_intl_transliterator_fetch_object(zend_o
 	TRANSLITERATOR_METHOD_FETCH_OBJECT_NO_CHECK; \
 	if( to->utrans == NULL ) \
 	{ \
-		intl_errors_set( &to->err, U_ILLEGAL_ARGUMENT_ERROR, "Found unconstructed transliterator", 0 ); \
-		RETURN_FALSE; \
+		zend_throw_error(NULL, "Found unconstructed transliterator"); \
+		RETURN_THROWS(); \
 	}
 
 int transliterator_object_construct( zval *object,