Merge pull request #213 from laravel/fix/non-yoda-style-moving-variables

[1.x] Fixes non yoda style moving variables

app/Actions/ElaborateSummary.php

@@ -40,7 +40,7 @@ public function execute($totalFiles, $changes)
             $totalFiles,
             0,
             0,
-            OutputInterface::VERBOSITY_VERBOSE <= $this->output->getVerbosity(),
+            $this->output->getVerbosity() >= OutputInterface::VERBOSITY_VERBOSE,
             $this->input->getOption('test'),
             $this->output->isDecorated()
         );

resources/presets/laravel.php

@@ -202,7 +202,7 @@
     ],
     'whitespace_after_comma_in_array' => true,
     'yoda_style' => [
-        'always_move_variable' => true,
+        'always_move_variable' => false,
         'equal' => false,
         'identical' => false,
         'less_and_greater' => false,

tests/Feature/Fixers/YodaStyleFixerTest.php

@@ -0,0 +1,21 @@
+<?php
+
+it('fixes the code', function () {
+    [$statusCode, $output] = run('default', [
+        'path' => base_path('tests/Fixtures/fixers/yoda_style.php'),
+        '--preset' => 'laravel',
+    ]);
+
+    expect($statusCode)->toBe(1)
+        ->and($output)
+        ->toContain('  ⨯')
+        ->toContain('@@ -20,6 +20,6 @@')
+        ->toContain(
+            <<<'EOF'
+              -if (null === $int) {
+              +if ($int === null) {
+                   //
+               }
+            EOF,
+        );
+});

tests/Fixtures/fixers/yoda_style.php

@@ -0,0 +1,25 @@
+<?php
+
+$int = 1;
+$array = [];
+$object = new stdClass();
+
+if (count($array) === (count($array) - intval(isset($array['a'])))) {
+    //
+}
+
+if ($object->count() === $int) {
+    //
+}
+
+if (array_values($array) !== $array) {
+    //
+}
+
+if ($object->int === $int && (int) $object->int === $int) {
+    //
+}
+
+if (null === $int) {
+    //
+}