Merge pull request #3213 from yajra/ci-patch

fix: static analysis

.gitattributes

@@ -6,6 +6,7 @@
 .gitattributes export-ignore
 .gitignore export-ignore
 .scrutinizer.yml export-ignore
-.styleci.yml export-ignore
 phpstan.neon.dist export-ignore
 phpunit.xml.dist export-ignore
+pint.json export-ignore
+rector.php export-ignore

.github/workflows/continuous-integration.yml

@@ -14,14 +14,14 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3]
+        php: [8.2, 8.3, 8.4]
         stability: [prefer-stable]
 
     name: PHP ${{ matrix.php }} - ${{ matrix.stability }}
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

.github/workflows/pint.yml

@@ -7,13 +7,21 @@ on:
 jobs:
   phplint:
     runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
     steps:
       - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+
       - name: "laravel-pint"
-        uses: aglipanci/laravel-pint-action@2.0.0
+        uses: aglipanci/laravel-pint-action@latest
         with:
           preset: laravel
           verboseMode: true
+
       - uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: "fix: pint"

.github/workflows/static-analysis.yml

@@ -29,12 +29,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [8.2, 8.3]
+        php: [8.2, 8.3, 8.4]
         stability: [prefer-stable]
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2

phpstan.neon.dist

@@ -10,8 +10,7 @@ parameters:
 
     ignoreErrors:
         - '#Unsafe usage of new static\(\).#'
+        - identifier: missingType.iterableValue
 
     excludePaths:
         - src/helper.php
-
-    checkMissingIterableValueType: false

src/Contracts/DataTable.php

@@ -10,7 +10,7 @@ interface DataTable
     /**
      * Get results.
      *
-     * @return \Illuminate\Support\Collection<int, array>
+     * @return \Illuminate\Support\Collection<int, \stdClass>|\Illuminate\Support\Collection<array-key, array>
      */
     public function results(): Collection;
 

src/QueryDataTable.php

@@ -130,7 +130,7 @@ public function make(bool $mDataSupport = true): JsonResponse
     /**
      * Get paginated results.
      *
-     * @return \Illuminate\Support\Collection<int, array>
+     * @return \Illuminate\Support\Collection<int, \stdClass>
      */
     public function results(): Collection
     {

src/config/datatables.php

@@ -57,10 +57,10 @@
      * Note, only change this if you know what you are doing!
      */
     'builders' => [
-        //Illuminate\Database\Eloquent\Relations\Relation::class => 'eloquent',
-        //Illuminate\Database\Eloquent\Builder::class            => 'eloquent',
-        //Illuminate\Database\Query\Builder::class               => 'query',
-        //Illuminate\Support\Collection::class                   => 'collection',
+        // Illuminate\Database\Eloquent\Relations\Relation::class => 'eloquent',
+        // Illuminate\Database\Eloquent\Builder::class            => 'eloquent',
+        // Illuminate\Database\Query\Builder::class               => 'query',
+        // Illuminate\Support\Collection::class                   => 'collection',
     ],
 
     /*