Declare the last few remaining constants via stubs

build/gen_stub.php

@@ -2526,6 +2526,7 @@ class ConstInfo extends VariableLike
     public ?string $cond;
     public ?string $cValue;
     public bool $isUndocumentable;
+    public bool $isFileCacheAllowed;
 
     /**
      * @var AttributeInfo[] $attributes
@@ -2544,7 +2545,8 @@ public function __construct(
         ?string $link,
         ?int $phpVersionIdMinimumCompatibility,
         array $attributes,
-        ?ExposedDocComment $exposedDocComment
+        ?ExposedDocComment $exposedDocComment,
+        bool $isFileCacheAllowed
     ) {
         $this->name = $name;
         $this->value = $value;
@@ -2553,6 +2555,7 @@ public function __construct(
         $this->cond = $cond;
         $this->cValue = $cValue;
         $this->isUndocumentable = $isUndocumentable;
+        $this->isFileCacheAllowed = $isFileCacheAllowed;
         parent::__construct($flags, $type, $phpDocType, $link, $phpVersionIdMinimumCompatibility, $attributes, $exposedDocComment);
     }
 
@@ -2698,6 +2701,9 @@ private function getGlobalConstDeclaration(EvaluatedValue $value, array $allCons
         $cExpr = $value->getCExpr();
 
         $flags = "CONST_PERSISTENT";
+        if (!$this->isFileCacheAllowed) {
+            $flags .= " | CONST_NO_FILE_CACHE";
+        }
         if ($this->phpVersionIdMinimumCompatibility !== null && $this->phpVersionIdMinimumCompatibility < 80000) {
             $flags .= " | CONST_CS";
         }
@@ -2725,7 +2731,8 @@ private function getGlobalConstDeclaration(EvaluatedValue $value, array $allCons
             return "\tREGISTER_STRING_CONSTANT(\"$constName\", " . ($cExpr ?: '"' . addslashes($constValue) . '"') . ", $flags);\n";
         }
 
-        throw new Exception("Unimplemented constant type");}
+        throw new Exception("Unimplemented constant type");
+    }
 
     /** @param array<string, ConstInfo> $allConstInfos */
     private function getClassConstDeclaration(EvaluatedValue $value, array $allConstInfos): string
@@ -4304,6 +4311,7 @@ function parseConstLike(
     $deprecated = false;
     $cValue = null;
     $link = null;
+    $isFileCacheAllowed = true;
     if ($comments) {
         $tags = parseDocComments($comments);
         foreach ($tags as $tag) {
@@ -4317,6 +4325,8 @@ function parseConstLike(
                 $isUndocumentable = true;
             } elseif ($tag->name === 'link') {
                 $link = $tag->value;
+            } elseif ($tag->name === 'no-file-cache') {
+                $isFileCacheAllowed = false;
             }
         }
     }
@@ -4339,7 +4349,8 @@ function parseConstLike(
         $link,
         $phpVersionIdMinimumCompatibility,
         $attributes,
-        createExposedDocComment($comments)
+        createExposedDocComment($comments),
+        $isFileCacheAllowed
     );
 }
 

ext/standard/dir.c

@@ -107,7 +107,11 @@ PHP_RINIT_FUNCTION(dir)
 
 PHP_MINIT_FUNCTION(dir)
 {
-	static char dirsep_str[2], pathsep_str[2];
+	dirsep_str[0] = DEFAULT_SLASH;
+	dirsep_str[1] = '\0';
+
+	pathsep_str[0] = ZEND_PATHS_SEPARATOR;
+	pathsep_str[1] = '\0';
 
 	register_dir_symbols(module_number);
 
@@ -117,14 +121,6 @@ PHP_MINIT_FUNCTION(dir)
 	ts_allocate_id(&dir_globals_id, sizeof(php_dir_globals), NULL, NULL);
 #endif
 
-	dirsep_str[0] = DEFAULT_SLASH;
-	dirsep_str[1] = '\0';
-	REGISTER_STRING_CONSTANT("DIRECTORY_SEPARATOR", dirsep_str, CONST_PERSISTENT);
-
-	pathsep_str[0] = ZEND_PATHS_SEPARATOR;
-	pathsep_str[1] = '\0';
-	REGISTER_STRING_CONSTANT("PATH_SEPARATOR", pathsep_str, CONST_PERSISTENT);
-
 	return SUCCESS;
 }
 /* }}} */

ext/standard/dir.stub.php

@@ -2,6 +2,17 @@
 
 /** @generate-class-entries */
 
+/**
+ * @var string
+ * @cvalue dirsep_str
+ */
+const DIRECTORY_SEPARATOR = UNKNOWN;
+/**
+ * @var string
+ * @cvalue pathsep_str
+ */
+const PATH_SEPARATOR = UNKNOWN;
+
 #ifdef HAVE_GLOB
 #if (defined(GLOB_BRACE) && GLOB_BRACE != 0)
 /**

ext/standard/php_dir_int.h

@@ -62,4 +62,6 @@
 
 #endif /* HAVE_GLOB */
 
+char dirsep_str[2], pathsep_str[2];
+
 #endif /* PHP_DIR_INT_H */

main/main.c

@@ -2137,16 +2137,8 @@ zend_result php_module_startup(sapi_module_struct *sf, zend_module_entry *additi
 
 	le_index_ptr = zend_register_list_destructors_ex(NULL, NULL, "index pointer", 0);
 
-    register_main_symbols(module_number);
-
-    REGISTER_MAIN_STRINGL_CONSTANT("PHP_SAPI", sapi_module.name, strlen(sapi_module.name), CONST_PERSISTENT | CONST_NO_FILE_CACHE);
-
 	php_binary_init();
-	if (PG(php_binary)) {
-		REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINARY", PG(php_binary), strlen(PG(php_binary)), CONST_PERSISTENT | CONST_NO_FILE_CACHE);
-	} else {
-		REGISTER_MAIN_STRINGL_CONSTANT("PHP_BINARY", "", 0, CONST_PERSISTENT | CONST_NO_FILE_CACHE);
-	}
+	register_main_symbols(module_number);
 
 	/* this will read in php.ini, set up the configuration parameters,
 	   load zend extensions and register php function extensions

main/main.stub.php

@@ -354,3 +354,15 @@
  */
 const ZEND_VERIFY_TYPE_INFERENCE = UNKNOWN;
 #endif
+/**
+ * @var string
+ * @cvalue sapi_module.name
+ * @no-file-cache
+ */
+const PHP_SAPI = UNKNOWN;
+/**
+ * @var string
+ * @cvalue PG(php_binary) ? PG(php_binary) : ""
+ * @no-file-cache
+ */
+const PHP_BINARY = UNKNOWN;