Add support for using final properties in stubs (php#17306)

DanielEScherzer · Jan 6, 2025 · 684ef01 · 684ef01
1 parent e4ad271
commit 684ef01
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/Zend/tests/type_declarations/typed_properties_095.phpt b/Zend/tests/type_declarations/typed_properties_095.phpt
@@ -75,6 +75,8 @@ object(_ZendTestClass)#1 (3) {
   uninitialized(Traversable&Countable)
   ["readonlyProp"]=>
   uninitialized(int)
+  ["finalProp"]=>
+  uninitialized(int)
   ["dnfProperty"]=>
   uninitialized(Iterator|(Traversable&Countable))
 }
@@ -93,6 +95,8 @@ object(Test)#4 (3) {
   uninitialized(Traversable&Countable)
   ["readonlyProp"]=>
   uninitialized(int)
+  ["finalProp"]=>
+  uninitialized(int)
   ["dnfProperty"]=>
   uninitialized(Iterator|(Traversable&Countable))
 }

diff --git a/build/gen_stub.php b/build/gen_stub.php
@@ -3103,6 +3103,10 @@ protected function getFlagsByPhpVersion(): array
             $flags = $this->addFlagForVersionsAbove($flags, "ZEND_ACC_STATIC", PHP_70_VERSION_ID);
         }
 
+        if ($this->flags & Modifiers::FINAL) {
+            $flags = $this->addFlagForVersionsAbove($flags, "ZEND_ACC_FINAL", PHP_84_VERSION_ID);
+        }
+
         if ($this->flags & Modifiers::READONLY) {
             $flags = $this->addFlagForVersionsAbove($flags, "ZEND_ACC_READONLY", PHP_81_VERSION_ID);
         } elseif ($this->classFlags & Modifiers::READONLY) {
@@ -3125,6 +3129,11 @@ protected function addModifiersToFieldSynopsis(DOMDocument $doc, DOMElement $fie
             $fieldsynopsisElement->appendChild($doc->createElement("modifier", "static"));
         }
 
+        if ($this->flags & Modifiers::FINAL) {
+            $fieldsynopsisElement->appendChild(new DOMText("\n     "));
+            $fieldsynopsisElement->appendChild($doc->createElement("modifier", "final"));
+        }
+
         if ($this->flags & Modifiers::READONLY || $this->isDocReadonly) {
             $fieldsynopsisElement->appendChild(new DOMText("\n     "));
             $fieldsynopsisElement->appendChild($doc->createElement("modifier", "readonly"));

diff --git a/ext/zend_test/test.stub.php b/ext/zend_test/test.stub.php
@@ -55,6 +55,7 @@ class _ZendTestClass implements _ZendTestInterface {
         public stdClass|Iterator|null $classUnionProp = null;
         public Traversable&Countable $classIntersectionProp;
         public readonly int $readonlyProp;
+        public final int $finalProp;
 
         public static function is_object(): int {}
 

diff --git a/ext/zend_test/test_arginfo.h b/ext/zend_test/test_arginfo.h