From 0617bcb11880ceec3e1c79a31e963ca65f4e480a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20L=C3=BCck?= <christian@clue.engineering>
Date: Sat, 29 Jan 2022 09:55:10 +0100
Subject: [PATCH] Update test suite & clue/phar-composer to avoid build error
 on Windows

---
 .github/workflows/ci.yml           | 11 ++++-------
 tests/install-as-dep/composer.json |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 53c3223..0367d93 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,6 +6,7 @@ on:
 
 jobs:
   PHPUnit:
+    name: PHPUnit (PHP ${{ matrix.php }} on ${{ matrix.os }})
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -25,19 +26,15 @@ jobs:
           - 5.4
     steps:
       - uses: actions/checkout@v2
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
+      - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
           extensions: sqlite3
+          coverage: xdebug
       - run: composer install
       - run: vendor/bin/phpunit --coverage-text
         if: ${{ matrix.php >= 7.3 }}
       - run: vendor/bin/phpunit --coverage-text -c phpunit.xml.legacy
         if: ${{ matrix.php < 7.3 }}
       - run: cd tests/install-as-dep && composer install && php query.php
-      - run: cd tests/install-as-dep && php -d phar.readonly=0 vendor/bin/phar-composer build . query.phar
-        continue-on-error: ${{ matrix.os == 'windows-2019' }}
-        id: phar
-      - run: php tests/install-as-dep/query.phar
-        if: ${{ steps.phar.outcome == 'success' }}
+      - run: cd tests/install-as-dep && php -d phar.readonly=0 vendor/bin/phar-composer build . query.phar && php query.phar
diff --git a/tests/install-as-dep/composer.json b/tests/install-as-dep/composer.json
index ff46121..3ad67ec 100644
--- a/tests/install-as-dep/composer.json
+++ b/tests/install-as-dep/composer.json
@@ -3,7 +3,7 @@
         "clue/reactphp-sqlite": "*@dev"
     },
     "require-dev": {
-        "clue/phar-composer": "^1.0"
+        "clue/phar-composer": "^1.4"
     },
     "bin": [
         "query.php"