Skip to content

Commit a474f15

Browse files
crynobonecrynobone
committed
Merge remote-tracking branch 'upstream/develop' into develop
Signed-off-by: Mior Muhammad Zaki <[email protected]>
2 parents 9510554 + 48e9a0b commit a474f15

Some content is hidden

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

68 files changed

+2606
-580
lines changed

‎.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@
1313
.gitignore export-ignore
1414
.styleci.yml export-ignore
1515
CHANGELOG.md export-ignore
16+
phpstan.neon.dist export-ignore
1617
phpunit.xml.dist export-ignore
18+
phpunit9.xml.dist export-ignore
19+
testbench.yaml export-ignore
1720
UPGRADE.md export-ignore

‎.github/ISSUE_TEMPLATE/1_Bug_report.md

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.github/ISSUE_TEMPLATE/1_Bug_report.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Bug Report
2+
description: "Report a general library issue."
3+
body:
4+
- type: markdown
5+
attributes:
6+
value: "Before submitting your report, [please ensure your Laravel version is still supported](https://laravel.com/docs/releases#support-policy)."
7+
- type: input
8+
attributes:
9+
label: Dusk Version
10+
description: Provide the Dusk version that you are using.
11+
placeholder: 7.1.0
12+
validations:
13+
required: true
14+
- type: input
15+
attributes:
16+
label: Laravel Version
17+
description: Provide the Laravel version that you are using.
18+
placeholder: 10.4.1
19+
validations:
20+
required: true
21+
- type: input
22+
attributes:
23+
label: PHP Version
24+
description: Provide the PHP version that you are using.
25+
placeholder: 8.1.4
26+
validations:
27+
required: true
28+
- type: input
29+
attributes:
30+
label: PHPUnit Version
31+
description: Provide the PHPUnit version that you are using.
32+
placeholder: 10.0.1
33+
validations:
34+
required: true
35+
- type: input
36+
attributes:
37+
label: Database Driver & Version
38+
description: If applicable, provide the database driver and version you are using.
39+
placeholder: "MySQL 8.0.31 for macOS 13.0 on arm64 (Homebrew)"
40+
validations:
41+
required: false
42+
- type: textarea
43+
attributes:
44+
label: Description
45+
description: Provide a detailed description of the issue you are facing.
46+
validations:
47+
required: true
48+
- type: textarea
49+
attributes:
50+
label: Steps To Reproduce
51+
description: Provide detailed steps to reproduce your issue. If necessary, please provide a GitHub repository to demonstrate your issue using `laravel new bug-report --github="--public"`.
52+
validations:
53+
required: true
54+

‎.github/workflows/browser-tests.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: browser-tests
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- '*.x'
8+
pull_request:
9+
schedule:
10+
- cron: '0 0 * * *'
11+
12+
jobs:
13+
browser-tests:
14+
runs-on: ubuntu-22.04
15+
16+
strategy:
17+
fail-fast: true
18+
matrix:
19+
php: ['8.0', 8.1, 8.2, 8.3]
20+
laravel: [9, 10]
21+
phpunit: [9, 10]
22+
exclude:
23+
- php: '8.0'
24+
laravel: 10
25+
- php: '8.0'
26+
phpunit: 10
27+
- php: 8.3
28+
laravel: 9
29+
- laravel: 9
30+
phpunit: 10
31+
32+
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - PHPUnit ${{ matrix.phpunit }}
33+
34+
steps:
35+
- name: Checkout code
36+
uses: actions/checkout@v3
37+
38+
- name: Setup PHP
39+
uses: shivammathur/setup-php@v2
40+
with:
41+
php-version: ${{ matrix.php }}
42+
extensions: dom, curl, libxml, mbstring, zip
43+
ini-values: error_reporting=E_ALL
44+
tools: composer:v2
45+
coverage: none
46+
47+
- name: Install dependencies
48+
run: |
49+
composer require "illuminate/contracts:^${{ matrix.laravel }}" "phpunit/phpunit:^${{ matrix.phpunit }}" --dev --no-update
50+
composer update --prefer-dist --no-interaction --no-progress
51+
52+
- name: Upgrade Chrome Driver
53+
run: php vendor/bin/testbench dusk:chrome-driver --detect
54+
55+
- name: Start Chrome Driver
56+
run: ./vendor/laravel/dusk/bin/chromedriver-linux &
57+
58+
- name: Run Laravel Server
59+
run: php vendor/bin/testbench serve --no-reload &
60+
61+
- name: Execute tests
62+
if: matrix.phpunit == '9'
63+
run: php vendor/bin/phpunit --no-coverage --no-configuration --dont-report-useless-tests --bootstrap vendor/autoload.php --color tests/Browser
64+
env:
65+
APP_URL: http://127.0.0.1:8000
66+
67+
- name: Execute tests
68+
run: php vendor/bin/phpunit -c phpunit.dusk.xml.dist
69+
if: matrix.phpunit != '9'
70+
env:
71+
APP_URL: http://127.0.0.1:8000

‎.github/workflows/issues.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: issues
2+
3+
on:
4+
issues:
5+
types: [labeled]
6+
7+
permissions:
8+
issues: write
9+
10+
jobs:
11+
help-wanted:
12+
uses: laravel/.github/.github/workflows/issues.yml@main

‎.github/workflows/pull-requests.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: pull requests
2+
3+
on:
4+
pull_request_target:
5+
types: [opened]
6+
7+
permissions:
8+
pull-requests: write
9+
10+
jobs:
11+
uneditable:
12+
uses: laravel/.github/.github/workflows/pull-requests.yml@main

‎.github/workflows/static-analysis.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: static analysis
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- '*.x'
8+
pull_request:
9+
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
tests:
15+
runs-on: ubuntu-22.04
16+
17+
strategy:
18+
fail-fast: true
19+
20+
name: Static Analysis
21+
22+
steps:
23+
- name: Checkout code
24+
uses: actions/checkout@v3
25+
26+
- name: Setup PHP
27+
uses: shivammathur/setup-php@v2
28+
with:
29+
php-version: 8.2
30+
tools: composer:v2
31+
coverage: none
32+
33+
- name: Install dependencies
34+
uses: nick-fields/retry@v2
35+
with:
36+
timeout_minutes: 5
37+
max_attempts: 5
38+
command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
39+
40+
- name: Execute type checking
41+
run: vendor/bin/phpstan

‎.github/workflows/tests.yml

Lines changed: 79 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,21 @@ name: tests
22

33
on:
44
push:
5+
branches:
6+
- master
7+
- '*.x'
58
pull_request:
69
schedule:
710
- cron: '0 0 * * *'
811

912
jobs:
1013
tests:
11-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-22.04
1215

1316
strategy:
1417
fail-fast: true
1518
matrix:
19+
<<<<<<< HEAD
1620
php: [7.3, 7.4, 8.0]
1721
laravel: [^8.0, ^9.0]
1822
phpunit: [^9.0, ^10.0]
@@ -21,25 +25,96 @@ jobs:
2125
phpunit: ^10.0
2226
- php: 7.3
2327
laravel: ^9.0
28+
=======
29+
php: ['8.0', 8.1, 8.2, 8.3]
30+
laravel: [9, 10]
31+
phpunit: [9, 10]
32+
exclude:
33+
- php: '8.0'
34+
laravel: 10
35+
- php: '8.0'
36+
phpunit: 10
37+
- php: 8.3
38+
laravel: 9
39+
- laravel: 9
40+
phpunit: 10
41+
>>>>>>> upstream/develop
2442

2543
name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} - PHPUnit ${{ matrix.phpunit }}
2644

2745
steps:
2846
- name: Checkout code
29-
uses: actions/checkout@v2
47+
uses: actions/checkout@v3
3048

3149
- name: Setup PHP
3250
uses: shivammathur/setup-php@v2
3351
with:
3452
php-version: ${{ matrix.php }}
3553
extensions: dom, curl, libxml, mbstring, zip
54+
ini-values: error_reporting=E_ALL
3655
tools: composer:v2
3756
coverage: none
3857

3958
- name: Install dependencies
4059
run: |
41-
composer require "illuminate/contracts:${{ matrix.laravel }}" "phpunit/phpunit:${{ matrix.phpunit }}" --dev --no-update
60+
composer require "illuminate/contracts:^${{ matrix.laravel }}" "phpunit/phpunit:^${{ matrix.phpunit }}" --dev --no-update
4261
composer update --prefer-dist --no-interaction --no-progress
4362
4463
- name: Execute tests
45-
run: vendor/bin/phpunit --verbose
64+
if: matrix.phpunit == '9'
65+
run: vendor/bin/phpunit -c phpunit9.xml.dist --verbose
66+
67+
- name: Execute tests
68+
if: matrix.phpunit != '9'
69+
run: vendor/bin/phpunit -c phpunit.xml.dist
70+
71+
stub-tests:
72+
runs-on: ubuntu-22.04
73+
74+
strategy:
75+
fail-fast: true
76+
matrix:
77+
php: [8.2]
78+
laravel: [9, 10]
79+
80+
name: Test Stubs PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }}
81+
82+
steps:
83+
- name: Setup PHP
84+
uses: shivammathur/setup-php@v2
85+
with:
86+
php-version: ${{ matrix.php }}
87+
extensions: dom, curl, libxml, mbstring, zip
88+
ini-values: error_reporting=E_ALL
89+
tools: composer:v2
90+
coverage: none
91+
92+
- name: Setup Laravel
93+
run: |
94+
composer create-project laravel/laravel:^${{ matrix.laravel }} .
95+
composer require laravel/dusk:@dev --no-interaction --no-update
96+
composer config repositories.dusk '{"type": "path", "url": "dusk"}' --file composer.json
97+
98+
- name: Checkout code
99+
uses: actions/checkout@v3
100+
with:
101+
path: 'dusk'
102+
103+
- name: Install Dusk
104+
run: |
105+
composer update "laravel/dusk" --prefer-dist --no-interaction --no-progress -W
106+
php artisan dusk:install
107+
108+
- name: Update Chrome Driver
109+
run: php artisan dusk:chrome-driver --detect
110+
111+
- name: Start Chrome Driver
112+
run: ./vendor/laravel/dusk/bin/chromedriver-linux &
113+
114+
- name: Run Laravel Server
115+
run: php artisan serve --no-reload &
116+
117+
- name: Run Dusk Tests
118+
run: php artisan dusk --without-tty
119+
env:
120+
APP_URL: http://127.0.0.1:8000

‎.github/workflows/update-changelog.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: update changelog
2+
3+
on:
4+
release:
5+
types: [released]
6+
7+
jobs:
8+
update:
9+
uses: laravel/.github/.github/workflows/update-changelog.yml@main

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/vendor
22
composer.lock
33
/phpunit.xml
4+
.phpunit.cache/*
45
.phpunit.result.cache

0 commit comments

Comments
 (0)