From b8a75b16c57ab9a16567df08893ef0b6af4845b7 Mon Sep 17 00:00:00 2001
From: William Desportes <williamdes@wdes.fr>
Date: Tue, 26 Jan 2021 22:39:25 +0100
Subject: [PATCH 1/2] Fix #16429 - Use php8.0 fixed version for TCPDF

Signed-off-by: William Desportes <williamdes@wdes.fr>
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8270253cc9..fa7bf17ecd 100644
--- a/composer.json
+++ b/composer.json
@@ -92,7 +92,7 @@
         "symfony/console": "^4.4",
         "symfony/finder": "^4.4",
         "symfony/twig-bridge": "^4.4",
-        "tecnickcom/tcpdf": "^6.3",
+        "tecnickcom/tcpdf": "dev-main#456b794f1fae9aee5c151a1ee515aae2aaa619a3",
         "vimeo/psalm": "^4.4.0"
     },
     "extra": {

From e441b1bd0dfb0a69cf94f226b62e3df5efaf69a6 Mon Sep 17 00:00:00 2001
From: Isaac Bennetch <bennetch@gmail.com>
Date: Wed, 27 Jan 2021 23:12:52 -0500
Subject: [PATCH 2/2] Fix build for TCPDF fix

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
---
 composer.json             |  3 ++-
 scripts/create-release.sh | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index fa7bf17ecd..ac540236a1 100644
--- a/composer.json
+++ b/composer.json
@@ -116,6 +116,7 @@
         "twig-lint": "php scripts/console lint:twig templates --ansi --show-deprecations"
     },
     "config":{
-        "sort-packages": true
+        "sort-packages": true,
+        "discard-changes": true
     }
 }
diff --git a/scripts/create-release.sh b/scripts/create-release.sh
index c93477bc61..1a85b3ab7b 100755
--- a/scripts/create-release.sh
+++ b/scripts/create-release.sh
@@ -243,7 +243,7 @@ if [ ! -d libraries/tcpdf ] ; then
     cp composer.json composer.json.backup
     echo "* Running composer"
     composer config platform.php "$PHP_REQ"
-    composer update --no-dev --optimize-autoloader
+    composer update --no-interaction --no-dev --optimize-autoloader
 
     # Parse the required versions from composer.json
     PACKAGES_VERSIONS=''
@@ -256,7 +256,7 @@ if [ ! -d libraries/tcpdf ] ; then
     do
         PACKAGES_VERSIONS="$PACKAGES_VERSIONS $PACKAGES:`awk "/require-dev/ {printline = 1; print; next } printline" composer.json | grep "$PACKAGES" | awk -F [\\"] '{print $4}'`"
     done
-    composer require --optimize-autoloader --update-no-dev $PACKAGES_VERSIONS
+    composer require --no-interaction --optimize-autoloader --update-no-dev $PACKAGES_VERSIONS
 
     mv composer.json.backup composer.json
     echo "* Cleanup of composer packages"
@@ -305,10 +305,10 @@ fi
 rm -rf themes/bootstrap
 
 if [ -f ./scripts/console ]; then
-    composer update
+    composer update --no-interaction
     # Warm up the routing cache for 5.1+ releases
     ./scripts/console cache:warmup --routing
-    composer update --no-dev --optimize-autoloader
+    composer update --no-interaction --no-dev --optimize-autoloader
 fi
 
 # Remove git metadata
@@ -317,7 +317,7 @@ find . -name .gitignore -print0 | xargs -0 -r rm -f
 find . -name .gitattributes -print0 | xargs -0 -r rm -f
 
 if [ $do_test -eq 1 ] ; then
-    composer update
+    composer update --no-interaction
     ./vendor/bin/phpunit --no-coverage --exclude-group selenium
     test_ret=$?
     if [ $do_ci -eq 1 ] ; then
@@ -336,7 +336,7 @@ if [ $do_test -eq 1 ] ; then
     rm -f .phpunit.result.cache
     # Remove libs installed for testing
     rm -rf build
-    composer update --no-dev --optimize-autoloader
+    composer update --no-interaction --no-dev --optimize-autoloader
 fi