update textdomain

Author: devnexen

UPGRADING

@@ -324,7 +324,7 @@ PHP 8.4 UPGRADE NOTES
 
 - Gettext:
   . bind_textdomain_codeset, textdomain and d(*)gettext functions now throw an exception
-    if the domain's argument is empty.
+    if the domain argument is empty.
 
 - Hash:
   . Changed the return type of hash_update() to true. It was already the case that only

ext/gettext/gettext.c

@@ -88,8 +88,11 @@ PHP_FUNCTION(textdomain)
 		RETURN_THROWS();
 	}
 
-	if (domain != NULL && ZSTR_LEN(domain) != 0 && !zend_string_equals_literal(domain, "0")) {
+	if (domain != NULL) {
 		PHP_GETTEXT_DOMAIN_LENGTH_CHECK(1, ZSTR_LEN(domain))
+	}
+
+	if (domain != NULL && !zend_string_equals_literal(domain, "0")) {
 		domain_name = ZSTR_VAL(domain);
 	}
 

ext/gettext/tests/gettext_textdomain-retval.phpt

@@ -18,11 +18,18 @@ bindtextdomain ("messages", "./locale");
 echo textdomain('test'), "\n";
 echo textdomain(null), "\n";
 echo textdomain('foo'), "\n";
+
+try {
+	textdomain('');
+} catch (\ValueError $e) {
+	echo $e->getMessage();
+}
 ?>
 --EXPECT--
 test
 test
 foo
+textdomain(): Argument #1 ($domain) cannot be empty
 --CREDITS--
 Christian Weiske, cweiske@php.net
 PHP Testfest Berlin 2009-05-09