Skip to content

Making ParseUser and ParseRole subclassable #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2015
Merged

Making ParseUser and ParseRole subclassable #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/Parse/ParseClient.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,14 @@ final class ParseClient
*/
public static function initialize($app_id, $rest_key, $master_key, $enableCurlExceptions = true)
{
ParseUser::registerSubclass();
ParseRole::registerSubclass();
if (! ParseObject::hasRegisteredSubclass('_User')) {
ParseUser::registerSubclass();
}

if (! ParseObject::hasRegisteredSubclass('_Role')) {
ParseRole::registerSubclass();
}

ParseInstallation::registerSubclass();
ParseSession::registerSubclass();
self::$applicationId = $app_id;
Expand Down
29 changes: 29 additions & 0 deletions src/Parse/ParseObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1224,6 +1224,35 @@ public static function _unregisterSubclass()
unset(self::$registeredSubclasses[$subclass]);
}

/**
* Check whether there is a subclass registered for a given parse class
*
* @param $parseClassName
*
* @return bool
*/
public static function hasRegisteredSubclass($parseClassName)
{
return array_key_exists($parseClassName, self::$registeredSubclasses);
}

/**
* Get the registered subclass for a Parse class, or a generic ParseObject
* if no subclass is registered.
*
* @param $parseClassName
*
* @return ParseObject
*/
public static function getRegisteredSubclass($parseClassName)
{
if (self::hasRegisteredSubclass($parseClassName)) {
return self::$registeredSubclasses[$parseClassName];
}

return new static($parseClassName);
}

/**
* Creates a ParseQuery for the subclass of ParseObject.
* Cannot be called on the base class ParseObject.
Expand Down
18 changes: 9 additions & 9 deletions src/Parse/ParseUser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class ParseUser extends ParseObject
*
* @var ParseUser
*/
private static $currentUser = null;
protected static $currentUser = null;

/**
* The sessionToken for an authenticated user.
Expand Down Expand Up @@ -137,7 +137,7 @@ public static function logIn($username, $password)
}
$data = ["username" => $username, "password" => $password];
$result = ParseClient::_request("GET", "/1/login", "", $data);
$user = new ParseUser();
$user = new static();
$user->_mergeAfterFetch($result);
$user->handleSaveResult(true);
ParseClient::getStorage()->set("user", $user);
Expand All @@ -156,7 +156,7 @@ public static function logIn($username, $password)
public static function become($sessionToken)
{
$result = ParseClient::_request('GET', '/1/users/me', $sessionToken);
$user = new ParseUser();
$user = new static();
$user->_mergeAfterFetch($result);
$user->handleSaveResult(true);
ParseClient::getStorage()->set("user", $user);
Expand All @@ -173,7 +173,7 @@ public static function become($sessionToken)
*/
public static function logOut()
{
$user = ParseUser::getCurrentUser();
$user = static::getCurrentUser();
if ($user) {
try {
ParseClient::_request('POST', '/1/logout', $user->getSessionToken());
Expand All @@ -192,7 +192,7 @@ public static function logOut()
*
* @return null
*/
private function handleSaveResult($makeCurrent = false)
protected function handleSaveResult($makeCurrent = false)
{
if (isset($this->serverData['password'])) {
unset($this->serverData['password']);
Expand Down Expand Up @@ -227,7 +227,7 @@ public static function getCurrentUser()
return $userData;
}
if (isset($userData["id"]) && isset($userData["_sessionToken"])) {
$user = ParseUser::create("_User", $userData["id"]);
$user = static::create("_User", $userData["id"]);
unset($userData["id"]);
$user->_sessionToken = $userData["_sessionToken"];
unset($userData["_sessionToken"]);
Expand All @@ -251,7 +251,7 @@ public static function getCurrentUser()
protected static function saveCurrentUser()
{
$storage = ParseClient::getStorage();
$storage->set('user', ParseUser::getCurrentUser());
$storage->set('user', static::getCurrentUser());
}

/**
Expand All @@ -271,8 +271,8 @@ public function getSessionToken()
*/
public function isCurrent()
{
if (ParseUser::getCurrentUser() && $this->getObjectId()) {
if ($this->getObjectId() == ParseUser::getCurrentUser()->getObjectId()) {
if (static::getCurrentUser() && $this->getObjectId()) {
if ($this->getObjectId() == static::getCurrentUser()->getObjectId()) {
return true;
}
}
Expand Down