From 8ec89bac5d1897e8f7fda4c30c16863ac903f36a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Gon=C3=A7alves?= <hugo.goncalves@kununu.com>
Date: Tue, 16 Sep 2025 17:48:09 +0100
Subject: [PATCH 1/2] Fix yoda style

---
 php-cs-fixer.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/php-cs-fixer.php b/php-cs-fixer.php
index 9a7035e..92b2f1d 100644
--- a/php-cs-fixer.php
+++ b/php-cs-fixer.php
@@ -72,9 +72,9 @@
         'void_return'                      => true,
         'yoda_style'                       => [
             'always_move_variable' => false,
-            'equal'                => false,
-            'identical'            => false,
-            'less_and_greater'     => false,
+            'equal'                => null,
+            'identical'            => null,
+            'less_and_greater'     => null,
         ],
     ])
     ->setFinder(

From 424600c36cb58eb86f9e45a4dd3139193e50b0bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20Gon=C3=A7alves?= <hugo.goncalves@kununu.com>
Date: Tue, 16 Sep 2025 17:52:59 +0100
Subject: [PATCH 2/2] Fix tests

---
 .../Kununu/CsFixer/_data/fixer_test_cases.php | 121 ++++++++----------
 1 file changed, 50 insertions(+), 71 deletions(-)

diff --git a/tests/Unit/Kununu/CsFixer/_data/fixer_test_cases.php b/tests/Unit/Kununu/CsFixer/_data/fixer_test_cases.php
index 7da2f84..cbba18b 100644
--- a/tests/Unit/Kununu/CsFixer/_data/fixer_test_cases.php
+++ b/tests/Unit/Kununu/CsFixer/_data/fixer_test_cases.php
@@ -1,4 +1,6 @@
 <?php
+declare(strict_types=1);
+
 return [
     'declare_strict_types' => [
         'before' => <<<'PHP'
@@ -12,8 +14,7 @@ public function foo()
         return 1;
     }
 }
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -28,7 +29,7 @@ public function foo()
     }
 }
 
-PHP
+PHP,
     ],
 
     'combine_consecutive_unsets' => [
@@ -37,8 +38,7 @@ public function foo()
 $a = 1; $b = 2;
 unset($a);
 unset($b);
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -46,7 +46,7 @@ public function foo()
 $b = 2;
 unset($a, $b);
 
-PHP
+PHP,
     ],
 
     'binary_operator_spaces' => [
@@ -57,8 +57,7 @@ public function foo()
     'two'  =>2,
     'three'=> 3
 ];
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -68,7 +67,7 @@ public function foo()
     'three'=> 3,
 ];
 
-PHP
+PHP,
     ],
 
     'explicit_indirect_variable' => [
@@ -76,29 +75,27 @@ public function foo()
 <?php
 $name = 'foo';
 $$name = 'value';
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
 $name = 'foo';
 ${$name} = 'value';
 
-PHP
+PHP,
     ],
 
     'concat_space' => [
         'before' => <<<'PHP'
 <?php
 $greeting = "Hi"."There";
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
 $greeting = 'HiThere';
 
-PHP
+PHP,
     ],
 
     'heredoc_to_nowdoc' => [
@@ -107,8 +104,7 @@ public function foo()
 $doc = <<<EOS
 This heredoc has no variables and could be a nowdoc.
 EOS;
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -116,7 +112,7 @@ public function foo()
 This heredoc has no variables and could be a nowdoc.
 EOS;
 
-PHP
+PHP,
     ],
 
     'global_namespace_import' => [
@@ -132,8 +128,7 @@ public function now(): void
         echo $dt->format('Y');
     }
 }
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -151,7 +146,7 @@ public function now(): void
     }
 }
 
-PHP
+PHP,
     ],
 
     'function_declaration_spacing' => [
@@ -168,8 +163,7 @@ public function doStuff ()
         return $fn(1);
     }
 }
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -185,7 +179,7 @@ public function doStuff()
     }
 }
 
-PHP
+PHP,
     ],
 
     'no_useless_else_and_no_useless_return' => [
@@ -212,8 +206,7 @@ private function isReady(): bool
         return static::$count > 0;
     }
 }
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -236,7 +229,7 @@ private function isReady(): bool
     }
 }
 
-PHP
+PHP,
     ],
 
     'ternary_to_null_coalescing' => [
@@ -246,8 +239,7 @@ function maybe($x)
 {
     return isset($x) ? $x : null;
 }
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -256,7 +248,7 @@ function maybe($x)
     return $x ?? null;
 }
 
-PHP
+PHP,
     ],
 
     'return_assignment' => [
@@ -267,8 +259,7 @@ function assignThenReturn()
     $a = 5;
     return $a;
 }
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -277,7 +268,7 @@ function assignThenReturn()
     return 5;
 }
 
-PHP
+PHP,
     ],
 
     'self_static_accessor' => [
@@ -292,8 +283,7 @@ public function isNonZero(): bool
         return static::$count > 0;
     }
 }
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -307,7 +297,7 @@ public function isNonZero(): bool
     }
 }
 
-PHP
+PHP,
     ],
 
     'void_return' => [
@@ -320,8 +310,7 @@ public function doSomething()
         echo "hello";
     }
 }
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -333,7 +322,7 @@ public function doSomething(): void
     }
 }
 
-PHP
+PHP,
     ],
 
     'yoda_style' => [
@@ -349,23 +338,22 @@ function check($a)
         return false;
     }
 }
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
 function check($a)
 {
-    if ($a === 42) {
+    if (42 === $a) {
         return true;
     }
 
-    if ($a != 'bar') {
+    if ('bar' != $a) {
         return false;
     }
 }
 
-PHP
+PHP,
     ],
 
     'no_extra_blank_lines' => [
@@ -386,8 +374,7 @@ public function test()
         return 1;
     }
 }
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -402,7 +389,7 @@ public function test()
     }
 }
 
-PHP
+PHP,
     ],
 
     'native_function_invocation_noop' => [
@@ -412,8 +399,7 @@ public function test()
 
 $result = strlen("abc");
 $now = time();
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -423,21 +409,20 @@ public function test()
 $result = strlen('abc');
 $now = time();
 
-PHP
+PHP,
     ],
 
     'single_quote_non_interpolated' => [
         'before' => <<<'PHP'
 <?php
 $message = "simple string";
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
 $message = 'simple string';
 
-PHP
+PHP,
     ],
 
     'single_quote_interpolated_no_change' => [
@@ -445,15 +430,14 @@ public function test()
 <?php
 $name = 'Name';
 $greeting = "Hello, $name!";
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
 $name = 'Name';
 $greeting = "Hello, $name!";
 
-PHP
+PHP,
     ],
 
     'trailing_comma_in_multiline' => [
@@ -463,8 +447,7 @@ public function test()
     'a',
     'b'
 ];
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -473,7 +456,7 @@ public function test()
     'b',
 ];
 
-PHP
+PHP,
     ],
 
     'unused_imports_removed_simple' => [
@@ -491,8 +474,7 @@ public function test(): void
         new Used();
     }
 }
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -509,7 +491,7 @@ public function test(): void
     }
 }
 
-PHP
+PHP,
     ],
 
     'no_superfluous_phpdoc_tags_noop' => [
@@ -522,8 +504,7 @@ public function test(): void
  * @author Someone
  */
 class Example {}
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -536,7 +517,7 @@ class Example
 {
 }
 
-PHP
+PHP,
     ],
 
     'blank_line_after_opening_tag_noop' => [
@@ -544,8 +525,7 @@ class Example
 <?php
 /** comment directly after open tag */
 class OpenTag {}
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -554,7 +534,7 @@ class OpenTag
 {
 }
 
-PHP
+PHP,
     ],
 
     'self_accessor_noop' => [
@@ -568,8 +548,7 @@ public function inc(): void
         static::$count++;
     }
 }
-PHP
-        ,
+PHP,
         'after' => <<<'PHP'
 <?php
 declare(strict_types=1);
@@ -583,6 +562,6 @@ public function inc(): void
     }
 }
 
-PHP
+PHP,
     ],
 ];