From 0e5a4498741d220e4d84e6ce4540b94f98715438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Viktor=20Sz=C3=A9pe?= <viktor@szepe.net>
Date: Sun, 30 Jul 2023 12:02:16 +0200
Subject: [PATCH] Add a real matrix to Static analysis workflow (#613)

Co-authored-by: Markus Staab <maggus.staab@googlemail.com>
---
 .github/workflows/phpstan.yml | 56 ++++++++++++++++++-----------------
 phpstan.neon.dist             |  5 ----
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index 84f34cd0b..df772c0f1 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -15,42 +15,44 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        php-version:
+          - "8.0"
+          - "8.1"
+          - "8.2"
+        db-image:
+          - "mysql:8.0"
+          - "mariadb:latest"
+        reflector:
+          - "mysqli"
+        mode:
+          - "recording"
+
         include:
+          - db-image: "mysql:8.0"
+            db-options: '--health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3'
+
+          - db-image: "mariadb:latest"
+            db-options: '--health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=1s --health-timeout=10s --health-retries=60'
+
+          # PHPStan development version
           - php-version: "8.0"
-            db-image: 'mysql:8.0'
+            db-image: "mysql:8.0"
+            db-options: '--health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3'
             reflector: "pdo-mysql"
             mode: "recording"
-            phpstan-version: "phpstan@dev"
+            phpstan-version: "dev"
 
+          # PDO MySQL reflector
           - php-version: "8.0"
-            db-image: 'mysql:8.0'
+            db-image: "mysql:8.0"
+            db-options: '--health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3'
             reflector: "pdo-mysql"
             mode: "recording"
-          - php-version: "8.0"
-            db-image: 'mysql:8.0'
-            reflector: "mysqli"
-            mode: "recording"
-
-          - php-version: "8.1"
-            db-image: 'mysql:8.0'
-            reflector: "mysqli"
-            mode: "recording"
-          - php-version: '8.1'
-            db-image: 'mariadb:latest'
-            reflector: "mysqli"
-            mode: "recording"
-
-          - php-version: "8.2"
-            db-image: 'mysql:8.0'
-            reflector: "mysqli"
-            mode: "recording"
-          - php-version: '8.2'
-            db-image: 'mariadb:latest'
-            reflector: "mysqli"
-            mode: "recording"
 
+          # Replay and Recording mode
           - php-version: "8.1"
-            db-image: 'mysql:8.0'
+            db-image: "mysql:8.0"
+            db-options: '--health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3'
             reflector: "mysqli"
             mode: "replay-and-recording"
 
@@ -66,7 +68,7 @@ jobs:
           MYSQL_ROOT_PASSWORD: root
         ports:
           - 3306:3306
-        options: ${{ startsWith(matrix.db-image, 'mariadb') && '--health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=1s --health-timeout=10s --health-retries=60' || '--health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3' }}
+        options: ${{ matrix.db-options }}
 
     steps:
       - uses: actions/checkout@v3
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index a7524734f..b5fe98c8b 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -12,11 +12,6 @@ parameters:
     paths:
         - src/
 
-    unused_public:
-        methods: true
-        properties: true
-        constants: true
-
     bootstrapFiles:
         - bootstrap.php