WIP

codebar-ag · Sep 21, 2023 · 23f8e48 · 23f8e48
1 parent 04097ea
commit 23f8e48
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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');