Merge branch 'master' of https://github.com/appwrite/appwrite into 0.10.x
This commit is contained in:
commit
4dd9424613
|
@ -1,8 +1,8 @@
|
||||||
dist: xenial
|
dist: focal
|
||||||
|
|
||||||
arch:
|
arch:
|
||||||
- amd64
|
- amd64
|
||||||
- arm64
|
- arm64-graviton2
|
||||||
|
|
||||||
os: linux
|
os: linux
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@ before_install:
|
||||||
- echo "_APP_FUNCTIONS_RUNTIMES=php-8.0" >> .env
|
- echo "_APP_FUNCTIONS_RUNTIMES=php-8.0" >> .env
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- docker-compose up -d
|
- docker-compose up -d --build
|
||||||
- sleep 10
|
- sleep 10
|
||||||
|
|
||||||
script:
|
script:
|
||||||
|
@ -41,6 +41,9 @@ script:
|
||||||
- docker-compose exec appwrite vars
|
- docker-compose exec appwrite vars
|
||||||
- docker-compose exec appwrite test --debug
|
- docker-compose exec appwrite test --debug
|
||||||
|
|
||||||
|
after_failure:
|
||||||
|
- docker-compose logs appwrite
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
- provider: script
|
- provider: script
|
||||||
edge: true
|
edge: true
|
||||||
|
|
|
@ -18,8 +18,8 @@ ARG DEBUG=false
|
||||||
ENV DEBUG=$DEBUG
|
ENV DEBUG=$DEBUG
|
||||||
|
|
||||||
ENV PHP_REDIS_VERSION=5.3.4 \
|
ENV PHP_REDIS_VERSION=5.3.4 \
|
||||||
PHP_SWOOLE_VERSION=v4.6.7 \
|
PHP_SWOOLE_VERSION=v4.7.0 \
|
||||||
PHP_IMAGICK_VERSION=3.5.0 \
|
PHP_IMAGICK_VERSION=3.5.1 \
|
||||||
PHP_YAML_VERSION=2.2.1 \
|
PHP_YAML_VERSION=2.2.1 \
|
||||||
PHP_MAXMINDDB_VERSION=v1.10.1
|
PHP_MAXMINDDB_VERSION=v1.10.1
|
||||||
|
|
||||||
|
|
|
@ -316,7 +316,7 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) {
|
||||||
|
|
||||||
if($route) {
|
if($route) {
|
||||||
Console::error('[Error] Method: '.$route->getMethod());
|
Console::error('[Error] Method: '.$route->getMethod());
|
||||||
Console::error('[Error] URL: '.$route->getURL());
|
Console::error('[Error] URL: '.$route->getPath());
|
||||||
}
|
}
|
||||||
|
|
||||||
Console::error('[Error] Type: '.get_class($error));
|
Console::error('[Error] Type: '.get_class($error));
|
||||||
|
|
|
@ -518,7 +518,7 @@ App::shutdown(function($utopia, $response, $request) {
|
||||||
throw new Exception('Failed to read results', 500);
|
throw new Exception('Failed to read results', 500);
|
||||||
}
|
}
|
||||||
|
|
||||||
$result[$route->getMethod() . ':' . $route->getURL()] = true;
|
$result[$route->getMethod() . ':' . $route->getPath()] = true;
|
||||||
|
|
||||||
$tests = \array_merge($tests, $result);
|
$tests = \array_merge($tests, $result);
|
||||||
|
|
||||||
|
@ -526,5 +526,5 @@ App::shutdown(function($utopia, $response, $request) {
|
||||||
throw new Exception('Failed to save resutls', 500);
|
throw new Exception('Failed to save resutls', 500);
|
||||||
}
|
}
|
||||||
|
|
||||||
$response->dynamic(new Document(['result' => $route->getMethod() . ':' . $route->getURL() . ':passed']), Response::MODEL_MOCK);
|
$response->dynamic(new Document(['result' => $route->getMethod() . ':' . $route->getPath() . ':passed']), Response::MODEL_MOCK);
|
||||||
}, ['utopia', 'response', 'request'], 'mock');
|
}, ['utopia', 'response', 'request'], 'mock');
|
|
@ -40,7 +40,7 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e
|
||||||
->setParam('{userId}', $user->getId())
|
->setParam('{userId}', $user->getId())
|
||||||
->setParam('{userAgent}', $request->getUserAgent(''))
|
->setParam('{userAgent}', $request->getUserAgent(''))
|
||||||
->setParam('{ip}', $request->getIP())
|
->setParam('{ip}', $request->getIP())
|
||||||
->setParam('{url}', $request->getHostname().$route->getURL())
|
->setParam('{url}', $request->getHostname().$route->getPath())
|
||||||
;
|
;
|
||||||
|
|
||||||
//TODO make sure we get array here
|
//TODO make sure we get array here
|
||||||
|
|
|
@ -166,7 +166,6 @@ $register->set('dbPool', function () { // Register DB connection
|
||||||
$dbPass = App::getEnv('_APP_DB_PASS', '');
|
$dbPass = App::getEnv('_APP_DB_PASS', '');
|
||||||
$dbScheme = App::getEnv('_APP_DB_SCHEMA', '');
|
$dbScheme = App::getEnv('_APP_DB_SCHEMA', '');
|
||||||
|
|
||||||
|
|
||||||
$pool = new PDOPool((new PDOConfig())
|
$pool = new PDOPool((new PDOConfig())
|
||||||
->withHost($dbHost)
|
->withHost($dbHost)
|
||||||
->withPort($dbPort)
|
->withPort($dbPort)
|
||||||
|
@ -174,6 +173,9 @@ $register->set('dbPool', function () { // Register DB connection
|
||||||
->withCharset('utf8mb4')
|
->withCharset('utf8mb4')
|
||||||
->withUsername($dbUser)
|
->withUsername($dbUser)
|
||||||
->withPassword($dbPass)
|
->withPassword($dbPass)
|
||||||
|
->withOptions([
|
||||||
|
PDO::ATTR_ERRMODE => App::isDevelopment() ? PDO::ERRMODE_WARNING : PDO::ERRMODE_SILENT, // If in production mode, warnings are not displayed
|
||||||
|
])
|
||||||
, 16);
|
, 16);
|
||||||
|
|
||||||
return $pool;
|
return $pool;
|
||||||
|
|
|
@ -9,7 +9,7 @@ $image = $this->getParam('image', '');
|
||||||
|
|
||||||
services:
|
services:
|
||||||
traefik:
|
traefik:
|
||||||
image: traefik:2.3
|
image: traefik:2.5
|
||||||
container_name: appwrite-traefik
|
container_name: appwrite-traefik
|
||||||
command:
|
command:
|
||||||
- --providers.file.directory=/storage/config
|
- --providers.file.directory=/storage/config
|
||||||
|
@ -342,7 +342,7 @@ services:
|
||||||
- MYSQL_DATABASE=${_APP_DB_SCHEMA}
|
- MYSQL_DATABASE=${_APP_DB_SCHEMA}
|
||||||
- MYSQL_USER=${_APP_DB_USER}
|
- MYSQL_USER=${_APP_DB_USER}
|
||||||
- MYSQL_PASSWORD=${_APP_DB_PASS}
|
- MYSQL_PASSWORD=${_APP_DB_PASS}
|
||||||
command: 'mysqld --innodb-flush-method=fsync --wait_timeout=86400'
|
command: 'mysqld --innodb-flush-method=fsync'
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:6.0-alpine3.12
|
image: redis:6.0-alpine3.12
|
||||||
|
|
|
@ -38,7 +38,7 @@
|
||||||
"appwrite/php-clamav": "1.1.*",
|
"appwrite/php-clamav": "1.1.*",
|
||||||
"appwrite/php-runtimes": "0.4.*",
|
"appwrite/php-runtimes": "0.4.*",
|
||||||
|
|
||||||
"utopia-php/framework": "0.17.*",
|
"utopia-php/framework": "0.18.*",
|
||||||
"utopia-php/abuse": "0.5.*",
|
"utopia-php/abuse": "0.5.*",
|
||||||
"utopia-php/analytics": "0.2.*",
|
"utopia-php/analytics": "0.2.*",
|
||||||
"utopia-php/audit": "0.5.*",
|
"utopia-php/audit": "0.5.*",
|
||||||
|
|
15
composer.lock
generated
15
composer.lock
generated
|
@ -4,7 +4,7 @@
|
||||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||||
"This file is @generated automatically"
|
"This file is @generated automatically"
|
||||||
],
|
],
|
||||||
"content-hash": "63a89a825697892a52aa27d6819b5972",
|
"content-hash": "45963af754680568d89330a4f37c40d1",
|
||||||
"packages": [
|
"packages": [
|
||||||
{
|
{
|
||||||
"name": "adhocore/jwt",
|
"name": "adhocore/jwt",
|
||||||
|
@ -1756,16 +1756,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/framework",
|
"name": "utopia-php/framework",
|
||||||
"version": "0.17.2",
|
"version": "0.18.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/utopia-php/framework.git",
|
"url": "https://github.com/utopia-php/framework.git",
|
||||||
"reference": "3cd5fa2a9e30040277861f4254c5ccd1b1600952"
|
"reference": "f577522a5eb8009967b893fb7ad4ee70d3f7c0db"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/utopia-php/framework/zipball/3cd5fa2a9e30040277861f4254c5ccd1b1600952",
|
"url": "https://api.github.com/repos/utopia-php/framework/zipball/f577522a5eb8009967b893fb7ad4ee70d3f7c0db",
|
||||||
"reference": "3cd5fa2a9e30040277861f4254c5ccd1b1600952",
|
"reference": "f577522a5eb8009967b893fb7ad4ee70d3f7c0db",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
@ -1799,9 +1799,9 @@
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"issues": "https://github.com/utopia-php/framework/issues",
|
"issues": "https://github.com/utopia-php/framework/issues",
|
||||||
"source": "https://github.com/utopia-php/framework/tree/0.17.2"
|
"source": "https://github.com/utopia-php/framework/tree/0.18.0"
|
||||||
},
|
},
|
||||||
"time": "2021-08-02T10:18:26+00:00"
|
"time": "2021-08-19T04:58:47+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "utopia-php/image",
|
"name": "utopia-php/image",
|
||||||
|
@ -4882,7 +4882,6 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"abandoned": true,
|
|
||||||
"time": "2020-09-28T06:45:17+00:00"
|
"time": "2020-09-28T06:45:17+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
|
|
@ -7,7 +7,7 @@ version: '3'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
traefik:
|
traefik:
|
||||||
image: traefik:2.3
|
image: traefik:2.5
|
||||||
container_name: appwrite-traefik
|
container_name: appwrite-traefik
|
||||||
command:
|
command:
|
||||||
- --log.level=DEBUG
|
- --log.level=DEBUG
|
||||||
|
@ -397,7 +397,7 @@ services:
|
||||||
- MYSQL_DATABASE=${_APP_DB_SCHEMA}
|
- MYSQL_DATABASE=${_APP_DB_SCHEMA}
|
||||||
- MYSQL_USER=${_APP_DB_USER}
|
- MYSQL_USER=${_APP_DB_USER}
|
||||||
- MYSQL_PASSWORD=${_APP_DB_PASS}
|
- MYSQL_PASSWORD=${_APP_DB_PASS}
|
||||||
command: 'mysqld --innodb-flush-method=fsync --wait_timeout=86400' # add ' --query_cache_size=0' for DB tests
|
command: 'mysqld --innodb-flush-method=fsync' # add ' --query_cache_size=0' for DB tests
|
||||||
# command: mv /var/lib/mysql/ib_logfile0 /var/lib/mysql/ib_logfile0.bu && mv /var/lib/mysql/ib_logfile1 /var/lib/mysql/ib_logfile1.bu
|
# command: mv /var/lib/mysql/ib_logfile0 /var/lib/mysql/ib_logfile0.bu && mv /var/lib/mysql/ib_logfile1 /var/lib/mysql/ib_logfile1.bu
|
||||||
|
|
||||||
# smtp:
|
# smtp:
|
||||||
|
|
|
@ -91,7 +91,7 @@ class OpenAPI3 extends Format
|
||||||
$usedModels = [];
|
$usedModels = [];
|
||||||
|
|
||||||
foreach ($this->routes as $route) { /** @var \Utopia\Route $route */
|
foreach ($this->routes as $route) { /** @var \Utopia\Route $route */
|
||||||
$url = \str_replace('/v1', '', $route->getURL());
|
$url = \str_replace('/v1', '', $route->getPath());
|
||||||
$scope = $route->getLabel('scope', '');
|
$scope = $route->getLabel('scope', '');
|
||||||
$hide = $route->getLabel('sdk.hide', false);
|
$hide = $route->getLabel('sdk.hide', false);
|
||||||
$consumes = [$route->getLabel('sdk.request.type', 'application/json')];
|
$consumes = [$route->getLabel('sdk.request.type', 'application/json')];
|
||||||
|
|
|
@ -89,7 +89,7 @@ class Swagger2 extends Format
|
||||||
$usedModels = [];
|
$usedModels = [];
|
||||||
|
|
||||||
foreach ($this->routes as $route) { /** @var \Utopia\Route $route */
|
foreach ($this->routes as $route) { /** @var \Utopia\Route $route */
|
||||||
$url = \str_replace('/v1', '', $route->getURL());
|
$url = \str_replace('/v1', '', $route->getPath());
|
||||||
$scope = $route->getLabel('scope', '');
|
$scope = $route->getLabel('scope', '');
|
||||||
$hide = $route->getLabel('sdk.hide', false);
|
$hide = $route->getLabel('sdk.hide', false);
|
||||||
$consumes = [$route->getLabel('sdk.request.type', 'application/json')];
|
$consumes = [$route->getLabel('sdk.request.type', 'application/json')];
|
||||||
|
|
Loading…
Reference in a new issue