Skip to content

Commit

Permalink
Get rid of symfony-exceptions.patch (#1815)
Browse files Browse the repository at this point in the history
* 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.
  • Loading branch information
rmunn authored May 22, 2024
1 parent 0194f27 commit 1e5f87b
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions docker/app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1e5f87b

Please sign in to comment.