Improve string class constant code generation (#9577)

Using strlen() will make sure that non-constant values can also be used.

Author: kocsismate

build/gen_stub.php

@@ -1670,7 +1670,7 @@ public function initializeZval(string $zvalName, iterable $allConstInfos): strin
                 $code .= "\tZVAL_EMPTY_STRING(&$zvalName);\n";
             } else {
                 $constValue = $cConstValue ?: '"' . addslashes($this->value) . '"';
-                $code .= "\tzend_string *{$zvalName}_str = zend_string_init($constValue, sizeof($constValue) - 1, 1);\n";
+                $code .= "\tzend_string *{$zvalName}_str = zend_string_init($constValue, strlen($constValue), 1);\n";
                 $code .= "\tZVAL_STR(&$zvalName, {$zvalName}_str);\n";
             }
         } elseif ($this->type->isArray()) {

ext/date/php_date_arginfo.h

@@ -3110,12 +3110,6 @@ static PHP_MINIT_FUNCTION(zip)
 	php_zip_register_prop_handler(&zip_prop_handlers, "filename",  NULL, php_zipobj_get_filename, IS_STRING);
 	php_zip_register_prop_handler(&zip_prop_handlers, "comment",   NULL, php_zipobj_get_zip_comment, IS_STRING);
 
-#ifdef HAVE_LIBZIP_VERSION
-	zend_declare_class_constant_string(zip_class_entry, "LIBZIP_VERSION", sizeof("LIBZIP_VERSION")-1, zip_libzip_version());
-#else
-	zend_declare_class_constant_string(zip_class_entry, "LIBZIP_VERSION", sizeof("LIBZIP_VERSION")-1, LIBZIP_VERSION);
-#endif
-
 	php_register_url_stream_wrapper("zip", &php_stream_zip_wrapper);
 
 	le_zip_dir   = zend_register_list_destructors_ex(php_zip_free_dir,   NULL, le_zip_dir_name,   module_number);

ext/intl/locale/locale_arginfo.h

@@ -33,6 +33,12 @@ extern zend_module_entry zip_module_entry;
 
 #define PHP_ZIP_VERSION "1.21.1"
 
+#ifdef HAVE_LIBZIP_VERSION
+#define LIBZIP_VERSION_STR zip_libzip_version()
+#else
+#define LIBZIP_VERSION_STR LIBZIP_VERSION
+#endif
+
 #define ZIP_OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename)
 
 typedef struct _ze_zip_rsrc {

ext/intl/uchar/uchar_arginfo.h

@@ -633,6 +633,12 @@ class ZipArchive implements Countable
      */
     public const EM_UNKNOWN = UNKNOWN;
 
+    /**
+     * @var string
+     * @cvalue LIBZIP_VERSION_STR
+     */
+    public const LIBZIP_VERSION = UNKNOWN;
+
     /** @readonly */
     public int $lastId;
     /** @readonly */