Skip to content

Commit d438d33

Browse files
adamzieladamziel
committed
Merge branch 'trunk' into blueprint-editor
2 parents 4a4bf00 + f4cee2d commit d438d33

File tree

91 files changed

+4928
-2799
lines changed

Some content is hidden

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

91 files changed

+4928
-2799
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 25 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -31,24 +31,20 @@ jobs:
3131
fail-fast: false
3232
matrix:
3333
include:
34-
- name: test-unit-asyncify (1/9)
34+
- name: test-unit-asyncify (1/7)
3535
target: test
36-
- name: test-unit-asyncify (2/9)
37-
target: test-asyncify
38-
- name: test-unit-asyncify (3/9)
39-
target: test-php-file-get-contents-asyncify
40-
- name: test-unit-asyncify (4/9)
41-
target: test-php-fopen-asyncify
42-
- name: test-unit-asyncify (5/9)
43-
target: test-php-fsockopen-asyncify
44-
- name: test-unit-asyncify (6/9)
45-
target: test-php-gethostbyname-asyncify
46-
- name: test-unit-asyncify (7/9)
47-
target: test-php-mysqli-asyncify
48-
- name: test-unit-asyncify (8/9)
49-
target: test-php-sqlite3-asyncify
50-
- name: test-unit-asyncify (9/9)
51-
target: test-php-file-locking-asyncify
36+
- name: test-unit-asyncify (2/7)
37+
target: test-group-1-asyncify
38+
- name: test-unit-asyncify (3/7)
39+
target: test-group-2-asyncify
40+
- name: test-unit-asyncify (4/7)
41+
target: test-group-3-asyncify
42+
- name: test-unit-asyncify (5/7)
43+
target: test-group-4-asyncify
44+
- name: test-unit-asyncify (6/7)
45+
target: test-group-5-asyncify
46+
- name: test-unit-asyncify (7/7)
47+
target: test-group-6-asyncify
5248
name: ${{ matrix.name }}
5349
services:
5450
mysql:
@@ -83,22 +79,18 @@ jobs:
8379
fail-fast: false
8480
matrix:
8581
include:
86-
- name: test-unit-jspi (1/8)
87-
target: test-jspi
88-
- name: test-unit-jspi (2/8)
89-
target: test-php-file-get-contents-jspi
90-
- name: test-unit-jspi (3/8)
91-
target: test-php-fopen-jspi
92-
- name: test-unit-jspi (4/8)
93-
target: test-php-fsockopen-jspi
94-
- name: test-unit-jspi (5/8)
95-
target: test-php-gethostbyname-jspi
96-
- name: test-unit-jspi (6/8)
97-
target: test-php-mysqli-jspi
98-
- name: test-unit-jspi (7/8)
99-
target: test-php-sqlite3-jspi
100-
- name: test-unit-jspi (8/8)
101-
target: test-php-file-locking-jspi
82+
- name: test-unit-jspi (1/6)
83+
target: test-group-1-jspi
84+
- name: test-unit-jspi (2/6)
85+
target: test-group-2-jspi
86+
- name: test-unit-jspi (3/6)
87+
target: test-group-3-jspi
88+
- name: test-unit-jspi (4/6)
89+
target: test-group-4-jspi
90+
- name: test-unit-jspi (5/6)
91+
target: test-group-5-jspi
92+
- name: test-unit-jspi (6/6)
93+
target: test-group-6-jspi
10294
name: ${{ matrix.name }}
10395
services:
10496
mysql:

‎packages/php-wasm/node/project.json‎

Lines changed: 79 additions & 133 deletions
Original file line numberDiff line numberDiff line change
@@ -146,219 +146,165 @@
146146
"executor": "@wp-playground/nx-extensions:package-for-self-hosting",
147147
"dependsOn": ["build"]
148148
},
149-
"test-asyncify": {
149+
"test-group-1-asyncify": {
150150
"executor": "@nx/vite:test",
151151
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
152152
"options": {
153153
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
154-
"testFiles": [
155-
"unzip-file.spec.ts",
156-
"php-crash.spec.ts",
157-
"php-ini.spec.ts",
158-
"php-memory.spec.ts",
159-
"php-process-manager.spec.ts",
160-
"php-vars.spec.ts",
161-
"rotate-php-runtime.spec.ts",
162-
"symlinks.spec.ts",
163-
"write-files.spec.ts",
164-
"php-networking.spec.ts",
165-
"php-dynamic-loading.spec.ts",
166-
"php-request-handler.spec.ts",
167-
"php.spec.ts",
168-
"php-worker.spec.ts",
169-
"php-soap.spec.ts",
170-
"php-image-extensions.spec.ts",
171-
"php-imagick.spec.ts"
172-
]
173-
}
174-
},
175-
"test-jspi": {
176-
"executor": "@nx/vite:test",
177-
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
178-
"options": {
179-
"configFile": "packages/php-wasm/node/vite.jspi.config.ts",
180-
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
181-
"testFiles": [
182-
"unzip-file.spec.ts",
183-
"php-crash.spec.ts",
184-
"php-ini.spec.ts",
185-
"php-memory.spec.ts",
186-
"php-process-manager.spec.ts",
187-
"php-vars.spec.ts",
188-
"rotate-php-runtime.spec.ts",
189-
"symlinks.spec.ts",
190-
"write-files.spec.ts",
191-
"php-networking.spec.ts",
192-
"php-dynamic-loading.spec.ts",
193-
"php-request-handler.spec.ts",
194-
"php.spec.ts",
195-
"php-worker.spec.ts",
196-
"php-soap.spec.ts",
197-
"php-image-extensions.spec.ts",
198-
"php-imagick.spec.ts"
199-
]
200-
}
201-
},
202-
"test-php-file-get-contents-asyncify": {
203-
"executor": "@nx/vite:test",
204-
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
205-
"options": {
206-
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
207-
"testFiles": ["php-file-get-contents.spec.ts"]
208-
}
209-
},
210-
"test-php-file-get-contents-jspi": {
211-
"executor": "@nx/vite:test",
212-
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
213-
"options": {
214-
"configFile": "packages/php-wasm/node/vite.jspi.config.ts",
215-
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
216-
"testFiles": ["php-file-get-contents.spec.ts"]
217-
}
218-
},
219-
"test-php-fopen-asyncify": {
220-
"executor": "@nx/vite:test",
221-
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
222-
"options": {
223-
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
224-
"testFiles": ["php-fopen.spec.ts"]
225-
}
226-
},
227-
"test-php-fopen-jspi": {
228-
"executor": "@nx/vite:test",
229-
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
230-
"options": {
231-
"configFile": "packages/php-wasm/node/vite.jspi.config.ts",
232-
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
233-
"testFiles": ["php-fopen.spec.ts"]
234-
}
235-
},
236-
"test-php-fsockopen-asyncify": {
237-
"executor": "@nx/vite:test",
238-
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
239-
"options": {
240-
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
241-
"testFiles": ["php-fsockopen.spec.ts"]
154+
"testFiles": ["php-part-1.spec.ts"]
242155
}
243156
},
244-
"test-php-fsockopen-jspi": {
157+
"test-group-1-jspi": {
245158
"executor": "@nx/vite:test",
246159
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
247160
"options": {
248161
"configFile": "packages/php-wasm/node/vite.jspi.config.ts",
249162
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
250-
"testFiles": ["php-fsockopen.spec.ts"]
163+
"testFiles": ["php-part-1.spec.ts"]
251164
}
252165
},
253-
"test-php-gethostbyname-asyncify": {
166+
"test-group-2-asyncify": {
254167
"executor": "@nx/vite:test",
255168
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
256169
"options": {
257170
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
258-
"testFiles": ["php-gethostbyname.spec.ts"]
171+
"testFiles": [
172+
"php-file-locking.spec.ts",
173+
"file-lock-manager-for-node.spec.ts",
174+
"php-imagick.spec.ts",
175+
"php-soap.spec.ts",
176+
"php-image-extensions.spec.ts",
177+
"php-fsockopen.spec.ts"
178+
]
259179
}
260180
},
261-
"test-php-gethostbyname-jspi": {
181+
"test-group-2-jspi": {
262182
"executor": "@nx/vite:test",
263183
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
264184
"options": {
265185
"configFile": "packages/php-wasm/node/vite.jspi.config.ts",
266186
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
267-
"testFiles": ["php-gethostbyname.spec.ts"]
187+
"testFiles": [
188+
"php-file-locking.spec.ts",
189+
"file-lock-manager-for-node.spec.ts",
190+
"php-imagick.spec.ts",
191+
"php-soap.spec.ts",
192+
"php-image-extensions.spec.ts",
193+
"php-fsockopen.spec.ts"
194+
]
268195
}
269196
},
270-
"test-php-mysqli-asyncify": {
197+
"test-group-3-asyncify": {
271198
"executor": "@nx/vite:test",
272199
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
273200
"options": {
274201
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
275-
"testFiles": ["php-mysqli.spec.ts"]
202+
"testFiles": [
203+
"php-request-handler.spec.ts",
204+
"mount.spec.ts",
205+
"rotate-php-runtime.spec.ts",
206+
"php-fopen.spec.ts",
207+
"php-file-get-contents.spec.ts",
208+
"php-gethostbyname.spec.ts"
209+
]
276210
}
277211
},
278-
"test-php-mysqli-jspi": {
212+
"test-group-3-jspi": {
279213
"executor": "@nx/vite:test",
280214
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
281215
"options": {
282216
"configFile": "packages/php-wasm/node/vite.jspi.config.ts",
283217
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
284-
"testFiles": ["php-mysqli.spec.ts"]
218+
"testFiles": [
219+
"php-request-handler.spec.ts",
220+
"mount.spec.ts",
221+
"rotate-php-runtime.spec.ts",
222+
"php-fopen.spec.ts",
223+
"php-file-get-contents.spec.ts",
224+
"php-gethostbyname.spec.ts"
225+
]
285226
}
286227
},
287-
"test-php-sqlite3-asyncify": {
228+
"test-group-4-asyncify": {
288229
"executor": "@nx/vite:test",
289230
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
290231
"options": {
291232
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
292-
"testFiles": ["php-sqlite3.spec.ts"]
233+
"testFiles": [
234+
"symlinks.spec.ts",
235+
"php-sqlite3.spec.ts",
236+
"php-networking.spec.ts",
237+
"php-dynamic-loading.spec.ts",
238+
"php-mysqli.spec.ts",
239+
"php-process-manager.spec.ts"
240+
]
293241
}
294242
},
295-
"test-php-sqlite3-jspi": {
243+
"test-group-4-jspi": {
296244
"executor": "@nx/vite:test",
297245
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
298246
"options": {
299247
"configFile": "packages/php-wasm/node/vite.jspi.config.ts",
300248
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
301-
"testFiles": ["php-sqlite3.spec.ts"]
249+
"testFiles": [
250+
"symlinks.spec.ts",
251+
"php-sqlite3.spec.ts",
252+
"php-networking.spec.ts",
253+
"php-dynamic-loading.spec.ts",
254+
"php-mysqli.spec.ts",
255+
"php-process-manager.spec.ts"
256+
]
302257
}
303258
},
304-
"test-php-file-locking-asyncify": {
259+
"test-group-5-asyncify": {
305260
"executor": "@nx/vite:test",
306261
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
307262
"options": {
308263
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
309264
"testFiles": [
310-
"php-file-locking.spec.ts",
311-
"file-lock-manager-for-node.spec.ts"
265+
"php-crash.spec.ts",
266+
"php-ini.spec.ts",
267+
"write-files.spec.ts",
268+
"php-worker.spec.ts",
269+
"unzip-file.spec.ts",
270+
"php-vars.spec.ts",
271+
"php-memory.spec.ts",
272+
"php-opcache.spec.ts"
312273
]
313274
}
314275
},
315-
"test-php-file-locking-jspi": {
276+
"test-group-5-jspi": {
316277
"executor": "@nx/vite:test",
317278
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
318279
"options": {
319280
"configFile": "packages/php-wasm/node/vite.jspi.config.ts",
320281
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
321282
"testFiles": [
322-
"php-file-locking.spec.ts",
323-
"file-lock-manager-for-node.spec.ts"
283+
"php-crash.spec.ts",
284+
"php-ini.spec.ts",
285+
"write-files.spec.ts",
286+
"php-worker.spec.ts",
287+
"unzip-file.spec.ts",
288+
"php-vars.spec.ts",
289+
"php-memory.spec.ts"
324290
]
325291
}
326292
},
327-
"test-php-image-extensions-asyncify": {
293+
"test-group-6-asyncify": {
328294
"executor": "@nx/vite:test",
329295
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
330296
"options": {
331297
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
332-
"testFiles": ["php-image-extensions.spec.ts"]
298+
"testFiles": ["php-part-2.spec.ts"]
333299
}
334300
},
335-
"test-php-image-extensions-jspi": {
301+
"test-group-6-jspi": {
336302
"executor": "@nx/vite:test",
337303
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
338304
"options": {
339305
"configFile": "packages/php-wasm/node/vite.jspi.config.ts",
340306
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
341-
"testFiles": ["php-image-extensions.spec.ts"]
342-
}
343-
},
344-
"test-php-asyncify-all": {
345-
"executor": "nx:noop",
346-
"dependsOn": [
347-
"test-php-file-get-contents-asyncify",
348-
"test-php-fopen-asyncify",
349-
"test-php-fsockopen-asyncify",
350-
"test-php-gethostbyname-asyncify",
351-
"test-php-mysqli-asyncify",
352-
"test-php-sqlite3-asyncify",
353-
"test-php-image-extensions-asyncify"
354-
]
355-
},
356-
"test-opcache": {
357-
"executor": "@nx/vite:test",
358-
"outputs": ["{workspaceRoot}/coverage/packages/php-wasm/node"],
359-
"options": {
360-
"reportsDirectory": "../../../coverage/packages/php-wasm/node",
361-
"testFiles": ["php-opcache.spec.ts"]
307+
"testFiles": ["php-part-2.spec.ts"]
362308
}
363309
},
364310
"lint": {

0 commit comments

Comments
 (0)