From 1e5f87b60c950812163338d4b2d47025f583dfc1 Mon Sep 17 00:00:00 2001 From: Robin Munn Date: Wed, 22 May 2024 13:19:51 +0700 Subject: [PATCH] Get rid of symfony-exceptions.patch (#1815) * Get rid of symfony-exceptions.patch We can finally get rid of this since it seems PHP exceptions are finally deriving from the Exception class rather than the Error class. * Simply comment out the appropriate Dockerfile lines This way we can easily re-apply the patch if need be. Also comment the commented-out lines so it's clear why they exist. --- docker/app/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docker/app/Dockerfile b/docker/app/Dockerfile index adc0ddb177..7db87c0a50 100644 --- a/docker/app/Dockerfile +++ b/docker/app/Dockerfile @@ -76,9 +76,10 @@ RUN chown -R www-data:www-data /var/www/html/assets /var/www/html/cache \ COPY --from=composer-builder /composer/vendor /var/www/html/vendor -# patch exception handling from Symfony to actually show exceptions instead of swallowing them -COPY docker/app/symfony-exceptions.patch / -RUN patch -p4 -i /symfony-exceptions.patch +# Uncomment the two lines below if you see Symfony errors like "expected Exception, got Error instead" +# This will allow you to see the actual underlying error, rather than the Symfony exception that hides the underlying one +# COPY docker/app/symfony-exceptions.patch / +# RUN patch -p4 -i /symfony-exceptions.patch RUN echo "${BUILD_VERSION}" > build-version.txt \ && sed -i "s/9.9.9/${BUILD_VERSION}/" version.php