Skip to content

Commit dc16b25

Browse files
committed
add 2.2 LTS composer_version shorthand
1 parent ba08ad5 commit dc16b25

File tree

5 files changed

+27
-0
lines changed

5 files changed

+27
-0
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }})
22

33
* Added logic to allow default `composer` version to be set based on PHP version.
4+
* Added `2.2` and `2.2-latest` shorthand options to install the latest stable 2.2 LTS version of `composer`.
45
* Set default `composer` version to `2.8.3`
56
* Set default `composer` version to `2.2.24` for PHP 5.3-7.2
67
* Set default `composer` version to `1.10.27` for PHP <= 5.2

docs/config.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,10 @@ composer_version: 1-latest
181181
composer_version: 2
182182
composer_version: 2-latest
183183
184+
# Install the latest stable 2.2 LTS version
185+
composer_version: 2.2
186+
composer_version: 2.2-latest
187+
184188
# Install latest pre-release version
185189
composer_version: preview
186190

examples/composer/.lando.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,15 @@ services:
2222
composer2ver:
2323
type: php
2424
composer_version: '2.1.10'
25+
composer22:
26+
type: php
27+
composer_version: 2.2
28+
composer22latest:
29+
type: php
30+
composer_version: 2.2-latest
31+
composer22ver:
32+
type: php
33+
composer_version: '2.2.10'
2534
dependencies:
2635
type: php
2736
composer_version: 2

examples/composer/README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,15 @@ lando exec composer2latest -- composer --version --no-ansi | tee >(cat 1>&2) | g
4646
# Should install composer 2.1.10 if composer_version set to specific version
4747
lando exec composer2ver -- composer --version --no-ansi | tee >(cat 1>&2) | grep -q "Composer version 2.1.10"
4848

49+
# Should install composer 2.2.x if composer_version set to 2.2
50+
lando exec composer22 -- composer --version --no-ansi | tee >(cat 1>&2) | grep -q "Composer version 2.2."
51+
52+
# Should install composer 2.2.x if composer_version set to 2.2-latest
53+
lando exec composer22latest -- composer --version --no-ansi | tee >(cat 1>&2) | grep -q "Composer version 2.2."
54+
55+
# Should install composer 2.2.10 if composer_version set to 2.2.10
56+
lando exec composer22ver -- composer --version --no-ansi | tee >(cat 1>&2) | grep -q "Composer version 2.2.10"
57+
4958
# Should install compose global dependencies if specified by user and have them available in PATH
5059
lando exec dependencies -- phpunit --version
5160
lando exec dependencies -- which phpunit | grep "/var/www/.composer/vendor/bin/phpunit"

scripts/install-composer.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ elif [ "$VERSION" = '2-latest' ]; then
1616
php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --2
1717
elif [ "$VERSION" = '2' ]; then
1818
php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --2
19+
elif [ "$VERSION" = '2.2' ]; then
20+
php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --2.2
21+
elif [ "$VERSION" = '2.2-latest' ]; then
22+
php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --2.2
1923
elif [ "$VERSION" = 'preview' ]; then
2024
php /tmp/composer-setup.php --install-dir=/usr/local/bin --filename=composer --preview
2125
elif [ "$VERSION" = 'snapshot' ]; then

0 commit comments

Comments
 (0)