Fix usage with Composer <2.3 (#132)

Closes #124
bamarni · Jul 14, 2022 · 2476470 · 2476470
1 parent c4cefbc
commit 2476470
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -10,7 +10,7 @@ on:
 jobs:
     unit-tests:
         runs-on: "ubuntu-latest"
-        name: "Unit Tests on PHP ${{ matrix.php }}"
+        name: "Unit Tests on PHP ${{ matrix.php }} and ${{ matrix.tools }}"
         strategy:
             fail-fast: false
             matrix:
@@ -20,6 +20,10 @@ jobs:
                     - "7.4"
                     - "8.0"
                     - "8.1"
+                tools: [ "composer" ]
+                include:
+                    - php: "7.2"
+                      tools: "composer:v2.0"
 
         steps:
             -   name: "Check out repository code"
@@ -29,7 +33,7 @@ jobs:
                 uses: "shivammathur/setup-php@v2"
                 with:
                     php-version: "${{ matrix.php }}"
-                    tools: "composer"
+                    tools: "${{ matrix.tools }}"
 
             -   name: "Install Composer dependencies"
                 uses: "ramsey/composer-install@v2"

diff --git a/src/Command/BinCommand.php b/src/Command/BinCommand.php
@@ -94,7 +94,8 @@ public function isProxyCommand(): bool
 
     public function execute(InputInterface $input, OutputInterface $output): int
     {
-        $config = Config::fromComposer($this->requireComposer());
+        // Switch to requireComposer() once Composer 2.3 is set as the minimum
+        $config = Config::fromComposer($this->getComposer());
         $currentWorkingDir = getcwd();
 
         $this->logger->logDebug(