Skip to content
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.

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

Support for composer 2.3.0 #46

Merged
merged 18 commits into from Mar 22, 2022
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 8 additions & 29 deletions .laminas-ci.json
@@ -1,36 +1,15 @@
{
"additional_checks": [
{
"name": "PHPUnit on PHP 7.4 using Composer v1 with lowest dependencies",
"name": "PHPUnit using Composer v1",
"job": {
"command": "rm -rf ./vendor && composer-1 install && ./vendor/bin/phpunit",
"php": "7.4",
"dependencies": "lowest"
}
},
{
"name": "PHPUnit on PHP 7.4 using Composer v1 with latest dependencies",
"job": {
"command": "rm -rf ./vendor && composer-1 install && ./vendor/bin/phpunit",
"php": "7.4",
"dependencies": "latest"
}
},
{
"name": "PHPUnit on PHP 8.0 using Composer v1 with lowest dependencies",
"job": {
"command": "rm -rf ./vendor && composer-1 install --ignore-platform-reqs && ./vendor/bin/phpunit",
"php": "8.0",
"dependencies": "lowest"
}
},
{
"name": "PHPUnit on PHP 8.0 using Composer v1 with latest dependencies",
"job": {
"command": "rm -rf ./vendor && composer-1 install && ./vendor/bin/phpunit",
"php": "8.0",
"dependencies": "latest"
"command": "rm -r vendor/ && composer require --dev --update-with-all-dependencies composer/composer:^1 && xmlstarlet ed -u '/phpunit/@convertDeprecationsToExceptions' -v 'false' phpunit.xml.dist > phpunit.xml && vendor/bin/phpunit",
boesing marked this conversation as resolved.
Show resolved Hide resolved
"php": "*",
"dependencies": "*"
}
}
]
],
"ignore_php_platform_requirements": {
"8.0": false
}
}
15 changes: 1 addition & 14 deletions .laminas-ci/pre-run.sh
@@ -1,17 +1,4 @@
#!/bin/bash

set -e

function get_composer() {
wget https://getcomposer.org/composer-1.phar
chmod a+x composer-1.phar
mv composer-1.phar /usr/local/bin/composer-1
}

JOB=$3
COMMAND=$(echo "${JOB}" | jq -r ".command")
PATTERN="composer-1 install"

if [[ "${COMMAND}" =~ ${PATTERN} ]];then
get_composer
fi
apt install xmlstarlet
7 changes: 5 additions & 2 deletions composer.json
Expand Up @@ -19,7 +19,10 @@
"forum": "https://discourse.laminas.dev"
},
"config": {
"sort-packages": true
"sort-packages": true,
"allow-plugins": {
"dealerdirect/phpcodesniffer-composer-installer": true
}
},
"extra": {
"class": "Laminas\\ComponentInstaller\\ComponentInstaller"
Expand All @@ -29,7 +32,7 @@
"composer-plugin-api": "^1.0 || ^2.0"
},
"require-dev": {
"composer/composer": "^2.1.9",
"composer/composer": "^2.1.9 || ^2.3.0-RC2",
Ocramius marked this conversation as resolved.
Show resolved Hide resolved
"laminas/laminas-coding-standard": "~2.3.0",
"malukenho/docheader": "^0.1.6",
"mikey179/vfsstream": "^1.6.10",
Expand Down