Merge pull request #645 from ergebnis/feature/composer

Enhancement: Bring back support for composer/composer:^1
ergebnis · Dec 30, 2020 · 23f34eb · 23f34eb
2 parents 111fc79 + 2fe32fd
commit 23f34eb
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 18 deletions.
diff --git a/.github/settings.yml b/.github/settings.yml
@@ -20,18 +20,30 @@ branches:
           - "Dependency Analysis (7.4, locked)"
           - "Static Code Analysis (7.4, locked)"
           - "Static Code Analysis (7.4, locked)"
-          - "Tests (7.2, highest)"
-          - "Tests (7.2, locked)"
-          - "Tests (7.2, lowest)"
-          - "Tests (7.3, highest)"
-          - "Tests (7.3, locked)"
-          - "Tests (7.3, lowest)"
-          - "Tests (7.4, highest)"
-          - "Tests (7.4, locked)"
-          - "Tests (7.4, lowest)"
-          - "Tests (8.0, highest)"
-          - "Tests (8.0, locked)"
-          - "Tests (8.0, lowest)"
+          - "Tests (7.2, 1, highest)"
+          - "Tests (7.2, 1, locked)"
+          - "Tests (7.2, 1, lowest)"
+          - "Tests (7.2, 2, highest)"
+          - "Tests (7.2, 2, locked)"
+          - "Tests (7.2, 2, lowest)"
+          - "Tests (7.3, 1, highest)"
+          - "Tests (7.3, 1, locked)"
+          - "Tests (7.3, 1, lowest)"
+          - "Tests (7.3, 2, highest)"
+          - "Tests (7.3, 2, locked)"
+          - "Tests (7.3, 2, lowest)"
+          - "Tests (7.4, 1, highest)"
+          - "Tests (7.4, 1, locked)"
+          - "Tests (7.4, 1, lowest)"
+          - "Tests (7.4, 2, highest)"
+          - "Tests (7.4, 2, locked)"
+          - "Tests (7.4, 2, lowest)"
+          - "Tests (8.0, 1, highest)"
+          - "Tests (8.0, 1, locked)"
+          - "Tests (8.0, 1, lowest)"
+          - "Tests (8.0, 2, highest)"
+          - "Tests (8.0, 2, locked)"
+          - "Tests (8.0, 2, lowest)"
         strict: false
       restrictions:
 

diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -202,6 +202,10 @@ jobs:
           - "7.4"
           - "8.0"
 
+        composer-version:
+          - "1"
+          - "2"
+
         dependencies:
           - "lowest"
           - "locked"
@@ -218,10 +222,14 @@ 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
@@ -6,7 +6,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## Unreleased
 
-For a full diff see [`2.12.2...main`][2.12.2...main].
+For a full diff see [`2.13.0...main`][2.13.0...main].
+
+## [`2.13.0`][2.13.0]
+
+For a full diff see [`2.12.2...2.13.0`][2.12.2...2.13.0].
+
+### Changed
+
+* Brought back support for `composer/composer:^1.0.0` ([#644]), by [@localheinz]
 
 ## [`2.12.2`][2.12.2]
 
@@ -528,6 +536,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [2.12.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.12.0
 [2.12.1]: https://github.com/ergebnis/composer-normalize/releases/tag/2.12.1
 [2.12.2]: https://github.com/ergebnis/composer-normalize/releases/tag/2.12.2
+[2.13.0]: https://github.com/ergebnis/composer-normalize/releases/tag/2.13.0
 
 [81bc3a8...0.1.0]: https://github.com/ergebnis/composer-normalize/compare/81bc3a8...0.1.0
 [0.1.0...0.2.0]: https://github.com/ergebnis/composer-normalize/compare/0.1.0...0.2.0
@@ -578,7 +587,8 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [2.11.0...2.12.0]: https://github.com/ergebnis/composer-normalize/compare/2.11.0...2.12.0
 [2.12.0...2.12.1]: https://github.com/ergebnis/composer-normalize/compare/2.12.0...2.12.1
 [2.12.1...2.12.2]: https://github.com/ergebnis/composer-normalize/compare/2.12.1...2.12.2
-[2.12.2...main]: https://github.com/ergebnis/composer-normalize/compare/2.12.2...main
+[2.12.2...2.13.0]: https://github.com/ergebnis/composer-normalize/compare/2.12.2...2.13.0
+[2.13.0...main]: https://github.com/ergebnis/composer-normalize/compare/2.13.0...main
 
 [#1]: https://github.com/ergebnis/composer-normalize/pull/1
 [#2]: https://github.com/ergebnis/composer-normalize/pull/2
@@ -652,6 +662,7 @@ For a full diff see [`81bc3a8...0.1.0`][81bc3a8...0.1.0].
 [#640]: https://github.com/ergebnis/composer-normalize/pull/640
 [#641]: https://github.com/ergebnis/composer-normalize/pull/641
 [#643]: https://github.com/ergebnis/composer-normalize/pull/643
+[#644]: https://github.com/ergebnis/composer-normalize/pull/644
 [#646]: https://github.com/ergebnis/composer-normalize/pull/646
 
 [@core23]: https://github.com/core23

diff --git a/composer.json b/composer.json
@@ -18,14 +18,14 @@
   ],
   "require": {
     "php": "^7.2 || ^8.0",
-    "composer-plugin-api": "^2.0.0",
+    "composer-plugin-api": "^1.1.0 || ^2.0.0",
     "ergebnis/json-normalizer": "^1.0.1",
     "ergebnis/json-printer": "^3.1.1",
     "justinrainbow/json-schema": "^5.2.10",
     "localheinz/diff": "^1.1.1"
   },
   "require-dev": {
-    "composer/composer": "^2.0.8",
+    "composer/composer": "^1.10.19 || ^2.0.8",
     "ergebnis/license": "^1.1.0",
     "ergebnis/php-cs-fixer-config": "^2.10.0",
     "ergebnis/phpstan-rules": "~0.15.3",

diff --git a/composer.lock b/composer.lock
diff --git a/test/Integration/phpunit.xml b/test/Integration/phpunit.xml
@@ -28,6 +28,7 @@
         </whitelist>
     </filter>
     <php>
+        <env name="COLUMNS" value="200"/>
         <env name="COMPOSER_ALLOW_XDEBUG" value="1"/>
         <ini name="memory_limit" value="-1"/>
     </php>