1
0
Fork 0
mirror of synced 2024-06-14 00:34:51 +12:00

Updated namespace structure

This commit is contained in:
Eldad Fux 2020-06-22 15:17:14 +03:00
parent 38758884b5
commit 32f917c78a
13 changed files with 27 additions and 62 deletions

View file

@ -133,7 +133,8 @@ $utopia->post('/v1/account')
->setParam('resource', 'users/'.$user->getId())
;
$response->dynamic($user);
$response->json($user->getArrayCopy());
//$response->dynamic($user);
}
);

View file

@ -22,7 +22,7 @@ use Appwrite\Database\Document;
use Appwrite\Database\Validator\Authorization;
use Appwrite\Database\Adapter\MySQL as MySQLAdapter;
use Appwrite\Database\Adapter\Redis as RedisAdapter;
use Appwrite\Response\Response;
use Appwrite\Utopia\Response;
use PHPMailer\PHPMailer\PHPMailer;
const APP_NAME = 'Appwrite';

View file

@ -1,37 +0,0 @@
<?php
namespace Appwrite\Response\Result;
use Appwrite\Database\Database;
use Appwrite\Response\Result;
class Sessions extends Result
{
public function __construct()
{
$this
->addRule('$id', 'string', 'Session ID.', '5e5ea5c16897e')
->addRule('expire', 'integer', 'Session expiration date in UNIX format.', 1583261121)
;
}
/**
* Get Name
*
* @return string
*/
public function getName():string
{
return 'Session';
}
/**
* Get Collection
*
* @return string
*/
public function getCollection():string
{
return Database::SYSTEM_COLLECTION_TOKENS;
}
}

View file

@ -1,10 +1,11 @@
<?php
namespace Appwrite\Response;
namespace Appwrite\Utopia;
use Exception;
use Appwrite\Database\Document;
use Appwrite\Response\Result\User;
use Appwrite\Utopia\Response\Result;
use Appwrite\Utopia\Response\Result\User;
use Utopia\Response as UtopiaResponse;
class Response extends UtopiaResponse
@ -13,7 +14,7 @@ class Response extends UtopiaResponse
public function __construct()
{
$this
->setResult(new User)
->setResult(new User())
;
}
@ -47,7 +48,7 @@ class Response extends UtopiaResponse
public function getResult(string $key): Result
{
if(!isset($this->results[$key])) {
throw new Exception('Undefined result');
throw new Exception('Undefined result: '.$key);
}
return $this->results[$key];
@ -66,7 +67,7 @@ class Response extends UtopiaResponse
foreach($result->getRules() as $key => $rule) {
if(!isset($data[$key])) {
throw new Exception('Missing result key');
throw new Exception('Missing response key: ' . $key);
}
$output[$key] = $data[$key];

View file

@ -1,6 +1,6 @@
<?php
namespace Appwrite\Response;
namespace Appwrite\Utopia\Response;
abstract class Result
{

View file

@ -1,9 +1,9 @@
<?php
namespace Appwrite\Response\Result;
namespace Appwrite\Utopia\Response\Result;
use Appwrite\Database\Database;
use Appwrite\Response\Result;
use Appwrite\Utopia\Response\Result;
class File extends Result
{

View file

@ -1,9 +1,9 @@
<?php
namespace Appwrite\Response\Result;
namespace Appwrite\Utopia\Response\Result;
use Appwrite\Database\Database;
use Appwrite\Response\Result;
use Appwrite\Utopia\Response\Result;
class Files extends Result
{

View file

@ -1,9 +1,9 @@
<?php
namespace Appwrite\Response\Result;
namespace Appwrite\Utopia\Response\Result;
use Appwrite\Database\Database;
use Appwrite\Response\Result;
use Appwrite\Utopia\Response\Result;
class Health extends Result
{

View file

@ -1,9 +1,9 @@
<?php
namespace Appwrite\Response\Result;
namespace Appwrite\Utopia\Response\Result;
use Appwrite\Database\Database;
use Appwrite\Response\Result;
use Appwrite\Utopia\Response\Result;
class Log extends Result
{

View file

@ -1,9 +1,9 @@
<?php
namespace Appwrite\Response\Result;
namespace Appwrite\Utopia\Response\Result;
use Appwrite\Database\Database;
use Appwrite\Response\Result;
use Appwrite\Utopia\Response\Result;
class Prefs extends Result
{

View file

@ -1,9 +1,9 @@
<?php
namespace Appwrite\Response\Result;
namespace Appwrite\Utopia\Response\Result;
use Appwrite\Database\Database;
use Appwrite\Response\Result;
use Appwrite\Utopia\Response\Result;
class Session extends Result
{

View file

@ -1,9 +1,9 @@
<?php
namespace Appwrite\Response\Result;
namespace Appwrite\Utopia\Response\Result;
use Appwrite\Database\Database;
use Appwrite\Response\Result;
use Appwrite\Utopia\Response\Result;
class Token extends Result
{

View file

@ -1,9 +1,9 @@
<?php
namespace Appwrite\Response\Result;
namespace Appwrite\Utopia\Response\Result;
use Appwrite\Database\Database;
use Appwrite\Response\Result;
use Appwrite\Utopia\Response\Result;
class User extends Result
{
@ -35,6 +35,6 @@ class User extends Result
*/
public function getCollection():string
{
return Database::SYSTEM_COLLECTION_TOKENS;
return Database::SYSTEM_COLLECTION_USERS;
}
}