Rename @cname to @cvalue in stubs (#9043)

@cname currently refers to the constant name in C. However, it is not always a (constant) name, but sometimes a function invocation, so naming it as @cvalue would be more appropriate.

Author: kocsismate

Zend/zend_attributes.stub.php

@@ -7,42 +7,42 @@ final class Attribute
 {
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_TARGET_CLASS
+     * @cvalue ZEND_ATTRIBUTE_TARGET_CLASS
      */
     const TARGET_CLASS = UNKNOWN;
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_TARGET_FUNCTION
+     * @cvalue ZEND_ATTRIBUTE_TARGET_FUNCTION
      */
     const TARGET_FUNCTION = UNKNOWN;
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_TARGET_METHOD
+     * @cvalue ZEND_ATTRIBUTE_TARGET_METHOD
      */
     const TARGET_METHOD = UNKNOWN;
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_TARGET_PROPERTY
+     * @cvalue ZEND_ATTRIBUTE_TARGET_PROPERTY
      */
     const TARGET_PROPERTY = UNKNOWN;
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_TARGET_CLASS_CONST
+     * @cvalue ZEND_ATTRIBUTE_TARGET_CLASS_CONST
      */
     const TARGET_CLASS_CONSTANT = UNKNOWN;
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_TARGET_PARAMETER
+     * @cvalue ZEND_ATTRIBUTE_TARGET_PARAMETER
      */
     const TARGET_PARAMETER = UNKNOWN;
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_TARGET_ALL
+     * @cvalue ZEND_ATTRIBUTE_TARGET_ALL
      */
     const TARGET_ALL = UNKNOWN;
     /**
      * @var int
-     * @cname ZEND_ATTRIBUTE_IS_REPEATABLE
+     * @cvalue ZEND_ATTRIBUTE_IS_REPEATABLE
      */
     const IS_REPEATABLE = UNKNOWN;
 

Zend/zend_attributes_arginfo.h

@@ -4,96 +4,96 @@
 
 /**
  * @var int
- * @cname E_ERROR
+ * @cvalue E_ERROR
  */
 const E_ERROR = UNKNOWN;
 
 /**
  * @var int
- * @cname E_WARNING
+ * @cvalue E_WARNING
  */
 const E_WARNING = UNKNOWN;
 
 /**
  * @var int
- * @cname E_PARSE
+ * @cvalue E_PARSE
  */
 const E_PARSE = UNKNOWN;
 
 /**
  * @var int
- * @cname E_NOTICE
+ * @cvalue E_NOTICE
  */
 const E_NOTICE = UNKNOWN;
 
 /**
  * @var int
- * @cname E_CORE_ERROR
+ * @cvalue E_CORE_ERROR
  */
 const E_CORE_ERROR = UNKNOWN;
 
 /**
  * @var int
- * @cname E_CORE_WARNING
+ * @cvalue E_CORE_WARNING
  */
 const E_CORE_WARNING = UNKNOWN;
 
 /**
  * @var int
- * @cname E_COMPILE_ERROR
+ * @cvalue E_COMPILE_ERROR
  */
 const E_COMPILE_ERROR = UNKNOWN;
 
 /**
  * @var int
- * @cname E_COMPILE_WARNING
+ * @cvalue E_COMPILE_WARNING
  */
 const E_COMPILE_WARNING = UNKNOWN;
 
 /**
  * @var int
- * @cname E_USER_ERROR
+ * @cvalue E_USER_ERROR
  */
 const E_USER_ERROR = UNKNOWN;
 
 /**
  * @var int
- * @cname E_USER_WARNING
+ * @cvalue E_USER_WARNING
  */
 const E_USER_WARNING = UNKNOWN;
 
 /**
  * @var int
- * @cname E_USER_NOTICE
+ * @cvalue E_USER_NOTICE
  */
 const E_USER_NOTICE = UNKNOWN;
 
 /**
  * @var int
- * @cname E_STRICT
+ * @cvalue E_STRICT
  */
 const E_STRICT = UNKNOWN;
 
 /**
  * @var int
- * @cname E_RECOVERABLE_ERROR
+ * @cvalue E_RECOVERABLE_ERROR
  */
 const E_RECOVERABLE_ERROR = UNKNOWN;
 
 /**
  * @var int
- * @cname E_DEPRECATED
+ * @cvalue E_DEPRECATED
  */
 const E_DEPRECATED = UNKNOWN;
 
 /**
  * @var int
- * @cname E_USER_DEPRECATED
+ * @cvalue E_USER_DEPRECATED
  */
 const E_USER_DEPRECATED = UNKNOWN;
 
 /**
  * @var int
- * @cname E_ALL
+ * @cvalue E_ALL
  */
 const E_ALL = UNKNOWN;

Zend/zend_constants.stub.php

@@ -1594,7 +1594,7 @@ class EvaluatedValue
     public $type;
 
     /** @var string|null */
-    public $cConstName;
+    public $cConstValue;
 
     /** @var bool */
     public $isUnknownConstValue;
@@ -1671,7 +1671,7 @@ private function __construct($value, SimpleType $type, ?string $cConstName, ?Con
     {
         $this->value = $value;
         $this->type = $type;
-        $this->cConstName = $cConstName;
+        $this->cConstValue = $cConstName;
         $this->originatingConst = $originatingConst;
         $this->isUnknownConstValue = $isUnknownConstValue;
     }
@@ -1719,8 +1719,8 @@ public function initializeZval(string $zvalName, iterable $allConstInfos): strin
      */
     public function getCConstValue(iterable $allConstInfos): ?string
     {
-        if ($this->cConstName) {
-            return $this->cConstName;
+        if ($this->cConstValue) {
+            return $this->cConstValue;
         }
 
         if ($this->originatingConst) {
@@ -1872,7 +1872,7 @@ class ConstInfo extends VariableLike
     /** @var string|null */
     public $cond;
     /** @var string|null */
-    public $cname;
+    public $cValue;
 
     public function __construct(
         ConstOrClassConstName $name,
@@ -1882,7 +1882,7 @@ public function __construct(
         ?Type $phpDocType,
         bool $isDeprecated,
         ?string $cond,
-        ?string $cname,
+        ?string $cValue,
         ?string $link,
         ?int $phpVersionIdMinimumCompatibility
     ) {
@@ -1891,7 +1891,7 @@ public function __construct(
         $this->valueString = $valueString;
         $this->isDeprecated = $isDeprecated;
         $this->cond = $cond;
-        $this->cname = $cname;
+        $this->cValue = $cValue;
         parent::__construct($flags, $phpDocType, $link, $phpVersionIdMinimumCompatibility);
     }
 
@@ -1903,7 +1903,7 @@ public function getValue(iterable $allConstInfos): EvaluatedValue
         return EvaluatedValue::createFromExpression(
             $this->value,
             $this->phpDocType->tryToSimpleType(),
-            $this->cname,
+            $this->cValue,
             $allConstInfos
         );
     }
@@ -1948,7 +1948,7 @@ protected function addTypeToFieldSynopsis(DOMDocument $doc, DOMElement $fieldsyn
      */
     protected function getFieldSynopsisValueString(iterable $allConstInfos): ?string
     {
-        $value = EvaluatedValue::createFromExpression($this->value, null, $this->cname, $allConstInfos);
+        $value = EvaluatedValue::createFromExpression($this->value, null, $this->cValue, $allConstInfos);
         if ($value->originatingConst) {
             return $value->originatingConst->getFieldSynopsisValueString($allConstInfos);
         }
@@ -1971,9 +1971,9 @@ public function getDeclaration(iterable $allConstInfos): string
             throw new Exception("Constant " . $this->name->__toString() . " must have a simple built-in type");
         }
 
-        $value = EvaluatedValue::createFromExpression($this->value, $type, $this->cname, $allConstInfos);
-        if ($value->isUnknownConstValue && !$value->cConstName) {
-            throw new Exception("Constant " . $this->name->__toString() . " must have a @cname annotation");
+        $value = EvaluatedValue::createFromExpression($this->value, $type, $this->cValue, $allConstInfos);
+        if ($value->isUnknownConstValue && !$value->cConstValue) {
+            throw new Exception("Constant " . $this->name->__toString() . " must have a @cvalue annotation");
         }
 
         $code = "";
@@ -2059,35 +2059,35 @@ private function getClassConstDeclaration(EvaluatedValue $value, iterable $allCo
 
     private function getValueAssertion(EvaluatedValue $value): string
     {
-        if ($value->isUnknownConstValue || $value->originatingConst || $value->cConstName === null) {
+        if ($value->isUnknownConstValue || $value->originatingConst || $value->cConstValue === null) {
             return "";
         }
 
-        $cName = $value->cConstName;
+        $cConstValue = $value->cConstValue;
         $constValue = $value->value;
 
         if ($value->type->isNull()) {
-            return "\tZEND_ASSERT($cName == NULL);\n";
+            return "\tZEND_ASSERT($cConstValue == NULL);\n";
         }
 
         if ($value->type->isBool()) {
             $cValue = $constValue ? "true" : "false";
-            return "\tZEND_ASSERT($cName == $cValue);\n";
+            return "\tZEND_ASSERT($cConstValue == $cValue);\n";
         }
 
         if ($value->type->isInt()) {
             $cValue = (int) $constValue;
-            return "\tZEND_ASSERT($cName == $cValue);\n";
+            return "\tZEND_ASSERT($cConstValue == $cValue);\n";
         }
 
         if ($value->type->isFloat()) {
             $cValue = (float) $constValue;
-            return "\tZEND_ASSERT($cName == $cValue);\n";
+            return "\tZEND_ASSERT($cConstValue == $cValue);\n";
         }
 
         if ($value->type->isString()) {
             $cValue = '"' . addslashes($constValue) . '"';
-            return "\tZEND_ASSERT(strcmp($cName, $cValue) == 0);\n";
+            return "\tZEND_ASSERT(strcmp($cConstValue, $cValue) == 0);\n";
         }
 
         throw new Exception("Unimplemented constant type");
@@ -3376,7 +3376,7 @@ function parseConstLike(
 ): ConstInfo {
     $phpDocType = null;
     $deprecated = false;
-    $cname = null;
+    $cValue = null;
     $link = null;
     if ($docComment) {
         $tags = parseDocComment($docComment);
@@ -3385,8 +3385,8 @@ function parseConstLike(
                 $phpDocType = $tag->getType();
             } elseif ($tag->name === 'deprecated') {
                 $deprecated = true;
-            } elseif ($tag->name === 'cname') {
-                $cname = $tag->value;
+            } elseif ($tag->name === 'cvalue') {
+                $cValue = $tag->value;
             } elseif ($tag->name === 'link') {
                 $link = $tag->value;
             }
@@ -3405,7 +3405,7 @@ function parseConstLike(
         Type::fromString($phpDocType),
         $deprecated,
         $cond,
-        $cname,
+        $cValue,
         $link,
         $phpVersionIdMinimumCompatibility
     );