Merge 1510a86 into 567d785

PHPCSStandards · May 10, 2024 · 31f983b · 31f983b
2 parents 567d785 + 1510a86
commit 31f983b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/PHPCSUtils/AbstractSniffs/AbstractArrayDeclarationSniff.php b/PHPCSUtils/AbstractSniffs/AbstractArrayDeclarationSniff.php
@@ -118,8 +118,6 @@ abstract class AbstractArrayDeclarationSniff implements Sniff
         \T_DNUMBER                  => \T_DNUMBER,
         \T_CONSTANT_ENCAPSED_STRING => \T_CONSTANT_ENCAPSED_STRING,
         \T_STRING_CONCAT            => \T_STRING_CONCAT,
-        \T_INLINE_THEN              => \T_INLINE_THEN,
-        \T_INLINE_ELSE              => \T_INLINE_ELSE,
         \T_BOOLEAN_NOT              => \T_BOOLEAN_NOT,
     ];
 
@@ -143,6 +141,7 @@ final public function __construct()
         $this->acceptedTokens += Tokens::$castTokens;
         $this->acceptedTokens += Tokens::$bracketTokens;
         $this->acceptedTokens += Tokens::$heredocTokens;
+        $this->acceptedTokens += Collections::ternaryOperators();
     }
 
     /**

diff --git a/PHPCSUtils/Tokens/Collections.php b/PHPCSUtils/Tokens/Collections.php
@@ -55,6 +55,7 @@
  *                                                                 declaration.
  * @method static array shortArrayTokens()                         Tokens which are used for short arrays.
  * @method static array shortListTokens()                          Tokens which are used for short lists.
+ * @method static array ternaryOperators()                         Tokens which represent ternary operators.
  * @method static array textStringStartTokens()                    Tokens which can start a - potentially multi-line -
  *                                                                 text string.
  */
@@ -514,6 +515,18 @@ final class Collections
         \T_CLOSE_SHORT_ARRAY => \T_CLOSE_SHORT_ARRAY,
     ];
 
+    /**
+     * Tokens which represent ternary operators.
+     *
+     * @since 1.1.0 Use the {@see Collections::ternaryOperators()} method for access.
+     *
+     * @var array<int|string, int|string>
+     */
+    private static $ternaryOperators = [
+        \T_INLINE_THEN => \T_INLINE_THEN,
+        \T_INLINE_ELSE => \T_INLINE_ELSE,
+    ];
+
     /**
      * Tokens which can start a - potentially multi-line - text string.
      *

diff --git a/PHPCSUtils/Utils/Operators.php b/PHPCSUtils/Utils/Operators.php
@@ -52,8 +52,6 @@ final class Operators
         \T_OPEN_SHORT_ARRAY    => true,
         \T_OPEN_CURLY_BRACKET  => true,
         \T_COLON               => true,
-        \T_INLINE_THEN         => true,
-        \T_INLINE_ELSE         => true,
         \T_CASE                => true,
         \T_FN_ARROW            => true,
         \T_MATCH_ARROW         => true,
@@ -206,6 +204,7 @@ public static function isUnaryPlusMinus(File $phpcsFile, $stackPtr)
             || isset(Tokens::$booleanOperators[$tokens[$prev]['code']]) === true
             || isset(Tokens::$assignmentTokens[$tokens[$prev]['code']]) === true
             || isset(Tokens::$castTokens[$tokens[$prev]['code']]) === true
+            || isset(Collections::ternaryOperators()[$tokens[$prev]['code']]) === true
             || isset(self::$extraUnaryIndicators[$tokens[$prev]['code']]) === true
         ) {
             return true;

diff --git a/Tests/Tokens/Collections/PropertyBasedTokenArraysTest.php b/Tests/Tokens/Collections/PropertyBasedTokenArraysTest.php
@@ -75,6 +75,7 @@ public static function dataPropertyBasedTokenArrays()
             'propertyModifierKeywords',
             'shortArrayTokens',
             'shortListTokens',
+            'ternaryOperators',
             'textStringStartTokens',
         ];