From 008e1f242fb77117791d476222fed0a65fc253d2 Mon Sep 17 00:00:00 2001
From: Bruce Weirdan <weirdan@gmail.com>
Date: Sun, 6 Dec 2020 05:09:29 +0200
Subject: [PATCH] Use preamble in filename generation

Additionally enable Psalm cache (this is expected to fail builds until
vimeo/psalm#4789 is merged/released).
---
 src/Module.php                       |  2 +-
 tests/_support/AcceptanceTester.php  |  9 +++++++++
 tests/acceptance/PsalmModule.feature | 24 +++++++++++++-----------
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/Module.php b/src/Module.php
index a129361..66b8791 100644
--- a/src/Module.php
+++ b/src/Module.php
@@ -322,7 +322,7 @@ public function haveTheFollowingCode(string $code): void
         $file = sprintf(
             '%s/%s.php',
             rtrim($this->config['default_dir'], '/'),
-            sha1($code)
+            sha1($this->preamble . $code)
         );
 
         $this->fs()->writeToFile(
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index b60a5c9..c4f544a 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace Weirdan\Codeception\Psalm\Tests;
 
 use Codeception\Actor;
@@ -6,4 +7,12 @@
 class AcceptanceTester extends Actor
 {
     use _generated\AcceptanceTesterActions;
+
+    /**
+     * @Given I have empty composer.lock
+     */
+    public function iHaveEmptyComposerlock(): void
+    {
+        $this->writeToFile('tests/_run/composer.lock', '{}');
+    }
 }
diff --git a/tests/acceptance/PsalmModule.feature b/tests/acceptance/PsalmModule.feature
index fd3c71e..8251e9c 100644
--- a/tests/acceptance/PsalmModule.feature
+++ b/tests/acceptance/PsalmModule.feature
@@ -9,6 +9,8 @@ Feature: Psalm module
     <?php
 
     """
+    # Psalm enables cache when there's a composer.lock file
+    And I have empty composer.lock
 
   Scenario: Running with no errors
     Given I have the following code
@@ -22,7 +24,7 @@ Feature: Psalm module
   Scenario: Running with errors
     Given I have the following code
       """
-      atan("asd");
+      atan("asdfg");
       """
     When I run Psalm
     Then I see these errors
@@ -35,7 +37,7 @@ Feature: Psalm module
     Given I have Psalm newer than "999.99" (because of "me wanting to see if it skips")
     And I have the following code
       """
-      atan(1.);
+      atan(1.9);
       """
     When I run Psalm
     Then I see no errors
@@ -44,7 +46,7 @@ Feature: Psalm module
     Given I have Psalm older than "999.99" (because of "me wanting to see if it runs")
     And I have the following code
       """
-      atan("zz");
+      atan("zzzzzzz");
       """
     When I run Psalm
     Then I see these errors
@@ -55,7 +57,7 @@ Feature: Psalm module
   Scenario: Running Psalm with dead code detection
     Given I have the following code
       """
-      class C {
+      class CD {
         /** @return void */
         private function m(int $p) {}
       }
@@ -64,7 +66,7 @@ Feature: Psalm module
     Then I see these errors
       | Type         | Message                                     |
       | UnusedParam  | Param $p is never referenced in this method |
-      | UnusedClass  | Class C is never used                       |
+      | UnusedClass  | Class CD is never used                      |
     And I see no other errors
 
   Scenario: Running Psalm with custom config
@@ -82,7 +84,7 @@ Feature: Psalm module
       """
     And I have the following code
       """
-      atan("asd");
+      atan("asdzzz");
       """
     When I run Psalm
     Then I see no errors
@@ -158,7 +160,7 @@ Feature: Psalm module
   Scenario: Using regexps to match error messages
     Given I have the following code
       """
-      class C extends PPP {}
+      class CCC extends PPP {}
       """
     When I run Psalm
     Then I see these errors
@@ -169,7 +171,7 @@ Feature: Psalm module
   Scenario: Escaping pipes in regexps
     Given I have the following code
       """
-      class C extends PPP {}
+      class CC extends PPP {}
       """
     When I run Psalm
     Then I see these errors
@@ -210,7 +212,7 @@ Feature: Psalm module
     Given I have Psalm newer than "3.7.2" (because of "exit code changed in 3.8.0")
     And I have the following code in "autoload.php"
       """
-      <?php missing_function();
+      <?php missing_function_2();
       """
     And I have the following config
       """
@@ -240,7 +242,7 @@ Feature: Psalm module
     Given I have the "codeception/module-cli" package satisfying the "^123.0"
     And I have the following code
       """
-      atan("zz");
+      atan("zzzz");
       """
     When I run Psalm
     Then I see no errors
@@ -249,7 +251,7 @@ Feature: Psalm module
     Given I have the "mr-nobody/unknown-package" package satisfying the "^123.0"
     And I have the following code
       """
-      atan("zz");
+      atan("zzz");
       """
     When I run Psalm
     Then I see no errors