From ec041c3ad5452312abd5ec01921ffc8d8d79becc Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 26 Nov 2020 15:47:33 +0100 Subject: [PATCH 1/3] dont use system composer for autoload checker this ensures that the same composer version is used by everyone (and ci) Signed-off-by: Robin Appelman --- .gitignore | 2 ++ build/autoloaderchecker.sh | 26 +++++++++----------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 27d5dbecc5..653c317863 100644 --- a/.gitignore +++ b/.gitignore @@ -158,3 +158,5 @@ clover.xml # Tests - dependencies tests/acceptance/composer.lock tests/acceptance/vendor/ + +composer.phar diff --git a/build/autoloaderchecker.sh b/build/autoloaderchecker.sh index ffa157f6c8..3a5ac32913 100755 --- a/build/autoloaderchecker.sh +++ b/build/autoloaderchecker.sh @@ -1,26 +1,18 @@ #!/usr/bin/env bash -COMPOSER_COMMAND=$(which "composer") -if [ "$COMPOSER_COMMAND" = '' ] -then - #No global composer found, try local or download it - if [ -e "composer.phar" ] - then - echo "Composer found: checking for update" - else - echo "Composer not found: fetching" - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - php composer-setup.php - php -r "unlink('composer-setup.php');" - fi +COMPOSER_COMMAND="php composer.phar" - COMPOSER_COMMAND="php composer.phar" +if [ -e "composer.phar" ] +then + echo "Composer found: checking for update" + $COMPOSER_COMMAND self-update else - echo "Global composer found: checking for update" + echo "Composer not found: fetching" + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" + php composer-setup.php + php -r "unlink('composer-setup.php');" fi -#Make sure we are on the latest composer -$COMPOSER_COMMAND self-update REPODIR=`git rev-parse --show-toplevel` From c55197791a8d070a7d764cdbcd98cf1b548f5678 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 2 Dec 2020 15:02:56 +0100 Subject: [PATCH 2/3] cleanup after autoloader generation Signed-off-by: Robin Appelman --- build/autoloaderchecker.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/autoloaderchecker.sh b/build/autoloaderchecker.sh index 3a5ac32913..9bf8b17a8c 100755 --- a/build/autoloaderchecker.sh +++ b/build/autoloaderchecker.sh @@ -42,6 +42,8 @@ do fi done +rm composer.phar + echo if [ $composerfile = true ] then From 55b9e554ec41544c21e4479760c1a32919cc2831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 4 Dec 2020 14:27:35 +0100 Subject: [PATCH 3/3] Force composer v1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- build/autoloaderchecker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/autoloaderchecker.sh b/build/autoloaderchecker.sh index 9bf8b17a8c..1aa880684f 100755 --- a/build/autoloaderchecker.sh +++ b/build/autoloaderchecker.sh @@ -9,7 +9,7 @@ then else echo "Composer not found: fetching" php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - php composer-setup.php + php composer-setup.php --1 php -r "unlink('composer-setup.php');" fi