Merge branch '0.7.x' of github.com:appwrite/appwrite into swoole-and-functions
This commit is contained in:
commit
67ddfbed34
58 changed files with 1800 additions and 270 deletions
|
@ -281,6 +281,12 @@ php-cs-fixer fix app/controllers --rules='{"braces": {"allow_single_line_closure
|
|||
php-cs-fixer fix src --rules='{"braces": {"allow_single_line_closure": true}}'
|
||||
```
|
||||
|
||||
Static Code Analysis:
|
||||
|
||||
```bash
|
||||
docker-compose exec appwrite /usr/src/code/vendor/bin/psalm
|
||||
```
|
||||
|
||||
## Tutorials
|
||||
|
||||
From time to time, our team will add tutorials that will help contributors find their way in the Appwrite source code. Below is a list of currently available tutorials:
|
||||
|
|
|
@ -115,6 +115,24 @@ return [
|
|||
'required' => false,
|
||||
'question' => '',
|
||||
],
|
||||
[
|
||||
'name' => '_APP_SMTP_SECURE',
|
||||
'default' => '',
|
||||
'required' => false,
|
||||
'question' => '',
|
||||
],
|
||||
[
|
||||
'name' => '_APP_SMTP_USERNAME',
|
||||
'default' => '',
|
||||
'required' => false,
|
||||
'question' => '',
|
||||
],
|
||||
[
|
||||
'name' => '_APP_SMTP_PASSWORD',
|
||||
'default' => '',
|
||||
'required' => false,
|
||||
'question' => '',
|
||||
],
|
||||
[
|
||||
'name' => '_APP_STORAGE_LIMIT',
|
||||
'default' => '100000000',
|
||||
|
|
|
@ -690,8 +690,7 @@ App::get('/v1/account/sessions')
|
|||
if ($record) {
|
||||
$sessions[$index]['geo']['isoCode'] = \strtolower($record['country']['iso_code']);
|
||||
$sessions[$index]['geo']['country'] = (isset($countries[$record['country']['iso_code']])) ? $countries[$record['country']['iso_code']] : $locale->getText('locale.country.unknown');
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$sessions[$index]['geo']['isoCode'] = '--';
|
||||
$sessions[$index]['geo']['country'] = $locale->getText('locale.country.unknown');
|
||||
}
|
||||
|
@ -795,11 +794,10 @@ App::get('/v1/account/logs')
|
|||
try {
|
||||
$record = $geodb->get($log['ip']);
|
||||
|
||||
if(isset($record)){
|
||||
if ($record) {
|
||||
$output[$i]['geo']['isoCode'] = \strtolower($record['country']['iso_code']);
|
||||
$output[$i]['geo']['country'] = (isset($countries[$record['country']['iso_code']])) ? $countries[$record['country']['iso_code']] : $locale->getText('locale.country.unknown');
|
||||
}
|
||||
else{
|
||||
} else {
|
||||
$output[$i]['geo']['isoCode'] = '--';
|
||||
$output[$i]['geo']['country'] = $locale->getText('locale.country.unknown');
|
||||
}
|
||||
|
|
|
@ -363,11 +363,12 @@ App::get('/v1/avatars/qr')
|
|||
/** @var Appwrite\Utopia\Response $response */
|
||||
|
||||
$download = ($download === '1' || $download === 'true' || $download === 1 || $download === true);
|
||||
$qropts = new QROptions([
|
||||
$options = new QROptions([
|
||||
'quietzone' => $size,
|
||||
'outputType' => QRCode::OUTPUT_IMAGICK
|
||||
]);
|
||||
$qrcode = new QRCode($qropts);
|
||||
|
||||
$qrcode = new QRCode($options);
|
||||
|
||||
if ($download) {
|
||||
$response->addHeader('Content-Disposition', 'attachment; filename="qr.png"');
|
||||
|
|
|
@ -315,11 +315,10 @@ App::get('/v1/users/:userId/logs')
|
|||
try {
|
||||
$record = $geodb->get($log['ip']);
|
||||
|
||||
if(isset($record)){
|
||||
if($record){
|
||||
$output[$i]['geo']['isoCode'] = \strtolower($record['country']['iso_code']);
|
||||
$output[$i]['geo']['country'] = (isset($countries[$record['country']['iso_code']])) ? $countries[$record['country']['iso_code']] : $locale->getText('locale.country.unknown');
|
||||
}
|
||||
else{
|
||||
} else{
|
||||
$output[$i]['geo']['isoCode'] = '--';
|
||||
$output[$i]['geo']['country'] = $locale->getText('locale.country.unknown');
|
||||
}
|
||||
|
|
|
@ -66,7 +66,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
|
|||
? $origin : 'localhost') . (!empty($port) ? ':'.$port : '');
|
||||
|
||||
$selfDomain = new Domain($request->getHostname());
|
||||
$endDomain = new Domain($origin);
|
||||
$endDomain = new Domain((string)$origin);
|
||||
|
||||
// var_dump('referer', $referrer);
|
||||
// var_dump('origin', $origin);
|
||||
|
|
|
@ -23,6 +23,9 @@ include __DIR__.'/controllers/general.php';
|
|||
$preloader = new Preloader();
|
||||
|
||||
foreach ([
|
||||
realpath(__DIR__ . '/../vendor/composer'),
|
||||
realpath(__DIR__ . '/../vendor/amphp'),
|
||||
realpath(__DIR__ . '/../vendor/felixfbecker'),
|
||||
realpath(__DIR__ . '/../vendor/twig/twig'),
|
||||
realpath(__DIR__ . '/../vendor/guzzlehttp/guzzle'),
|
||||
realpath(__DIR__ . '/../vendor/domnikl'),
|
||||
|
|
|
@ -145,7 +145,7 @@ $cli
|
|||
|
||||
Console::log("Running \"docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans\"");
|
||||
|
||||
$exit = Console::execute("docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans", null, $stdout, $stderr);
|
||||
$exit = Console::execute("docker-compose -f {$path}/docker-compose.yml up -d --remove-orphans", '', $stdout, $stderr);
|
||||
|
||||
if ($exit !== 0) {
|
||||
Console::error("Failed to install Appwrite dockers");
|
||||
|
|
|
@ -32,7 +32,7 @@ Co\run(function() use ($environments) { // Warmup: make sure images are ready t
|
|||
|
||||
Console::info('Warming up '.$environment['name'].' environment');
|
||||
|
||||
Console::execute('docker pull '.$environment['image'], null, $stdout, $stderr);
|
||||
Console::execute('docker pull '.$environment['image'], '', $stdout, $stderr);
|
||||
|
||||
if(!empty($stdout)) {
|
||||
Console::log($stdout);
|
||||
|
@ -306,7 +306,7 @@ class FunctionsV1
|
|||
$executionStart = \microtime(true);
|
||||
|
||||
$exitCode = Console::execute('docker ps --all --format "name={{.Names}}&status={{.Status}}&labels={{.Labels}}" --filter label=appwrite-type=function'
|
||||
, null, $stdout, $stderr, 30);
|
||||
, '', $stdout, $stderr, 30);
|
||||
|
||||
$executionEnd = \microtime(true);
|
||||
|
||||
|
@ -344,7 +344,7 @@ class FunctionsV1
|
|||
$stdout = '';
|
||||
$stderr = '';
|
||||
|
||||
if(Console::execute("docker rm {$container}", null, $stdout, $stderr, 30) !== 0) {
|
||||
if(Console::execute("docker rm {$container}", '', $stdout, $stderr, 30) !== 0) {
|
||||
throw new Exception('Failed to remove offline container: '.$stderr);
|
||||
}
|
||||
|
||||
|
@ -372,7 +372,7 @@ class FunctionsV1
|
|||
".\implode("\n", $vars)."
|
||||
{$environment['image']} \
|
||||
sh -c 'mv /tmp/code.tar.gz /usr/local/src/code.tar.gz && tar -zxf /usr/local/src/code.tar.gz --strip 1 && rm /usr/local/src/code.tar.gz && tail -f /dev/null'"
|
||||
, null, $stdout, $stderr, 30);
|
||||
, '', $stdout, $stderr, 30);
|
||||
|
||||
$executionEnd = \microtime(true);
|
||||
|
||||
|
@ -395,7 +395,7 @@ class FunctionsV1
|
|||
".\implode("\n", $vars)."
|
||||
{$container} \
|
||||
{$command}"
|
||||
, null, $stdout, $stderr, $function->getAttribute('timeout', (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900)));
|
||||
, '', $stdout, $stderr, $function->getAttribute('timeout', (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900)));
|
||||
|
||||
$executionEnd = \microtime(true);
|
||||
$executionTime = ($executionEnd - $executionStart);
|
||||
|
@ -459,7 +459,7 @@ class FunctionsV1
|
|||
$stdout = '';
|
||||
$stderr = '';
|
||||
|
||||
if(Console::execute("docker stop {$first['name']}", null, $stdout, $stderr, 30) !== 0) {
|
||||
if(Console::execute("docker stop {$first['name']}", '', $stdout, $stderr, 30) !== 0) {
|
||||
Console::error('Failed to remove container: '.$stderr);
|
||||
}
|
||||
|
||||
|
|
|
@ -34,11 +34,11 @@
|
|||
|
||||
"appwrite/php-clamav": "1.0.*",
|
||||
|
||||
"utopia-php/framework": "0.9.1",
|
||||
"utopia-php/framework": "0.9.6",
|
||||
"utopia-php/abuse": "0.2.*",
|
||||
"utopia-php/audit": "0.3.*",
|
||||
"utopia-php/cache": "0.2.*",
|
||||
"utopia-php/cli": "0.7.1",
|
||||
"utopia-php/cli": "0.7.2",
|
||||
"utopia-php/config": "0.2.*",
|
||||
"utopia-php/locale": "0.3.*",
|
||||
"utopia-php/registry": "0.2.*",
|
||||
|
@ -57,7 +57,8 @@
|
|||
"require-dev": {
|
||||
"swoole/ide-helper": "4.5.5",
|
||||
"appwrite/sdk-generator": "master",
|
||||
"phpunit/phpunit": "^9.3"
|
||||
"phpunit/phpunit": "^9.3",
|
||||
"vimeo/psalm": "4.0.1"
|
||||
},
|
||||
"repositories": [
|
||||
{
|
||||
|
|
1619
composer.lock
generated
1619
composer.lock
generated
File diff suppressed because it is too large
Load diff
|
@ -52,6 +52,7 @@ services:
|
|||
- appwrite-certificates:/storage/certificates:rw
|
||||
- appwrite-functions:/storage/functions:rw
|
||||
- ./phpunit.xml:/usr/src/code/phpunit.xml
|
||||
- ./psalm.xml:/usr/src/code/psalm.xml
|
||||
- ./tests:/usr/src/code/tests
|
||||
- ./app:/usr/src/code/app
|
||||
# - ./vendor:/usr/src/code/vendor
|
||||
|
|
15
psalm.xml
Normal file
15
psalm.xml
Normal file
|
@ -0,0 +1,15 @@
|
|||
<?xml version="1.0"?>
|
||||
<psalm
|
||||
errorLevel="3"
|
||||
resolveFromConfigFile="true"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="https://getpsalm.org/schema/config"
|
||||
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
|
||||
>
|
||||
<projectFiles>
|
||||
<directory name="src" />
|
||||
<ignoreFiles>
|
||||
<directory name="vendor" />
|
||||
</ignoreFiles>
|
||||
</projectFiles>
|
||||
</psalm>
|
|
@ -118,7 +118,7 @@ class Auth
|
|||
*
|
||||
* @return string
|
||||
*/
|
||||
public static function hash($string)
|
||||
public static function hash(string $string)
|
||||
{
|
||||
return \hash('sha256', $string);
|
||||
}
|
||||
|
@ -130,7 +130,7 @@ class Auth
|
|||
*
|
||||
* @param $string
|
||||
*
|
||||
* @return bool|string
|
||||
* @return bool|string|null
|
||||
*/
|
||||
public static function passwordHash($string)
|
||||
{
|
||||
|
@ -193,14 +193,14 @@ class Auth
|
|||
*/
|
||||
public static function tokenVerify(array $tokens, int $type, string $secret)
|
||||
{
|
||||
foreach ($tokens as $token) { /* @var $token Document */
|
||||
if (isset($token['type']) &&
|
||||
isset($token['secret']) &&
|
||||
isset($token['expire']) &&
|
||||
$token['type'] == $type &&
|
||||
$token['secret'] === self::hash($secret) &&
|
||||
$token['expire'] >= \time()) {
|
||||
return $token->getId();
|
||||
foreach ($tokens as $token) { /** @var Document $token */
|
||||
if ($token->isSet('type') &&
|
||||
$token->isSet('secret') &&
|
||||
$token->isSet('expire') &&
|
||||
$token->getAttribute('type') == $type &&
|
||||
$token->getAttribute('secret') === self::hash($secret) &&
|
||||
$token->getAttribute('expire') >= \time()) {
|
||||
return (string)$token->getId();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ abstract class OAuth2
|
|||
protected $callback;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
* @var array
|
||||
*/
|
||||
protected $state;
|
||||
|
||||
|
@ -38,7 +38,7 @@ abstract class OAuth2
|
|||
* @param array $state
|
||||
* @param array $scopes
|
||||
*/
|
||||
public function __construct(string $appId, string $appSecret, string $callback, $state = [], $scopes = [])
|
||||
public function __construct(string $appId, string $appSecret, string $callback, array $state = [], array $scopes = [])
|
||||
{
|
||||
$this->appID = $appId;
|
||||
$this->appSecret = $appSecret;
|
||||
|
@ -116,7 +116,7 @@ abstract class OAuth2
|
|||
/**
|
||||
* @param $state
|
||||
*
|
||||
* @return string
|
||||
* @return array
|
||||
*/
|
||||
public function parseState(string $state)
|
||||
{
|
||||
|
@ -152,6 +152,6 @@ abstract class OAuth2
|
|||
|
||||
\curl_close($ch);
|
||||
|
||||
return $response;
|
||||
return (string)$response;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ class Amazon extends OAuth2
|
|||
/**
|
||||
* @param $state
|
||||
*
|
||||
* @return json
|
||||
* @return array
|
||||
*/
|
||||
public function parseState(string $state)
|
||||
{
|
||||
|
@ -63,7 +63,7 @@ class Amazon extends OAuth2
|
|||
*/
|
||||
public function getAccessToken(string $code): string
|
||||
{
|
||||
$headers[] = 'Content-Type: application/x-www-form-urlencoded;charset=UTF-8';
|
||||
$headers = ['Content-Type: application/x-www-form-urlencoded;charset=UTF-8'];
|
||||
$accessToken = $this->request(
|
||||
'POST',
|
||||
'https://api.amazon.com/auth/o2/token',
|
||||
|
@ -76,6 +76,7 @@ class Amazon extends OAuth2
|
|||
'grant_type' => 'authorization_code'
|
||||
])
|
||||
);
|
||||
|
||||
$accessToken = \json_decode($accessToken, true);
|
||||
|
||||
if (isset($accessToken['access_token'])) {
|
||||
|
|
|
@ -58,7 +58,7 @@ class Apple extends OAuth2
|
|||
*/
|
||||
public function getAccessToken(string $code): string
|
||||
{
|
||||
$headers[] = 'Content-Type: application/x-www-form-urlencoded';
|
||||
$headers = ['Content-Type: application/x-www-form-urlencoded'];
|
||||
$accessToken = $this->request(
|
||||
'POST',
|
||||
'https://appleid.apple.com/auth/token',
|
||||
|
@ -175,8 +175,10 @@ class Apple extends OAuth2
|
|||
|
||||
/**
|
||||
* @param string $data
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
protected function encode($data)
|
||||
protected function encode($data): string
|
||||
{
|
||||
return \str_replace(['+', '/', '='], ['-', '_', ''], \base64_encode($data));
|
||||
}
|
||||
|
|
|
@ -48,7 +48,7 @@ class Bitbucket extends OAuth2
|
|||
public function getAccessToken(string $code): string
|
||||
{
|
||||
// Required as per Bitbucket Spec.
|
||||
$headers[] = 'Content-Type: application/x-www-form-urlencoded';
|
||||
$headers = ['Content-Type: application/x-www-form-urlencoded'];
|
||||
|
||||
$accessToken = $this->request(
|
||||
'POST',
|
||||
|
|
|
@ -69,7 +69,7 @@ class Discord extends OAuth2
|
|||
'redirect_uri' => $this->callback,
|
||||
'client_id' => $this->appID,
|
||||
'client_secret' => $this->appSecret,
|
||||
'scope' => \implode(' ', $this->scope)
|
||||
'scope' => \implode(' ', $this->getScopes())
|
||||
])
|
||||
);
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@ class Dropbox extends OAuth2
|
|||
*/
|
||||
public function getAccessToken(string $code): string
|
||||
{
|
||||
$headers[] = 'Content-Type: application/x-www-form-urlencoded';
|
||||
$headers = ['Content-Type: application/x-www-form-urlencoded'];
|
||||
$accessToken = $this->request(
|
||||
'POST',
|
||||
'https://api.dropboxapi.com/oauth2/token',
|
||||
|
@ -127,7 +127,7 @@ class Dropbox extends OAuth2
|
|||
protected function getUser(string $accessToken): array
|
||||
{
|
||||
if (empty($this->user)) {
|
||||
$headers[] = 'Authorization: Bearer '. \urlencode($accessToken);
|
||||
$headers = ['Authorization: Bearer '. \urlencode($accessToken)];
|
||||
$user = $this->request('POST', 'https://api.dropboxapi.com/2/users/get_current_account', $headers);
|
||||
$this->user = \json_decode($user, true);
|
||||
}
|
||||
|
|
|
@ -53,7 +53,7 @@ class Microsoft extends OAuth2
|
|||
*/
|
||||
public function getAccessToken(string $code): string
|
||||
{
|
||||
$headers[] = 'Content-Type: application/x-www-form-urlencoded';
|
||||
$headers = ['Content-Type: application/x-www-form-urlencoded'];
|
||||
|
||||
$accessToken = $this->request(
|
||||
'POST',
|
||||
|
@ -134,7 +134,7 @@ class Microsoft extends OAuth2
|
|||
protected function getUser(string $accessToken): array
|
||||
{
|
||||
if (empty($this->user)) {
|
||||
$headers[] = 'Authorization: Bearer '. \urlencode($accessToken);
|
||||
$headers = ['Authorization: Bearer '. \urlencode($accessToken)];
|
||||
$user = $this->request('GET', 'https://graph.microsoft.com/v1.0/me', $headers);
|
||||
$this->user = \json_decode($user, true);
|
||||
}
|
||||
|
|
|
@ -10,18 +10,24 @@ use Appwrite\Auth\OAuth2;
|
|||
class Paypal extends OAuth2
|
||||
{
|
||||
/**
|
||||
* @var string
|
||||
* @var array
|
||||
*/
|
||||
private $endpoint = [
|
||||
'sandbox' => 'https://www.sandbox.paypal.com/',
|
||||
'live' => 'https://www.paypal.com/',
|
||||
];
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
private $resourceEndpoint = [
|
||||
'sandbox' => 'https://api.sandbox.paypal.com/v1/',
|
||||
'live' => 'https://api.paypal.com/v1/',
|
||||
];
|
||||
|
||||
/**
|
||||
* @var string
|
||||
*/
|
||||
protected $environment = 'live';
|
||||
|
||||
/**
|
||||
|
@ -29,7 +35,9 @@ class Paypal extends OAuth2
|
|||
*/
|
||||
protected $user = [];
|
||||
|
||||
|
||||
/**
|
||||
* @var array
|
||||
*/
|
||||
protected $scopes = [
|
||||
'openid',
|
||||
'profile',
|
||||
|
|
|
@ -34,7 +34,7 @@ class Salesforce extends OAuth2
|
|||
/**
|
||||
* @param $state
|
||||
*
|
||||
* @return json
|
||||
* @return array
|
||||
*/
|
||||
public function parseState(string $state)
|
||||
{
|
||||
|
|
|
@ -61,7 +61,7 @@ class Vk extends OAuth2
|
|||
*/
|
||||
public function getAccessToken(string $code): string
|
||||
{
|
||||
$headers[] = 'Content-Type: application/x-www-form-urlencoded;charset=UTF-8';
|
||||
$headers = ['Content-Type: application/x-www-form-urlencoded;charset=UTF-8'];
|
||||
$accessToken = $this->request(
|
||||
'POST',
|
||||
'https://oauth.vk.com/access_token?',
|
||||
|
|
|
@ -45,7 +45,7 @@ class Yahoo extends OAuth2
|
|||
/**
|
||||
* @param $state
|
||||
*
|
||||
* @return json
|
||||
* @return array
|
||||
*/
|
||||
public function parseState(string $state)
|
||||
{
|
||||
|
|
|
@ -32,7 +32,7 @@ class Yandex extends OAuth2
|
|||
/**
|
||||
* @param $state
|
||||
*
|
||||
* @return json
|
||||
* @return array
|
||||
*/
|
||||
public function parseState(string $state)
|
||||
{
|
||||
|
|
|
@ -54,7 +54,7 @@ abstract class Adapter
|
|||
/**
|
||||
* Get Document.
|
||||
*
|
||||
* @param int $id
|
||||
* @param string $id
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
|
@ -82,11 +82,11 @@ abstract class Adapter
|
|||
/**
|
||||
* Delete Node.
|
||||
*
|
||||
* @param int $id
|
||||
* @param string $id
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
abstract public function deleteDocument($id);
|
||||
abstract public function deleteDocument(string $id);
|
||||
|
||||
/**
|
||||
* Delete Unique Key.
|
||||
|
|
|
@ -139,7 +139,7 @@ class MySQL extends Adapter
|
|||
{
|
||||
$order = 0;
|
||||
$data = \array_merge(['$id' => null, '$permissions' => []], $data); // Merge data with default params
|
||||
$signature = \md5(\json_encode($data, true));
|
||||
$signature = \md5(\json_encode($data));
|
||||
$revision = \uniqid('', true);
|
||||
$data['$id'] = (empty($data['$id'])) ? null : $data['$id'];
|
||||
|
||||
|
@ -232,6 +232,10 @@ class MySQL extends Adapter
|
|||
|
||||
// Handle array of relations
|
||||
if (self::DATA_TYPE_ARRAY === $type) {
|
||||
if(!is_array($value)) { // Property should be of type array, if not = skip
|
||||
continue;
|
||||
}
|
||||
|
||||
foreach ($value as $i => $child) {
|
||||
if (self::DATA_TYPE_DICTIONARY !== $this->getDataType($child)) { // not dictionary
|
||||
|
||||
|
@ -315,13 +319,13 @@ class MySQL extends Adapter
|
|||
/**
|
||||
* Delete Document.
|
||||
*
|
||||
* @param int $id
|
||||
* @param string $id
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function deleteDocument($id)
|
||||
public function deleteDocument(string $id)
|
||||
{
|
||||
$st1 = $this->getPDO()->prepare('DELETE FROM `'.$this->getNamespace().'.database.documents`
|
||||
WHERE uid = :id
|
||||
|
@ -765,8 +769,10 @@ class MySQL extends Adapter
|
|||
|
||||
/**
|
||||
* Get Unique Document ID.
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function getId()
|
||||
public function getId(): string
|
||||
{
|
||||
$unique = \uniqid();
|
||||
$attempts = 5;
|
||||
|
@ -884,12 +890,12 @@ class MySQL extends Adapter
|
|||
}
|
||||
|
||||
/**
|
||||
* @param $key
|
||||
* @param $value
|
||||
* @param string $key
|
||||
* @param mixed $value
|
||||
*
|
||||
* @return $this
|
||||
*/
|
||||
public function setDebug($key, $value)
|
||||
public function setDebug(string $key, $value): self
|
||||
{
|
||||
$this->debug[$key] = $value;
|
||||
|
||||
|
@ -899,15 +905,17 @@ class MySQL extends Adapter
|
|||
/**
|
||||
* @return array
|
||||
*/
|
||||
public function getDebug()
|
||||
public function getDebug(): array
|
||||
{
|
||||
return $this->debug;
|
||||
}
|
||||
|
||||
/**
|
||||
* return $this;.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function resetDebug()
|
||||
public function resetDebug(): void
|
||||
{
|
||||
$this->debug = [];
|
||||
}
|
||||
|
@ -917,7 +925,7 @@ class MySQL extends Adapter
|
|||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
protected function getPDO()
|
||||
protected function getPDO(): PDO
|
||||
{
|
||||
return $this->register->get('db');
|
||||
}
|
||||
|
|
|
@ -137,13 +137,13 @@ class Redis extends Adapter
|
|||
/**
|
||||
* Delete Document.
|
||||
*
|
||||
* @param $id
|
||||
* @param string $id
|
||||
*
|
||||
* @return array
|
||||
*
|
||||
* @throws Exception
|
||||
*/
|
||||
public function deleteDocument($id)
|
||||
public function deleteDocument(string $id)
|
||||
{
|
||||
$data = $this->adapter->deleteDocument($id);
|
||||
|
||||
|
@ -243,7 +243,7 @@ class Redis extends Adapter
|
|||
*/
|
||||
public function lastModified()
|
||||
{
|
||||
return;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -116,7 +116,7 @@ class Database
|
|||
/**
|
||||
* Create Namespace.
|
||||
*
|
||||
* @param int $namespace
|
||||
* @param string $namespace
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
@ -128,7 +128,7 @@ class Database
|
|||
/**
|
||||
* Delete Namespace.
|
||||
*
|
||||
* @param int $namespace
|
||||
* @param string $namespace
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
@ -187,22 +187,23 @@ class Database
|
|||
}
|
||||
|
||||
/**
|
||||
* @param int $id
|
||||
* @param string $id
|
||||
* @param bool $mock is mocked data allowed?
|
||||
* @param bool $decode enable decoding?
|
||||
*
|
||||
* @return Document
|
||||
*/
|
||||
public function getDocument($id, $mock = true, $decode = true)
|
||||
public function getDocument($id, bool $mock = true, bool $decode = true)
|
||||
{
|
||||
if (\is_null($id)) {
|
||||
return new Document([]);
|
||||
return new Document();
|
||||
}
|
||||
|
||||
$document = new Document((isset($this->mocks[$id]) && $mock) ? $this->mocks[$id] : $this->adapter->getDocument($id));
|
||||
$validator = new Authorization($document, 'read');
|
||||
|
||||
if (!$validator->isValid($document->getPermissions())) { // Check if user has read access to this document
|
||||
return new Document([]);
|
||||
return new Document();
|
||||
}
|
||||
|
||||
$document = ($decode) ? $this->decode($document) : $document;
|
||||
|
@ -332,13 +333,13 @@ class Database
|
|||
}
|
||||
|
||||
/**
|
||||
* @param int $id
|
||||
* @param string $id
|
||||
*
|
||||
* @return Document|false
|
||||
*
|
||||
* @throws AuthorizationException
|
||||
*/
|
||||
public function deleteDocument($id)
|
||||
public function deleteDocument(string $id)
|
||||
{
|
||||
$document = $this->getDocument($id);
|
||||
|
||||
|
@ -401,9 +402,9 @@ class Database
|
|||
* @param string $key
|
||||
* @param string $value
|
||||
*
|
||||
* @return array
|
||||
* @return self
|
||||
*/
|
||||
public function setMock($key, $value)
|
||||
public function setMock($key, $value): self
|
||||
{
|
||||
$this->mocks[$key] = $value;
|
||||
|
||||
|
@ -411,11 +412,11 @@ class Database
|
|||
}
|
||||
|
||||
/**
|
||||
* @param string $mocks
|
||||
* @param array $mocks
|
||||
*
|
||||
* @return array
|
||||
* @return self
|
||||
*/
|
||||
public function setMocks(array $mocks)
|
||||
public function setMocks(array $mocks): self
|
||||
{
|
||||
$this->mocks = $mocks;
|
||||
|
||||
|
@ -437,9 +438,9 @@ class Database
|
|||
* @param callable $encode
|
||||
* @param callable $decode
|
||||
*
|
||||
* return $this
|
||||
* @return void
|
||||
*/
|
||||
static public function addFilter(string $name, callable $encode, callable $decode)
|
||||
static public function addFilter(string $name, callable $encode, callable $decode): void
|
||||
{
|
||||
self::$filters[$name] = [
|
||||
'encode' => $encode,
|
||||
|
|
|
@ -17,7 +17,7 @@ class Document extends ArrayObject
|
|||
*
|
||||
* @see ArrayObject::__construct
|
||||
*
|
||||
* @param null $input
|
||||
* @param array $input
|
||||
* @param int $flags
|
||||
* @param string $iterator_class
|
||||
*/
|
||||
|
@ -49,7 +49,7 @@ class Document extends ArrayObject
|
|||
}
|
||||
|
||||
/**
|
||||
* @return int|null
|
||||
* @return string
|
||||
*/
|
||||
public function getCollection()
|
||||
{
|
||||
|
@ -196,7 +196,7 @@ class Document extends ArrayObject
|
|||
/**
|
||||
* Checks if a document key is set.
|
||||
*
|
||||
* @param $key
|
||||
* @param string $key
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
|
|
@ -15,7 +15,7 @@ class Authorization extends Validator
|
|||
/**
|
||||
* @var Document
|
||||
*/
|
||||
protected $document = null;
|
||||
protected $document;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
|
@ -56,7 +56,7 @@ class Authorization extends Validator
|
|||
*
|
||||
* Returns true if valid or false if not.
|
||||
*
|
||||
* @param array $permissions
|
||||
* @param mixed $permissions
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
@ -89,8 +89,10 @@ class Authorization extends Validator
|
|||
|
||||
/**
|
||||
* @param string $role
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public static function setRole($role)
|
||||
public static function setRole($role): void
|
||||
{
|
||||
self::$roles[] = $role;
|
||||
}
|
||||
|
@ -120,8 +122,10 @@ class Authorization extends Validator
|
|||
* Change default status.
|
||||
* This will be used for the
|
||||
* value set on the self::reset() method
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public static function setDefaultStatus($status)
|
||||
public static function setDefaultStatus($status): void
|
||||
{
|
||||
self::$statusDefault = $status;
|
||||
self::$status = $status;
|
||||
|
@ -129,24 +133,30 @@ class Authorization extends Validator
|
|||
|
||||
/**
|
||||
* Enable Authorization checks
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public static function enable()
|
||||
public static function enable(): void
|
||||
{
|
||||
self::$status = true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Disable Authorization checks
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public static function disable()
|
||||
public static function disable(): void
|
||||
{
|
||||
self::$status = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Disable Authorization checks
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public static function reset()
|
||||
public static function reset(): void
|
||||
{
|
||||
self::$status = self::$statusDefault;
|
||||
}
|
||||
|
|
|
@ -31,7 +31,11 @@ class Collection extends Structure
|
|||
}
|
||||
|
||||
/**
|
||||
* @param Document $document
|
||||
* Is valid.
|
||||
*
|
||||
* Returns true if valid or false if not.
|
||||
*
|
||||
* @param mixed $document
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
|
|
@ -16,7 +16,7 @@ class DocumentId extends Validator
|
|||
/**
|
||||
* @var Database
|
||||
*/
|
||||
protected $database = null;
|
||||
protected $database;
|
||||
|
||||
/**
|
||||
* @var string
|
||||
|
|
|
@ -15,7 +15,7 @@ class Permissions extends Validator
|
|||
/**
|
||||
* @var Document
|
||||
*/
|
||||
protected $document = null;
|
||||
protected $document;
|
||||
|
||||
/**
|
||||
* Structure constructor.
|
||||
|
@ -44,7 +44,7 @@ class Permissions extends Validator
|
|||
*
|
||||
* Returns true if valid or false if not.
|
||||
*
|
||||
* @param array $value
|
||||
* @param mixed $value
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
|
|
@ -29,9 +29,9 @@ class Structure extends Validator
|
|||
protected $database;
|
||||
|
||||
/**
|
||||
* @var int
|
||||
* @var string
|
||||
*/
|
||||
protected $id = null;
|
||||
protected $id = '';
|
||||
|
||||
/**
|
||||
* Basic rules to apply on all documents.
|
||||
|
@ -118,7 +118,7 @@ class Structure extends Validator
|
|||
*
|
||||
* Returns true if valid or false if not.
|
||||
*
|
||||
* @param Document $document
|
||||
* @param mixed $document
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
@ -156,9 +156,14 @@ class Structure extends Validator
|
|||
|
||||
foreach ($array as $key => $value) {
|
||||
$rule = $collection->search('key', $key, $rules);
|
||||
$ruleType = (isset($rule['type'])) ? $rule['type'] : '';
|
||||
$ruleRequired = (isset($rule['required'])) ? $rule['required'] : true;
|
||||
$ruleArray = (isset($rule['array'])) ? $rule['array'] : false;
|
||||
|
||||
if(!$rule) {
|
||||
continue;
|
||||
}
|
||||
|
||||
$ruleType = $rule['type'] ?? '';
|
||||
$ruleRequired = $rule['required'] ?? true;
|
||||
$ruleArray = $rule['array'] ?? false;
|
||||
$validator = null;
|
||||
|
||||
switch ($ruleType) {
|
||||
|
@ -269,7 +274,14 @@ class Structure extends Validator
|
|||
return true;
|
||||
}
|
||||
|
||||
protected function getCollection($id)
|
||||
/**
|
||||
* Get Collection
|
||||
*
|
||||
* Get Collection by unique ID
|
||||
*
|
||||
* @return Document
|
||||
*/
|
||||
protected function getCollection($id): Document
|
||||
{
|
||||
return $this->database->getDocument($id);
|
||||
}
|
||||
|
|
|
@ -15,7 +15,7 @@ class UID extends Validator
|
|||
*/
|
||||
public function getDescription()
|
||||
{
|
||||
return 'Validate UUID format';
|
||||
return 'Invalid UID format';
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -23,12 +23,20 @@ class UID extends Validator
|
|||
*
|
||||
* Returns true if valid or false if not.
|
||||
*
|
||||
* @param string $value
|
||||
* @param mixed $value
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isValid($value)
|
||||
{
|
||||
if ($value === 0) { // TODO Deprecate confition when we get the chance.
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!is_string($value)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if(mb_strlen($value) > 32) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -28,7 +28,7 @@ class Compose
|
|||
}
|
||||
|
||||
/**
|
||||
* @return array
|
||||
* @return string
|
||||
*/
|
||||
public function getVersion(): string
|
||||
{
|
||||
|
|
|
@ -54,7 +54,7 @@ class Service
|
|||
public function getImageVersion(): string
|
||||
{
|
||||
$image = $this->getImage();
|
||||
return substr($image, strpos($image, ':')+1);
|
||||
return substr($image, ((int)strpos($image, ':'))+1);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -46,7 +46,7 @@ class Env
|
|||
/**
|
||||
* @param string $key
|
||||
*
|
||||
* @return mixed|null
|
||||
* @return string
|
||||
*/
|
||||
public function getVar(string $key): string
|
||||
{
|
||||
|
|
|
@ -59,7 +59,7 @@ class PDO extends PDONative
|
|||
return $this->pdo->quote($string, $parameter_type);
|
||||
}
|
||||
|
||||
public function reconnect()
|
||||
public function reconnect(): PDONative
|
||||
{
|
||||
$this->pdo = new PDONative($this->dsn, $this->username, $this->passwd, $this->options);
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ use Utopia\Validator;
|
|||
class CNAME extends Validator
|
||||
{
|
||||
/**
|
||||
* @var int
|
||||
* @var string
|
||||
*/
|
||||
protected $target;
|
||||
|
||||
|
@ -19,6 +19,9 @@ class CNAME extends Validator
|
|||
$this->target = $target;
|
||||
}
|
||||
|
||||
/**
|
||||
* @return string
|
||||
*/
|
||||
public function getDescription()
|
||||
{
|
||||
return 'Invalid CNAME record';
|
||||
|
@ -27,19 +30,19 @@ class CNAME extends Validator
|
|||
/**
|
||||
* Check if CNAME record target value matches selected target
|
||||
*
|
||||
* @param string $domain
|
||||
* @param mixed $domain
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isValid($domain)
|
||||
{
|
||||
try {
|
||||
$records = \dns_get_record($domain, DNS_CNAME);
|
||||
} catch (\Throwable $th) {
|
||||
if(!is_string($domain)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!$records || !\is_array($records)) {
|
||||
try {
|
||||
$records = \dns_get_record($domain, DNS_CNAME);
|
||||
} catch (\Throwable $th) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -93,12 +93,16 @@ class Origin extends Validator
|
|||
* Check if Origin has been whiltlisted
|
||||
* for access to the API
|
||||
*
|
||||
* @param string $origin
|
||||
* @param mixed $origin
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isValid($origin)
|
||||
{
|
||||
if(!is_string($origin)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$scheme = \parse_url($origin, PHP_URL_SCHEME);
|
||||
$host = \parse_url($origin, PHP_URL_HOST);
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@ class OpenSSL
|
|||
* @param $length
|
||||
* @param null $crypto_strong
|
||||
*
|
||||
* @return int
|
||||
* @return false|string
|
||||
*/
|
||||
public static function randomPseudoBytes($length, &$crypto_strong = null)
|
||||
{
|
||||
|
|
|
@ -34,7 +34,7 @@ class Resize
|
|||
*
|
||||
* @return Resize
|
||||
*
|
||||
* @throws \ImagickException
|
||||
* @throws \Throwable
|
||||
*/
|
||||
public function crop(int $width, int $height)
|
||||
{
|
||||
|
@ -73,7 +73,7 @@ class Resize
|
|||
*
|
||||
* @return Resize
|
||||
*
|
||||
* @throws \ImagickException
|
||||
* @throws \Throwable
|
||||
*/
|
||||
public function setBackground($color)
|
||||
{
|
||||
|
@ -133,7 +133,7 @@ class Resize
|
|||
case 'webp':
|
||||
try {
|
||||
$this->image->setImageFormat('webp');
|
||||
} catch (\ImagickException $th) {
|
||||
} catch (\Throwable $th) {
|
||||
$signature = $this->image->getImageSignature();
|
||||
$temp = '/tmp/temp-'.$signature.'.'.\strtolower($this->image->getImageFormat());
|
||||
$output = '/tmp/output-'.$signature.'.webp';
|
||||
|
|
|
@ -73,7 +73,7 @@ abstract class Device
|
|||
* @param string $path
|
||||
* @param string $data
|
||||
*
|
||||
* @return string
|
||||
* @return bool
|
||||
*/
|
||||
abstract public function write(string $path, string $data): bool;
|
||||
|
||||
|
|
|
@ -72,7 +72,7 @@ class Local extends Device
|
|||
*
|
||||
* @throws \Exception
|
||||
*
|
||||
* @return string|bool saved destination on success or false on failures
|
||||
* @return bool
|
||||
*/
|
||||
public function upload($source, $path):bool
|
||||
{
|
||||
|
@ -117,7 +117,7 @@ class Local extends Device
|
|||
}
|
||||
}
|
||||
|
||||
return \file_put_contents($path, $data);
|
||||
return (bool)\file_put_contents($path, $data);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -51,7 +51,7 @@ class S3 extends Device
|
|||
*
|
||||
* @throws \Exception
|
||||
*
|
||||
* @return string|bool saved destination on success or false on failures
|
||||
* @return bool
|
||||
*/
|
||||
public function upload($source, $path):bool
|
||||
{
|
||||
|
|
|
@ -24,8 +24,10 @@ class Storage
|
|||
* @param Device $device
|
||||
*
|
||||
* @throws Exception
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public static function setDevice($name, Device $device)
|
||||
public static function setDevice($name, Device $device): void
|
||||
{
|
||||
self::$devices[$name] = $device;
|
||||
}
|
||||
|
@ -104,7 +106,7 @@ class Storage
|
|||
),
|
||||
);
|
||||
|
||||
$factor = floor((strlen($bytes) - 1) / 3);
|
||||
$factor = (int)floor((strlen((string)$bytes) - 1) / 3);
|
||||
|
||||
return sprintf("%.{$decimals}f%s", $bytes / pow($mod, $factor), $units[$system][$factor]);
|
||||
}
|
||||
|
|
|
@ -16,7 +16,7 @@ class File extends Validator
|
|||
*
|
||||
* TODO think what to do here, currently only used for parameter to be present in SDKs
|
||||
*
|
||||
* @param string $name
|
||||
* @param mixed $name
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
|
|
@ -14,7 +14,7 @@ class FileName extends Validator
|
|||
/**
|
||||
* The file name can only contain "a-z", "A-Z", "0-9" and "-" and not empty.
|
||||
*
|
||||
* @param string $name
|
||||
* @param mixed $name
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
|
@ -24,6 +24,10 @@ class FileName extends Validator
|
|||
return false;
|
||||
}
|
||||
|
||||
if(!is_string($name)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!\preg_match('/^[a-zA-Z0-9.]+$/', $name)) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -29,12 +29,16 @@ class FileSize extends Validator
|
|||
/**
|
||||
* Finds whether a file size is smaller than required limit.
|
||||
*
|
||||
* @param int $fileSize
|
||||
* @param mixed $fileSize
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isValid($fileSize)
|
||||
{
|
||||
if(!is_int($fileSize)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($fileSize > $this->max) {
|
||||
return false;
|
||||
}
|
||||
|
|
|
@ -14,12 +14,16 @@ class Upload extends Validator
|
|||
/**
|
||||
* Check if a file is a valid upload file
|
||||
*
|
||||
* @param string $path
|
||||
* @param mixed $path
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function isValid($path)
|
||||
{
|
||||
if(!is_string($path)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (\is_uploaded_file($path)) {
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -97,9 +97,9 @@ class URL
|
|||
*
|
||||
* Convert query string array to string
|
||||
*
|
||||
* @param string $query
|
||||
* @param array $query
|
||||
*
|
||||
* @return array
|
||||
* @return string
|
||||
*/
|
||||
public static function unparseQuery(array $query):string
|
||||
{
|
||||
|
|
|
@ -112,6 +112,8 @@ class Response extends SwooleResponse
|
|||
|
||||
/**
|
||||
* Response constructor.
|
||||
*
|
||||
* @param float $time
|
||||
*/
|
||||
public function __construct(SwooleHTTPResponse $response)
|
||||
{
|
||||
|
@ -275,8 +277,10 @@ class Response extends SwooleResponse
|
|||
* @see https://en.wikipedia.org/wiki/YAML
|
||||
*
|
||||
* @param array $data
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function yaml(array $data)
|
||||
public function yaml(array $data): void
|
||||
{
|
||||
if(!extension_loaded('yaml')) {
|
||||
throw new Exception('Missing yaml extension. Learn more at: https://www.php.net/manual/en/book.yaml.php');
|
||||
|
|
|
@ -31,7 +31,7 @@ abstract class Model
|
|||
/**
|
||||
* Get Rules
|
||||
*
|
||||
* @return string
|
||||
* @return array
|
||||
*/
|
||||
public function getRules(): array
|
||||
{
|
||||
|
|
|
@ -23,7 +23,7 @@ class Error extends Model
|
|||
->addRule('version', [
|
||||
'type' => 'string',
|
||||
'description' => 'Server version number.',
|
||||
'example' => APP_VERSION_STABLE,
|
||||
'example' => '1.0',
|
||||
])
|
||||
;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue