Merge branch 'master' into 4.x

Author: jrfnl

src/Files/File.php

@@ -1871,6 +1871,7 @@ public function getMethodProperties($stackPtr)
      *    '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.
+     *    'is_abstract'     => boolean,       // TRUE if the abstract 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.
@@ -1922,6 +1923,7 @@ public function getMemberProperties($stackPtr)
             T_VAR      => T_VAR,
             T_READONLY => T_READONLY,
             T_FINAL    => T_FINAL,
+            T_ABSTRACT => T_ABSTRACT,
         ];
 
         $valid += Tokens::SCOPE_MODIFIERS;
@@ -1933,6 +1935,7 @@ public function getMemberProperties($stackPtr)
         $isStatic       = false;
         $isReadonly     = false;
         $isFinal        = false;
+        $isAbstract     = false;
 
         $startOfStatement = $this->findPrevious(
             [
@@ -1980,6 +1983,9 @@ public function getMemberProperties($stackPtr)
             case T_FINAL:
                 $isFinal = true;
                 break;
+            case T_ABSTRACT:
+                $isAbstract = true;
+                break;
             }//end switch
         }//end for
 
@@ -2036,6 +2042,7 @@ public function getMemberProperties($stackPtr)
             'is_static'       => $isStatic,
             'is_readonly'     => $isReadonly,
             'is_final'        => $isFinal,
+            'is_abstract'     => $isAbstract,
             'type'            => $type,
             'type_token'      => $typeToken,
             'type_end_token'  => $typeEndToken,

tests/Core/Files/File/GetMemberPropertiesTest.inc

@@ -401,3 +401,27 @@ class AsymVisibility {
     /* testPHP84IllegalAsymPublicProtectedSetStaticProperty */
     public protected(set) static mixed $prop10;
 }
+
+abstract class WithAbstractProperties {
+    /* testPHP84AbstractPublicTypedProp */
+    abstract public string $val1 { get; }
+    /* testPHP84AbstractProtectedTypedProp */
+    abstract protected Union|Type $val2 { set; }
+    /* testPHP84AbstractMiddleTypedProp */
+    public abstract Intersection&Type $val3 { get; }
+    /* testPHP84AbstractImplicitVisibilityTypedProp */
+    abstract int $val4 { set; }
+    /* testPHP84AbstractImplicitVisibilityProp */
+    abstract $val5 { get; }
+    /* testPHP84AbstractNullableTypedProp */
+    abstract public ?string $val6 { set; }
+    /* testPHP84AbstractComplexTypedProp */
+    abstract protected (Foo&\Bar)|false $val7 { get; }
+
+    /* testPHP84IllegalAbstractPrivateProp */
+    private abstract string $val8 { get; }
+    /* testPHP84IllegalAbstractReadonlyProp */
+    public readonly abstract string $val9 { get; }
+    /* testPHP84IllegalAbstractStaticProp */
+    public abstract static string $val10 { get; }
+}