@@ -14,7 +14,7 @@ class ParseUser extends ParseObject
14
14
/**
15
15
* @var ParseUser The currently logged-in user.
16
16
*/
17
- private static $ currentUser = null ;
17
+ protected static $ currentUser = null ;
18
18
19
19
/**
20
20
* @var string The sessionToken for an authenticated user.
@@ -90,7 +90,7 @@ public function isAuthenticated()
90
90
/**
91
91
* Signs up the current user, or throw if invalid.
92
92
* This will create a new ParseUser on the server, and also persist the
93
- * session so that you can access the user using ParseUser ::getCurrentUser();.
93
+ * session so that you can access the user using static ::getCurrentUser();.
94
94
*/
95
95
public function signUp ()
96
96
{
@@ -133,7 +133,7 @@ public static function logIn($username, $password)
133
133
}
134
134
$ data = ["username " => $ username , "password " => $ password ];
135
135
$ result = ParseClient::_request ("GET " , "/1/login " , "" , $ data );
136
- $ user = new ParseUser ();
136
+ $ user = new static ();
137
137
$ user ->_mergeAfterFetch ($ result );
138
138
$ user ->handleSaveResult (true );
139
139
ParseClient::getStorage ()->set ("user " , $ user );
@@ -152,7 +152,7 @@ public static function logIn($username, $password)
152
152
public static function become ($ sessionToken )
153
153
{
154
154
$ result = ParseClient::_request ('GET ' , '/1/users/me ' , $ sessionToken );
155
- $ user = new ParseUser ();
155
+ $ user = new static ();
156
156
$ user ->_mergeAfterFetch ($ result );
157
157
$ user ->handleSaveResult (true );
158
158
ParseClient::getStorage ()->set ("user " , $ user );
@@ -169,7 +169,7 @@ public static function become($sessionToken)
169
169
*/
170
170
public static function logOut ()
171
171
{
172
- $ user = ParseUser ::getCurrentUser ();
172
+ $ user = static ::getCurrentUser ();
173
173
if ($ user ) {
174
174
try {
175
175
ParseClient::_request ('POST ' , '/1/logout ' , $ user ->getSessionToken ());
@@ -188,7 +188,7 @@ public static function logOut()
188
188
*
189
189
* @return null
190
190
*/
191
- private function handleSaveResult ($ makeCurrent = false )
191
+ public function handleSaveResult ($ makeCurrent = false )
192
192
{
193
193
if (isset ($ this ->serverData ['password ' ])) {
194
194
unset($ this ->serverData ['password ' ]);
@@ -223,7 +223,7 @@ public static function getCurrentUser()
223
223
return $ userData ;
224
224
}
225
225
if (isset ($ userData ["id " ]) && isset ($ userData ["_sessionToken " ])) {
226
- $ user = ParseUser ::create ("_User " , $ userData ["id " ]);
226
+ $ user = static ::create ("_User " , $ userData ["id " ]);
227
227
unset($ userData ["id " ]);
228
228
$ user ->_sessionToken = $ userData ["_sessionToken " ];
229
229
unset($ userData ["_sessionToken " ]);
@@ -247,7 +247,7 @@ public static function getCurrentUser()
247
247
protected static function saveCurrentUser ()
248
248
{
249
249
$ storage = ParseClient::getStorage ();
250
- $ storage ->set ('user ' , ParseUser ::getCurrentUser ());
250
+ $ storage ->set ('user ' , static ::getCurrentUser ());
251
251
}
252
252
253
253
/**
@@ -267,8 +267,8 @@ public function getSessionToken()
267
267
*/
268
268
public function isCurrent ()
269
269
{
270
- if (ParseUser ::getCurrentUser () && $ this ->getObjectId ()) {
271
- if ($ this ->getObjectId () == ParseUser ::getCurrentUser ()->getObjectId ()) {
270
+ if (static ::getCurrentUser () && $ this ->getObjectId ()) {
271
+ if ($ this ->getObjectId () == static ::getCurrentUser ()->getObjectId ()) {
272
272
return true ;
273
273
}
274
274
}
0 commit comments