Skip to content

Commit e66bb31

Browse files
lrljoelrljoe
authored
Merge pull request rappasoft#1855 from rappasoft/development
Development to Develop
2 parents 98a5ef3 + b0cd682 commit e66bb31

File tree

287 files changed

+8882
-4997
lines changed

Some content is hidden

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

287 files changed

+8882
-4997
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,4 @@
3737
/resources/js/partials/filter-date-range.js export-ignore
3838
/resources/js/partials/filter-number-range.js export-ignore
3939
/resources/js/partials/reorder.js export-ignore
40+
/minifyJs export-ignore

‎.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: 15 additions & 5 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') }}
@@ -74,7 +84,7 @@ jobs:
7484
run: composer update --${{ matrix.stability }} --no-interaction
7585

7686
- name: Install PHPStan
77-
run: composer require nunomaduro/larastan:^2.0 --dev --no-interaction
87+
run: composer require larastan/larastan:^2.0 --dev --no-interaction
7888

7989
- name: Run PHPStan Tests
8090
run: ./vendor/bin/phpstan analyse

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
name: run-tests-pcov-pull
22

33
on:
4+
push:
5+
branches:
6+
- 'develop'
7+
- 'development'
8+
- 'master'
49
pull_request:
510
branches:
611
- 'develop'
12+
- 'development'
713
- 'master'
814

915
jobs:
@@ -17,14 +23,14 @@ jobs:
1723
laravel: [10]
1824
stability: [prefer-dist]
1925

20-
name: PCOV-PULL - ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
26+
name: PCOV - ${{ matrix.os }} - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }}
2127
env:
2228
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-withpcov
2329
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pcov,pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo
2430

2531
steps:
2632
- name: Checkout code
27-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4
2834

2935
- name: Setup cache environment
3036
id: extcache
@@ -46,7 +52,7 @@ jobs:
4652
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4753

4854
- name: Cache extensions
49-
uses: actions/cache@v3
55+
uses: actions/cache@v4
5056
with:
5157
path: ${{ steps.extcache.outputs.dir }}
5258
key: ${{ steps.extcache.outputs.key }}
@@ -60,7 +66,7 @@ jobs:
6066
run: |
6167
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
6268
63-
- uses: actions/cache@v3
69+
- uses: actions/cache@v4
6470
with:
6571
path: ${{ steps.composer-cache.outputs.dir }}
6672
key: ${{ runner.os }}-PCOV-PULL-PHP${{ matrix.php }}-Laravel${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
@@ -85,7 +91,7 @@ jobs:
8591
run: php ./vendor/bin/paratest --cache-directory=".phpunit.cache/code-coverage" --strict-coverage --coverage-clover ./coverage.xml --processes=4
8692

8793
- name: Upload coverage reports to Codecov
88-
uses: codecov/codecov-action@v3
94+
uses: codecov/codecov-action@v4
8995
env:
9096
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
9197
with:

‎.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)