PHP 8.4 | File::getMemberProperties(): allow for final properties (#834)

Update File::getMemberProperties() to report when a property is marked as final. Update existing tests (which are all for non-final properties) to expect that the property not be marked as final, and add a new test case for a final that should be, and is, marked as final.

Part of #734

Author: DanielEScherzer

src/Files/File.php

@@ -1845,6 +1845,7 @@ public function getMethodProperties($stackPtr)
      *    'scope_specified' => boolean,       // TRUE if the scope was explicitly specified.
      *    'is_static'       => boolean,       // TRUE if the static keyword was found.
      *    'is_readonly'     => boolean,       // TRUE if the readonly keyword was found.
+     *    'is_final'        => boolean,       // TRUE if the final keyword was found.
      *    'type'            => string,        // The type of the var (empty if no type specified).
      *    'type_token'      => integer|false, // The stack pointer to the start of the type
      *                                        // or FALSE if there is no type.
@@ -1917,6 +1918,7 @@ public function getMemberProperties($stackPtr)
             T_STATIC    => T_STATIC,
             T_VAR       => T_VAR,
             T_READONLY  => T_READONLY,
+            T_FINAL     => T_FINAL,
         ];
 
         $valid += Tokens::$emptyTokens;
@@ -1925,6 +1927,7 @@ public function getMemberProperties($stackPtr)
         $scopeSpecified = false;
         $isStatic       = false;
         $isReadonly     = false;
+        $isFinal        = false;
 
         $startOfStatement = $this->findPrevious(
             [
@@ -1960,7 +1963,10 @@ public function getMemberProperties($stackPtr)
             case T_READONLY:
                 $isReadonly = true;
                 break;
-            }
+            case T_FINAL:
+                $isFinal = true;
+                break;
+            }//end switch
         }//end for
 
         $type         = '';
@@ -2016,6 +2022,7 @@ public function getMemberProperties($stackPtr)
             'scope_specified' => $scopeSpecified,
             'is_static'       => $isStatic,
             'is_readonly'     => $isReadonly,
+            'is_final'        => $isFinal,
             'type'            => $type,
             'type_token'      => $typeToken,
             'type_end_token'  => $typeEndToken,

tests/Core/File/GetMemberPropertiesTest.inc

@@ -354,3 +354,24 @@ trait DNFTypes {
     // Intentional fatal error - nullable operator cannot be combined with DNF.
     var ?(A&\Pck\B)|bool $propD;
 }
+
+class WithFinalProperties {
+    /* testPHP84FinalPublicTypedProp */
+    final public string $val1;
+    /* testPHP84FinalProtectedTypedProp */
+    final protected string $val2;
+    /* testPHP84FinalMiddleTypedProp */
+    public final string $val3;
+    /* testPHP84FinalMiddleStaticTypedProp */
+    public final static string $val4;
+    /* testPHP84FinalLastTypedProp */
+    public readonly final string $val5;
+    /* testPHP84FinalImplicitVisibilityTypedProp */
+    final string $val6;
+    /* testPHP84FinalImplicitVisibilityProp */
+    final $val7;
+    /* testPHP84FinalNullableTypedProp */
+    final public ?string $val8;
+    /* testPHP84FinalComplexTypedProp */
+    final public (Foo&\Bar)|bool $val9;
+}