From bb7eb45c679e12664382bcfeb455b2c41b9c85b1 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Fri, 21 Jan 2022 14:29:17 +0100
Subject: [PATCH 1/2] cleanup composer.json

---
 composer.json | 12 ++++--------
 phpunit.xml   |  3 ++-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/composer.json b/composer.json
index 218edc7..40c51c7 100644
--- a/composer.json
+++ b/composer.json
@@ -4,18 +4,12 @@
     "require": {
         "php": "^8.0",
         "nikic/php-parser": "^4.13",
-        "phpstan/phpstan": "^1.2",
         "rector/rector": "^0.12",
         "zendframework/zendframework1": "^1.12"
     },
     "require-dev": {
         "ext-pdo": "*",
-        "friendsofphp/php-cs-fixer": "3.4.0",
-        "phpstan/phpstan-php-parser": "^1.1",
-        "phpstan/phpstan-phpunit": "^1.0",
-        "phpstan/phpstan-strict-rules": "^1.1",
-        "phpunit/phpunit": "^9",
-        "symplify/phpstan-extensions": "^10.0"
+        "phpunit/phpunit": "^9.5"
     },
 
     "autoload": {
@@ -25,7 +19,9 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "staabm\\ZfSelectStrip\\Tests\\": "tests/"
+            "staabm\\ZfSelectStrip\\Tests\\": "tests/",
+            "staabm\\ZfSelectStrip\\Tests\\Rector\\": "tests/rector",
+            "staabm\\ZfSelectStrip\\Tests\\PHPStan\\": "tests/phpstan"
         },
         "classmap": [
             "tests/classes/"
diff --git a/phpunit.xml b/phpunit.xml
index fc6fc72..b52d078 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -14,7 +14,8 @@
 
     <testsuites>
         <testsuite name="ZfSelectStrip">
-            <directory suffix="Test.php">tests/</directory>
+            <directory>tests/rector</directory>
+            <directory>tests/phpstan</directory>
         </testsuite>
     </testsuites>
 

From bd7bea7fdb4cb8a34c73e2a9e47958707ff5de74 Mon Sep 17 00:00:00 2001
From: Tomas Votruba <tomas.vot@gmail.com>
Date: Fri, 21 Jan 2022 14:30:18 +0100
Subject: [PATCH 2/2] separate phpstan and rector run

---
 .github/workflows/tests.yml | 3 ++-
 phpunit.xml                 | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 938704d..03320a7 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -54,4 +54,5 @@ jobs:
           mysql -uroot -h127.0.0.1 -proot -e 'create database zf;'
           mysql -uroot -h127.0.0.1 -proot zf < tests/schema.sql
 
-      - run: vendor/bin/phpunit
+      - run: vendor/bin/phpunit --testsuite phpstan
+      - run: vendor/bin/phpunit --testsuite rector
diff --git a/phpunit.xml b/phpunit.xml
index b52d078..f7eadfd 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -13,10 +13,12 @@
          verbose="false">
 
     <testsuites>
-        <testsuite name="ZfSelectStrip">
-            <directory>tests/rector</directory>
+        <testsuite name="phpstan">
             <directory>tests/phpstan</directory>
         </testsuite>
+        <testsuite name="rector">
+            <directory>tests/rector</directory>
+        </testsuite>
     </testsuites>
 
     <logging/>