From 601e88d3e1f423a09f306ef8d8f703cea6ebe1f1 Mon Sep 17 00:00:00 2001
From: Max Leonov <maxbanton@users.noreply.github.com>
Date: Tue, 17 Nov 2020 17:17:00 +0200
Subject: [PATCH] Coveralls hotfix & some additional improvements on GH Actions
 build process (#92)

* Attempt to fix coveralls

* Up

* Fix GH actions

* Update setup-php gh actions step

* No progress for coveralls GH actions step

* Install
---
 .github/workflows/php.yml | 17 ++++++++++-------
 composer.json             |  3 +--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
index af2e401..8bebec2 100644
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -7,14 +7,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.2', '7.3', '7.4']
+        php-versions: ['7.2', '7.3', '7.4', '8.0']
     name: PHP ${{ matrix.php-versions }}
     steps:
       - name: Checkout
         uses: actions/checkout@v1
 
       - name: Setup PHP
-        uses: shivammathur/setup-php@v1
+        uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
           extensions: mbstring
@@ -35,7 +35,7 @@ jobs:
           restore-keys: ${{ runner.os }}-composer-
 
       - name: Install dependencies
-        run: composer install --prefer-dist --no-progress --no-suggest -o
+        run: composer install --prefer-dist --no-progress -o
 
       - name: Check syntax
         run: |
@@ -45,8 +45,11 @@ jobs:
       - name: Run tests
         run: vendor/bin/phpunit --coverage-clover build/logs/clover.xml
 
-      - name: Send to coveralls
-        run: php vendor/bin/php-coveralls -v
+      - name: Upload coverage results to Coveralls
         env:
-          COVERALLS_RUN_LOCALLY: 1
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          composer require php-coveralls/php-coveralls --prefer-dist --no-progress -o
+          vendor/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v
+          
+      
diff --git a/composer.json b/composer.json
index db5d178..32bcade 100644
--- a/composer.json
+++ b/composer.json
@@ -28,8 +28,7 @@
     "require-dev": {
         "maxbanton/dd": "^2.0",
         "phpunit/phpunit": "^8.5",
-        "squizlabs/php_codesniffer": "^3.5",
-        "php-coveralls/php-coveralls": "^2.2"
+        "squizlabs/php_codesniffer": "^3.5"
     },
     "suggest": {
         "maxbanton/dd": "Minimalistic dump-and-die function for easy debugging"