From 28582d5cd69e91bb587a0a40400d4b423c6fdeee Mon Sep 17 00:00:00 2001
From: Sander Muller <github@scode.nl>
Date: Thu, 23 Jul 2026 18:07:10 +0200
Subject: [PATCH] Use a patch file to update the package in the
 result-cache-package-update e2e test

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .github/workflows/e2e-tests.yml                      | 12 +++++++-----
 e2e/result-cache-package-update/composer.json        | 11 ++++++++++-
 e2e/result-cache-package-update/logger/composer.json |  1 +
 .../logger/src/Logger.php                            | 12 ++++++++++++
 e2e/result-cache-package-update/src/Foo.php          |  4 ++--
 e2e/result-cache-package-update/updatePackage.patch  |  5 +++++
 6 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100644 e2e/result-cache-package-update/logger/composer.json
 create mode 100644 e2e/result-cache-package-update/logger/src/Logger.php
 create mode 100644 e2e/result-cache-package-update/updatePackage.patch

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 3a905bafc7..a3a0d7e3ef 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -405,13 +405,15 @@ jobs:
               cd e2e/result-cache-package-update
               composer install
               ../../bin/phpstan analyse
-              # Simulate a single Composer package being updated by changing its recorded reference in
-              # vendor/composer/installed.php. The cache must be invalidated only for files depending on
-              # that package (src/Foo.php uses psr/log), not for the whole project.
-              php -r '$f = "vendor/composer/installed.php"; $d = require $f; $d["versions"]["psr/log"]["reference"] = "0000000000000000000000000000000000000000"; file_put_contents($f, "<?php return " . var_export($d, true) . ";" . PHP_EOL);'
+              # Update a single Composer package by bumping its version with a patch and letting Composer
+              # reinstall it, which changes its recorded reference in vendor/composer/installed.php. The
+              # cache must be invalidated only for files depending on that package (src/Foo.php uses
+              # test/logger), not for the whole project.
+              patch -p1 < updatePackage.patch
+              composer update test/logger --no-cache
               OUTPUT=$(../bashunit -a exit_code "0" "../../bin/phpstan analyse -vv")
               echo "$OUTPUT"
-              ../bashunit -a contains 'Composer packages changed (psr/log); re-analysing only the files depending on them.' "$OUTPUT"
+              ../bashunit -a contains 'Composer packages changed (test/logger); re-analysing only the files depending on them.' "$OUTPUT"
               ../bashunit -a contains 'Result cache restored. 1 file will be reanalysed.' "$OUTPUT"
           - script: |
               cd e2e/bug-12606
diff --git a/e2e/result-cache-package-update/composer.json b/e2e/result-cache-package-update/composer.json
index b345c35088..0ada566208 100644
--- a/e2e/result-cache-package-update/composer.json
+++ b/e2e/result-cache-package-update/composer.json
@@ -1,7 +1,16 @@
 {
 	"name": "phpstan/result-cache-package-update-e2e",
+	"repositories": [
+		{
+			"type": "path",
+			"url": "./logger",
+			"options": {
+				"symlink": false
+			}
+		}
+	],
 	"require": {
-		"psr/log": "^3.0"
+		"test/logger": "*"
 	},
 	"autoload": {
 		"classmap": ["src"]
diff --git a/e2e/result-cache-package-update/logger/composer.json b/e2e/result-cache-package-update/logger/composer.json
new file mode 100644
index 0000000000..8b33c945f9
--- /dev/null
+++ b/e2e/result-cache-package-update/logger/composer.json
@@ -0,0 +1 @@
+{ "name": "test/logger", "version": "1.0.0", "autoload": { "classmap": ["src"] } }
diff --git a/e2e/result-cache-package-update/logger/src/Logger.php b/e2e/result-cache-package-update/logger/src/Logger.php
new file mode 100644
index 0000000000..fa37b4844f
--- /dev/null
+++ b/e2e/result-cache-package-update/logger/src/Logger.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Test\Logger;
+
+class Logger
+{
+
+	public function info(string $message): void
+	{
+	}
+
+}
diff --git a/e2e/result-cache-package-update/src/Foo.php b/e2e/result-cache-package-update/src/Foo.php
index 7b8fb75a8c..acc50973f2 100644
--- a/e2e/result-cache-package-update/src/Foo.php
+++ b/e2e/result-cache-package-update/src/Foo.php
@@ -2,12 +2,12 @@
 
 namespace ResultCachePackageUpdateE2E;
 
-use Psr\Log\LoggerInterface;
+use Test\Logger\Logger;
 
 class Foo
 {
 
-	public function __construct(private LoggerInterface $logger)
+	public function __construct(private Logger $logger)
 	{
 	}
 
diff --git a/e2e/result-cache-package-update/updatePackage.patch b/e2e/result-cache-package-update/updatePackage.patch
new file mode 100644
index 0000000000..9826e7963c
--- /dev/null
+++ b/e2e/result-cache-package-update/updatePackage.patch
@@ -0,0 +1,5 @@
+--- a/logger/composer.json
++++ b/logger/composer.json
+@@ -1 +1 @@
+-{ "name": "test/logger", "version": "1.0.0", "autoload": { "classmap": ["src"] } }
++{ "name": "test/logger", "version": "2.0.0", "autoload": { "classmap": ["src"] } }