Skip to content

Commit eef05bc

Browse files
committed
Merge remote-tracking branch 'origin/main' into feat-operators
# Conflicts: # src/Database/Database.php
2 parents 486c7c6 + 4bbd108 commit eef05bc

Some content is hidden

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

42 files changed

+6157
-426
lines changed

.github/workflows/tests.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,19 @@ jobs:
7272
matrix:
7373
adapter:
7474
[
75+
MongoDB,
7576
MariaDB,
7677
MySQL,
7778
Postgres,
7879
SQLite,
7980
Mirror,
8081
Pool,
82+
SharedTables/MongoDB,
8183
SharedTables/MariaDB,
8284
SharedTables/MySQL,
8385
SharedTables/Postgres,
8486
SharedTables/SQLite,
87+
Schemaless/MongoDB,
8588
]
8689

8790
steps:

Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@ FROM php:8.3.19-cli-alpine3.21 AS compile
1616

1717
ENV PHP_REDIS_VERSION="6.0.2" \
1818
PHP_SWOOLE_VERSION="v5.1.7" \
19-
PHP_XDEBUG_VERSION="3.4.2"
20-
19+
PHP_XDEBUG_VERSION="3.4.2" \
20+
PHP_MONGODB_VERSION="2.1.1"
2121
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
2222

23-
RUN \
24-
apk update \
25-
&& apk add --no-cache \
23+
RUN apk update && apk add --no-cache \
2624
postgresql-libs \
2725
postgresql-dev \
2826
make \
@@ -35,9 +33,11 @@ RUN \
3533
linux-headers \
3634
docker-cli \
3735
docker-cli-compose \
38-
&& docker-php-ext-install opcache pgsql pdo_mysql pdo_pgsql \
39-
&& apk del postgresql-dev \
40-
&& rm -rf /var/cache/apk/*
36+
&& pecl install mongodb-$PHP_MONGODB_VERSION \
37+
&& docker-php-ext-enable mongodb \
38+
&& docker-php-ext-install opcache pgsql pdo_mysql pdo_pgsql \
39+
&& apk del postgresql-dev \
40+
&& rm -rf /var/cache/apk/*
4141

4242
# Redis Extension
4343
FROM compile AS redis

composer.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,28 @@
3535
"require": {
3636
"php": ">=8.1",
3737
"ext-pdo": "*",
38+
"ext-mongodb": "*",
3839
"ext-mbstring": "*",
39-
"utopia-php/framework": "0.33.*",
40+
"utopia-php/validators": "0.0.*",
4041
"utopia-php/cache": "0.13.*",
41-
"utopia-php/pools": "0.8.*"
42+
"utopia-php/pools": "0.8.*",
43+
"utopia-php/mongo": "0.11.*"
4244
},
4345
"require-dev": {
4446
"fakerphp/faker": "1.23.*",
4547
"phpunit/phpunit": "9.*",
4648
"pcov/clobber": "2.*",
4749
"swoole/ide-helper": "5.1.3",
4850
"utopia-php/cli": "0.14.*",
49-
"laravel/pint": "1.*",
51+
"laravel/pint": "*",
5052
"phpstan/phpstan": "1.*",
5153
"rregeer/phpunit-coverage-check": "0.3.*"
5254
},
5355
"suggests": {
5456
"ext-redis": "Needed to support Redis Cache Adapter",
55-
"ext-pdo": "Needed to support MariaDB, MySQL or SQLite Database Adapter"
57+
"ext-pdo": "Needed to support MariaDB, MySQL or SQLite Database Adapter",
58+
"mongodb/mongodb": "Needed to support MongoDB Database Adapter"
59+
5660
},
5761
"config": {
5862
"allow-plugins": {

0 commit comments

Comments
 (0)