Skip to content

Commit 6cd283b

Browse files
authored
Merge branch 'laravel:12.x' into html-boolean-attributes
2 parents 43e516a + 24f0f28 commit 6cd283b

File tree

149 files changed

+3376
-431
lines changed

Some content is hidden

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

149 files changed

+3376
-431
lines changed

.github/workflows/databases.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,55 @@ jobs:
147147
env:
148148
DB_CONNECTION: mariadb
149149

150+
pgsql_18:
151+
runs-on: ubuntu-24.04
152+
timeout-minutes: 5
153+
154+
services:
155+
postgresql:
156+
image: postgres:18
157+
env:
158+
POSTGRES_DB: laravel
159+
POSTGRES_USER: forge
160+
POSTGRES_PASSWORD: password
161+
ports:
162+
- 5432:5432
163+
options: --health-cmd=pg_isready --health-interval=10s --health-timeout=5s --health-retries=3
164+
165+
strategy:
166+
fail-fast: true
167+
168+
name: PostgreSQL 18
169+
170+
steps:
171+
- name: Checkout code
172+
uses: actions/checkout@v4
173+
174+
- name: Setup PHP
175+
uses: shivammathur/setup-php@v2
176+
with:
177+
php-version: 8.3
178+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_pgsql, :php-psr
179+
tools: composer:v2
180+
coverage: none
181+
182+
- name: Set Framework version
183+
run: composer config version "12.x-dev"
184+
185+
- name: Install dependencies
186+
uses: nick-fields/retry@v3
187+
with:
188+
timeout_minutes: 5
189+
max_attempts: 5
190+
command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
191+
192+
- name: Execute tests
193+
run: vendor/bin/phpunit tests/Integration/Database
194+
env:
195+
DB_CONNECTION: pgsql
196+
DB_USERNAME: forge
197+
DB_PASSWORD: password
198+
150199
pgsql_14:
151200
runs-on: ubuntu-24.04
152201
timeout-minutes: 5

.github/workflows/queues.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@ jobs:
161161

162162
- name: Create Redis Cluster
163163
run: |
164-
sudo apt-get install -y redis-server
164+
sudo apt update
165+
sudo apt-get install -y --fix-missing redis-server
165166
sudo service redis-server stop
166167
redis-server --daemonize yes --port 7000 --appendonly yes --cluster-enabled yes --cluster-config-file nodes-7000.conf
167168
redis-server --daemonize yes --port 7001 --appendonly yes --cluster-enabled yes --cluster-config-file nodes-7001.conf

.github/workflows/tests.yml

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,23 @@ jobs:
4040
fail-fast: true
4141
matrix:
4242
php: [8.2, 8.3, 8.4]
43-
phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.3.0']
43+
phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.4.0']
4444
stability: [prefer-lowest, prefer-stable]
4545
exclude:
4646
- php: 8.2
4747
phpunit: '12.0.0'
4848
- php: 8.2
49-
phpunit: '12.3.0'
49+
phpunit: '12.4.0'
5050
include:
5151
- php: 8.3
5252
phpunit: '12.1.0'
5353
stability: prefer-stable
5454
- php: 8.3
5555
phpunit: '12.2.0'
5656
stability: prefer-stable
57+
- php: 8.3
58+
phpunit: '12.3.0'
59+
stability: prefer-stable
5760

5861
name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }}
5962

@@ -76,15 +79,6 @@ jobs:
7679
- name: Set Framework version
7780
run: composer config version "12.x-dev"
7881

79-
- name: Set Minimum dependencies for `prefer-lowest`
80-
uses: nick-fields/retry@v3
81-
with:
82-
timeout_minutes: 5
83-
max_attempts: 5
84-
command: composer require opis/string:2.0.1 --no-interaction --no-update
85-
shell: bash
86-
if: matrix.stability == 'prefer-lowest'
87-
8882
- name: Install dependencies
8983
uses: nick-fields/retry@v3
9084
with:
@@ -117,20 +111,23 @@ jobs:
117111
fail-fast: true
118112
matrix:
119113
php: [8.2, 8.3, 8.4]
120-
phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.3.0']
114+
phpunit: ['10.5.35', '11.5.3', '12.0.0', '12.4.0']
121115
stability: [prefer-lowest, prefer-stable]
122116
exclude:
123117
- php: 8.2
124118
phpunit: '12.0.0'
125119
- php: 8.2
126-
phpunit: '12.3.0'
120+
phpunit: '12.4.0'
127121
include:
128122
- php: 8.3
129123
phpunit: '12.1.0'
130124
stability: prefer-stable
131125
- php: 8.3
132126
phpunit: '12.2.0'
133127
stability: prefer-stable
128+
- php: 8.3
129+
phpunit: '12.3.0'
130+
stability: prefer-stable
134131

135132
name: PHP ${{ matrix.php }} - PHPUnit ${{ matrix.phpunit }} - ${{ matrix.stability }} - Windows
136133

@@ -154,15 +151,6 @@ jobs:
154151
- name: Set Framework version
155152
run: composer config version "12.x-dev"
156153

157-
- name: Set Minimum dependencies for `prefer-lowest`
158-
uses: nick-fields/retry@v3
159-
with:
160-
timeout_minutes: 5
161-
max_attempts: 5
162-
command: composer require opis/string:2.0.1 --no-interaction --no-update
163-
shell: bash
164-
if: matrix.stability == 'prefer-lowest'
165-
166154
- name: Install dependencies
167155
uses: nick-fields/retry@v3
168156
with:

.github/workflows/update-assets.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,15 @@ name: 'update assets'
33
on:
44
push:
55
branches:
6-
- '12.x'
6+
- master
7+
- '*.x'
78
paths:
8-
- '/src/Illuminate/Foundation/resources/exceptions/renderer/package-lock.json'
9-
workflow_dispatch:
9+
- 'src/Illuminate/Foundation/resources/exceptions/renderer/**'
10+
- '!src/Illuminate/Foundation/resources/exceptions/renderer/dist/**'
11+
pull_request:
12+
paths:
13+
- 'src/Illuminate/Foundation/resources/exceptions/renderer/**'
14+
- '!src/Illuminate/Foundation/resources/exceptions/renderer/dist/**'
1015

1116
permissions:
1217
contents: write

0 commit comments

Comments
 (0)