From c8228554a365f5dee9d08075ba5b8947f8cc42f0 Mon Sep 17 00:00:00 2001 From: Aaron Gustavo Nieves Date: Thu, 25 Jun 2026 16:00:52 -0500 Subject: [PATCH] Apply 7.4 reset-formats patch with GNU patch (fuzz), pin module-rest ^3.4 git apply needs exact context, so the patch breaks when unrelated lines shift on the test branch (Messenger .env/routes additions, lock refreshes). GNU patch --fuzz tolerates that, so the patch keeps applying without a rebuild. --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 71725035..4be22411 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -55,9 +55,9 @@ jobs: if [ "${{ matrix.symfony }}" = "7.4" ]; then composer remove symfony/messenger --dev --no-interaction - composer require codeception/module-rest --dev + composer require codeception/module-rest:^3.4 --dev git -C framework-tests checkout -- composer.json - git -C framework-tests apply resetFormatsAfterRequest_issue_test.patch + patch -d framework-tests -p1 --fuzz=3 --no-backup-if-mismatch < framework-tests/resetFormatsAfterRequest_issue_test.patch composer -d framework-tests update --no-progress php framework-tests/bin/console lexik:jwt:generate-keypair --skip-if-exists php vendor/bin/codecept run Functional -c framework-tests