Skip to content

Commit 69086d4

Browse files
crynobonecrynobone
committed
Merge branch '12.x' into json-api-resource
2 parents ea1ea07 + a925110 commit 69086d4

File tree

169 files changed

+3140
-533
lines changed

Some content is hidden

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

169 files changed

+3140
-533
lines changed

‎.github/workflows/queues.yml‎

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -82,100 +82,6 @@ jobs:
8282
DB_CONNECTION: sqlite
8383
QUEUE_CONNECTION: database
8484

85-
redis:
86-
runs-on: ubuntu-24.04
87-
88-
services:
89-
redis:
90-
image: redis:7.0
91-
ports:
92-
- 6379:6379
93-
options: --entrypoint redis-server
94-
95-
strategy:
96-
fail-fast: true
97-
matrix:
98-
client: ['phpredis', 'predis']
99-
100-
name: Redis (${{ matrix.client}}) Driver
101-
102-
steps:
103-
- name: Checkout code
104-
uses: actions/checkout@v4
105-
106-
- name: Setup PHP
107-
uses: shivammathur/setup-php@v2
108-
with:
109-
php-version: 8.2
110-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr
111-
tools: composer:v2
112-
coverage: none
113-
114-
- name: Set Framework version
115-
run: composer config version "12.x-dev"
116-
117-
- name: Install dependencies
118-
uses: nick-fields/retry@v3
119-
with:
120-
timeout_minutes: 5
121-
max_attempts: 5
122-
command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
123-
124-
- name: Execute tests
125-
run: vendor/bin/phpunit tests/Integration/Queue
126-
env:
127-
REDIS_CLIENT: ${{ matrix.client }}
128-
QUEUE_CONNECTION: redis
129-
130-
redis-cluster:
131-
runs-on: ubuntu-24.04
132-
133-
strategy:
134-
fail-fast: true
135-
matrix:
136-
client: ['phpredis', 'predis']
137-
138-
name: Redis Cluster (${{ matrix.client}}) Driver
139-
140-
steps:
141-
- name: Checkout code
142-
uses: actions/checkout@v4
143-
144-
- name: Setup PHP
145-
uses: shivammathur/setup-php@v2
146-
with:
147-
php-version: 8.2
148-
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr
149-
tools: composer:v2
150-
coverage: none
151-
152-
- name: Set Framework version
153-
run: composer config version "12.x-dev"
154-
155-
- name: Install dependencies
156-
uses: nick-fields/retry@v3
157-
with:
158-
timeout_minutes: 5
159-
max_attempts: 5
160-
command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
161-
162-
- name: Create Redis Cluster
163-
run: |
164-
sudo apt update
165-
sudo apt-get install -y --fix-missing redis-server
166-
sudo service redis-server stop
167-
redis-server --daemonize yes --port 7000 --appendonly yes --cluster-enabled yes --cluster-config-file nodes-7000.conf
168-
redis-server --daemonize yes --port 7001 --appendonly yes --cluster-enabled yes --cluster-config-file nodes-7001.conf
169-
redis-server --daemonize yes --port 7002 --appendonly yes --cluster-enabled yes --cluster-config-file nodes-7002.conf
170-
redis-cli --cluster create 127.0.0.1:7000 127.0.0.1:7001 127.0.0.1:7002 --cluster-replicas 0 --cluster-yes
171-
172-
- name: Execute tests
173-
run: vendor/bin/phpunit tests/Integration/Queue
174-
env:
175-
REDIS_CLIENT: ${{ matrix.client }}
176-
REDIS_CLUSTER_HOSTS_AND_PORTS: 127.0.0.1:7000,127.0.0.1:7001,127.0.0.1:7002
177-
REDIS_QUEUE: '{default}'
178-
17985
beanstalkd:
18086
runs-on: ubuntu-24.04
18187

‎.github/workflows/redis.yml‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
name: Redis and Redis Cluster
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
- '*.x'
8+
pull_request:
9+
10+
jobs:
11+
redis:
12+
runs-on: ubuntu-24.04
13+
14+
services:
15+
redis:
16+
image: redis:7.0
17+
ports:
18+
- 6379:6379
19+
options: --entrypoint redis-server
20+
21+
strategy:
22+
fail-fast: true
23+
matrix:
24+
client: ['phpredis', 'predis']
25+
26+
name: Redis (${{ matrix.client}}) Driver
27+
28+
steps:
29+
- name: Checkout code
30+
uses: actions/checkout@v4
31+
32+
- name: Setup PHP
33+
uses: shivammathur/setup-php@v2
34+
with:
35+
php-version: 8.2
36+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr
37+
tools: composer:v2
38+
coverage: none
39+
40+
- name: Set Framework version
41+
run: composer config version "12.x-dev"
42+
43+
- name: Install dependencies
44+
uses: nick-fields/retry@v3
45+
with:
46+
timeout_minutes: 5
47+
max_attempts: 5
48+
command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
49+
50+
- name: Execute Cache tests
51+
run: vendor/bin/phpunit tests/Integration/Cache
52+
env:
53+
CACHE_STORE: redis
54+
REDIS_CACHE_CONNECTION: cache
55+
REDIS_CACHE_LOCK_CONNECTION: cache
56+
REDIS_CLIENT: ${{ matrix.client }}
57+
58+
- name: Execute Queue tests
59+
run: vendor/bin/phpunit tests/Integration/Queue
60+
env:
61+
REDIS_CLIENT: ${{ matrix.client }}
62+
QUEUE_CONNECTION: redis
63+
64+
redis-cluster:
65+
runs-on: ubuntu-24.04
66+
67+
strategy:
68+
fail-fast: true
69+
matrix:
70+
client: ['phpredis', 'predis']
71+
72+
name: Redis Cluster (${{ matrix.client}}) Driver
73+
74+
steps:
75+
- name: Checkout code
76+
uses: actions/checkout@v4
77+
78+
- name: Setup PHP
79+
uses: shivammathur/setup-php@v2
80+
with:
81+
php-version: 8.2
82+
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, :php-psr
83+
tools: composer:v2
84+
coverage: none
85+
86+
- name: Set Framework version
87+
run: composer config version "12.x-dev"
88+
89+
- name: Install dependencies
90+
uses: nick-fields/retry@v3
91+
with:
92+
timeout_minutes: 5
93+
max_attempts: 5
94+
command: composer update --prefer-stable --prefer-dist --no-interaction --no-progress
95+
96+
- name: Create Redis Cluster
97+
run: |
98+
sudo apt update
99+
sudo apt-get install -y --fix-missing redis-server
100+
sudo service redis-server stop
101+
redis-server --daemonize yes --port 7000 --appendonly yes --cluster-enabled yes --cluster-config-file nodes-7000.conf
102+
redis-server --daemonize yes --port 7001 --appendonly yes --cluster-enabled yes --cluster-config-file nodes-7001.conf
103+
redis-server --daemonize yes --port 7002 --appendonly yes --cluster-enabled yes --cluster-config-file nodes-7002.conf
104+
redis-cli --cluster create 127.0.0.1:7000 127.0.0.1:7001 127.0.0.1:7002 --cluster-replicas 0 --cluster-yes
105+
106+
- name: Check Redis Cluster is ready
107+
uses: nick-fields/retry@v3
108+
with:
109+
timeout_seconds: 5
110+
max_attempts: 5
111+
retry_wait_seconds: 5
112+
retry_on: error
113+
command: |
114+
redis-cli -c -h 127.0.0.1 -p 7000 cluster info | grep "cluster_state:ok"
115+
redis-cli -c -h 127.0.0.1 -p 7001 cluster info | grep "cluster_state:ok"
116+
redis-cli -c -h 127.0.0.1 -p 7002 cluster info | grep "cluster_state:ok"
117+
118+
- name: Execute Cache tests
119+
run: vendor/bin/phpunit tests/Integration/Cache
120+
env:
121+
CACHE_STORE: redis
122+
REDIS_CACHE_CONNECTION: default
123+
REDIS_CACHE_LOCK_CONNECTION: default
124+
REDIS_CLIENT: ${{ matrix.client }}
125+
REDIS_CLUSTER_HOSTS_AND_PORTS: 127.0.0.1:7000,127.0.0.1:7001,127.0.0.1:7002
126+
127+
- name: Execute Queue Tests
128+
run: vendor/bin/phpunit tests/Integration/Queue
129+
env:
130+
REDIS_CLIENT: ${{ matrix.client }}
131+
REDIS_CLUSTER_HOSTS_AND_PORTS: 127.0.0.1:7000,127.0.0.1:7001,127.0.0.1:7002
132+
REDIS_QUEUE: '{default}'
133+
QUEUE_CONNECTION: redis
134+

‎.github/workflows/tests.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,18 @@ jobs:
4848
- php: 8.2
4949
phpunit: '12.4.0'
5050
include:
51+
- php: 8.5
52+
phpunit: '12.1.0'
53+
stability: prefer-stable
54+
- php: 8.5
55+
phpunit: '12.2.0'
56+
stability: prefer-stable
57+
- php: 8.5
58+
phpunit: '12.3.0'
59+
stability: prefer-stable
60+
- php: 8.5
61+
phpunit: '12.4.0'
62+
stability: prefer-stable
5163
- php: 8.3
5264
phpunit: '12.1.0'
5365
stability: prefer-stable
@@ -119,6 +131,18 @@ jobs:
119131
- php: 8.2
120132
phpunit: '12.4.0'
121133
include:
134+
- php: 8.5
135+
phpunit: '12.1.0'
136+
stability: prefer-stable
137+
- php: 8.5
138+
phpunit: '12.2.0'
139+
stability: prefer-stable
140+
- php: 8.5
141+
phpunit: '12.3.0'
142+
stability: prefer-stable
143+
- php: 8.5
144+
phpunit: '12.4.0'
145+
stability: prefer-stable
122146
- php: 8.3
123147
phpunit: '12.1.0'
124148
stability: prefer-stable

0 commit comments

Comments
 (0)