CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-18 18:54:55 +12:00
Code Issues Projects Releases Wiki Activity

Fixed PSR issues in Utopia Library

Browse source 
Signed-off-by: Asmit2952 <asmitbm2952002@gmail.com>
This commit is contained in:
Asmit2952 2021-10-06 19:52:38 +05:30
parent 026efb8c25
commit 5a729e0932
40 changed files with 201 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Appwrite/Utopia/Response.php
View file

@ -268,7 +268,7 @@ class Response extends SwooleResponse
$output = $this->output($document, $model);
// If filter is set, parse the output
if(self::isFilter()){
if (self::isFilter()) {
$output = self::getFilter()->parse($output, $model);
}

6
src/Appwrite/Utopia/Response/Filter.php
View file

@ -2,7 +2,8 @@
namespace Appwrite\Utopia\Response;
abstract class Filter {
abstract class Filter
{
/**
* Parse the content to another format.
@ -12,6 +13,5 @@ abstract class Filter {
*
* @return array
*/
abstract function parse(array $content, string $model): array;
abstract public function parse(array $content, string $model): array;
}

49
src/Appwrite/Utopia/Response/Filters/V06.php
View file

@ -12,14 +12,15 @@ use Exception;
use Utopia\Config\Config;
use Utopia\Locale\Locale as Locale;
class V06 extends Filter {
class V06 extends Filter
{
// Convert 0.7 Data format to 0.6 format
public function parse(array $content, string $model): array {
public function parse(array $content, string $model): array
{
$parsedResponse = [];
switch($model) {
switch ($model) {
case Response::MODEL_DOCUMENT_LIST:
$parsedResponse = $content;
@ -33,15 +34,15 @@ class V06 extends Filter {
$parsedResponse = $this->parseCollectionList($content);
break;
case Response::MODEL_FILE :
case Response::MODEL_FILE:
$parsedResponse = $this->parseFile($content);
break;
case Response::MODEL_FILE_LIST :
case Response::MODEL_FILE_LIST:
$parsedResponse = $content;
break;
case Response::MODEL_USER :
case Response::MODEL_USER:
$parsedResponse = $this->parseUser($content);
break;
@ -65,15 +66,15 @@ class V06 extends Filter {
$parsedResponse = $content['memberships'];
break;
case Response::MODEL_SESSION :
case Response::MODEL_SESSION:
$parsedResponse = $this->parseSession($content);
break;
case Response::MODEL_SESSION_LIST :
case Response::MODEL_SESSION_LIST:
$parsedResponse = $this->parseSessionList($content);
break;
case Response::MODEL_LOG_LIST :
case Response::MODEL_LOG_LIST:
$parsedResponse = $this->parseLogList($content);
break;
@ -105,9 +106,9 @@ class V06 extends Filter {
$parsedResponse = $content;
break;
case Response::MODEL_ANY :
case Response::MODEL_DOCUMENT :
case Response::MODEL_PREFERENCES :
case Response::MODEL_ANY:
case Response::MODEL_DOCUMENT:
case Response::MODEL_PREFERENCES:
$parsedResponse = $content;
break;
@ -120,7 +121,7 @@ class V06 extends Filter {
private function parseCollectionList(array $content)
{
foreach($content['collections'] as $key => $collection){
foreach ($content['collections'] as $key => $collection) {
$content['collections'][$key] = $this->parseCollection($collection);
}
return $content;
@ -154,7 +155,7 @@ class V06 extends Filter {
$content['locations'] = [];
$currencies = $content['currencies'];
$parsedResponse = [];
foreach($currencies as $currency) {
foreach ($currencies as $currency) {
$currency['locations'] = [];
$parsedResponse[] = $currency;
}
@ -166,7 +167,7 @@ class V06 extends Filter {
{
$continents = $content['continents'];
$parsedResponse = [];
foreach($continents as $continent) {
foreach ($continents as $continent) {
$parsedResponse[$continent['code']] = $continent['name'];
}
$content['continents'] = $parsedResponse;
@ -177,7 +178,7 @@ class V06 extends Filter {
{
$phones = $content['phones'];
$parsedResponse = [];
foreach($phones as $phone) {
foreach ($phones as $phone) {
$parsedResponse[$phone['countryCode']] = $phone['code'];
}
$content['phones'] = $parsedResponse;
@ -188,7 +189,7 @@ class V06 extends Filter {
{
$countries = $content['countries'];
$parsedResponse = [];
foreach($countries as $country) {
foreach ($countries as $country) {
$parsedResponse[$country['code']] = $country['name'];
}
$content['countries'] = $parsedResponse;
@ -224,7 +225,7 @@ class V06 extends Filter {
{
$teams = $content['teams'];
$parsedResponse = [];
foreach($teams as $team) {
foreach ($teams as $team) {
$parsedResponse[] = $this->parseTeam($team);
}
$content['teams'] = $parsedResponse;
@ -235,7 +236,7 @@ class V06 extends Filter {
{
$logs = $content['logs'];
$parsedResponse = [];
foreach($logs as $log) {
foreach ($logs as $log) {
$parsedResponse[] = [
'brand' => $log['deviceBrand'],
'device' => $log['deviceName'],
@ -245,7 +246,7 @@ class V06 extends Filter {
'time' => $log['time'],
'geo' => [
'isoCode' => empty($log['countryCode']) ? '---' : $log['countryCode'] ,
'country' => empty($log['countryName'] ) ? Locale::getText('locale.country.unknown') : $log['countryName']
'country' => empty($log['countryName']) ? Locale::getText('locale.country.unknown') : $log['countryName']
],
'OS' => [
'name' => $log['osName'],
@ -270,7 +271,7 @@ class V06 extends Filter {
{
$sessions = $content['sessions'];
$parsedResponse = [];
foreach($sessions as $session) {
foreach ($sessions as $session) {
$parsedResponse[] = [
'$id' => $session['$id'],
'brand' => $session['deviceBrand'],
@ -280,7 +281,7 @@ class V06 extends Filter {
'model' => $session['deviceModel'],
'geo' => [
'isoCode' => empty($session['countryCode']) ? '---' : $session['countryCode'] ,
'country' => empty($session['countryName'] ) ? Locale::getText('locale.country.unknown') : $session['countryName']
'country' => empty($session['countryName']) ? Locale::getText('locale.country.unknown') : $session['countryName']
],
'OS' => [
'name' => $session['osName'],
@ -311,7 +312,7 @@ class V06 extends Filter {
{
$users = $content['users'];
$parsedResponse = [];
foreach($users as $user) {
foreach ($users as $user) {
$parsedResponse[] = $this->parseUser($user);
}
$content['users'] = $parsedResponse;

26
src/Appwrite/Utopia/Response/Filters/V07.php
View file

@ -5,19 +5,25 @@ namespace Appwrite\Utopia\Response\Filters;
use Appwrite\Utopia\Response;
use Appwrite\Utopia\Response\Filter;
use Exception;
class V07 extends Filter {
class V07 extends Filter
{
// Convert 0.8 Data format to 0.7 format
public function parse(array $content, string $model): array {
public function parse(array $content, string $model): array
{
$parsedResponse = [];
switch($model) {
switch ($model) {
case Response::MODEL_DOCUMENT_LIST: /** ANY was replaced by DOCUMENT in 0.8.x but this is backward compatible with 0.7.x */
// no break
case Response::MODEL_DOCUMENT: /** ANY was replaced by DOCUMENT in 0.8.x but this is backward compatible with 0.7.x */
// no break
case Response::MODEL_USER_LIST: /** [FIELDS ADDED in 0.8.x] passwordUpdate */
// no break
case Response::MODEL_USER: /** [FIELDS ADDED in 0.8.x] passwordUpdate */
// no break
case Response::MODEL_COLLECTION_LIST:
case Response::MODEL_COLLECTION:
case Response::MODEL_FILE_LIST:
@ -31,7 +37,9 @@ class V07 extends Filter {
case Response::MODEL_MEMBERSHIP_LIST:
case Response::MODEL_MEMBERSHIP:
case Response::MODEL_SESSION_LIST: /** [FIELDS ADDED in 0.8.x] provider, providerUid, providerToken */
// no break
case Response::MODEL_SESSION: /** [FIELDS ADDED in 0.8.x] provider, providerUid, providerToken */
// no break
case Response::MODEL_JWT:
case Response::MODEL_LOG:
case Response::MODEL_LOG_LIST:
@ -63,6 +71,7 @@ class V07 extends Filter {
case Response::MODEL_MOCK:
case Response::MODEL_ANY:
case Response::MODEL_PREFERENCES: /** ANY was replaced by PREFERENCES in 0.8.x but this is backward compatible with 0.7.x */
// no break
case Response::MODEL_NONE:
case Response::MODEL_ERROR:
case Response::MODEL_ERROR_DEV:
@ -81,20 +90,21 @@ class V07 extends Filter {
return $parsedResponse;
}
protected function parseFunction(array $content) {
protected function parseFunction(array $content)
{
$content['env'] = $content['runtime'];
unset($content['runtime']);
return $content;
}
protected function parseFunctionList(array $content){
protected function parseFunctionList(array $content)
{
$functions = $content['functions'];
$parsedResponse = [];
foreach($functions as $function) {
foreach ($functions as $function) {
$parsedResponse[] = $this->parseFunction($function);
}
$content['functions'] = $parsedResponse;
return $content;
}
}

18
src/Appwrite/Utopia/Response/Filters/V08.php
View file

@ -6,15 +6,15 @@ use Appwrite\Utopia\Response;
use Appwrite\Utopia\Response\Filter;
use Exception;
class V08 extends Filter {
class V08 extends Filter
{
// Convert 0.9 Data format to 0.8 format
public function parse(array $content, string $model): array {
public function parse(array $content, string $model): array
{
$parsedResponse = [];
switch($model) {
switch ($model) {
case Response::MODEL_DOCUMENT_LIST:
case Response::MODEL_DOCUMENT:
@ -83,16 +83,18 @@ class V08 extends Filter {
return $parsedResponse;
}
protected function parseFunction(array $content) {
protected function parseFunction(array $content)
{
$content['env'] = $content['runtime'];
unset($content['runtime']);
return $content;
}
protected function parseFunctionList(array $content){
protected function parseFunctionList(array $content)
{
$functions = $content['functions'];
$parsedResponse = [];
foreach($functions as $function) {
foreach ($functions as $function) {
$parsedResponse[] = $this->parseFunction($function);
}
$content['functions'] = $parsedResponse;

4
src/Appwrite/Utopia/Response/Model.php
View file

@ -75,8 +75,8 @@ abstract class Model
{
$list = [];
foreach($this->rules as $key => $rule) {
if(isset($rule['require']) || $rule['require']) {
foreach ($this->rules as $key => $rule) {
if (isset($rule['require']) || $rule['require']) {
$list[] = $key;
}
}