Merge pull request #502 from utopia-php/chore-revert-framework-v2

Chore revert framework v2

Author: abnegate

.github/workflows/tests.yml

@@ -77,6 +77,7 @@ jobs:
             Postgres,
             SQLite,
             MongoDB,
+            Mirror,
             SharedTables/MariaDB,
             SharedTables/MySQL,
             SharedTables/Postgres,

Dockerfile

@@ -1,28 +1,39 @@
 FROM composer:2.0 AS composer
 
-ARG TESTING=false
-ENV TESTING=$TESTING
-
 WORKDIR /usr/local/src/
 
 COPY composer.lock /usr/local/src/
 COPY composer.json /usr/local/src/
 
-RUN composer install --ignore-platform-reqs --optimize-autoloader \
-    --no-plugins --no-scripts --prefer-dist
-
-FROM php:8.3.3-cli-alpine3.19 AS compile
+RUN composer install \
+    --ignore-platform-reqs \
+    --optimize-autoloader \
+    --no-plugins \
+    --no-scripts \
+    --prefer-dist
+    
+FROM php:8.3.10-cli-alpine3.20 AS compile
 
-ENV PHP_REDIS_VERSION=6.0.2 \
-    PHP_SWOOLE_VERSION=v5.1.2 \
-    PHP_MONGO_VERSION=1.16.1 \
-    PHP_XDEBUG_VERSION=3.3.2
+ENV PHP_REDIS_VERSION="6.0.2" \
+    PHP_SWOOLE_VERSION="v5.1.3" \
+    PHP_MONGO_VERSION="1.16.1" \
+    PHP_XDEBUG_VERSION="3.3.2"
 
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 RUN \
   apk update \
-  && apk add --no-cache postgresql-libs postgresql-dev make automake autoconf gcc g++ git brotli-dev linux-headers \
+  && apk add --no-cache \
+    postgresql-libs \
+    postgresql-dev \
+    make \
+    automake \
+    autoconf \
+    gcc \
+    g++ \
+    git \
+    brotli-dev \
+    linux-headers \
   && docker-php-ext-install opcache pgsql pdo_mysql pdo_pgsql \
   && apk del postgresql-dev \
   && rm -rf /var/cache/apk/*
@@ -86,6 +97,7 @@ RUN echo extension=redis.so >> /usr/local/etc/php/conf.d/redis.ini
 RUN echo extension=swoole.so >> /usr/local/etc/php/conf.d/swoole.ini
 RUN echo extension=mongodb.so >> /usr/local/etc/php/conf.d/mongodb.ini
 RUN echo extension=pcov.so >> /usr/local/etc/php/conf.d/pcov.ini
+RUN echo extension=xdebug.so >> /usr/local/etc/php/conf.d/xdebug.ini
 
 RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
 
@@ -100,14 +112,13 @@ COPY --from=mongodb /usr/local/lib/php/extensions/no-debug-non-zts-20230831/mong
 COPY --from=pcov /usr/local/lib/php/extensions/no-debug-non-zts-20230831/pcov.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/
 COPY --from=xdebug /usr/local/lib/php/extensions/no-debug-non-zts-20230831/xdebug.so /usr/local/lib/php/extensions/no-debug-non-zts-20230831/
 
-# Add Source Code
 COPY ./bin /usr/src/code/bin
 COPY ./src /usr/src/code/src
 COPY ./dev /usr/src/code/dev
 
 # Add Debug Configs
-RUN if [ "$DEBUG" == "true" ]; then cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; fi
-RUN if [ "$DEBUG" == "true" ]; then mkdir -p /tmp/xdebug; fi
+RUN if [ "$DEBUG" = "true" ]; then cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; fi
+RUN if [ "$DEBUG" = "true" ]; then mkdir -p /tmp/xdebug; fi
 RUN if [ "$DEBUG" = "false" ]; then rm -rf /usr/src/code/dev; fi
 RUN if [ "$DEBUG" = "false" ]; then rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20220829/xdebug.so; fi
 

README.md

@@ -26,7 +26,7 @@ A list of the utopia/php concepts and their relevant equivalent using the differ
 - **Document** - A simple JSON object that will be stored in one of the utopia/database collections. For SQL-based adapters, this will be equivalent to a row. For a No-SQL adapter, this will equivalent to a native document.
 - **Attribute** - A simple document attribute. For SQL-based adapters, this will be equivalent to a column. For a No-SQL adapter, this will equivalent to a native document field.
 - **Index** - A simple collection index used to improve the performance of your database queries.
-- **Permissions** - Using permissions, you can decide which roles have read, create, update and delete access for a specific document. The special attribute `$permissions` is used to store permission metadata for each document in the collection. A permission role can be any string you want. You can use `$authorization->addRole()` to delegate new roles to your users, once obtained a new role a user would gain read, create, update or delete access to a relevant document.
+- **Permissions** - Using permissions, you can decide which roles have read, create, update and delete access for a specific document. The special attribute `$permissions` is used to store permission metadata for each document in the collection. A permission role can be any string you want. You can use `Authorization::setRole()` to delegate new roles to your users, once obtained a new role a user would gain read, create, update or delete access to a relevant document.
 
 ### Filters
 

bin/tasks/index.php

@@ -13,8 +13,8 @@
 use Utopia\Database\Adapter\Mongo;
 use Utopia\Database\Adapter\MySQL;
 use Utopia\Database\Database;
-use Utopia\Http\Validator\Text;
 use Utopia\Mongo\Client;
+use Utopia\Validator\Text;
 
 /**
  * @Example

bin/tasks/load.php

@@ -21,11 +21,9 @@
 use Utopia\Database\Helpers\Permission;
 use Utopia\Database\Helpers\Role;
 use Utopia\Database\Validator\Authorization;
-use Utopia\Http\Validator\Numeric;
-use Utopia\Http\Validator\Text;
 use Utopia\Mongo\Client;
-
-$authorization = new Authorization();
+use Utopia\Validator\Numeric;
+use Utopia\Validator\Text;
 
 /**
  * @Example
@@ -63,7 +61,7 @@
                     $database->setNamespace($namespace);
 
                     // Outline collection schema
-                    $createSchema($database);
+                    createSchema($database);
 
                     // reclaim resources
                     $database = null;
@@ -123,7 +121,7 @@
                     $database->setNamespace($namespace);
 
                     // Outline collection schema
-                    $createSchema($database);
+                    createSchema($database);
 
                     // reclaim resources
                     $database = null;
@@ -185,7 +183,7 @@
                     $database->setNamespace($namespace);
 
                     // Outline collection schema
-                    $createSchema($database);
+                    createSchema($database);
 
                     // Fill DB
                     $faker = Factory::create();
@@ -228,13 +226,14 @@
     });
 
 
-$createSchema = function (Database $database) use ($authorization): void {
+function createSchema(Database $database): void
+{
     if ($database->exists($database->getDatabase())) {
         $database->delete($database->getDatabase());
     }
     $database->create();
 
-    $authorization->addRole(Role::any()->toString());
+    Authorization::setRole(Role::any()->toString());
 
     $database->createCollection('articles', permissions: [
         Permission::create(Role::any()),
@@ -248,7 +247,7 @@
     $database->createAttribute('articles', 'views', Database::VAR_INTEGER, 0, true);
     $database->createAttribute('articles', 'tags', Database::VAR_STRING, 0, true, array: true);
     $database->createIndex('articles', 'text', Database::INDEX_FULLTEXT, ['text']);
-};
+}
 
 function createDocument($database, Generator $faker): void
 {

bin/tasks/query.php

@@ -14,9 +14,10 @@
 use Utopia\Database\Adapter\MySQL;
 use Utopia\Database\Database;
 use Utopia\Database\Query;
-use Utopia\Http\Validator\Numeric;
-use Utopia\Http\Validator\Text;
+use Utopia\Database\Validator\Authorization;
 use Utopia\Mongo\Client;
+use Utopia\Validator\Numeric;
+use Utopia\Validator\Text;
 
 /**
  * @Example
@@ -83,35 +84,35 @@
 
         $report = [];
 
-        $count = $setRoles($faker, 1);
+        $count = setRoles($faker, 1);
         Console::info("\n{$count} roles:");
         $report[] = [
             'roles' => $count,
             'results' => runQueries($database, $limit)
         ];
 
-        $count = $setRoles($faker, 100);
+        $count = setRoles($faker, 100);
         Console::info("\n{$count} roles:");
         $report[] = [
             'roles' => $count,
             'results' => runQueries($database, $limit)
         ];
 
-        $count = $setRoles($faker, 400);
+        $count = setRoles($faker, 400);
         Console::info("\n{$count} roles:");
         $report[] = [
             'roles' => $count,
             'results' => runQueries($database, $limit)
         ];
 
-        $count = $setRoles($faker, 500);
+        $count = setRoles($faker, 500);
         Console::info("\n{$count} roles:");
         $report[] = [
             'roles' => $count,
             'results' => runQueries($database, $limit)
         ];
 
-        $count = $setRoles($faker, 1000);
+        $count = setRoles($faker, 1000);
         Console::info("\n{$count} roles:");
         $report[] = [
             'roles' => $count,
@@ -135,12 +136,13 @@
         Console::error($error->getMessage());
     });
 
-$setRoles = function ($faker, $count) use ($authorization): int {
+function setRoles($faker, $count): int
+{
     for ($i = 0; $i < $count; $i++) {
-        $authorization->addRole($faker->numerify('user####'));
+        Authorization::setRole($faker->numerify('user####'));
     }
-    return \count($authorization->getRoles());
-};
+    return \count(Authorization::getRoles());
+}
 
 function runQueries(Database $database, int $limit): array
 {

composer.json

@@ -27,33 +27,39 @@
             "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": {
+        "php": ">=8.3",
         "ext-pdo": "*",
         "ext-mbstring": "*",
-        "php": ">=8.0",
-        "utopia-php/framework": "1.0.*",
-        "utopia-php/cache": "0.10.*",
+        "utopia-php/framework": "0.33.*",
+        "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.19.*",
-        "laravel/pint": "1.17.*",
-        "phpstan/phpstan": "1.11.*",
+        "utopia-php/cli": "0.14.*",
+        "laravel/pint": "1.*",
+        "phpstan/phpstan": "1.*",
         "rregeer/phpunit-coverage-check": "0.3.*"
     },
     "suggests": {
         "ext-mongodb": "Needed to support MongoDB Database Adapter",
         "ext-redis": "Needed to support Redis Cache Adapter",
         "ext-pdo": "Needed to support MariaDB, MySQL or SQLite Database Adapter",
         "mongodb/mongodb": "Needed to support MongoDB Database Adapter"
+    },
+    "config": {
+        "allow-plugins": {
+            "php-http/discovery": true,
+            "tbachert/spi": true
+        }
     }
 }