Merge remote-tracking branch 'o/master'

zoonru · Mar 21, 2024 · 7d28e30 · 7d28e30
2 parents 7662d69 + f9d2511
commit 7d28e30
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@ CHANGELOG for PHP CS Fixer
 
 This file contains changelogs for stable releases only.
 
+Changelog for v3.52.1
+---------------------
+
+* fix: StatementIndentationFixer - do not crash on ternary operator in class property (#7899)
+* fix: `PhpCsFixer\Tokenizer\Tokens::setSize` return type (#7900)
+
 Changelog for v3.52.0
 ---------------------
 

diff --git a/src/Console/Application.php b/src/Console/Application.php
@@ -41,7 +41,7 @@
 final class Application extends BaseApplication
 {
     public const NAME = 'PHP CS Fixer';
-    public const VERSION = '3.52.1-DEV';
+    public const VERSION = '3.52.2-DEV';
     public const VERSION_CODENAME = '15 Keys';
 
     private ToolInfo $toolInfo;

diff --git a/src/Fixer/Whitespace/StatementIndentationFixer.php b/src/Fixer/Whitespace/StatementIndentationFixer.php
@@ -230,7 +230,7 @@ protected function applyFix(\SplFileInfo $file, Tokens $tokens): void
                 } elseif ($token->equals(':')) {
                     if (isset($caseBlockStarts[$index])) {
                         [$endIndex, $endIndexInclusive] = $this->findCaseBlockEnd($tokens, $index);
-                    } else {
+                    } elseif ($this->alternativeSyntaxAnalyzer->belongsToAlternativeSyntax($tokens, $index)) {
                         $endIndex = $this->alternativeSyntaxAnalyzer->findAlternativeSyntaxBlockEnd($tokens, $alternativeBlockStarts[$index]);
                     }
                 } elseif ($token->isGivenKind(CT::T_DESTRUCTURING_SQUARE_BRACE_OPEN)) {

diff --git a/src/Tokenizer/Tokens.php b/src/Tokenizer/Tokens.php
@@ -287,6 +287,7 @@ public static function getBlockEdgeDefinitions(): array
      *
      * @param int $size
      */
+    #[\ReturnTypeWillChange]
     public function setSize($size): bool
     {
         if ($this->getSize() !== $size) {

diff --git a/tests/Fixer/Whitespace/StatementIndentationFixerTest.php b/tests/Fixer/Whitespace/StatementIndentationFixerTest.php
@@ -1464,6 +1464,16 @@ class Foo
     1,
 ];',
         ];
+
+        yield 'ternary operator in property' => [
+            <<<'PHP'
+                <?php
+                class Foo
+                {
+                    public int $bar = BAZ ? -1 : 1;
+                }
+                PHP
+        ];
     }
 
     /**