Merge a0a119f into 8955a74

PHPCSStandards · Mar 21, 2020 · 108a252 · 108a252
2 parents 8955a74 + a0a119f
commit 108a252
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/PHPCSUtils/Tokens/Collections.php b/PHPCSUtils/Tokens/Collections.php
@@ -260,6 +260,21 @@ class Collections
         \T_INTERFACE  => \T_INTERFACE,
     ];
 
+    /**
+     * Tokens types used for "forwarding" calls within OO structures.
+     *
+     * @link https://www.php.net/manual/en/language.oop5.paamayim-nekudotayim.php
+     *
+     * @since 1.0.0
+     *
+     * @var array <int|string> => <int|string>
+     */
+    public static $OOHierarchyKeywords = [
+        \T_PARENT => \T_PARENT,
+        \T_SELF   => \T_SELF,
+        \T_STATIC => \T_STATIC,
+    ];
+
     /**
      * Tokens types which can be encountered in the fully/partially qualified name of an OO structure.
      *

diff --git a/PHPCSUtils/Utils/Operators.php b/PHPCSUtils/Utils/Operators.php
@@ -149,9 +149,7 @@ public static function isReference(File $phpcsFile, $stackPtr)
             } else {
                 $skip   = Tokens::$emptyTokens;
                 $skip  += Collections::$OONameTokens;
-                $skip[] = \T_SELF;
-                $skip[] = \T_PARENT;
-                $skip[] = \T_STATIC;
+                $skip  += Collections::$OOHierarchyKeywords;
                 $skip[] = \T_DOUBLE_COLON;
 
                 $nextSignificantAfter = $phpcsFile->findNext(