From 84a5b45c902ea5e7d372ba250125226abb15b671 Mon Sep 17 00:00:00 2001
From: Dennis Riehle <webmaster@riehle-web.com>
Date: Thu, 4 Nov 2021 16:47:30 +0100
Subject: [PATCH 1/2] Updated composer scripts

Developers can now run all checks including static analysis checks with
"composer check".
---
 composer.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 5d91f057..de92c8ed 100644
--- a/composer.json
+++ b/composer.json
@@ -104,11 +104,15 @@
     "scripts": {
         "check": [
             "@cs-check",
+            "@phpstan",
+            "@psalm",
             "@test"
         ],
         "cs-check": "phpcs",
         "cs-fix": "phpcbf",
+        "phpstan": "phpstan analyse",
+        "psalm": "psalm --stats",
         "test": "phpunit --colors=always",
-        "test-coverage": "phpunit --coverage-clover=coverage.xml"
+        "test-coverage": "phpunit --colors=always --coverage-clover=coverage.xml"
     }
 }

From c5b99824a0992c46e8c566eb35f10324f90d34b1 Mon Sep 17 00:00:00 2001
From: Dennis Riehle <webmaster@riehle-web.com>
Date: Thu, 4 Nov 2021 16:49:18 +0100
Subject: [PATCH 2/2] Remove coverage-checker

It is not needed anymore, as the coverage is directly reported in the
workflows using Codecov.
---
 .github/workflows/continuous-integration.yml |  3 --
 build/.gitignore                             |  3 --
 build/coverage-checker.php                   | 42 --------------------
 3 files changed, 48 deletions(-)
 delete mode 100644 build/.gitignore
 delete mode 100644 build/coverage-checker.php

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index e7517e99..ba272e1d 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -72,9 +72,6 @@ jobs:
       - name: "Run PHPUnit"
         run: "composer test-coverage"
 
-      - name: "Test coverage"
-        run: "php build/coverage-checker.php coverage.xml 70"
-
       - name: "Upload coverage file"
         uses: "actions/upload-artifact@v2"
         with:
diff --git a/build/.gitignore b/build/.gitignore
deleted file mode 100644
index 00e4b0b7..00000000
--- a/build/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*
-!.gitignore
-!coverage-checker.php
\ No newline at end of file
diff --git a/build/coverage-checker.php b/build/coverage-checker.php
deleted file mode 100644
index a29f9e80..00000000
--- a/build/coverage-checker.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Code coverage checker. Analyzes a given `clover.xml` report produced
- * by PHPUnit and checks if coverage fits expected ratio
- *
- * Usage:
- *     php coverage-checker <path-to-clover> <pass-percentage>
- *
- * @author Marco Pivetta <ocramius@gmail.com>
- */
-
-$inputFile = $argv[1];
-$percentage = min(100, max(0, (int) $argv[2]));
-
-if (!file_exists($inputFile)) {
-    throw new InvalidArgumentException('Invalid input file provided');
-}
-
-if (!$percentage) {
-    throw new InvalidArgumentException('An integer checked percentage must be given as second parameter');
-}
-
-$xml = new SimpleXMLElement(file_get_contents($inputFile));
-/* @var $metrics SimpleXMLElement[] */
-$metrics = $xml->xpath('//metrics');
-
-$totalElements = 0;
-$checkedElements = 0;
-
-foreach ($metrics as $metric) {
-    $totalElements   += (int) $metric['elements'];
-    $checkedElements += (int) $metric['coveredelements'];
-}
-
-$coverage = round(($checkedElements / $totalElements) * 100);
-
-if ($coverage < $percentage) {
-    echo 'Code coverage is ' . $coverage . '%, which is below the accepted ' . $percentage . '%' . PHP_EOL;
-    exit(1);
-}
-
-echo 'Code coverage is ' . $coverage . '% - OK!' . PHP_EOL;