From 41908d44288c4b72fd84babd84975c8de7012453 Mon Sep 17 00:00:00 2001
From: Andy Heathershaw <andy@andysh.uk>
Date: Sun, 28 Jul 2019 13:21:36 +0100
Subject: [PATCH] Force composer to always discard any local changes to
 packages - this gets around a checksumming issue in the AWS SDK upgrade.

---
 composer.json     | 3 ++-
 public/update.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 1255b7c..f0988ea 100644
--- a/composer.json
+++ b/composer.json
@@ -55,6 +55,7 @@
         ]
     },
     "config": {
-        "preferred-install": "dist"
+        "preferred-install": "dist",
+        "discard-changes": true
     }
 }
diff --git a/public/update.php b/public/update.php
index bf56d01..afcbd4c 100644
--- a/public/update.php
+++ b/public/update.php
@@ -237,7 +237,7 @@ php artisan view:clear
     private function runComposer()
     {
         ob_start();
-        system('php composer.phar install', $rc);
+        system('php composer.phar --no-interaction install', $rc);
         $result = ob_get_clean();
         echo nl2br($result);
         if ($rc != 0)