Merge pull request #108 from utopia-php/chore-update-database

Author: abnegate

composer.json

@@ -22,8 +22,8 @@
         "ext-pdo": "*",
         "ext-curl": "*",
         "ext-redis": "*",
-        "utopia-php/database": "3.*.*",
-        "appwrite/appwrite": "19.*.*"
+        "utopia-php/database": "4.*",
+        "appwrite/appwrite": "19.*"
     },
     "require-dev": {
         "phpunit/phpunit": "9.*",

composer.lock

@@ -10,7 +10,6 @@
 use Utopia\Database\Exception\Duplicate;
 use Utopia\Database\Exception\Structure;
 use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
 use Utopia\Exception;
 
 class Database extends TimeLimit
@@ -139,7 +138,7 @@ protected function count(string $key, int $timestamp): int
         $timestamp = $this->toDateTime($timestamp);
 
         /** @var array<Document> $result */
-        $result = Authorization::skip(function () use ($key, $timestamp) {
+        $result = $this->db->getAuthorization()->skip(function () use ($key, $timestamp) {
             return $this->db->find(self::COLLECTION, [
                 Query::equal('key', [$key]),
                 Query::equal('time', [$timestamp]),
@@ -172,7 +171,7 @@ protected function hit(string $key, int $timestamp): void
         }
 
         $timestamp = $this->toDateTime($timestamp);
-        Authorization::skip(function () use ($timestamp, $key) {
+        $this->db->getAuthorization()->skip(function () use ($timestamp, $key) {
             $data = $this->db->findOne(self::COLLECTION, [
                 Query::equal('key', [$key]),
                 Query::equal('time', [$timestamp]),
@@ -226,7 +225,7 @@ protected function hit(string $key, int $timestamp): void
     protected function set(string $key, int $timestamp, int $value): void
     {
         $timestamp = $this->toDateTime($timestamp);
-        Authorization::skip(function () use ($timestamp, $key, $value) {
+        $this->db->getAuthorization()->skip(function () use ($timestamp, $key, $value) {
             $data = $this->db->findOne(self::COLLECTION, [
                 Query::equal('key', [$key]),
                 Query::equal('time', [$timestamp]),
@@ -284,7 +283,7 @@ protected function set(string $key, int $timestamp, int $value): void
     public function getLogs(?int $offset = null, ?int $limit = 25): array
     {
         /** @var array<Document> $results */
-        $results = Authorization::skip(function () use ($offset, $limit) {
+        $results = $this->db->getAuthorization()->skip(function () use ($offset, $limit) {
             $queries = [];
             $queries[] = Query::orderDesc('');
 
@@ -312,7 +311,7 @@ public function getLogs(?int $offset = null, ?int $limit = 25): array
     public function cleanup(int $timestamp): bool
     {
         $timestamp = $this->toDateTime($timestamp);
-        Authorization::skip(function () use ($timestamp) {
+        $this->db->getAuthorization()->skip(function () use ($timestamp) {
             do {
                 $documents = $this->db->find(self::COLLECTION, [
                     Query::lessThan('time', $timestamp),