aheathershaw/blue-twilight
1
0
Fork 0
Code Issues 32 Pull Requests Releases 15 Wiki Activity

Force composer to always discard any local changes to packages - this gets around a checksumming issue in the AWS SDK upgrade.

Browse Source
This commit is contained in:
Andy Heathershaw 2019-07-28 13:21:36 +01:00
parent 728d14563e
commit 41908d4428
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -55,6 +55,7 @@
] ]
}, },
"config": { "config": {
"preferred-install": "dist" "preferred-install": "dist",
"discard-changes": true
} }
} }

2
public/update.php
View File

@ -237,7 +237,7 @@ php artisan view:clear
private function runComposer() private function runComposer()
{ {
ob_start(); ob_start();
system('php composer.phar install', $rc); system('php composer.phar --no-interaction install', $rc);
$result = ob_get_clean(); $result = ob_get_clean();
echo nl2br($result); echo nl2br($result);
if ($rc != 0) if ($rc != 0)