Skip to content

[stable20] dont use system composer for autoload checker #24557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ChristophWurst merged 3 commits into from
Dec 4, 2020
+13 −17
Merged

[stable20] dont use system composer for autoload checker #24557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec041c3
dont use system composer for autoload checker
icewind1991 Nov 26, 2020
c551977
cleanup after autoloader generation
icewind1991 Dec 2, 2020
55b9e55
Force composer v1
juliusknorr Dec 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,3 +158,5 @@ clover.xml
# Tests - dependencies
tests/acceptance/composer.lock
tests/acceptance/vendor/

composer.phar
28 changes: 11 additions & 17 deletions build/autoloaderchecker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
#!/usr/bin/env bash

COMPOSER_COMMAND=$(which "composer")
if [ "$COMPOSER_COMMAND" = '' ]
COMPOSER_COMMAND="php composer.phar"

if [ -e "composer.phar" ]
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"
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 --1
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`

Expand Down Expand Up @@ -50,6 +42,8 @@ do
fi
done

rm composer.phar

echo
if [ $composerfile = true ]
then
Expand Down