From 357c2d03aa6e404d6711e6f0b9793eb488847cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=B6ller?= Date: Mon, 22 Nov 2021 10:34:50 +0100 Subject: [PATCH] Fix: Drop support for composer/composer:^1.0.0 --- .github/workflows/integrate.yaml | 8 -------- CHANGELOG.md | 4 ++++ composer.json | 2 +- composer.lock | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index c5ee7b22..8d5132c9 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -201,10 +201,6 @@ jobs: - "7.4" - "8.0" - composer-version: - - "1" - - "2" - dependencies: - "lowest" - "locked" @@ -221,14 +217,10 @@ jobs: extensions: "${{ env.PHP_EXTENSIONS }}" ini-values: "${{ env.PHP_INI_VALUES }}" php-version: "${{ matrix.php-version }}" - tools: "composer:v${{ matrix.composer-version }}" - name: "Set up problem matchers for phpunit/phpunit" run: "echo \"::add-matcher::${{ runner.tool_cache }}/phpunit.json\"" - - name: "Show composer version" - run: "composer --version" - - name: "Determine composer cache directory" uses: "./.github/actions/composer/composer/determine-cache-directory" diff --git a/CHANGELOG.md b/CHANGELOG.md index 78375e67..3700831a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), For a full diff see [`2.15.0...main`][2.15.0...main]. +### Changed + +* Dropped support for `composer/composer:^1.0.0` ([#754]), by [@ergebnis-bot] + ## [`2.15.0`][2.15.0] For a full diff see [`2.14.0...2.15.0`][2.14.0...2.15.0]. diff --git a/composer.json b/composer.json index ae58eb12..02292d8b 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "localheinz/diff": "^1.1.1" }, "require-dev": { - "composer/composer": "^1.10.22 || ^2.0.13", + "composer/composer": "^2.0.13", "ergebnis/license": "^1.1.0", "ergebnis/php-cs-fixer-config": "^2.14.0", "ergebnis/phpstan-rules": "~0.15.3", diff --git a/composer.lock b/composer.lock index 8f3a123c..0b2ad3c3 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5cb1cebe51e5e72c85b15b66ee896acd", + "content-hash": "d315f746f0eb6f5833ea4ee8a86072b9", "packages": [ { "name": "ergebnis/json-normalizer",