Skip to content

Commit ea46885

Browse files
lrljoelrljoe
committed
Merge branch 'v4-beta' of https://github.com/LowerRockLabs/laravel-livewire-tables into v4-development
2 parents 02e2bb4 + 438e311 commit ea46885

File tree

979 files changed

+39848
-15332
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

979 files changed

+39848
-15332
lines changed

‎.github/workflows/discord-releases.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ on:
44

55
jobs:
66
github-releases-to-discord:
7-
runs-on: ubuntu-latest
7+
runs-on: ubuntu-24.04
88
steps:
99
- name: Checkout
1010
uses: actions/checkout@v4
1111
- name: Package Releases
12-
uses: SethCohen/[email protected]
12+
uses: SethCohen/github-releases-to-discord@latest
13+
env:
14+
WEBHOOK_DISCORD_RELEASE_URL: ${{ secrets.WEBHOOK_DISCORD_RELEASE_URL }}
1315
with:
14-
webhook_url: ${{ secrets.WEBHOOK_DISCORD_RELEASE_URL }}
16+
webhook_url: $WEBHOOK_DISCORD_RELEASE_URL
1517
color: "2105893"
1618
username: "GitHub Release-Bot"
1719
avatar_url: "https://cdn.discordapp.com/avatars/487431320314576937/bd64361e4ba6313d561d54e78c9e7171.png"

‎.github/workflows/pint.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
ref: ${{ github.head_ref }}
2525

2626
- name: Fix PHP code style issues
27-
uses: aglipanci/laravel-pint-action@2.2.0
27+
uses: aglipanci/laravel-pint-action@latest
2828

29-
- name: Commit changes
30-
uses: stefanzweifel/git-auto-commit-action@v4
29+
- name: Commit styling changes
30+
uses: stefanzweifel/git-auto-commit-action@v5
3131
with:
3232
commit_message: Fix styling

‎.github/workflows/run-phpstan-pull.yml‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
name: run-phpstan-pull
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- 'master'
7+
- 'development'
8+
9+
jobs:
10+
test:
11+
runs-on: ${{ matrix.os }}
12+
strategy:
13+
fail-fast: true
14+
matrix:
15+
os: [ubuntu-latest]
16+
php: [8.4]
17+
laravel: [12]
18+
stability: [prefer-dist]
19+
20+
name: PHPStan - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
21+
env:
22+
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
23+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, exif, iconv, fileinfo
24+
25+
steps:
26+
- name: Checkout code
27+
uses: actions/checkout@v4
28+
29+
- name: Setup cache environment
30+
id: extcache
31+
uses: shivammathur/cache-extensions@v1
32+
with:
33+
php-version: ${{ matrix.php }}
34+
extensions: ${{ env.extensions }}
35+
key: ${{ env.extensionKey }}
36+
37+
- name: Cache extensions
38+
uses: actions/cache@v4
39+
with:
40+
path: ${{ steps.extcache.outputs.dir }}
41+
key: ${{ steps.extcache.outputs.key }}
42+
restore-keys: ${{ steps.extcache.outputs.key }}
43+
44+
- name: Setup PHP
45+
uses: shivammathur/setup-php@v2
46+
with:
47+
php-version: ${{ matrix.php }}
48+
extensions: ${{ env.extensions }}
49+
coverage: pcov
50+
tools: phpunit:11.4
51+
env:
52+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
53+
54+
- name: Setup problem matchers for PHP
55+
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
56+
57+
- name: Get composer cache directory
58+
id: composer-cache
59+
run: |
60+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
61+
62+
- uses: actions/cache@v4
63+
with:
64+
path: ${{ steps.composer-cache.outputs.dir }}
65+
key: phpstan-${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
66+
restore-keys: phpstan-${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
67+
68+
- name: Add token
69+
env:
70+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
71+
run: |
72+
composer config github-oauth.github.com $GITHUB_TOKEN
73+
74+
- name: Install dependencies
75+
if: steps.composer-cache.outputs.cache-hit != 'true'
76+
run: composer require "laravel/framework:${{ matrix.laravel }}.*" --no-interaction --no-update
77+
78+
- name: Update dependencies
79+
if: steps.composer-cache.outputs.cache-hit != 'true'
80+
run: composer update --${{ matrix.stability }} --no-interaction -W
81+
82+
- name: Install PHPStan
83+
run: composer require larastan/larastan:^3.0 --no-interaction -W
84+
85+
- uses: actions/cache@v4
86+
with:
87+
path: ./build/phpstan
88+
key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
89+
90+
- name: Run PHPStan Tests
91+
run: ./vendor/bin/phpstan analyse

‎.github/workflows/run-phpstan.yml‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
name: run-phpstan
22

33
on:
4-
pull_request:
5-
branches:
6-
- 'master'
7-
- 'development'
84
push:
95
branches:
106
- '*' # matches every branch that doesn't contain a '/'
117
- '*/*' # matches every branch containing a single '/'
128
- '**' # matches every branch
139
- '!master'
10+
- '!development'
1411

1512
jobs:
1613
test:
@@ -19,14 +16,14 @@ jobs:
1916
fail-fast: true
2017
matrix:
2118
os: [ubuntu-latest]
22-
php: [8.3]
23-
laravel: [10]
19+
php: [8.4]
20+
laravel: [12]
2421
stability: [prefer-dist]
2522

2623
name: PHPStan - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
2724
env:
28-
extensionKey: phpextensions
29-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
25+
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
26+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, exif, iconv, fileinfo
3027

3128
steps:
3229
- name: Checkout code
@@ -53,7 +50,7 @@ jobs:
5350
php-version: ${{ matrix.php }}
5451
extensions: ${{ env.extensions }}
5552
coverage: pcov
56-
tools: phpunit:9.5
53+
tools: phpunit:11.4
5754
env:
5855
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5956

@@ -68,23 +65,30 @@ jobs:
6865
- uses: actions/cache@v4
6966
with:
7067
path: ${{ steps.composer-cache.outputs.dir }}
71-
key: ${{ runner.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
72-
restore-keys: ${{ runner.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-
68+
key: phpstan-${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
69+
restore-keys: phpstan-${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
7370

7471
- name: Add token
72+
env:
73+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7574
run: |
76-
composer config github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
75+
composer config github-oauth.github.com $GITHUB_TOKEN
7776
7877
- name: Install dependencies
7978
if: steps.composer-cache.outputs.cache-hit != 'true'
8079
run: composer require "laravel/framework:${{ matrix.laravel }}.*" --no-interaction --no-update
8180

8281
- name: Update dependencies
8382
if: steps.composer-cache.outputs.cache-hit != 'true'
84-
run: composer update --${{ matrix.stability }} --no-interaction
83+
run: composer update --${{ matrix.stability }} --no-interaction -W
8584

8685
- name: Install PHPStan
87-
run: composer require larastan/larastan:^2.0 --dev --no-interaction
86+
run: composer require larastan/larastan:^3.0 --dev --no-interaction -W
87+
88+
- uses: actions/cache@v4
89+
with:
90+
path: ./build/phpstan
91+
key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
8892

8993
- name: Run PHPStan Tests
90-
run: ./vendor/bin/phpstan analyse
94+
run: ./vendor/bin/phpstan analyse

‎.github/workflows/run-tests-pcov-pull.yml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ name: run-tests-pcov-pull
33
on:
44
push:
55
branches:
6-
- 'develop'
76
- 'development'
87
- 'master'
98
pull_request:
109
branches:
11-
- 'develop'
1210
- 'development'
1311
- 'master'
1412

@@ -18,15 +16,15 @@ jobs:
1816
strategy:
1917
fail-fast: false
2018
matrix:
21-
os: [ubuntu-latest]
19+
os: [ubuntu-24.04]
2220
php: [8.3]
23-
laravel: [10]
21+
laravel: [11]
2422
stability: [prefer-dist]
2523

2624
name: PCOV - ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
2725
env:
2826
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-withpcov
29-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pcov,pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
27+
extensions: dom, curl, libxml, mbstring, zip, pdo, sqlite, pcov,pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, fileinfo
3028

3129
steps:
3230
- name: Checkout code
@@ -39,7 +37,14 @@ jobs:
3937
php-version: ${{ matrix.php }}
4038
extensions: ${{ env.extensions }}
4139
key: ${{ env.extensionKey }}
42-
40+
41+
- name: Cache extensions
42+
uses: actions/cache@v4
43+
with:
44+
path: ${{ steps.extcache.outputs.dir }}
45+
key: ${{ steps.extcache.outputs.key }}
46+
restore-keys: ${{ steps.extcache.outputs.key }}
47+
4348
- name: Setup PHP
4449
uses: shivammathur/setup-php@v2
4550
with:
@@ -51,13 +56,6 @@ jobs:
5156
env:
5257
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5358

54-
- name: Cache extensions
55-
uses: actions/cache@v4
56-
with:
57-
path: ${{ steps.extcache.outputs.dir }}
58-
key: ${{ steps.extcache.outputs.key }}
59-
restore-keys: ${{ steps.extcache.outputs.key }}
60-
6159
- name: Setup problem matchers for PHP
6260
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
6361

@@ -69,12 +67,14 @@ jobs:
6967
- uses: actions/cache@v4
7068
with:
7169
path: ${{ steps.composer-cache.outputs.dir }}
72-
key: ${{ runner.os }}-PCOV-PULL-PHP${{ matrix.php }}-Laravel${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
73-
restore-keys: ${{ runner.os }}-PCOV-PULL-PHP${{ matrix.php }}-Laravel${{ matrix.laravel }}-composer-
70+
key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
71+
restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
7472

7573
- name: Add token
74+
env:
75+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7676
run: |
77-
composer config github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
77+
composer config github-oauth.github.com $GITHUB_TOKEN
7878
7979
- name: Install dependencies
8080
if: steps.composer-cache.outputs.cache-hit != 'true'
@@ -88,14 +88,14 @@ jobs:
8888
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
8989

9090
- name: Run Unit Tests
91-
run: php ./vendor/bin/paratest --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml --processes=4
91+
run: php ./vendor/bin/phpunit --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml --testsuite "Laravel Livewire Tables Unit Test Suite","Laravel Livewire Tables Visuals Test Suite"
9292

9393
- name: Upload coverage reports to Codecov
94-
uses: codecov/codecov-action@v4
94+
uses: codecov/codecov-action@v5
9595
env:
9696
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
9797
with:
98-
token: ${{ secrets.CODE_COV_TOKEN }}
98+
token: $CODECOV_TOKEN
9999
files: ./coverage.xml
100100
verbose: true
101101

0 commit comments

Comments
 (0)