Skip to content

Commit 0b44ab2

Browse files
Merge pull request #189 from utopia-php/feat-sync-with-33-34
Feat sync with 33 34
2 parents 8bbe56a + 5ed7634 commit 0b44ab2

33 files changed

+2940
-593
lines changed

.github/workflows/bench.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ jobs:
1212

1313
- name: Run Linter
1414
run: |
15-
docker run --rm -v $PWD:/app composer sh -c \
15+
docker run --rm -v $PWD:/app composer:2.6 sh -c \
1616
"composer install --profile --ignore-platform-reqs && git config --global --add safe.directory /app && composer bench -- --progress=plain"

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212

1313
- name: Run CodeQL
1414
run: |
15-
docker run --rm -v $PWD:/app composer sh -c \
15+
docker run --rm -v $PWD:/app composer:2.8 sh -c \
1616
"composer install --profile --ignore-platform-reqs && composer check"
1717

.github/workflows/test.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,14 @@ jobs:
2424
- name: Wait for Server to be ready
2525
run: sleep 10
2626

27+
- name: Run unit Tests
28+
run: docker compose exec swoole vendor/bin/phpunit --configuration phpunit.xml --testsuite=unit
29+
2730
- name: Run FPM Tests
28-
run: docker compose exec fpm vendor/bin/phpunit --configuration phpunit.xml
31+
run: docker compose exec fpm vendor/bin/phpunit --configuration phpunit.xml --group=fpm
2932

3033
- name: Run Swoole Tests
31-
run: docker compose exec swoole vendor/bin/phpunit --configuration phpunit.xml
34+
run: docker compose exec swoole vendor/bin/phpunit --configuration phpunit.xml --group=swoole
3235

3336
- name: Run Swoole Corotuine Tests
34-
run: docker compose exec swoole-coroutine vendor/bin/phpunit --configuration phpunit.xml
37+
run: docker compose exec swoole-coroutine vendor/bin/phpunit --configuration phpunit.xml --group=swoole-coroutine

Dockerfile.fpm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM composer:2.0 AS step0
1+
FROM composer:2.8 AS step0
22

33

44
ARG TESTING=true
@@ -13,11 +13,11 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
1313
--no-plugins --no-scripts --prefer-dist \
1414
`if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
1515

16-
FROM php:8.0-cli-alpine as final
16+
FROM php:8.3-cli-alpine AS final
1717
LABEL maintainer="team@appwrite.io"
1818

1919
ENV DEBIAN_FRONTEND=noninteractive \
20-
PHP_VERSION=8
20+
PHP_VERSION=82
2121

2222
RUN \
2323
apk add --no-cache --virtual .deps \

Dockerfile.swoole

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM composer:2.0 AS step0
1+
FROM composer:2.8 AS step0
22

33
ARG TESTING=true
44
ARG DEBUG=false
@@ -14,7 +14,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
1414
--no-plugins --no-scripts --prefer-dist \
1515
`if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
1616

17-
FROM appwrite/base:0.9.0 as final
17+
FROM appwrite/base:0.11.3 AS final
1818

1919
ARG TESTING=true
2020
ARG DEBUG=false

Dockerfile.swoole_coroutines

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM composer:2.0 AS step0
1+
FROM composer:2.8 AS step0
22

33
ARG TESTING=true
44
ARG DEBUG=false
@@ -14,7 +14,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
1414
--no-plugins --no-scripts --prefer-dist \
1515
`if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
1616

17-
FROM appwrite/base:0.9.0 as final
17+
FROM appwrite/base:0.11.3 AS final
1818

1919
ARG TESTING=true
2020
ARG DEBUG=false

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ To learn more about architecture and features for this library, check out more i
275275

276276
## System Requirements
277277

278-
Utopia HTTP requires PHP 8.1 or later. We recommend using the latest PHP version whenever possible.
278+
Utopia Framework requires PHP 8.1 or later. We recommend using the latest PHP version whenever possible.
279279

280280
## More from Utopia
281281

composer.json

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,29 @@
2323
"scripts": {
2424
"lint": "vendor/bin/pint --test",
2525
"format": "vendor/bin/pint",
26-
"check": "vendor/bin/phpstan analyse -c phpstan.neon --memory-limit=256M",
26+
"check": "vendor/bin/phpstan analyse -c phpstan.neon --memory-limit 512M",
2727
"test": "vendor/bin/phpunit --configuration phpunit.xml",
2828
"bench": "vendor/bin/phpbench run --report=benchmark"
2929
},
3030
"require": {
31-
"php": ">=8.0",
31+
"php": ">=8.1",
3232
"ext-swoole": "*",
33-
"utopia-php/servers": "0.1.*"
33+
"utopia-php/servers": "0.1.*",
34+
"utopia-php/compression": "0.1.*",
35+
"utopia-php/telemetry": "0.1.*"
3436
},
3537
"require-dev": {
3638
"ext-xdebug": "*",
3739
"phpunit/phpunit": "^9.5.25",
3840
"swoole/ide-helper": "4.8.3",
39-
"phpbench/phpbench": "^1.2",
40-
"laravel/pint": "1.*",
41-
"phpstan/phpstan": "1.*"
41+
"laravel/pint": "^1.2",
42+
"phpstan/phpstan": "1.*",
43+
"phpbench/phpbench": "^1.2"
44+
},
45+
"config": {
46+
"allow-plugins": {
47+
"php-http/discovery": false,
48+
"tbachert/spi": false
49+
}
4250
}
4351
}

0 commit comments

Comments
 (0)