From 28edf7786099bf1529228a8a76edda4590dba578 Mon Sep 17 00:00:00 2001
From: tamiroh <tamiroh71@gmail.com>
Date: Sun, 18 Feb 2024 20:53:01 +0900
Subject: [PATCH] Update priority

---
 src/Fixer/Operator/NoUselessConcatOperatorFixer.php |  2 +-
 .../StringNotation/ExplicitStringVariableFixer.php  |  3 ++-
 tests/AutoReview/FixerFactoryTest.php               |  3 +++
 ..._string_variable,no_useless_concat_operator.test | 13 +++++++++++++
 4 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 tests/Fixtures/Integration/priority/explicit_string_variable,no_useless_concat_operator.test

diff --git a/src/Fixer/Operator/NoUselessConcatOperatorFixer.php b/src/Fixer/Operator/NoUselessConcatOperatorFixer.php
index aa482dc86bd..79c35e7cdf2 100644
--- a/src/Fixer/Operator/NoUselessConcatOperatorFixer.php
+++ b/src/Fixer/Operator/NoUselessConcatOperatorFixer.php
@@ -54,7 +54,7 @@ public function getDefinition(): FixerDefinitionInterface
      * {@inheritdoc}
      *
      * Must run before DateTimeCreateFromFormatCallFixer, EregToPregFixer, PhpUnitDedicateAssertInternalTypeFixer, RegularCallableCallFixer, SetTypeToCastFixer.
-     * Must run after NoBinaryStringFixer, SingleQuoteFixer.
+     * Must run after ExplicitStringVariableFixer, NoBinaryStringFixer, SingleQuoteFixer.
      */
     public function getPriority(): int
     {
diff --git a/src/Fixer/StringNotation/ExplicitStringVariableFixer.php b/src/Fixer/StringNotation/ExplicitStringVariableFixer.php
index ca0c741f964..5194a72e813 100644
--- a/src/Fixer/StringNotation/ExplicitStringVariableFixer.php
+++ b/src/Fixer/StringNotation/ExplicitStringVariableFixer.php
@@ -52,11 +52,12 @@ public function getDefinition(): FixerDefinitionInterface
     /**
      * {@inheritdoc}
      *
+     * Must run before NoUselessConcatOperatorFixer.
      * Must run after BacktickToShellExecFixer.
      */
     public function getPriority(): int
     {
-        return 0;
+        return 6;
     }
 
     public function isCandidate(Tokens $tokens): bool
diff --git a/tests/AutoReview/FixerFactoryTest.php b/tests/AutoReview/FixerFactoryTest.php
index a3b6efd833e..a1f6cf6faef 100644
--- a/tests/AutoReview/FixerFactoryTest.php
+++ b/tests/AutoReview/FixerFactoryTest.php
@@ -442,6 +442,9 @@ private static function getFixersPriorityGraph(): array
                 'heredoc_to_nowdoc',
                 'single_quote',
             ],
+            'explicit_string_variable' => [
+                'no_useless_concat_operator',
+            ],
             'final_class' => [
                 'protected_to_private',
                 'self_static_accessor',
diff --git a/tests/Fixtures/Integration/priority/explicit_string_variable,no_useless_concat_operator.test b/tests/Fixtures/Integration/priority/explicit_string_variable,no_useless_concat_operator.test
new file mode 100644
index 00000000000..e0c5821acdc
--- /dev/null
+++ b/tests/Fixtures/Integration/priority/explicit_string_variable,no_useless_concat_operator.test
@@ -0,0 +1,13 @@
+--TEST--
+Integration of fixers: explicit_string_variable,no_useless_concat_operator.
+--RULESET--
+{"no_useless_concat_operator": true, "explicit_string_variable": true}
+--EXPECT--
+<?php
+
+$foo = "bar {$baz}qux";
+
+--INPUT--
+<?php
+
+$foo = "bar $baz" . "qux";