Skip to content

Commit 32f2a93

Browse files
committed
Merge remote-tracking branch 'origin/0.33.x' into feat-request-model
# Conflicts: # composer.lock
2 parents 569d808 + 838e3a2 commit 32f2a93

47 files changed

Lines changed: 260 additions & 3183 deletions

Some content is hidden

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

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
FROM composer:2.0 AS step0
22

3-
43
ARG TESTING=true
5-
64
ENV TESTING=$TESTING
75

86
WORKDIR /usr/local/src/
@@ -23,7 +21,6 @@ RUN \
2321
apk add --no-cache --virtual .deps \
2422
supervisor php$PHP_VERSION php$PHP_VERSION-fpm php$PHP_VERSION-mbstring nginx bash
2523

26-
2724
# Nginx Configuration (with self-signed ssl certificates)
2825
COPY ./tests/docker/nginx.conf /etc/nginx/nginx.conf
2926

composer.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
"require": {
2525
"php": ">=8.3",
2626
"utopia-php/compression": "0.1.*",
27-
"utopia-php/telemetry": "0.1.*"
27+
"utopia-php/telemetry": "0.1.*",
28+
"utopia-php/validators": "0.1.*"
2829
},
2930
"require-dev": {
3031
"phpunit/phpunit": "9.*",

0 commit comments

Comments
 (0)