Php8.1 support (#67)

* Fix Namespace

* Clean up ignores

* PHP8.1 support

Also adding in github action and removing travis

* Wrong command used

* Wrong command used

* Remove support for speeding up by filtering

* PHPCS issue..

* Fix the command

* Ignore function comments issue

.github/workflows/ci.yaml

@@ -0,0 +1,33 @@
+name: CI
+on:
+  push:
+  pull_request:
+jobs:
+  tests:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system: ['ubuntu-latest', 'windows-latest', 'macOS-latest']
+        php-version: ['7.1', '7.2', '7.3', '7.4', '8.0']
+    name: PHP ${{ matrix.php-version }} Test on ${{ matrix.operating-system }}
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Cache dependencies
+        uses: actions/cache@v1
+        with:
+          path: /tmp/composer-cache
+          key: dependencies-composer-${{ hashFiles('composer.json') }}
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          tools: composer:v2
+      - name: Install Composer dependencies
+        run: composer install --prefer-dist --no-interaction --no-suggest
+      - name: Install phpcs
+        run: composer global require squizlabs/php_codesniffer
+      - name: Install phpmd
+        run: composer global require phpmd/phpmd
+      - name: Run the build
+        run: ./build.sh

build.sh

@@ -5,7 +5,7 @@ git log origin/master... | grep -q SKIP_BUILD && exit 0
 
 [ -z "$UPDATE_COVERAGE" ] || composer require satooshi/php-coveralls:v1.1.0
 
-composer install --dev
+composer install
 git diff $(git merge-base origin/master HEAD) > diff.txt
 phpcs --standard=psr2 src
 phpcs --standard=psr2 --ignore=bootstrap.php,fixtures/* tests

composer.json

@@ -2,7 +2,7 @@
     "name": "exussum12/coverage-checker",
     "description": "Allows checking the code coverage of a single pull request",
     "require-dev": {
-        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
+        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
     },
     "license": "MIT",
     "authors": [

src/Loaders/Clover.php

@@ -50,12 +50,12 @@ public function parseLines(): array
     /**
      * {@inheritdoc}
      */
-    public function getErrorsOnLine(string $file, int $line)
+    public function getErrorsOnLine(string $file, int $lineNumber)
     {
-        if (!isset($this->coveredLines[$file][$line])) {
+        if (!isset($this->coveredLines[$file][$lineNumber])) {
             return null;
         }
-        return $this->coveredLines[$file][$line] > 0 ?
+        return $this->coveredLines[$file][$lineNumber] > 0 ?
             []:
             ['No unit test covering this line']
         ;
@@ -92,11 +92,13 @@ protected function checkForNewFiles(XMLReader $reader, string $currentFile)
     protected function addLine(XMLReader $reader, string $currentFile)
     {
         $covered = $reader->getAttribute('count') > 0;
+        $line = $this->coveredLines
+        [$currentFile]
+        [$reader->getAttribute('num')] ?? 0;
 
         $this->coveredLines
         [$currentFile]
-        [$reader->getAttribute('num')]
-            = $covered ?: "No test coverage";
+        [$reader->getAttribute('num')] = $line + $covered;
     }
 
     protected function handleStatement(XMLReader $reader, string $currentFile)

src/Loaders/PhpCs.php

@@ -38,6 +38,10 @@ class PhpCs implements FileChecker
         'Squiz.Commenting.FunctionComment',
     ];
 
+    protected $functionIgnoreComments = [
+        'Squiz.Commenting.FunctionComment.ParamCommentFullStop'
+    ];
+
     /**
      * @var array
      */
@@ -123,7 +127,7 @@ protected function addInvalidLine(string $file, stdClass $message)
 
         $error = $this->messageStartsWith($message->source, $this->lookupErrorPrefix);
 
-        if ($error) {
+        if ($error && !in_array($message->source, $this->functionIgnoreComments, true)) {
             $this->handleLookupError($file, $message, $error);
             return;
         }

tests/PhpunitFilterTest.php

@@ -21,6 +21,9 @@ class PhpunitFilterTest extends TestCase
      */
     public function setUpTest()
     {
+        if (PHP_VERSION > 7.2) {
+            $this->markTestSkipped("Not currently supported");
+        }
         $this->coverage = __DIR__ . '/fixtures/php-coverage.php';
         $this->diff = new DiffFileLoader(__DIR__ . '/fixtures/change.txt');
         $this->matcher = new FileMatchers\EndsWith();