Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/pint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .styleci.yml

This file was deleted.

3 changes: 1 addition & 2 deletions phpstan.neon.dist
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ parameters:

ignoreErrors:
- '#Unsafe usage of new static\(\).#'
- identifier: missingType.iterableValue

excludePaths:
- src/helper.php

checkMissingIterableValueType: false
3 changes: 0 additions & 3 deletions sonar-project.properties

This file was deleted.

2 changes: 1 addition & 1 deletion src/Contracts/DataTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/QueryDataTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
8 changes: 4 additions & 4 deletions src/config/datatables.php
Original file line number Diff line number Diff line change
Expand Up @@ -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',
],

/*
Expand Down
Loading