Fix tests running

asbiin · asbiin · commit a95728b1eb3a · 2025-03-20T19:37:36.000+01:00
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -15,10 +15,10 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.1', '8.2', '8.3', '8.4']
         laravel: ['9.*', '10.*', '11.*', '12.*']
         stability: [prefer-lowest, prefer-stable]
         exclude:
@@ -30,6 +30,9 @@ jobs:
             php: '8.1'
 
     name: P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
+    defaults:
+      run:
+        shell: bash
 
     steps:
       - name: Checkout code
@@ -48,6 +51,17 @@ jobs:
           echo "::add-matcher::${{ runner.tool_cache }}/php.json"
           echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
+      - name: Get Composer Cache Directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Cache composer files
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ matrix.php }}-${{ matrix.laravel }}-${{ matrix.stability }}
+          restore-keys: |
+            ${{ runner.os }}-composer-
+
       - name: Install dependencies
         run: |
           composer require "illuminate/contracts:${{ matrix.laravel }}" --no-interaction --no-update
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .idea
 .phpunit.result.cache
+.phpunit.cache
 build
 composer.lock
 coverage
diff --git a/composer.json b/composer.json
@@ -28,7 +28,7 @@
     },
     "require-dev": {
         "guzzlehttp/guzzle": "^7.8",
-        "larastan/larastan": "^2.0.1",
+        "larastan/larastan": "^2.0|^3.0",
         "laravel/pint": "^0.2.2|^1.21",
         "nunomaduro/collision": "^6.0|^7.0|^8.0",
         "orchestra/testbench": "^7.0|^8.0|^9.0|^10.0",
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -2,12 +2,10 @@ includes:
     - phpstan-baseline.neon
 
 parameters:
-    level: 4
     paths:
         - src
-        - config
+    inferPrivatePropertyTypeFromConstructor: true
+    level: 4
     tmpDir: build/phpstan
     checkOctaneCompatibility: true
     checkModelProperties: true
-    checkMissingIterableValueType: false
-
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -3,37 +3,35 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     backupGlobals="false"
-    backupStaticAttributes="false"
     bootstrap="vendor/autoload.php"
     colors="true"
-    convertErrorsToExceptions="true"
-    convertNoticesToExceptions="true"
-    convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
     executionOrder="random"
     failOnWarning="true"
     failOnRisky="true"
     failOnEmptyTestSuite="true"
     beStrictAboutOutputDuringTests="true"
-    verbose="true"
->
-    <testsuites>
-        <testsuite name="Pirsch Test Suite">
-            <directory>tests</directory>
-        </testsuite>
-    </testsuites>
-    <coverage>
-        <include>
-            <directory suffix=".php">./src</directory>
-        </include>
-        <report>
-            <html outputDirectory="build/coverage"/>
-            <text outputFile="build/coverage.txt"/>
-            <clover outputFile="build/logs/clover.xml"/>
-        </report>
-    </coverage>
-    <logging>
-        <junit outputFile="build/report.junit.xml"/>
-    </logging>
+    cacheDirectory=".phpunit.cache"
+    backupStaticProperties="false">
+  <testsuites>
+    <testsuite name="Pirsch Test Suite">
+      <directory>tests</directory>
+    </testsuite>
+  </testsuites>
+  <coverage>
+    <report>
+      <html outputDirectory="build/coverage"/>
+      <text outputFile="build/coverage.txt"/>
+      <clover outputFile="build/logs/clover.xml"/>
+    </report>
+  </coverage>
+  <logging>
+    <junit outputFile="build/report.junit.xml"/>
+  </logging>
+  <source>
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </source>
 </phpunit>
diff --git a/src/Facades/Pirsch.php b/src/Facades/Pirsch.php
@@ -4,6 +4,11 @@
 
 use Illuminate\Support\Facades\Facade;
 
+/**
+ * @method static void track(?string $name = null, ?array $meta = null)
+ *
+ * @see \Pirsch\Pirsch
+ */
 class Pirsch extends Facade
 {
     protected static function getFacadeAccessor()
diff --git a/src/Pirsch.php b/src/Pirsch.php
@@ -47,6 +47,7 @@ public static function track(
                         ],
                     );
             } catch (ConnectionException) {
+                // remove error
             }
         });
     }

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,7 @@ public static function track(`
`47`	`47`	`],`
`48`	`48`	`);`
`49`	`49`	`} catch (ConnectionException) {`
	`50`	`+ // remove error`
`50`	`51`	`}`
`51`	`52`	`});`
`52`	`53`	`}`