Merge pull request #11416 from vimeo/disable_diff_mode

Disable diff mode

Author: danog

src/Psalm/Internal/Cli/Psalm.php

@@ -322,7 +322,7 @@ public static function run(array $argv): void
 
         $show_info = self::initShowInfo($options);
 
-        $is_diff = self::initIsDiff($options);
+        $is_diff = false; // self::initIsDiff($options);
 
         $find_unused_code = self::shouldFindUnusedCode($options, $config);
 
@@ -489,12 +489,12 @@ private static function initShowInfo(array $options): bool
             : false;
     }
 
-    private static function initIsDiff(array $options): bool
+    /*private static function initIsDiff(array $options): bool
     {
         return !isset($options['no-diff'])
             && !isset($options['set-baseline'])
             && !isset($options['update-baseline']);
-    }
+    }*/
 
     /**
      * @param array<int,string> $args

tests/EndToEnd/PsalmEndToEndTest.php

@@ -164,6 +164,7 @@ public function testPsalmWithPHPVersionFromConfig(): void
         );
     }
 
+    /*
     public function testPsalmDiff(): void
     {
         copy(__DIR__ . '/../fixtures/DummyProjectWithErrors/diff_composer.lock', self::$tmpDir . '/composer.lock');
@@ -187,7 +188,7 @@ public function testPsalmDiff(): void
         $this->assertSame(2, $result['CODE']);
 
         @unlink(self::$tmpDir . '/composer.lock');
-    }
+    }*/
 
     public function testTainting(): void
     {