Merge remote-tracking branch 'origin/0.53.x' into feat-migrations

# Conflicts: # composer.json # docker-compose.yml # src/Database/Adapter.php # src/Database/Adapter/MariaDB.php # src/Database/Adapter/Postgres.php # src/Database/Adapter/SQL.php # src/Database/Adapter/SQLite.php # src/Database/Database.php
utopia-php · Nov 6, 2024 · 4688aef · 4688aef
2 parents 3357657 + 6661edf
commit 4688aef
Show file tree

Hide file tree

Showing 24 changed files with 2,764 additions and 1,131 deletions.
diff --git a/composer.json b/composer.json
@@ -27,27 +27,27 @@
             "Composer\\Config::disableProcessTimeout",
             "docker compose exec tests vendor/bin/phpunit --configuration phpunit.xml"
         ],
-        "lint": "./vendor/bin/pint --test",
-        "format": "./vendor/bin/pint",
+        "lint": "php -d memory_limit=2G ./vendor/bin/pint --test",
+        "format": "php -d memory_limit=2G ./vendor/bin/pint",
         "check": "./vendor/bin/phpstan analyse --level 7 src tests --memory-limit 2G",
         "coverage": "./vendor/bin/coverage-check ./tmp/clover.xml 90"
     },
     "require": {
         "ext-pdo": "*",
         "ext-mbstring": "*",
-        "php": ">=8.0",
+        "php": ">=8.3",
         "utopia-php/framework": "0.33.*",
-        "utopia-php/cache": "0.10.*",
+        "utopia-php/cache": "0.11.*",
         "utopia-php/mongo": "0.3.*"
     },
     "require-dev": {
         "fakerphp/faker": "1.23.*",
-        "phpunit/phpunit": "9.6.*",
-        "pcov/clobber": "2.0.*",
+        "phpunit/phpunit": "9.*",
+        "pcov/clobber": "2.*",
         "swoole/ide-helper": "5.1.3",
         "utopia-php/cli": "0.14.*",
-        "laravel/pint": "1.17.*",
-        "phpstan/phpstan": "1.11.*",
+        "laravel/pint": "1.*",
+        "phpstan/phpstan": "1.*",
         "rregeer/phpunit-coverage-check": "0.3.*"
     },
     "suggests": {

diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
     build:
       context: .
       args:
-        - DEBUG=true
+        DEBUG: true
     networks:
       - database
     volumes:

diff --git a/pint.json b/pint.json
@@ -1,5 +1,8 @@
 {
     "preset": "psr12",
+    "exclude": [
+        "vendor"
+    ],
     "rules": {
         "array_indentation": true,
         "single_import_per_statement": true,