Skip to content

Commit 1099d17

Browse files
lrljoeMP70
lrljoe
and
MP70
authored
Development to Master for 3.2.8 (rappasoft#1753)
* Adjust for HTML Columns * Update ChangeLog and SP * fix: Apply cursor pointer only on clickable columns when using Bootst… (rappasoft#1742) * Ensure HTML Columns Return HTML Correctly (rappasoft#1737) * Adjust for HTML Columns * fix: Apply cursor pointer only on clickable columns when using Bootstrap --------- Co-authored-by: Joe <[email protected]> * Fix styling * Fix hide bulk actions when empty not reflecting in frontend (rappasoft#1747) * Fix issue with Hide Bulk Actions When Empty not reflecting in frontend * Fix styling * Add development branch into tests --------- Co-authored-by: lrljoe <[email protected]> * Change Return Type for attributes() to static (rappasoft#1749) * Switch to using Composer\InstalledVersions for AboutCommand to reduce necessity to update ServiceProvider with each update (rappasoft#1748) * Two improvements to improve typehinting, migrate to larastan/larastan, cleanup of test (rappasoft#1750) * Add ArrayColumn (BETA) (rappasoft#1751) * Add ArrayColumn * Fix styling --------- Co-authored-by: lrljoe <[email protected]> * Always hide bulk actions option (rappasoft#1752) * Add option to "Always Hide Bulk Actions" * Fix styling * Fix test function name clash --------- Co-authored-by: lrljoe <[email protected]> * Optionally disable count for simple pagination (rappasoft#1755) * Add option for setShouldRetrieveTotalItemCountStatus * Fix styling --------- Co-authored-by: lrljoe <[email protected]> * Update ChangeLog For 3.2.8 Release (rappasoft#1754) * Update ChangeLog for 3.2.8 * Add release date * Fix phpstan unescaped | * Fix missing typehints (rappasoft#1757) * Add additional typehints * Fix styling * Add filterCollection typehint * Fix styling * trUrlCallback fixes * Use Collection rather than collect() helper * Fix styling * Add ignore for "Unable to resolve the template type" for Illuminate Collection, add typehint for empty * Add ignore for $model has no defined type (allows for non Eloquent Model to be used longer term) * Adjust concurrency * Adjust Test * Adjust Again * Adjust PHPStan * Add Max Parallel * Use v4 of checkout/cache * Run one at a time * Add Clear Cache Workflow * Fix * Migrate to v4 and adjust workflows * Adjust workflow run rules * Adjust Run-Tests to separate L10 and L11 jobs * Adjust run-tests * Adjust Test * Add Laravel matrix * Adjust Concurrency * Adjust * Adjust Pull Jobs to Match Push jobs --------- Co-authored-by: lrljoe <[email protected]> --------- Co-authored-by: Matt Pickering <[email protected]> Co-authored-by: lrljoe <[email protected]>
1 parent cd723c1 commit 1099d17

File tree

60 files changed

+724
-146
lines changed

Some content is hidden

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

60 files changed

+724
-146
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Checkout
10-
uses: actions/checkout@v3
10+
uses: actions/checkout@v4
1111
- name: Package Releases
1212
uses: SethCohen/[email protected]
1313
with:

‎.github/workflows/pint.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ name: Fix PHP code style issues
22

33
on:
44
push:
5+
branches:
6+
- '*' # matches every branch that doesn't contain a '/'
7+
- '*/*' # matches every branch containing a single '/'
8+
- '**' # matches every branch
9+
- '!master'
510
paths:
611
- '**.php'
712

@@ -14,7 +19,7 @@ jobs:
1419

1520
steps:
1621
- name: Checkout code
17-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4
1823
with:
1924
ref: ${{ github.head_ref }}
2025

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
name: run-phpstan
22

3-
on: [push, pull_request]
3+
on:
4+
pull_request:
5+
branches:
6+
- 'master'
7+
- 'development'
8+
push:
9+
branches:
10+
- '*' # matches every branch that doesn't contain a '/'
11+
- '*/*' # matches every branch containing a single '/'
12+
- '**' # matches every branch
13+
- '!master'
414

515
jobs:
616
test:
@@ -20,7 +30,7 @@ jobs:
2030

2131
steps:
2232
- name: Checkout code
23-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
2434

2535
- name: Setup cache environment
2636
id: extcache
@@ -31,7 +41,7 @@ jobs:
3141
key: ${{ env.extensionKey }}
3242

3343
- name: Cache extensions
34-
uses: actions/cache@v3
44+
uses: actions/cache@v4
3545
with:
3646
path: ${{ steps.extcache.outputs.dir }}
3747
key: ${{ steps.extcache.outputs.key }}
@@ -55,7 +65,7 @@ jobs:
5565
run: |
5666
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
5767
58-
- uses: actions/cache@v3
68+
- uses: actions/cache@v4
5969
with:
6070
path: ${{ steps.composer-cache.outputs.dir }}
6171
key: ${{ runner.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
- 'develop'
7+
- 'development'
78
- 'master'
89

910
jobs:
@@ -24,7 +25,7 @@ jobs:
2425

2526
steps:
2627
- name: Checkout code
27-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2829

2930
- name: Setup cache environment
3031
id: extcache
@@ -46,7 +47,7 @@ jobs:
4647
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4748

4849
- name: Cache extensions
49-
uses: actions/cache@v3
50+
uses: actions/cache@v4
5051
with:
5152
path: ${{ steps.extcache.outputs.dir }}
5253
key: ${{ steps.extcache.outputs.key }}
@@ -60,7 +61,7 @@ jobs:
6061
run: |
6162
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
6263
63-
- uses: actions/cache@v3
64+
- uses: actions/cache@v4
6465
with:
6566
path: ${{ steps.composer-cache.outputs.dir }}
6667
key: ${{ runner.os }}-PCOV-PULL-PHP${{ matrix.php }}-Laravel${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}

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

Lines changed: 97 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,44 @@ on:
44
pull_request:
55
branches:
66
- 'develop'
7+
- 'development'
78
- 'master'
89

910
jobs:
10-
test:
11+
test-laravel10:
1112
runs-on: ${{ matrix.os }}
1213
strategy:
1314
fail-fast: false
15+
max-parallel: 3
1416
matrix:
1517
os: [ubuntu-latest]
1618
php: [8.1, 8.2, 8.3]
17-
laravel: [10.*,11.*]
19+
laravel: [10.*]
1820
stability: [prefer-dist]
19-
exclude:
20-
- laravel: 11.*
21-
php: 8.1
2221

23-
name: STD-PULL - ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
22+
name: PULL PHP-${{ matrix.php }} - Laravel-10
2423
env:
25-
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
24+
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L{{ matrix.laravel }}
2625
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
2726

2827
steps:
2928
- name: Checkout code
30-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3130

3231
- name: Setup cache environment
3332
id: extcache
3433
uses: shivammathur/cache-extensions@v1
3534
with:
3635
php-version: ${{ matrix.php }}
3736
extensions: ${{ env.extensions }}
38-
key: ${{ runner.os }}-${{ env.extensionKey }}
37+
key: ${{ env.extensionKey }}
3938

4039
- name: Cache extensions
41-
uses: actions/cache@v3
40+
uses: actions/cache@v4
4241
with:
4342
path: ${{ steps.extcache.outputs.dir }}
44-
key: ${{ steps.extcache.outputs.key }}
45-
restore-keys: ${{ steps.extcache.outputs.key }}
43+
key: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
44+
restore-keys: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
4645

4746
- name: Setup PHP
4847
uses: shivammathur/setup-php@v2
@@ -63,11 +62,11 @@ jobs:
6362
run: |
6463
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
6564
66-
- uses: actions/cache@v3
65+
- uses: actions/cache@v4
6766
with:
6867
path: ${{ steps.composer-cache.outputs.dir }}
69-
key: ${{ runner.os }}-STDPULL-PHP-${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
70-
restore-keys: ${{ runner.os }}-STDPULL-PHP-${{ matrix.php }}-L${{ matrix.laravel }}-composer-
68+
key: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
69+
restore-keys: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
7170

7271
- name: Add token
7372
run: |
@@ -78,7 +77,90 @@ jobs:
7877
run: composer require "laravel/framework:${{ matrix.laravel }}.*" --no-interaction --no-update
7978

8079
- name: Update dependencies
80+
if: steps.composer-cache.outputs.cache-hit != 'true'
8181
run: composer update --${{ matrix.stability }} --no-interaction
8282

83+
- name: Setup problem matchers for PHPUnit
84+
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
85+
86+
- name: Run Unit Tests
87+
run: php ./vendor/bin/paratest --no-coverage --processes=4
88+
89+
90+
test-laravel11:
91+
runs-on: ${{ matrix.os }}
92+
strategy:
93+
fail-fast: false
94+
max-parallel: 2
95+
matrix:
96+
os: [ubuntu-latest]
97+
php: [8.2, 8.3]
98+
laravel: [11.*]
99+
stability: [prefer-dist]
100+
101+
name: PULL PHP-${{ matrix.php }} - Laravel-11
102+
env:
103+
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L{{ matrix.laravel }}
104+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr
105+
106+
steps:
107+
- name: Checkout code
108+
uses: actions/checkout@v4
109+
110+
- name: Setup cache environment
111+
id: extcache
112+
uses: shivammathur/cache-extensions@v1
113+
with:
114+
php-version: ${{ matrix.php }}
115+
extensions: ${{ env.extensions }}
116+
key: ${{ env.extensionKey }}
117+
118+
- name: Cache extensions
119+
uses: actions/cache@v4
120+
with:
121+
path: ${{ steps.extcache.outputs.dir }}
122+
key: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
123+
restore-keys: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
124+
125+
- name: Setup PHP
126+
uses: shivammathur/setup-php@v2
127+
with:
128+
php-version: ${{ matrix.php }}
129+
extensions: ${{ env.extensions }}
130+
tools: phpunit:latest
131+
ini-values: memory_limit=512M
132+
coverage: none
133+
env:
134+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
135+
136+
- name: Setup problem matchers for PHP
137+
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
138+
139+
- name: Get composer cache directory
140+
id: composer-cache
141+
run: |
142+
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
143+
144+
- uses: actions/cache@v4
145+
with:
146+
path: ${{ steps.composer-cache.outputs.dir }}
147+
key: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
148+
restore-keys: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
149+
150+
- name: Add token
151+
run: |
152+
composer config github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
153+
154+
- name: Install dependencies
155+
if: steps.composer-cache.outputs.cache-hit != 'true'
156+
run: composer require "laravel/framework:${{ matrix.laravel }}.*" --no-interaction --no-update
157+
158+
- name: Update dependencies
159+
if: steps.composer-cache.outputs.cache-hit != 'true'
160+
run: composer update --${{ matrix.stability }} --no-interaction
161+
162+
- name: Setup problem matchers for PHPUnit
163+
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
164+
83165
- name: Run Unit Tests
84166
run: php ./vendor/bin/paratest --no-coverage --processes=4

0 commit comments

Comments
 (0)