From 04097eab2420f213a4cdbac3d9173be021e68b1f Mon Sep 17 00:00:00 2001
From: Sebastian Fix <sebastian.fix@codebar.ch>
Date: Thu, 21 Sep 2023 13:43:21 +0200
Subject: [PATCH 1/3] WIP

---
 .github/workflows/phpstan.yml | 11 ++++-------
 composer.json                 |  7 ++++++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index 8776e8f..8148c24 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -1,13 +1,10 @@
 name: PHPStan
 
 on:
-  pull_request:
-    - '**.php'
-    - 'phpstan.neon.dist'
   push:
-    paths:
-      - '**.php'
-      - 'phpstan.neon.dist'
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
 
 jobs:
   phpstan:
@@ -26,4 +23,4 @@ jobs:
         uses: ramsey/composer-install@v2
 
       - name: Run PHPStan
-        run: ./vendor/bin/phpstan analyse src --error-format=github
+        run: ./vendor/bin/phpstan analyse src --error-format=github
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 95881c8..514cedc 100644
--- a/composer.json
+++ b/composer.json
@@ -15,11 +15,15 @@
             "email": "sebastian.fix@codebar.ch",
             "homepage": "https://www.codebar.ch",
             "role": "Developer"
+        },
+        {
+            "name": "Rhys Lees",
+            "role": "Software-Developer"
         }
     ],
     "require": {
         "php": "^8.2",
-        "guzzlehttp/guzzle": "^7.2",
+        "guzzlehttp/guzzle": "^7.5",
         "illuminate/contracts": "^10.0",
         "laravel/framework": "10.*",
         "orchestra/testbench": "8.*",
@@ -33,6 +37,7 @@
         "laravel/pint": "^1.5",
         "nunomaduro/collision": "^7.0",
         "nunomaduro/larastan": "^2.4.0",
+        "orchestra/testbench": "^8.0",
         "pestphp/pest": "^2.0",
         "pestphp/pest-plugin-laravel": "^2.0",
         "phpstan/extension-installer": "^1.1",

From 23f8e48aa08f416e51a1b8976529847e06b4d70b Mon Sep 17 00:00:00 2001
From: Sebastian Fix <sebastian.fix@codebar.ch>
Date: Thu, 21 Sep 2023 13:45:02 +0200
Subject: [PATCH 2/3] WIP

---
 .github/workflows/phpstan.yml   | 7 +++++++
 .github/workflows/run-tests.yml | 1 +
 tests/TestCase.php              | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index 8148c24..a5fb642 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -1,6 +1,13 @@
 name: PHPStan
 
 on:
+<<<<<<< HEAD
+=======
+  pull_request:
+    paths:
+      - '**.php'
+      - 'phpstan.neon.dist'
+>>>>>>> 67aa803fa405c790afcc1f34b4afa5957b827114
   push:
     branches: [ main ]
   pull_request:
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 44dcd90..05ed5d7 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -11,6 +11,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: true
+      max-parallel: 1
       matrix:
         os: [ ubuntu-latest, windows-latest ]
         php: [ 8.2 ]
diff --git a/tests/TestCase.php b/tests/TestCase.php
index fcafde4..902105b 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -39,7 +39,7 @@ public function getEnvironmentSetUp($app): void
             'prefix' => '',
         ]);
 
-        if (is_dir(__DIR__ . '/Fixtures/Saloon/') && count(scandir(__DIR__ . '/Fixtures/Saloon')) > 0) {
+        if (is_dir(__DIR__.'/Fixtures/Saloon/') && count(scandir(__DIR__.'/Fixtures/Saloon')) > 0) {
             $app['config']->set('zendesk.subdomain', 'codebar-zendesk');
             $app['config']->set('zendesk.auth.email_address', 'fake-email');
             $app['config']->set('zendesk.auth.api_token', 'fake-token');

From a901d6344ba3a3482571b4f8b3e6153986955530 Mon Sep 17 00:00:00 2001
From: Sebastian Fix <sebastian.fix@codebar.ch>
Date: Thu, 21 Sep 2023 13:46:42 +0200
Subject: [PATCH 3/3] WIP

---
 .github/workflows/phpstan.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/phpstan.yml b/.github/workflows/phpstan.yml
index a5fb642..8148c24 100644
--- a/.github/workflows/phpstan.yml
+++ b/.github/workflows/phpstan.yml
@@ -1,13 +1,6 @@
 name: PHPStan
 
 on:
-<<<<<<< HEAD
-=======
-  pull_request:
-    paths:
-      - '**.php'
-      - 'phpstan.neon.dist'
->>>>>>> 67aa803fa405c790afcc1f34b4afa5957b827114
   push:
     branches: [ main ]
   pull_request: