From df4d87814b74db2f61cab778232a5c0c88eaa7b4 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Thu, 26 Nov 2015 17:35:39 +0800 Subject: [PATCH 001/249] [WIP] LeanEngine runtime --- src/LeanCloud/Engine/Cloud.php | 77 +++++++ src/LeanCloud/Engine/FunctionError.php | 15 ++ src/LeanCloud/Engine/LeanEngine.php | 275 +++++++++++++++++++++++++ 3 files changed, 367 insertions(+) create mode 100644 src/LeanCloud/Engine/Cloud.php create mode 100644 src/LeanCloud/Engine/FunctionError.php create mode 100644 src/LeanCloud/Engine/LeanEngine.php diff --git a/src/LeanCloud/Engine/Cloud.php b/src/LeanCloud/Engine/Cloud.php new file mode 100644 index 0000000..b8e9614 --- /dev/null +++ b/src/LeanCloud/Engine/Cloud.php @@ -0,0 +1,77 @@ +code}]: {$this->message}\n"; + } +} \ No newline at end of file diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php new file mode 100644 index 0000000..4796541 --- /dev/null +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -0,0 +1,275 @@ + $code, + "error" => $message + )); + exit; + } + + /** + * Authenticate application request + * + * @return bool + */ + private static function authRequest() { + // The client address is available from: + // $_SERVER["HTTP_X_Real_Ip"]; + // $_SERVER["HTTP_X_Forwaded_For"]; + $appId = $_SERVER["HTTP_X_LC_Id"]; + $appId = $appId ? $appId : $_SERVER["HTTP_X_Avoscloud_Application_Id"]; + $appId = $appId ? $appId : $_SERVER["HTTP_X_Uluru_Application_Id"]; + if (!$appId) { + self::renderError("Unauthorized", 401, 401); + } + $sign = $_SERVER["HTTP_X_LC_Sign"] ? + $_SERVER["HTTP_X_LC_Sign"] : + $_SERVER["HTTP_X_Avoscloud_Request_Sign"]; + if ($sign && LeanClient::verifySign($appId, $sign)) { + return true; + } + + $appKey = $_SERVER["HTTP_X_LC_Key"]; + $appKey = $appKey ? $appKey : $_SERVER["HTTP_X_Avoscloud_Application_Key"]; + $appKey = $appKey ? $appKey : $_SERVER["HTTP_X_Uluru_Application_Key"]; + if ($appKey && LeanClient::verifyKey($appId, $appKey)) { + return true; + } + + $masterKey = $_SERVER["HTTP_X_Avoscloud_Master_Key"] ? + $_SERVER["HTTP_X_Avoscloud_Master_Key"] : + $_SERVER["HTTP_X_Uluru_Master_Key"]; + if ($masterKey && LeanClient::verifyMasterKey($appId, $masterKey)) { + return true; + } + return false; + } + + /** + * Process request session + */ + private static function processSession() { + if (!self::authRequest()) { + self::renderError("Unauthorized", 401, 401); + } + $token = $_SERVER["HTTP_X_LC_Session"] ? + $_SERVER["HTTP_X_LC_Session"] : + $_SERVER["HTTP_X_Avoscloud-Session-Token"]; + $token = $token ? $token : $_SERVER["HTTP_X_Uluru_Session_Token"]; + LeanUser::become($token); + } + + /** + * Dispatch request + */ + public static function dispatch() { + $url = rtrim($_SERVER["REQUEST_URI"], "/"); + if ($url == "/__engine/1/ping") { + self::renderJSON(array( + "runtime" => "PHP:TODO", + "version" => LeanClient::VERSION; + )); + } + self::processSession(); + $user = LeanUser::getCurrentUser(); + $matches = array(); + if (preg_match("/\/(1|1\.1)\/(functions|call)(.*)/", $url, $matches) == 1) { + $origin = $_SERVER["HTTP_Origin"]; + header("Access-Control-Allow-Origin: " . ($origin ? $origin : "*")); + if ($method == "OPTIONS") { + header("Access-Control-Max-Age: 86400"); + header("Access-Control-Allow-Methods: ". + "PUT, GET, POST, DELETE, OPTIONS"); + header("Access-Control-Allow-Headers: " . + implode(", ", self::$allowedHeaders)); + header("Content-Length: 0"); + exit; + } + + // Get request body from input stream. Note php framework + // might read and emptied input. + $body = file_get_contents("php://input"); + $data = LeanClient::decode($body, null); // Request data + $params = explode("/", ltrim($matches[3], "/")); + if ($matches[3] == "/_ops/metadatas") { + $result = self::renderJSON(array_keys(Cloud::getKeys())); + } + try { + if (count($params) == 1) { + $result = self::runFunc($params[0], $data, $user); + } else if ($params[0] == "onVerified") { + // onVerified hook has endpoint: functions/onVerified/sms + $result = self::runOnVerified($params[1], $user); + } else if ($params[0] == "_User" && $params[1] == "onLogin") { + $result = self::runOnLogin($data["object"]); + } else if ($params[0] == "BigQuery" || $params[0] == "Insight") { + $result = self::runOnInsight($data); + } else if (count($params) == 2) { + $result = self::runHook($params[0], $params[1], + $data["object"], $user); + } else { + self::renderError("Route not found.", 1, 404); + } + } catch (FunctionError $err) { + self::renderError($err->getMessage(), $err->getCode()); + } + self::renderJSON(array("result" => $result)); + } + } + + /** + * Run cloud function + * + * Example: + * + * ```php + * LeanEngine::runFunc("sayHello", array("name" => "alice"), $user); + * // sayHello(array("name" => "alice"), $user); + * ``` + * + * @param string $funcName Name of defined function + * @param array $data Array of parameters passed to function + * @param LeanUser $user Request user + * @return mixed + * @throws FunctionError + */ + public static function runFunc($funcName, $params, $user) { + $func = Cloud::getFunc($funcName); + if (!$func) { + throw new FunctionError("Cloud function not found.", 404); + } + return call_user_func($func, $params, $user); + } + + /** + * Run cloud hook + * + * Example: + * + * ```php + * LeanEngine::runHook("TestObject", "beforeUpdate", $object, $user); + * // hook($object, $user); + * ``` + * + * @param string $className Classname + * @param string $hookName Hook name, e.g. beforeUpdate + * @param LeanObject $object The object of attached hook + * @param LeanUser $user Request user + * @return mixed + * @throws FunctionError + */ + public static function runHook($className, $hookName, $object, + $user=null) { + $name = Cloud::getHookName($className, $hookName); + $func = Cloud::getFunc($name); + if (!$func) { + throw new FunctionError("Cloud hook `{$name}' not found.", + 404); + } + return call_user_func($func, $object, $user); + } + + /** + * Run hook when a user logs in + * + * @param LeanUser $user The user that tries to login + * @throws FunctionError + */ + public static function runOnLogin($user) { + return self::runHook("_User", "onLogin", $user); + } + + /** + * Run hook when user verified by Email or SMS + * + * @param string $type Either "sms" or "email", case-sensitive + * @param LeanUser $user The verifying user + * @throws FunctionError + */ + public static function runOnVerified($type, $user) { + $name = "__on_verified_{$type}"; + $func = Cloud::getFunc($name); + if (!$func) { + throw new FunctionError("Cloud hook `{$name}' not found.", + 404); + } + return call_user_func($func, $user); + } + + /** + * Run hook when BigQuery complete + * + * @see self::runOnInsight + */ + public static function runOnBigQuery($params) { + return self::runOnInsight($params); + } + + /** + * Run hook on big query complete + * + * @param array $params Job id and + * @return mixed + * @throws FunctionError + */ + public static function runOnInsight($params) { + $name = "__on_complete_bigquery_job"; + $func = Cloud::getFunc($name); + if (!$func) { + throw new FunctionError("Cloud hook `{$name}' not found.", + 404); + } + return call_user_func($func, $params); + } + +} + From 517de90d41a7cc75d5a07cd2f23a366d8a4a615d Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 27 Nov 2015 16:27:33 +0800 Subject: [PATCH 002/249] Add Cloud functions and hooks test --- src/LeanCloud/Engine/Cloud.php | 304 +++++++++++++++++++++++++++++++-- tests/CloudTest.php | 97 +++++++++++ 2 files changed, 386 insertions(+), 15 deletions(-) create mode 100644 tests/CloudTest.php diff --git a/src/LeanCloud/Engine/Cloud.php b/src/LeanCloud/Engine/Cloud.php index b8e9614..ba6fa1a 100644 --- a/src/LeanCloud/Engine/Cloud.php +++ b/src/LeanCloud/Engine/Cloud.php @@ -1,4 +1,5 @@ "__before_save_for_", + "afterSave" => "__after_save_for_", + "beforeUpdate" => "__before_update_for_", + "afterUpdate" => "__after_update_for_", + "beforeDelete" => "__before_delete_for_", + "afterDelete" => "__after_delete_for_", + "onLogin" => "__on_login_", + "onVerified" => "__on_verified_", + "onComplete" => "__on_complete_" + ); + + /** + * Get defined function by name + * + * @param string $funcName Name of function or hook + * @return callable|null + */ + public static function getFunc($funcName) { + return (isset(self::$repo[$funcName]) ? self::$repo[$funcName] : null); + } + + /** + * Get internal hook name + * + * @param string $hookName + * @return string + */ + private static function getHookPrefix($hookName) { + return (isset(self::$hookMap[$hookName]) ? + self::$hookMap[$hookName] : null); + } /** * Define a cloud function * - * The POST body will be json decoded into array, which will be passed - * callable as first argument. The current user, if available, will be - * passed as second arg. Example: + * The function accepts two arguments: the first is an array of + * parameters, the second is user in the session. Example: * * ```php * Cloud::define("sayHello", function($params, $user) { - * return "Hello $params['name']!" + * return "Hello {$params['name']}!"; * }); * ``` * * @param string $funcName - * @param callable $func The function accepts two arguments + * @param callable $func */ public static function define($funcName, $func) { self::$repo[$funcName] = $func; } + /** + * Define before save hook for a class + * + * The function shall take two arguments: the first one is class + * object, the second is user if available in session. If your $func + * throws `FunctionError`, the save will be rejected. + * + * @param string $className + * @param callable $func + * @see FunctionError + */ + public static function beforeSave($className, $func) { + $name = self::getHookPrefix("beforeSave") . $className; + self::define($name, $func); + } + /** * Define after save hook for a class * + * The function shall take two arguments: the first one is class + * object, the second is user if available in session. Any error + * in after hook will be ignored. * - * @param string $className + * @param string $className * @param callable $func + * @see FunctionError */ public static function afterSave($className, $func) { - self::define("__afterSave_{$className}", $func); + $name = self::getHookPrefix("afterSave") . $className; + self::define($name, $func); + } + + /** + * Define before update hook for a class + * + * The function shall take two arguments: the first one is class + * object, the second is user if available in session. If your $func + * throws `FunctionError`, the update will be rejected. + * + * @param string $className + * @param callable $func + * @see FunctionError + */ + public static function beforeUpdate($className, $func) { + $name = self::getHookPrefix("beforeUpdate") . $className; + self::define($name, $func); } /** - * Register hook on user verified email or sms + * Define after update hook for a class + * + * The function shall take two arguments: the first one is class + * object, the second is user if available in session. Any error + * in $func will be ignored. * - * @param string $type Either sms or email + * @param string $className * @param callable $func + * @see FunctionError */ - public static function onVerified($type, $func) {} - public static function onLogin($func) {} - public static function onBigQuery($event, $func) {} - public static function onInsight($event, $func) {} + public static function afterUpdate($className, $func) { + $name = self::getHookPrefix("afterUpdate") . $className; + self::define($name, $func); + } + + /** + * Define before delete hook for a class + * + * The function shall take two arguments: the first one is class + * object, the second is user if available in session. If your $func + * throws `FunctionError`, the delete will be rejected. + * + * @param string $className + * @param callable $func + * @see FunctionError + */ + public static function beforeDelete($className, $func) { + $name = self::getHookPrefix("beforeDelete") . $className; + self::define($name, $func); + } + + /** + * Define after delete hook for a class + * + * The function shall take two arguments: the first one is class + * object, the second is user if available in session. Any error + * in $func will be ignored. + * + * @param string $className + * @param callable $func + * @see FunctionError + */ + public static function afterDelete($className, $func) { + $name = self::getHookPrefix("afterDelete") . $className; + self::define($name, $func); + } + + /** + * Define hook for when user tries to login + * + * The function takes one argument, the login user. A `FunctionError` + * could be thrown in the $func, which will reject the user for login. + * + * @param callable $func + * @see self::runOnLogin + */ + public static function onLogin($func) { + self::define("__on_login__User", $func); + } + + + /** + * Define hook for when user verified sms or email + * + * The function takes one argument, the verified user. + * + * @param string $type Either "sms" or "email" + * @param callable $func + * @see self::runOnVerified + */ + public static function onVerified($type, $func) { + self::define("__on_verified_{$type}", $func); + } + + /** + * Define on complete hook for big query + * + * @param callable $func + * @alias self::onInsight() + */ + public static function onBigQuery($func) { + self::onInsight($func); + } + + /** + * Define on complete hook for big query + * + * The function takes one argument, the big query job info as array: + * + * ```php + * array( + * "id" => "job id", + * "status" => "OK/ERROR", + * "message" => "..." + * ); + * ``` + * + * @param callable $func + * @see self::runOnInsight + */ + public static function onInsight($func) { + self::define("__on_complete_bigquery_job", $func); + } + + /** + * Run cloud function + * + * Example: + * + * ```php + * LeanEngine::runFunc("sayHello", array("name" => "alice"), $user); + * // sayHello(array("name" => "alice"), $user); + * ``` + * + * @param string $funcName Name of defined function + * @param array $data Array of parameters passed to function + * @param LeanUser $user Request user + * @return mixed + * @throws FunctionError + * @see self::define + */ + public static function runFunc($funcName, $params, $user) { + $func = self::getFunc($funcName); + if (!$func) { + throw new FunctionError("Cloud function not found.", 404); + } + return call_user_func($func, $params, $user); + } + + /** + * Run cloud hook + * + * Example: + * + * ```php + * LeanEngine::runHook("TestObject", "beforeUpdate", $object, $user); + * // hook($object, $user); + * ``` + * + * @param string $className Classname + * @param string $hookName Hook name, e.g. beforeUpdate + * @param LeanObject $object The object of attached hook + * @param LeanUser $user Request user + * @return mixed + * @throws FunctionError + */ + public static function runHook($className, $hookName, $object, + $user=null) { + $name = self::getHookPrefix($hookName) . $className; + $func = self::getFunc($name); + if (!$func) { + throw new FunctionError("Cloud hook `{$name}' not found.", + 404); + } + return call_user_func($func, $object, $user); + } + + /** + * Run hook when a user logs in + * + * @param LeanUser $user The user that tries to login + * @throws FunctionError + * @see self::onLogin + */ + public static function runOnLogin($user) { + return self::runHook("_User", "onLogin", $user); + } + + /** + * Run hook when user verified by Email or SMS + * + * @param string $type Either "sms" or "email", case-sensitive + * @param LeanUser $user The verifying user + * @throws FunctionError + * @see self::onVerified + */ + public static function runOnVerified($type, $user) { + $name = "__on_verified_{$type}"; + $func = self::getFunc($name); + if (!$func) { + throw new FunctionError("Cloud hook `{$name}' not found.", + 404); + } + return call_user_func($func, $user); + } + + /** + * Run hook when BigQuery complete + * + * @see self::runOnInsight + */ + public static function runOnBigQuery($params) { + return self::runOnInsight($params); + } + + /** + * Run hook on big query complete + * + * @param array $job Big query job info + * @return mixed + * @throws FunctionError + * @see self::onInsight + */ + public static function runOnInsight($job) { + $name = "__on_complete_bigquery_job"; + $func = self::getFunc($name); + if (!$func) { + throw new FunctionError("Cloud hook `{$name}' not found.", + 404); + } + return call_user_func($func, $job); + } } diff --git a/tests/CloudTest.php b/tests/CloudTest.php new file mode 100644 index 0000000..6ce3923 --- /dev/null +++ b/tests/CloudTest.php @@ -0,0 +1,97 @@ +assertEquals("hello", $result); + } + + public function testFunctionWithArg() { + Cloud::define("sayHello", function($params, $user) { + return "hello {$params['name']}"; + }); + + $result = Cloud::runFunc("sayHello", array("name" => "alice"), null); + $this->assertEquals("hello alice", $result); + } + + public function testClassHook() { + forEach(array("beforeSave", "afterSave", + "beforeUpdate", "afterUpdate", + "beforeDelete", "afterDelete") as $hookName) { + $count = 42; + call_user_func( + array("LeanCloud\Engine\Cloud", $hookName), + "TestObject", + function($obj, $user) use (&$count) { + $count += 1; + } + ); + Cloud::runHook("TestObject", $hookName, null, null); + $this->assertEquals(43, $count); + } + } + + public function testOnVerifiedHook() { + // use a closure to ensure hook being executed + $count = 42; + Cloud::onVerified("sms", function($user) use (&$count) { + $count += 1; + }); + Cloud::runOnVerified("sms", null); + $this->assertEquals(43, $count); + } + + public function testOnLogin() { + $count = 42; + Cloud::onLogin(function($user) use (&$count) { + $count += 1; + }); + Cloud::runOnLogin(null); + $this->assertEquals(43, $count); + } + + public function testOnInsight() { + $count = 42; + Cloud::onInsight(function($job) use (&$count) { + $count += 1; + }); + Cloud::runOnInsight(null); + $this->assertEquals(43, $count); + } + + public function testAfterSave() { + $count = 42; + Cloud::afterSave("TestObject", function($obj, $user) use (&$count) { + $count += 1; + }); + Cloud::runHook("TestObject", "afterSave", null, null); + $this->assertEquals(43, $count); + } + + public function testBeforeUpdate() { + $count = 42; + Cloud::beforeUpdate("TestObject", function($obj, $user) use (&$count) { + $count += 1; + }); + Cloud::runHook("TestObject", "beforeUpdate", null, null); + $this->assertEquals(43, $count); + } + + public function testAfterUpdate() { + $count = 42; + Cloud::afterUpdate("TestObject", function($obj, $user) use (&$count) { + $count += 1; + }); + Cloud::runHook("TestObject", "afterUpdate", null, null); + $this->assertEquals(43, $count); + } + +} + From 437403fc7fd2fad19c8ef5c3abb8471a9b589ca3 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 27 Nov 2015 16:54:50 +0800 Subject: [PATCH 003/249] Update doc for Cloud --- src/LeanCloud/Engine/Cloud.php | 38 +++++++++++++++------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/src/LeanCloud/Engine/Cloud.php b/src/LeanCloud/Engine/Cloud.php index ba6fa1a..9367493 100644 --- a/src/LeanCloud/Engine/Cloud.php +++ b/src/LeanCloud/Engine/Cloud.php @@ -2,24 +2,8 @@ namespace LeanCloud\Engine; /** - * Define functions and hooks on cloud + * Cloud functions and hooks repository * - *```php - * LeanEngine::define("sayHello", function($params, $user) { - * }); - * - * LeanEngine::afterSave("TestObject", function($object, $user) { - * }); - * - * LeanEngine::onLogin(function($user) { - * }); - * - * LeanEngine::onVerified("sms", function($user) { - * }); - * - * LeanEngine::onInsight(function($params) { - * }); - *``` */ class Cloud { @@ -47,12 +31,12 @@ class Cloud { ); /** - * Get defined function by name + * Get defined function or hook by internal name * * @param string $funcName Name of function or hook * @return callable|null */ - public static function getFunc($funcName) { + private static function getFunc($funcName) { return (isset(self::$repo[$funcName]) ? self::$repo[$funcName] : null); } @@ -70,7 +54,7 @@ private static function getHookPrefix($hookName) { /** * Define a cloud function * - * The function accepts two arguments: the first is an array of + * The function shall take two arguments: the first is an array of * parameters, the second is user in the session. Example: * * ```php @@ -81,6 +65,7 @@ private static function getHookPrefix($hookName) { * * @param string $funcName * @param callable $func + * @see self::runFunc */ public static function define($funcName, $func) { self::$repo[$funcName] = $func; @@ -91,7 +76,18 @@ public static function define($funcName, $func) { * * The function shall take two arguments: the first one is class * object, the second is user if available in session. If your $func - * throws `FunctionError`, the save will be rejected. + * throws `FunctionError`, the save will be rejected. Example: + * + * ```php + * Cloud::beforeSave("TestObject", function($object, $user) { + * $title = $object->get("title"); + * if (strlen($title) > 140) { + * // Throw error and reject the save operation. + * throw new FunctionError("Title is too long", 1); + * } + * // else object will be saved. + * }); + * ``` * * @param string $className * @param callable $func From 130c059ece9a5a5a770d48f2fa650d3c07ef2b63 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 30 Nov 2015 11:31:08 +0800 Subject: [PATCH 004/249] Move LeanEngine function invoking to Cloud --- src/LeanCloud/Engine/LeanEngine.php | 181 +++++++++------------------- 1 file changed, 56 insertions(+), 125 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 4796541..ef2e17f 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -1,5 +1,7 @@ $code, - "error" => $message - )); - exit; - } - /** * Authenticate application request * @@ -103,20 +77,21 @@ private static function processSession() { } $token = $_SERVER["HTTP_X_LC_Session"] ? $_SERVER["HTTP_X_LC_Session"] : - $_SERVER["HTTP_X_Avoscloud-Session-Token"]; + $_SERVER["HTTP_X_Avoscloud_Session_Token"]; $token = $token ? $token : $_SERVER["HTTP_X_Uluru_Session_Token"]; LeanUser::become($token); } /** * Dispatch request + * */ - public static function dispatch() { + private static function dispatch() { $url = rtrim($_SERVER["REQUEST_URI"], "/"); if ($url == "/__engine/1/ping") { self::renderJSON(array( "runtime" => "PHP:TODO", - "version" => LeanClient::VERSION; + "version" => LeanClient::VERSION )); } self::processSession(); @@ -124,6 +99,7 @@ public static function dispatch() { $matches = array(); if (preg_match("/\/(1|1\.1)\/(functions|call)(.*)/", $url, $matches) == 1) { $origin = $_SERVER["HTTP_Origin"]; + $method = $_SERVER["REQUEST_METHOD"]; header("Access-Control-Allow-Origin: " . ($origin ? $origin : "*")); if ($method == "OPTIONS") { header("Access-Control-Max-Age: 86400"); @@ -145,17 +121,32 @@ public static function dispatch() { } try { if (count($params) == 1) { - $result = self::runFunc($params[0], $data, $user); + // {1,1.1}/functions/{funcName} + $result = Cloud::runFunc($params[0], $data, $user); } else if ($params[0] == "onVerified") { - // onVerified hook has endpoint: functions/onVerified/sms - $result = self::runOnVerified($params[1], $user); + // {1,1.1}/functions/onVerified/sms + Cloud::runOnVerified($params[1], $user); + $result = "ok"; } else if ($params[0] == "_User" && $params[1] == "onLogin") { - $result = self::runOnLogin($data["object"]); + // {1,1.1}/functions/_User/onLogin + Cloud::runOnLogin($data["object"]); + $result = "ok"; } else if ($params[0] == "BigQuery" || $params[0] == "Insight") { - $result = self::runOnInsight($data); + // {1,1.1}/functions/BigQuery/onComplete + Cloud::runOnInsight($data); + $result = "ok"; } else if (count($params) == 2) { - $result = self::runHook($params[0], $params[1], - $data["object"], $user); + // {1,1.1}/functions/{className}/beforeSave + $obj = $data["object"]; + Cloud::runHook($params[0], $params[1], + $obj, $user); + if ($params[1] == "beforeDelete") { + $result = ""; + } else if (strpos($params[1], "after") === 0) { + $result = "ok"; + } else { + $result = $obj; + } } else { self::renderError("Route not found.", 1, 404); } @@ -167,109 +158,49 @@ public static function dispatch() { } /** - * Run cloud function - * - * Example: - * - * ```php - * LeanEngine::runFunc("sayHello", array("name" => "alice"), $user); - * // sayHello(array("name" => "alice"), $user); - * ``` - * - * @param string $funcName Name of defined function - * @param array $data Array of parameters passed to function - * @param LeanUser $user Request user - * @return mixed - * @throws FunctionError - */ - public static function runFunc($funcName, $params, $user) { - $func = Cloud::getFunc($funcName); - if (!$func) { - throw new FunctionError("Cloud function not found.", 404); - } - return call_user_func($func, $params, $user); - } - - /** - * Run cloud hook - * - * Example: - * - * ```php - * LeanEngine::runHook("TestObject", "beforeUpdate", $object, $user); - * // hook($object, $user); - * ``` - * - * @param string $className Classname - * @param string $hookName Hook name, e.g. beforeUpdate - * @param LeanObject $object The object of attached hook - * @param LeanUser $user Request user - * @return mixed - * @throws FunctionError - */ - public static function runHook($className, $hookName, $object, - $user=null) { - $name = Cloud::getHookName($className, $hookName); - $func = Cloud::getFunc($name); - if (!$func) { - throw new FunctionError("Cloud hook `{$name}' not found.", - 404); - } - return call_user_func($func, $object, $user); - } - - /** - * Run hook when a user logs in + * Render data as JSON output and end request * - * @param LeanUser $user The user that tries to login - * @throws FunctionError + * @param array $data */ - public static function runOnLogin($user) { - return self::runHook("_User", "onLogin", $user); + private static function renderJSON($data) { + header("Content-Type: application/json; charset=utf-8;"); + echo json_encode(LeanClient::encode($data)); + exit; } /** - * Run hook when user verified by Email or SMS + * Render error response and end request * - * @param string $type Either "sms" or "email", case-sensitive - * @param LeanUser $user The verifying user - * @throws FunctionError + * @param string $message Error message + * @param string $code Error code + * @param string $status Http response status code */ - public static function runOnVerified($type, $user) { - $name = "__on_verified_{$type}"; - $func = Cloud::getFunc($name); - if (!$func) { - throw new FunctionError("Cloud hook `{$name}' not found.", - 404); - } - return call_user_func($func, $user); + private static function renderError($message, $code=1, $status=400) { + http_response_code($status); + header("Content-Type: application/json; charset=utf-8;"); + echo json_encode(array( + "code" => $code, + "error" => $message + )); + exit; } /** - * Run hook when BigQuery complete - * - * @see self::runOnInsight + * Start engine and process request */ - public static function runOnBigQuery($params) { - return self::runOnInsight($params); + public function start() { + self::dispatch(); } /** - * Run hook on big query complete + * Function to expose LeanEngine as Laraval middleware * - * @param array $params Job id and - * @return mixed - * @throws FunctionError + * @param Request $request Laravel request + * @param Callable $next Laravel Closure */ - public static function runOnInsight($params) { - $name = "__on_complete_bigquery_job"; - $func = Cloud::getFunc($name); - if (!$func) { - throw new FunctionError("Cloud hook `{$name}' not found.", - 404); - } - return call_user_func($func, $params); + public static handle($request, $next) { + self::dispatch(); + $next(); } - } From 2f9ad9aee4c761a0c761fa2396311cd77299c734 Mon Sep 17 00:00:00 2001 From: Gavin Wu Date: Mon, 30 Nov 2015 18:12:10 +0800 Subject: [PATCH 005/249] Update LeanClient.php $error = curl_errno ---> $error = curl_error --- src/LeanCloud/LeanClient.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LeanCloud/LeanClient.php b/src/LeanCloud/LeanClient.php index 918b179..c0278c0 100644 --- a/src/LeanCloud/LeanClient.php +++ b/src/LeanCloud/LeanClient.php @@ -306,7 +306,7 @@ public static function request($method, $path, $data, $resp = curl_exec($req); $respCode = curl_getinfo($req, CURLINFO_HTTP_CODE); $respType = curl_getinfo($req, CURLINFO_CONTENT_TYPE); - $error = curl_errno($req); + $error = curl_error($req); $errno = curl_errno($req); curl_close($req); From 3d148366039913349f21502ee66d0ddb7e5bd230 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 30 Nov 2015 18:17:35 +0800 Subject: [PATCH 006/249] Return function keys in cloud function repository --- src/LeanCloud/Engine/Cloud.php | 4 ++++ tests/CloudTest.php | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/src/LeanCloud/Engine/Cloud.php b/src/LeanCloud/Engine/Cloud.php index 9367493..86146af 100644 --- a/src/LeanCloud/Engine/Cloud.php +++ b/src/LeanCloud/Engine/Cloud.php @@ -30,6 +30,10 @@ class Cloud { "onComplete" => "__on_complete_" ); + public static function getKeys() { + return array_keys(self::$repo); + } + /** * Get defined function or hook by internal name * diff --git a/tests/CloudTest.php b/tests/CloudTest.php index 6ce3923..1255599 100644 --- a/tests/CloudTest.php +++ b/tests/CloudTest.php @@ -3,6 +3,14 @@ use LeanCloud\Engine\Cloud; class CloudTest extends PHPUnit_Framework_TestCase { + public function testGetKeys() { + $name = uniqid(); + Cloud::define($name, function($params, $user) { + return "hello"; + }); + $this->assertContains($name, Cloud::getKeys()); + } + public function testFunctionWithoutArg() { Cloud::define("hello", function($params, $user) { return "hello"; From 34803eaa5afd2e74db843b04c9877222df669445 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 1 Dec 2015 12:09:06 +0800 Subject: [PATCH 007/249] Add verifySign and verifyKey in Client --- src/LeanCloud/LeanClient.php | 43 ++++++++++++++++++++++++++++++++++++ tests/LeanClientTest.php | 30 +++++++++++++++++++++++++ 2 files changed, 73 insertions(+) diff --git a/src/LeanCloud/LeanClient.php b/src/LeanCloud/LeanClient.php index 918b179..629e2f9 100644 --- a/src/LeanCloud/LeanClient.php +++ b/src/LeanCloud/LeanClient.php @@ -234,6 +234,49 @@ public static function buildHeaders($sessionToken, $useMasterKey) { return $h; } + /** + * Verify app ID and sign + * + * The sign must be in the format of "{md5sum},{timestamp}[,master]", + * which follows the format as in header "X-LC-Sign". + * + * @param string $appId App Id + * @param string $sign Request sign + * @return bool + */ + public static function verifySign($appId, $sign) { + if (!$appId || ($appId != self::$appId)) { + return false; + } + $parts = explode(",", $sign); + $key = self::$appKey; + if (isset($parts[2]) && "master" === trim($parts[2])) { + $key = self::$appMasterKey; + } + return $parts[0] === md5(trim($parts[1]) . $key); + } + + /** + * Verify app ID and key + * + * The key shall be in format of "{key}[,master]", it will be verified + * as master key if master suffix present. + * + * @param string $appId App Id + * @param string $key App key or master key + * @return bool + */ + public static function verifyKey($appId, $key) { + if (!$appId || ($appId != self::$appId)) { + return false; + } + $parts = explode(",", $key); + if (isset($parts[1]) && "master" === trim($parts[1])) { + return self::$appMasterKey === $parts[0]; + } + return self::$appKey === $parts[0]; + } + /** * Issue request to LeanCloud * diff --git a/tests/LeanClientTest.php b/tests/LeanClientTest.php index 2b983cf..220ceec 100644 --- a/tests/LeanClientTest.php +++ b/tests/LeanClientTest.php @@ -38,6 +38,36 @@ public function testUseRegion() { "https://us-api.leancloud.cn/1.1"); } + public function testVerifyKey() { + $result = LeanClient::verifyKey( + getenv("LC_APP_ID"), + getenv("LC_APP_KEY") + ); + $this->assertTrue($result); + } + + public function testVerifyKeyMaster() { + $result = LeanClient::verifyKey( + getenv("LC_APP_ID"), + getenv("LC_APP_MASTER_KEY") . ",master" + ); + $this->assertTrue($result); + } + + public function testVerifySign() { + $time = time(); + $sign = md5($time . getenv("LC_APP_KEY")) . ",{$time}"; + $result = LeanClient::verifySign(getenv("LC_APP_ID"), $sign); + $this->assertTrue($result); + } + + public function testVerifySignMaster() { + $time = time(); + $sign = md5($time . getenv("LC_APP_MASTER_KEY")) . ",{$time},master"; + $result = LeanClient::verifySign(getenv("LC_APP_ID"), $sign); + $this->assertTrue($result); + } + public function testUseMasterKeyByDefault() { LeanClient::useMasterKey(true); $headers = LeanClient::buildHeaders("token", null); From c516c23090f71d626d1ebbd44288b9ce61868785 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 1 Dec 2015 14:38:16 +0800 Subject: [PATCH 008/249] Add test cases for LeanEngine --- src/LeanCloud/Engine/LeanEngine.php | 98 ++++++++++++++++++----------- tests/engine/LeanEngineTest.php | 77 +++++++++++++++++++++++ tests/engine/index.php | 25 ++++++++ 3 files changed, 165 insertions(+), 35 deletions(-) create mode 100644 tests/engine/LeanEngineTest.php create mode 100644 tests/engine/index.php diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index ef2e17f..13d19c4 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -30,56 +30,82 @@ class LeanEngine { 'Content-Type' ); + /** + * Search keys for value in a hash array + * + * @param array $map The hash array to search in + * @param array $keys Keys in order + * @retrun mixed + */ + private static function getVal($hash, $keys) { + $val = null; + forEach($keys as $k) { + if (isset($hash[$k])) { + $val = $hash[$k]; + } + if ($val) { + return $val; + } + } + return $val; + } + /** * Authenticate application request * * @return bool */ private static function authRequest() { - // The client address is available from: - // $_SERVER["HTTP_X_Real_Ip"]; - // $_SERVER["HTTP_X_Forwaded_For"]; - $appId = $_SERVER["HTTP_X_LC_Id"]; - $appId = $appId ? $appId : $_SERVER["HTTP_X_Avoscloud_Application_Id"]; - $appId = $appId ? $appId : $_SERVER["HTTP_X_Uluru_Application_Id"]; + $appId = self::getVal($_SERVER, array( + "HTTP_X_LC_ID", + "HTTP_X_AVOSCLOUD_APPLICATION_ID", + "HTTP_X_ULURU_APPLICATION_ID" + )); if (!$appId) { - self::renderError("Unauthorized", 401, 401); + self::renderError("Application ID not found", 401, 401); } - $sign = $_SERVER["HTTP_X_LC_Sign"] ? - $_SERVER["HTTP_X_LC_Sign"] : - $_SERVER["HTTP_X_Avoscloud_Request_Sign"]; + $sign = self::getVal($_SERVER, array( + "HTTP_X_LC_SIGN", + "HTTP_X_AVOSCLOUD_REQUEST_SIGN" + )); if ($sign && LeanClient::verifySign($appId, $sign)) { return true; } - $appKey = $_SERVER["HTTP_X_LC_Key"]; - $appKey = $appKey ? $appKey : $_SERVER["HTTP_X_Avoscloud_Application_Key"]; - $appKey = $appKey ? $appKey : $_SERVER["HTTP_X_Uluru_Application_Key"]; + $appKey = self::getVal($_SERVER, array( + "HTTP_X_LC_KEY", + "HTTP_X_AVOSCLOUD_APPLICATION_KEY", + "HTTP_X_ULURU_APPLICATION_KEY" + )); if ($appKey && LeanClient::verifyKey($appId, $appKey)) { return true; } - $masterKey = $_SERVER["HTTP_X_Avoscloud_Master_Key"] ? - $_SERVER["HTTP_X_Avoscloud_Master_Key"] : - $_SERVER["HTTP_X_Uluru_Master_Key"]; - if ($masterKey && LeanClient::verifyMasterKey($appId, $masterKey)) { + $masterKey = self::getVal($_SERVER, array( + "HTTP_X_AVOSCLOUD_MASTER_KEY", + "HTTP_X_ULURU_MASTER_KEY" + )); + $key = "{$masterKey}, master"; + if ($masterKey && LeanClient::verifyKey($appId, $key)) { return true; } - return false; + + self::renderError("Unauthorized", 401, 401); } /** * Process request session */ private static function processSession() { - if (!self::authRequest()) { - self::renderError("Unauthorized", 401, 401); + self::authRequest(); + $token = self::getVal($_SERVER, array( + "HTTP_X_LC_SESSION", + "HTTP_X_AVOSCLOUD_SESSION_TOKEN", + "HTTP_X_ULURU_SESSION_TOKEN" + )); + if ($token) { + LeanUser::become($token); } - $token = $_SERVER["HTTP_X_LC_Session"] ? - $_SERVER["HTTP_X_LC_Session"] : - $_SERVER["HTTP_X_Avoscloud_Session_Token"]; - $token = $token ? $token : $_SERVER["HTTP_X_Uluru_Session_Token"]; - LeanUser::become($token); } /** @@ -95,11 +121,10 @@ private static function dispatch() { )); } self::processSession(); - $user = LeanUser::getCurrentUser(); $matches = array(); if (preg_match("/\/(1|1\.1)\/(functions|call)(.*)/", $url, $matches) == 1) { - $origin = $_SERVER["HTTP_Origin"]; $method = $_SERVER["REQUEST_METHOD"]; + $origin = $_SERVER["HTTP_ORIGIN"]; header("Access-Control-Allow-Origin: " . ($origin ? $origin : "*")); if ($method == "OPTIONS") { header("Access-Control-Max-Age: 86400"); @@ -111,14 +136,16 @@ private static function dispatch() { exit; } + if ($matches[3] == "/_ops/metadatas") { + // only master key can do this + self::renderJSON(Cloud::getKeys()); + } // Get request body from input stream. Note php framework // might read and emptied input. - $body = file_get_contents("php://input"); - $data = LeanClient::decode($body, null); // Request data + $body = file_get_contents("php://input"); + $data = LeanClient::decode(json_decode($body, true), null); $params = explode("/", ltrim($matches[3], "/")); - if ($matches[3] == "/_ops/metadatas") { - $result = self::renderJSON(array_keys(Cloud::getKeys())); - } + $user = LeanUser::getCurrentUser(); try { if (count($params) == 1) { // {1,1.1}/functions/{funcName} @@ -150,10 +177,10 @@ private static function dispatch() { } else { self::renderError("Route not found.", 1, 404); } + self::renderJSON(array("result" => $result)); } catch (FunctionError $err) { self::renderError($err->getMessage(), $err->getCode()); } - self::renderJSON(array("result" => $result)); } } @@ -197,10 +224,11 @@ public function start() { * * @param Request $request Laravel request * @param Callable $next Laravel Closure + * @return mixed */ - public static handle($request, $next) { + public function handle($request, $next) { self::dispatch(); - $next(); + return $next($request); } } diff --git a/tests/engine/LeanEngineTest.php b/tests/engine/LeanEngineTest.php new file mode 100644 index 0000000..4598e68 --- /dev/null +++ b/tests/engine/LeanEngineTest.php @@ -0,0 +1,77 @@ + 0) { + throw new \RuntimeException("CURL connection error $errno: $url"); + } + $data = json_decode($resp, true); + if (isset($data["error"])) { + $code = isset($data["code"]) ? $data["code"] : -1; + throw new CloudException("{$code} {$data['error']}", $code); + } + return $data; + } + + public function testPingEngine() { + $resp = $this->request("/__engine/1/ping", "GET"); + $this->assertArrayHasKey("runtime", $resp); + $this->assertArrayHasKey("version", $resp); + } + + public function testGetFuncitonMetadata() { + $resp = $this->request("/1/functions/_ops/metadatas", "GET"); + $this->assertContains("hello", $resp); + } + + public function testCloudFunctionHello() { + $resp = $this->request("/1/functions/hello", "POST", array()); + $this->assertEquals("hello", $resp["result"]); + } + + public function testFunctionWithParam() { + $resp = $this->request("/1/functions/sayHello", "POST", array( + "name" => "alice" + )); + $this->assertEquals("hello alice", $resp["result"]); + } +} + diff --git a/tests/engine/index.php b/tests/engine/index.php new file mode 100644 index 0000000..c2fdf77 --- /dev/null +++ b/tests/engine/index.php @@ -0,0 +1,25 @@ +start(); + From 290a27167988b9a50cafdcc4a30a12331ed79849 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 1 Dec 2015 17:15:39 +0800 Subject: [PATCH 009/249] Add test cases for LeanEngine --- src/LeanCloud/Engine/LeanEngine.php | 4 ++-- tests/engine/LeanEngineTest.php | 34 +++++++++++++++++++++++++++++ tests/engine/index.php | 17 +++++++++++++++ 3 files changed, 53 insertions(+), 2 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 13d19c4..0ae15a0 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -120,7 +120,6 @@ private static function dispatch() { "version" => LeanClient::VERSION )); } - self::processSession(); $matches = array(); if (preg_match("/\/(1|1\.1)\/(functions|call)(.*)/", $url, $matches) == 1) { $method = $_SERVER["REQUEST_METHOD"]; @@ -135,6 +134,8 @@ private static function dispatch() { header("Content-Length: 0"); exit; } + self::processSession(); + $user = LeanUser::getCurrentUser(); if ($matches[3] == "/_ops/metadatas") { // only master key can do this @@ -145,7 +146,6 @@ private static function dispatch() { $body = file_get_contents("php://input"); $data = LeanClient::decode(json_decode($body, true), null); $params = explode("/", ltrim($matches[3], "/")); - $user = LeanUser::getCurrentUser(); try { if (count($params) == 1) { // {1,1.1}/functions/{funcName} diff --git a/tests/engine/LeanEngineTest.php b/tests/engine/LeanEngineTest.php index 4598e68..3b5b63c 100644 --- a/tests/engine/LeanEngineTest.php +++ b/tests/engine/LeanEngineTest.php @@ -73,5 +73,39 @@ public function testFunctionWithParam() { )); $this->assertEquals("hello alice", $resp["result"]); } + + public function testOnInsight() { + $resp = $this->request("/1/functions/BigQuery/onComplete", "POST", array( + "id" => "id001", + "status" => "OK", + "message" => "Big query completed successfully." + )); + $this->assertEquals("ok", $resp["result"]); + } + + public function testOnLogin() { + $resp = $this->request("/1/functions/_User/onLogin", "POST", array( + "object" => array( + "__type" => "Object", + "className" => "_User", + "objectId" => "id002", + "username" => "alice" + ) + )); + $this->assertEquals("ok", $resp["result"]); + } + + public function testOnVerifiedSms() { + $resp = $this->request("/1/functions/onVerified/sms", "POST", array( + "object" => array( + "__type" => "Object", + "className" => "_User", + "objectId" => "id002", + "username" => "alice" + ) + )); + $this->assertEquals("ok", $resp["result"]); + } + } diff --git a/tests/engine/index.php b/tests/engine/index.php index c2fdf77..9f8fbde 100644 --- a/tests/engine/index.php +++ b/tests/engine/index.php @@ -20,6 +20,23 @@ return "hello {$params['name']}"; }); +Cloud::onLogin(function($user) { + return; +}); + +Cloud::onInsight(function($job) { + return; +}); + +Cloud::onVerified("sms", function($user){ + return; +}); + +Cloud::beforeSave("TestObject", function($obj, $user) { + $obj->set("__testKey", 42); + return $obj; +}); + $engine = new LeanEngine(); $engine->start(); From 8458ec22b2ba344ffd940f68929bcf9bd5da591d Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 2 Dec 2015 15:32:25 +0800 Subject: [PATCH 010/249] Refactor LeanEngine as instantiable class --- src/LeanCloud/Engine/LeanEngine.php | 182 +++++++++++++++++++--------- tests/engine/index.php | 7 +- 2 files changed, 126 insertions(+), 63 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 0ae15a0..d58b41f 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -30,6 +30,13 @@ class LeanEngine { 'Content-Type' ); + /** + * Engine environment + * + * @var array + */ + private $req = array(); + /** * Search keys for value in a hash array * @@ -37,7 +44,7 @@ class LeanEngine { * @param array $keys Keys in order * @retrun mixed */ - private static function getVal($hash, $keys) { + private function getVal($hash, $keys) { $val = null; forEach($keys as $k) { if (isset($hash[$k])) { @@ -51,60 +58,105 @@ private static function getVal($hash, $keys) { } /** - * Authenticate application request + * Parse app session info into req * - * @return bool */ - private static function authRequest() { - $appId = self::getVal($_SERVER, array( - "HTTP_X_LC_ID", - "HTTP_X_AVOSCLOUD_APPLICATION_ID", - "HTTP_X_ULURU_APPLICATION_ID" - )); - if (!$appId) { - self::renderError("Application ID not found", 401, 401); + private function parseRequest() { + $contentType = isset($_SERVER["CONTENT_TYPE"]) ? + $_SERVER["CONTENT_TYPE"] : + $_SERVER["HTTP_CONTENT_TYPE"]; + if (preg_match("/text\/plain/", $contentType)) { + // the CORS request might be sent as POST request with text/plain + // header, whence the app key info is attached in the body as + // JSON. + $this->req["appId"] = isset($data["_ApplicationId"]) ? + $data["_ApplicationId"] : null; + $this->req["appKey"] = isset($data["_ApplicationKey"]) ? + $data["_ApplicationKey"] : null; + $this->req["masterKey"] = isset($data["_MasterKey"]) ? + $data["_MasterKey"] : null; + $this->req["sessionToken"] = isset($data["_SessionToken"]) ? + $data["_SessionToken"] : null; + $this->req["sign"] = null; + $this->req["useProd"] = isset($data["_ApplicationProduction"]) ? + (true && $data["_ApplicationProduction"]) : + true; + } else { + $this->req["appId"] = $this->getVal($_SERVER, array( + "HTTP_X_LC_ID", + "HTTP_X_AVOSCLOUD_APPLICATION_ID", + "HTTP_X_ULURU_APPLICATION_ID" + )); + $this->req["appKey"] = $this->getVal($_SERVER, array( + "HTTP_X_LC_KEY", + "HTTP_X_AVOSCLOUD_APPLICATION_KEY", + "HTTP_X_ULURU_APPLICATION_KEY" + )); + $this->req["masterKey"] = $this->getVal($_SERVER, array( + "HTTP_X_AVOSCLOUD_MASTER_KEY", + "HTTP_X_ULURU_MASTER_KEY" + )); + $this->req["sessionToken"] = $this->getVal($_SERVER, array( + "HTTP_X_LC_SESSION", + "HTTP_X_AVOSCLOUD_SESSION_TOKEN", + "HTTP_X_ULURU_SESSION_TOKEN" + )); + $this->req["sign"] = $this->getVal($_SERVER, array( + "HTTP_X_LC_SIGN", + "HTTP_X_AVOSCLOUD_REQUEST_SIGN" + )); + $prod = $this->getVal($_SERVER, array( + "HTTP_X_LC_PROD", + "HTTP_X_AVOSCLOUD_APPLICATION_PRODUCTION", + "HTTP_X_ULURU_APPLICATION_PRODUCTION" + )); + $this->req["useProd"] = true; + if ($prod === 0 || $prod === false) { + $this->req["useProd"] = false; + } } - $sign = self::getVal($_SERVER, array( - "HTTP_X_LC_SIGN", - "HTTP_X_AVOSCLOUD_REQUEST_SIGN" - )); + $this->req["useMaster"] = false; + } + + /** + * Authenticate application request + */ + private function authRequest() { + $appId = $this->req["appId"]; + $sign = $this->req["sign"]; if ($sign && LeanClient::verifySign($appId, $sign)) { + if (strpos($sign, "master") !== false) { + $this->req["useMaster"] = true; + } return true; } - $appKey = self::getVal($_SERVER, array( - "HTTP_X_LC_KEY", - "HTTP_X_AVOSCLOUD_APPLICATION_KEY", - "HTTP_X_ULURU_APPLICATION_KEY" - )); + $appKey = $this->req["appKey"]; if ($appKey && LeanClient::verifyKey($appId, $appKey)) { + if (strpos($appKey, "master") !== false) { + $this->req["useMaster"] = true; + } return true; } - $masterKey = self::getVal($_SERVER, array( - "HTTP_X_AVOSCLOUD_MASTER_KEY", - "HTTP_X_ULURU_MASTER_KEY" - )); + $masterKey = $this->req["masterKey"]; $key = "{$masterKey}, master"; if ($masterKey && LeanClient::verifyKey($appId, $key)) { + $this->req["useMaster"] = true; return true; } - self::renderError("Unauthorized", 401, 401); + $this->renderError("Unauthorized", 401, 401); } /** * Process request session */ - private static function processSession() { - self::authRequest(); - $token = self::getVal($_SERVER, array( - "HTTP_X_LC_SESSION", - "HTTP_X_AVOSCLOUD_SESSION_TOKEN", - "HTTP_X_ULURU_SESSION_TOKEN" - )); - if ($token) { - LeanUser::become($token); + private function processSession() { + $this->parseRequest(); + $this->authRequest(); + if ($this->req["sessionToken"]) { + LeanUser::become($this->req["sessionToken"]); } } @@ -112,10 +164,10 @@ private static function processSession() { * Dispatch request * */ - private static function dispatch() { + private function dispatch() { $url = rtrim($_SERVER["REQUEST_URI"], "/"); if ($url == "/__engine/1/ping") { - self::renderJSON(array( + $this->renderJSON(array( "runtime" => "PHP:TODO", "version" => LeanClient::VERSION )); @@ -134,15 +186,17 @@ private static function dispatch() { header("Content-Length: 0"); exit; } - self::processSession(); + $this->processSession(); $user = LeanUser::getCurrentUser(); - if ($matches[3] == "/_ops/metadatas") { - // only master key can do this - self::renderJSON(Cloud::getKeys()); + if ($this->req["useMaster"]) { + $this->renderJSON(Cloud::getKeys()); + } else { + $this->renderError("Unauthorized.", 401, 401); + } } - // Get request body from input stream. Note php framework - // might read and emptied input. + + // Note prior to php 5.6, the input can be read only once $body = file_get_contents("php://input"); $data = LeanClient::decode(json_decode($body, true), null); $params = explode("/", ltrim($matches[3], "/")); @@ -150,36 +204,34 @@ private static function dispatch() { if (count($params) == 1) { // {1,1.1}/functions/{funcName} $result = Cloud::runFunc($params[0], $data, $user); + $this->renderJSON(array("result" => $result)); } else if ($params[0] == "onVerified") { // {1,1.1}/functions/onVerified/sms Cloud::runOnVerified($params[1], $user); - $result = "ok"; + $this->renderJSON(array("result" => "ok")); } else if ($params[0] == "_User" && $params[1] == "onLogin") { // {1,1.1}/functions/_User/onLogin Cloud::runOnLogin($data["object"]); - $result = "ok"; + $this->renderJSON(array("result" => "ok")); } else if ($params[0] == "BigQuery" || $params[0] == "Insight") { // {1,1.1}/functions/BigQuery/onComplete Cloud::runOnInsight($data); - $result = "ok"; + $this->renderJSON(array("result" => "ok")); } else if (count($params) == 2) { // {1,1.1}/functions/{className}/beforeSave $obj = $data["object"]; Cloud::runHook($params[0], $params[1], $obj, $user); if ($params[1] == "beforeDelete") { - $result = ""; + $this->renderJSON(array()); } else if (strpos($params[1], "after") === 0) { - $result = "ok"; + $this->renderJSON(array("result" => "ok")); } else { - $result = $obj; + $this->renderJSON($obj); } - } else { - self::renderError("Route not found.", 1, 404); } - self::renderJSON(array("result" => $result)); } catch (FunctionError $err) { - self::renderError($err->getMessage(), $err->getCode()); + $this->renderError($err->getMessage(), $err->getCode()); } } } @@ -189,20 +241,20 @@ private static function dispatch() { * * @param array $data */ - private static function renderJSON($data) { + private function renderJSON($data) { header("Content-Type: application/json; charset=utf-8;"); echo json_encode(LeanClient::encode($data)); exit; } /** - * Render error response and end request + * Render error and end request * * @param string $message Error message * @param string $code Error code * @param string $status Http response status code */ - private static function renderError($message, $code=1, $status=400) { + private function renderError($message, $code=1, $status=400) { http_response_code($status); header("Content-Type: application/json; charset=utf-8;"); echo json_encode(array( @@ -216,18 +268,32 @@ private static function renderError($message, $code=1, $status=400) { * Start engine and process request */ public function start() { - self::dispatch(); + $this->dispatch(); } /** - * Function to expose LeanEngine as Laraval middleware + * Handle Laravel request + * + * It exposes LeanEngine as a Laravel middleware, which can be + * registered in Laravel application. E.g. in + * `app/Http/Kernel.php`: + * + * ```php + * class Kernel extends HttpKernel { + * protected $middleware = [ + * ..., + * \LeanCloud\Engine\LeanEngine::class, + * ]; + * } + * ``` * * @param Request $request Laravel request * @param Callable $next Laravel Closure * @return mixed + * @link http://laravel.com/docs/5.1/middleware */ public function handle($request, $next) { - self::dispatch(); + $this->dispatch(); return $next($request); } } diff --git a/tests/engine/index.php b/tests/engine/index.php index 9f8fbde..e8366ce 100644 --- a/tests/engine/index.php +++ b/tests/engine/index.php @@ -12,10 +12,12 @@ getenv("LC_APP_MASTER_KEY") ); +// define a function Cloud::define("hello", function() { return "hello"; }); +// define function with named params Cloud::define("sayHello", function($params, $user) { return "hello {$params['name']}"; }); @@ -32,11 +34,6 @@ return; }); -Cloud::beforeSave("TestObject", function($obj, $user) { - $obj->set("__testKey", 42); - return $obj; -}); - $engine = new LeanEngine(); $engine->start(); From b7ad14ff7e6cafe9a009cdf803945bec6ff477dd Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 2 Dec 2015 16:55:50 +0800 Subject: [PATCH 011/249] Exclude LeanEngine test cases for now --- Makefile | 5 ++++- phpunit.xml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d341ac1..f72d7e4 100644 --- a/Makefile +++ b/Makefile @@ -7,4 +7,7 @@ release: doc: vendor/bin/apigen generate --source src --destination docs -.PHONY: test doc +engine: + php -t tests/engine -S $(LC_APP_HOST):$(LC_APP_PORT) + +.PHONY: test doc engine diff --git a/phpunit.xml b/phpunit.xml index 9e27115..ba43e77 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -5,13 +5,13 @@ tests + tests/engine src - src/LeanCloud/LeanClient.php From 844856ffd62f13edcd15fab6a6e8a945245e76c1 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Thu, 3 Dec 2015 15:56:45 +0800 Subject: [PATCH 012/249] =?UTF-8?q?LeanEngine:=20=E5=B0=86=20parseRequest?= =?UTF-8?q?=20=E8=A7=A3=E8=97=95=E5=87=BA=E6=9D=A5=E4=BB=A5=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=A7=A3=E6=9E=90=E9=9D=9E=E5=8E=9F=E7=94=9F=E8=AF=B7?= =?UTF-8?q?=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/LeanCloud/Engine/LeanEngine.php | 78 ++++++++++++++++++++--------- 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index d58b41f..aded3c7 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -31,7 +31,7 @@ class LeanEngine { ); /** - * Engine environment + * Request info * * @var array */ @@ -57,18 +57,8 @@ private function getVal($hash, $keys) { return $val; } - /** - * Parse app session info into req - * - */ - private function parseRequest() { - $contentType = isset($_SERVER["CONTENT_TYPE"]) ? - $_SERVER["CONTENT_TYPE"] : - $_SERVER["HTTP_CONTENT_TYPE"]; - if (preg_match("/text\/plain/", $contentType)) { - // the CORS request might be sent as POST request with text/plain - // header, whence the app key info is attached in the body as - // JSON. + private function parsePlainBody($data) { + if (!empty($data)) { $this->req["appId"] = isset($data["_ApplicationId"]) ? $data["_ApplicationId"] : null; $this->req["appKey"] = isset($data["_ApplicationKey"]) ? @@ -80,8 +70,40 @@ private function parseRequest() { $this->req["sign"] = null; $this->req["useProd"] = isset($data["_ApplicationProduction"]) ? (true && $data["_ApplicationProduction"]) : - true; + true; + // remove internal fields set by API + forEach($data as $key) { + if ($key[0] === "_") { + unset($data[$key]); + } + } + $this->req["data"] = $data; + } + } + + /** + * Parse raw request + */ + private function parseRequest() { + $url = $_SERVER["REQUEST_URI"]; + $body = ""; + if (preg_match("/^\/(1|1\.1)\/(functions|call)(.*)/", $url) == 1) { + // Note prior to php 5.6, input could be read only once. To not + // interfere with 3rd party framework, we read it only within + // LeanEngine internal endpoints. + $body = file_get_contents("php://input"); + } + $contentType = $this->getVal($_SERVER, array( + "CONTENT_TYPE", + "HTTP_CONTENT_TYPE" + )); + if (preg_match("/text\/plain/", $contentType)) { + // the CORS request might be sent as POST request with text/plain + // header, whence the app key info is attached in the body as + // JSON. + $this->parsePlainBody(json_decode($body, true)); } else { + $this->req["data"] = json_decode($body, true); $this->req["appId"] = $this->getVal($_SERVER, array( "HTTP_X_LC_ID", "HTTP_X_AVOSCLOUD_APPLICATION_ID", @@ -114,6 +136,7 @@ private function parseRequest() { if ($prod === 0 || $prod === false) { $this->req["useProd"] = false; } + $this->req["origin"] = $_SERVER["HTTP_ORIGIN"]; } $this->req["useMaster"] = false; } @@ -153,7 +176,6 @@ private function authRequest() { * Process request session */ private function processSession() { - $this->parseRequest(); $this->authRequest(); if ($this->req["sessionToken"]) { LeanUser::become($this->req["sessionToken"]); @@ -163,9 +185,12 @@ private function processSession() { /** * Dispatch request * + * @param string $method Request method + * @param string $url Request URL + * @param array $data JSON decoded body */ - private function dispatch() { - $url = rtrim($_SERVER["REQUEST_URI"], "/"); + private function dispatch($method, $url, $data) { + $url = rtrim($url, "/"); if ($url == "/__engine/1/ping") { $this->renderJSON(array( "runtime" => "PHP:TODO", @@ -173,9 +198,8 @@ private function dispatch() { )); } $matches = array(); - if (preg_match("/\/(1|1\.1)\/(functions|call)(.*)/", $url, $matches) == 1) { - $method = $_SERVER["REQUEST_METHOD"]; - $origin = $_SERVER["HTTP_ORIGIN"]; + if (preg_match("/^\/(1|1\.1)\/(functions|call)(.*)/", $url, $matches) == 1) { + $origin = $this->req["origin"]; header("Access-Control-Allow-Origin: " . ($origin ? $origin : "*")); if ($method == "OPTIONS") { header("Access-Control-Max-Age: 86400"); @@ -196,9 +220,7 @@ private function dispatch() { } } - // Note prior to php 5.6, the input can be read only once - $body = file_get_contents("php://input"); - $data = LeanClient::decode(json_decode($body, true), null); + $data = LeanClient::decode($data, null); $params = explode("/", ltrim($matches[3], "/")); try { if (count($params) == 1) { @@ -268,7 +290,10 @@ private function renderError($message, $code=1, $status=400) { * Start engine and process request */ public function start() { - $this->dispatch(); + $this->parseRequest(); + $this->dispatch($_SERVER["REQUEST_METHOD"], + $_SERVER["REQUEST_URI"], + $this->req["data"]); } /** @@ -293,7 +318,10 @@ public function start() { * @link http://laravel.com/docs/5.1/middleware */ public function handle($request, $next) { - $this->dispatch(); + // TODO: parse laravel request + $this->dispatch($request->method(), + $request->url(), + $request->json()); return $next($request); } } From 42b04efcebc5aa7bb5e479b14bf19b888ae2fedf Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Thu, 3 Dec 2015 16:03:17 +0800 Subject: [PATCH 013/249] Update travis env --- .travis.yml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20e4467..7176fd4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ php: - 5.6 env: - - LC_APP_ID=wnDg0lPt0wcYGJSiHRwHBhD4 LC_APP_KEY=u9ekx9HFSFFBErWwyWHFmPDy LC_API_REGION=US + - LC_API_REGION=US script: - phpunit --coverage-clover=coverage.xml diff --git a/Makefile b/Makefile index f72d7e4..01a910e 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ release: doc: vendor/bin/apigen generate --source src --destination docs -engine: +test_engine: php -t tests/engine -S $(LC_APP_HOST):$(LC_APP_PORT) -.PHONY: test doc engine +.PHONY: test doc test_engine From 0bffdc1332ca2d441d5cdc52b6979934d95cb801 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Thu, 3 Dec 2015 16:24:12 +0800 Subject: [PATCH 014/249] LeanEngine: rename parsed variables like short header names --- src/LeanCloud/Engine/LeanEngine.php | 55 +++++++++++++++-------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index aded3c7..59d20f4 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -59,18 +59,18 @@ private function getVal($hash, $keys) { private function parsePlainBody($data) { if (!empty($data)) { - $this->req["appId"] = isset($data["_ApplicationId"]) ? - $data["_ApplicationId"] : null; - $this->req["appKey"] = isset($data["_ApplicationKey"]) ? - $data["_ApplicationKey"] : null; - $this->req["masterKey"] = isset($data["_MasterKey"]) ? - $data["_MasterKey"] : null; - $this->req["sessionToken"] = isset($data["_SessionToken"]) ? - $data["_SessionToken"] : null; - $this->req["sign"] = null; - $this->req["useProd"] = isset($data["_ApplicationProduction"]) ? - (true && $data["_ApplicationProduction"]) : - true; + $this->req["X_LC_ID"] = isset($data["_ApplicationId"]) ? + $data["_ApplicationId"] : null; + $this->req["X_LC_KEY"] = isset($data["_ApplicationKey"]) ? + $data["_ApplicationKey"] : null; + $this->req["X_LC_MASTER_KEY"] = isset($data["_MasterKey"]) ? + $data["_MasterKey"] : null; + $this->req["X_LC_SESSION"] = isset($data["_SessionToken"]) ? + $data["_SessionToken"] : null; + $this->req["X_LC_SIGN"] = null; + $this->req["useProd"] = isset($data["_ApplicationProduction"]) ? + (true && $data["_ApplicationProduction"]) : + true; // remove internal fields set by API forEach($data as $key) { if ($key[0] === "_") { @@ -104,26 +104,26 @@ private function parseRequest() { $this->parsePlainBody(json_decode($body, true)); } else { $this->req["data"] = json_decode($body, true); - $this->req["appId"] = $this->getVal($_SERVER, array( + $this->req["X_LC_ID"] = $this->getVal($_SERVER, array( "HTTP_X_LC_ID", "HTTP_X_AVOSCLOUD_APPLICATION_ID", "HTTP_X_ULURU_APPLICATION_ID" )); - $this->req["appKey"] = $this->getVal($_SERVER, array( + $this->req["X_LC_KEY"] = $this->getVal($_SERVER, array( "HTTP_X_LC_KEY", "HTTP_X_AVOSCLOUD_APPLICATION_KEY", "HTTP_X_ULURU_APPLICATION_KEY" )); - $this->req["masterKey"] = $this->getVal($_SERVER, array( + $this->req["X_LC_MASTER_KEY"] = $this->getVal($_SERVER, array( "HTTP_X_AVOSCLOUD_MASTER_KEY", "HTTP_X_ULURU_MASTER_KEY" )); - $this->req["sessionToken"] = $this->getVal($_SERVER, array( + $this->req["X_LC_SESSION"] = $this->getVal($_SERVER, array( "HTTP_X_LC_SESSION", "HTTP_X_AVOSCLOUD_SESSION_TOKEN", "HTTP_X_ULURU_SESSION_TOKEN" )); - $this->req["sign"] = $this->getVal($_SERVER, array( + $this->req["X_LC_SIGN"] = $this->getVal($_SERVER, array( "HTTP_X_LC_SIGN", "HTTP_X_AVOSCLOUD_REQUEST_SIGN" )); @@ -136,7 +136,7 @@ private function parseRequest() { if ($prod === 0 || $prod === false) { $this->req["useProd"] = false; } - $this->req["origin"] = $_SERVER["HTTP_ORIGIN"]; + $this->req["ORIGIN"] = $_SERVER["HTTP_ORIGIN"]; } $this->req["useMaster"] = false; } @@ -145,8 +145,8 @@ private function parseRequest() { * Authenticate application request */ private function authRequest() { - $appId = $this->req["appId"]; - $sign = $this->req["sign"]; + $appId = $this->req["X_LC_ID"]; + $sign = $this->req["X_LC_SIGN"]; if ($sign && LeanClient::verifySign($appId, $sign)) { if (strpos($sign, "master") !== false) { $this->req["useMaster"] = true; @@ -154,7 +154,7 @@ private function authRequest() { return true; } - $appKey = $this->req["appKey"]; + $appKey = $this->req["X_LC_KEY"]; if ($appKey && LeanClient::verifyKey($appId, $appKey)) { if (strpos($appKey, "master") !== false) { $this->req["useMaster"] = true; @@ -162,7 +162,7 @@ private function authRequest() { return true; } - $masterKey = $this->req["masterKey"]; + $masterKey = $this->req["X_LC_MASTER_KEY"]; $key = "{$masterKey}, master"; if ($masterKey && LeanClient::verifyKey($appId, $key)) { $this->req["useMaster"] = true; @@ -177,8 +177,9 @@ private function authRequest() { */ private function processSession() { $this->authRequest(); - if ($this->req["sessionToken"]) { - LeanUser::become($this->req["sessionToken"]); + $token = $this->req["X_LC_SESSION"]; + if ($token) { + LeanUser::become($token); } } @@ -191,7 +192,7 @@ private function processSession() { */ private function dispatch($method, $url, $data) { $url = rtrim($url, "/"); - if ($url == "/__engine/1/ping") { + if (strpos($url, "/__engine/1/ping") === 0) { $this->renderJSON(array( "runtime" => "PHP:TODO", "version" => LeanClient::VERSION @@ -199,7 +200,7 @@ private function dispatch($method, $url, $data) { } $matches = array(); if (preg_match("/^\/(1|1\.1)\/(functions|call)(.*)/", $url, $matches) == 1) { - $origin = $this->req["origin"]; + $origin = $this->req["ORIGIN"]; header("Access-Control-Allow-Origin: " . ($origin ? $origin : "*")); if ($method == "OPTIONS") { header("Access-Control-Max-Age: 86400"); @@ -212,7 +213,7 @@ private function dispatch($method, $url, $data) { } $this->processSession(); $user = LeanUser::getCurrentUser(); - if ($matches[3] == "/_ops/metadatas") { + if (strpos($matches[3], "/_ops/metadatas") === 0) { if ($this->req["useMaster"]) { $this->renderJSON(Cloud::getKeys()); } else { From 93f855860a1d2fd7681466d9abf2b7612defd635 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 4 Dec 2015 11:51:54 +0800 Subject: [PATCH 015/249] LeanEngine: further decouple parsing request from dispatching --- src/LeanCloud/Engine/LeanEngine.php | 163 ++++++++++++++++------------ 1 file changed, 95 insertions(+), 68 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 59d20f4..c830e04 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -38,17 +38,17 @@ class LeanEngine { private $req = array(); /** - * Search keys for value in a hash array + * Retrieve value by multiple keys in array * - * @param array $map The hash array to search in + * @param array $arr The array to search in * @param array $keys Keys in order * @retrun mixed */ - private function getVal($hash, $keys) { + private function retrieveVal($arr, $keys) { $val = null; forEach($keys as $k) { - if (isset($hash[$k])) { - $val = $hash[$k]; + if (isset($arr[$k])) { + $val = $arr[$k]; } if ($val) { return $val; @@ -57,7 +57,19 @@ private function getVal($hash, $keys) { return $val; } - private function parsePlainBody($data) { + + /** + * Parse plain text body + * + * The CORS request might be sent as POST request with text/plain + * header, whence the app key info is attached in the body as + * JSON. + * + * @param string $body + * @return array $data + */ + private function parsePlainBody($body) { + $data = json_decode($body, true); if (!empty($data)) { $this->req["X_LC_ID"] = isset($data["_ApplicationId"]) ? $data["_ApplicationId"] : null; @@ -71,6 +83,7 @@ private function parsePlainBody($data) { $this->req["useProd"] = isset($data["_ApplicationProduction"]) ? (true && $data["_ApplicationProduction"]) : true; + $this->req["useMaster"] = false; // remove internal fields set by API forEach($data as $key) { if ($key[0] === "_") { @@ -79,70 +92,61 @@ private function parsePlainBody($data) { } $this->req["data"] = $data; } + return $data; } /** - * Parse raw request + * Parse variant headers into standard names */ - private function parseRequest() { - $url = $_SERVER["REQUEST_URI"]; - $body = ""; - if (preg_match("/^\/(1|1\.1)\/(functions|call)(.*)/", $url) == 1) { - // Note prior to php 5.6, input could be read only once. To not - // interfere with 3rd party framework, we read it only within - // LeanEngine internal endpoints. - $body = file_get_contents("php://input"); + private function parseHeaders($headers=null) { + if (empty($headers)) { + $headers = $_SERVER; } - $contentType = $this->getVal($_SERVER, array( + $this->req["ORIGIN"] = $this->retrieveVal($headers, array( + "HTTP_ORIGIN" + )); + $this->req["CONTENT_TYPE"] = $this->retrieveVal($headers, array( "CONTENT_TYPE", "HTTP_CONTENT_TYPE" )); - if (preg_match("/text\/plain/", $contentType)) { - // the CORS request might be sent as POST request with text/plain - // header, whence the app key info is attached in the body as - // JSON. - $this->parsePlainBody(json_decode($body, true)); - } else { - $this->req["data"] = json_decode($body, true); - $this->req["X_LC_ID"] = $this->getVal($_SERVER, array( - "HTTP_X_LC_ID", - "HTTP_X_AVOSCLOUD_APPLICATION_ID", - "HTTP_X_ULURU_APPLICATION_ID" - )); - $this->req["X_LC_KEY"] = $this->getVal($_SERVER, array( - "HTTP_X_LC_KEY", - "HTTP_X_AVOSCLOUD_APPLICATION_KEY", - "HTTP_X_ULURU_APPLICATION_KEY" - )); - $this->req["X_LC_MASTER_KEY"] = $this->getVal($_SERVER, array( - "HTTP_X_AVOSCLOUD_MASTER_KEY", - "HTTP_X_ULURU_MASTER_KEY" - )); - $this->req["X_LC_SESSION"] = $this->getVal($_SERVER, array( - "HTTP_X_LC_SESSION", - "HTTP_X_AVOSCLOUD_SESSION_TOKEN", - "HTTP_X_ULURU_SESSION_TOKEN" - )); - $this->req["X_LC_SIGN"] = $this->getVal($_SERVER, array( - "HTTP_X_LC_SIGN", - "HTTP_X_AVOSCLOUD_REQUEST_SIGN" - )); - $prod = $this->getVal($_SERVER, array( - "HTTP_X_LC_PROD", - "HTTP_X_AVOSCLOUD_APPLICATION_PRODUCTION", - "HTTP_X_ULURU_APPLICATION_PRODUCTION" - )); - $this->req["useProd"] = true; - if ($prod === 0 || $prod === false) { - $this->req["useProd"] = false; - } - $this->req["ORIGIN"] = $_SERVER["HTTP_ORIGIN"]; + + $this->req["X_LC_ID"] = $this->retrieveVal($headers, array( + "HTTP_X_LC_ID", + "HTTP_X_AVOSCLOUD_APPLICATION_ID", + "HTTP_X_ULURU_APPLICATION_ID" + )); + $this->req["X_LC_KEY"] = $this->retrieveVal($headers, array( + "HTTP_X_LC_KEY", + "HTTP_X_AVOSCLOUD_APPLICATION_KEY", + "HTTP_X_ULURU_APPLICATION_KEY" + )); + $this->req["X_LC_MASTER_KEY"] = $this->retrieveVal($headers, array( + "HTTP_X_AVOSCLOUD_MASTER_KEY", + "HTTP_X_ULURU_MASTER_KEY" + )); + $this->req["X_LC_SESSION"] = $this->retrieveVal($headers, array( + "HTTP_X_LC_SESSION", + "HTTP_X_AVOSCLOUD_SESSION_TOKEN", + "HTTP_X_ULURU_SESSION_TOKEN" + )); + $this->req["X_LC_SIGN"] = $this->retrieveVal($headers, array( + "HTTP_X_LC_SIGN", + "HTTP_X_AVOSCLOUD_REQUEST_SIGN" + )); + $prod = $this->retrieveVal($headers, array( + "HTTP_X_LC_PROD", + "HTTP_X_AVOSCLOUD_APPLICATION_PRODUCTION", + "HTTP_X_ULURU_APPLICATION_PRODUCTION" + )); + $this->req["useProd"] = true; + if ($prod === 0 || $prod === false) { + $this->req["useProd"] = false; } $this->req["useMaster"] = false; } /** - * Authenticate application request + * Authenticate request by app ID and key */ private function authRequest() { $appId = $this->req["X_LC_ID"]; @@ -173,7 +177,7 @@ private function authRequest() { } /** - * Process request session + * Set user session if sessionToken present */ private function processSession() { $this->authRequest(); @@ -186,11 +190,25 @@ private function processSession() { /** * Dispatch request * + * Following routes are processed and returned by LeanEngine: + * + * ``` + * OPTIONS {1,1.1}/{functions,call}.* + * * __engine/1/ping + * * {1,1.1}/{functions,call}/_ops/metadatas + * * {1,1.1}/{functions,call}/onVerified/{sms,email} + * * {1,1.1}/{functions,call}/BigQuery/onComplete + * * {1,1.1}/{functions,call}/{className}/{hookName} + * * {1,1.1}/{functions,call}/{funcName} + * ``` + * + * others may be added in future. + * * @param string $method Request method * @param string $url Request URL - * @param array $data JSON decoded body + * @param array $body Request body */ - private function dispatch($method, $url, $data) { + private function dispatch($method, $url, $body=null) { $url = rtrim($url, "/"); if (strpos($url, "/__engine/1/ping") === 0) { $this->renderJSON(array( @@ -211,6 +229,16 @@ private function dispatch($method, $url, $data) { header("Content-Length: 0"); exit; } + if (($method == "POST" || $method == "PUT") && empty($body)) { + // Note input can be read only once prior to php 5.6. + $body = file_get_contents("php://input"); + } + if (preg_match("/text\/plain/", $this->req["CONTENT_TYPE"])) { + $json = $this->parsePlainBody($body); + } else { + $json = json_decode($body, true); + } + $this->processSession(); $user = LeanUser::getCurrentUser(); if (strpos($matches[3], "/_ops/metadatas") === 0) { @@ -221,7 +249,7 @@ private function dispatch($method, $url, $data) { } } - $data = LeanClient::decode($data, null); + $data = LeanClient::decode($json, null); $params = explode("/", ltrim($matches[3], "/")); try { if (count($params) == 1) { @@ -243,14 +271,14 @@ private function dispatch($method, $url, $data) { } else if (count($params) == 2) { // {1,1.1}/functions/{className}/beforeSave $obj = $data["object"]; - Cloud::runHook($params[0], $params[1], + $obj2 = Cloud::runHook($params[0], $params[1], $obj, $user); if ($params[1] == "beforeDelete") { $this->renderJSON(array()); } else if (strpos($params[1], "after") === 0) { $this->renderJSON(array("result" => "ok")); } else { - $this->renderJSON($obj); + $this->renderJSON($obj2); } } } catch (FunctionError $err) { @@ -291,10 +319,9 @@ private function renderError($message, $code=1, $status=400) { * Start engine and process request */ public function start() { - $this->parseRequest(); + $this->parseHeaders($_SERVER); $this->dispatch($_SERVER["REQUEST_METHOD"], - $_SERVER["REQUEST_URI"], - $this->req["data"]); + $_SERVER["REQUEST_URI"]); } /** @@ -319,10 +346,10 @@ public function start() { * @link http://laravel.com/docs/5.1/middleware */ public function handle($request, $next) { - // TODO: parse laravel request + $this->parseHeaders($request->header()); $this->dispatch($request->method(), $request->url(), - $request->json()); + $request->getContent()); return $next($request); } } From 2b4e3c9668908fb3479293d7b8ac0f848af44f8b Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Thu, 10 Dec 2015 17:30:06 +0800 Subject: [PATCH 016/249] LeanEngine: add https redirect middleware --- src/LeanCloud/Engine/HttpsRedirect.php | 66 ++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 src/LeanCloud/Engine/HttpsRedirect.php diff --git a/src/LeanCloud/Engine/HttpsRedirect.php b/src/LeanCloud/Engine/HttpsRedirect.php new file mode 100644 index 0000000..497c8c2 --- /dev/null +++ b/src/LeanCloud/Engine/HttpsRedirect.php @@ -0,0 +1,66 @@ + Date: Thu, 10 Dec 2015 17:32:38 +0800 Subject: [PATCH 017/249] LeanEngine: refactor instance methods as static methods --- src/LeanCloud/Engine/LeanEngine.php | 147 ++++++++++++++-------------- tests/engine/LeanEngineTest.php | 14 +++ tests/engine/index.php | 8 +- 3 files changed, 96 insertions(+), 73 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index c830e04..20daeb6 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -31,11 +31,11 @@ class LeanEngine { ); /** - * Request info + * Parsed env variables * * @var array */ - private $req = array(); + public static $ENV = array(); /** * Retrieve value by multiple keys in array @@ -44,7 +44,7 @@ class LeanEngine { * @param array $keys Keys in order * @retrun mixed */ - private function retrieveVal($arr, $keys) { + private static function retrieveVal($arr, $keys) { $val = null; forEach($keys as $k) { if (isset($arr[$k])) { @@ -57,7 +57,6 @@ private function retrieveVal($arr, $keys) { return $val; } - /** * Parse plain text body * @@ -66,122 +65,129 @@ private function retrieveVal($arr, $keys) { * JSON. * * @param string $body - * @return array $data + * @return array Decoded body array */ - private function parsePlainBody($body) { + private static function parsePlainBody($body) { $data = json_decode($body, true); if (!empty($data)) { - $this->req["X_LC_ID"] = isset($data["_ApplicationId"]) ? + self::$ENV["LC_ID"] = isset($data["_ApplicationId"]) ? $data["_ApplicationId"] : null; - $this->req["X_LC_KEY"] = isset($data["_ApplicationKey"]) ? + self::$ENV["LC_KEY"] = isset($data["_ApplicationKey"]) ? $data["_ApplicationKey"] : null; - $this->req["X_LC_MASTER_KEY"] = isset($data["_MasterKey"]) ? + self::$ENV["LC_MASTER_KEY"] = isset($data["_MasterKey"]) ? $data["_MasterKey"] : null; - $this->req["X_LC_SESSION"] = isset($data["_SessionToken"]) ? + self::$ENV["LC_SESSION"] = isset($data["_SessionToken"]) ? $data["_SessionToken"] : null; - $this->req["X_LC_SIGN"] = null; - $this->req["useProd"] = isset($data["_ApplicationProduction"]) ? + self::$ENV["LC_SIGN"] = null; + self::$ENV["useProd"] = isset($data["_ApplicationProduction"]) ? (true && $data["_ApplicationProduction"]) : true; - $this->req["useMaster"] = false; + self::$ENV["useMaster"] = false; // remove internal fields set by API forEach($data as $key) { if ($key[0] === "_") { unset($data[$key]); } } - $this->req["data"] = $data; } return $data; } /** * Parse variant headers into standard names + * + * The headers shall be an associative array that contains raw + * header keys. For example, in Laravel they are available at + * `$request->header()`. It will default to `$_SERVER` if not + * provided. + * + * @param array $headers */ - private function parseHeaders($headers=null) { + private static function parseHeaders($headers=null) { if (empty($headers)) { $headers = $_SERVER; } - $this->req["ORIGIN"] = $this->retrieveVal($headers, array( + self::$ENV["ORIGIN"] = static::retrieveVal($headers, array( "HTTP_ORIGIN" )); - $this->req["CONTENT_TYPE"] = $this->retrieveVal($headers, array( + self::$ENV["CONTENT_TYPE"] = static::retrieveVal($headers, array( "CONTENT_TYPE", "HTTP_CONTENT_TYPE" )); - $this->req["X_LC_ID"] = $this->retrieveVal($headers, array( + self::$ENV["LC_ID"] = static::retrieveVal($headers, array( "HTTP_X_LC_ID", "HTTP_X_AVOSCLOUD_APPLICATION_ID", "HTTP_X_ULURU_APPLICATION_ID" )); - $this->req["X_LC_KEY"] = $this->retrieveVal($headers, array( + self::$ENV["LC_KEY"] = static::retrieveVal($headers, array( "HTTP_X_LC_KEY", "HTTP_X_AVOSCLOUD_APPLICATION_KEY", "HTTP_X_ULURU_APPLICATION_KEY" )); - $this->req["X_LC_MASTER_KEY"] = $this->retrieveVal($headers, array( + self::$ENV["LC_MASTER_KEY"] = static::retrieveVal($headers, array( "HTTP_X_AVOSCLOUD_MASTER_KEY", "HTTP_X_ULURU_MASTER_KEY" )); - $this->req["X_LC_SESSION"] = $this->retrieveVal($headers, array( + self::$ENV["LC_SESSION"] = static::retrieveVal($headers, array( "HTTP_X_LC_SESSION", "HTTP_X_AVOSCLOUD_SESSION_TOKEN", "HTTP_X_ULURU_SESSION_TOKEN" )); - $this->req["X_LC_SIGN"] = $this->retrieveVal($headers, array( + self::$ENV["LC_SIGN"] = static::retrieveVal($headers, array( "HTTP_X_LC_SIGN", "HTTP_X_AVOSCLOUD_REQUEST_SIGN" )); - $prod = $this->retrieveVal($headers, array( + $prod = static::retrieveVal($headers, array( "HTTP_X_LC_PROD", "HTTP_X_AVOSCLOUD_APPLICATION_PRODUCTION", "HTTP_X_ULURU_APPLICATION_PRODUCTION" )); - $this->req["useProd"] = true; + self::$ENV["useProd"] = true; if ($prod === 0 || $prod === false) { - $this->req["useProd"] = false; + self::$ENV["useProd"] = false; } - $this->req["useMaster"] = false; + self::$ENV["useMaster"] = false; } /** * Authenticate request by app ID and key */ - private function authRequest() { - $appId = $this->req["X_LC_ID"]; - $sign = $this->req["X_LC_SIGN"]; + private static function authRequest() { + $appId = self::$ENV["LC_ID"]; + $sign = self::$ENV["LC_SIGN"]; if ($sign && LeanClient::verifySign($appId, $sign)) { if (strpos($sign, "master") !== false) { - $this->req["useMaster"] = true; + self::$ENV["useMaster"] = true; } return true; } - $appKey = $this->req["X_LC_KEY"]; + $appKey = self::$ENV["LC_KEY"]; if ($appKey && LeanClient::verifyKey($appId, $appKey)) { if (strpos($appKey, "master") !== false) { - $this->req["useMaster"] = true; + self::$ENV["useMaster"] = true; } return true; } - $masterKey = $this->req["X_LC_MASTER_KEY"]; + $masterKey = self::$ENV["LC_MASTER_KEY"]; $key = "{$masterKey}, master"; if ($masterKey && LeanClient::verifyKey($appId, $key)) { - $this->req["useMaster"] = true; + self::$ENV["useMaster"] = true; return true; } - $this->renderError("Unauthorized", 401, 401); + static::renderError("Unauthorized", 401, 401); } /** * Set user session if sessionToken present + * */ - private function processSession() { - $this->authRequest(); - $token = $this->req["X_LC_SESSION"]; + private static function processSession() { + static::authRequest(); + $token = self::$ENV["LC_SESSION"]; if ($token) { LeanUser::become($token); } @@ -205,20 +211,20 @@ private function processSession() { * others may be added in future. * * @param string $method Request method - * @param string $url Request URL + * @param string $url Request url * @param array $body Request body */ - private function dispatch($method, $url, $body=null) { + private static function dispatch($method, $url, $body=null) { $url = rtrim($url, "/"); if (strpos($url, "/__engine/1/ping") === 0) { - $this->renderJSON(array( + static::renderJSON(array( "runtime" => "PHP:TODO", "version" => LeanClient::VERSION )); } $matches = array(); - if (preg_match("/^\/(1|1\.1)\/(functions|call)(.*)/", $url, $matches) == 1) { - $origin = $this->req["ORIGIN"]; + if (preg_match("/^\/(1|1\.1)\/(functions|call)(.*)/", $url, $matches) === 1) { + $origin = self::$ENV["ORIGIN"]; header("Access-Control-Allow-Origin: " . ($origin ? $origin : "*")); if ($method == "OPTIONS") { header("Access-Control-Max-Age: 86400"); @@ -233,19 +239,19 @@ private function dispatch($method, $url, $body=null) { // Note input can be read only once prior to php 5.6. $body = file_get_contents("php://input"); } - if (preg_match("/text\/plain/", $this->req["CONTENT_TYPE"])) { - $json = $this->parsePlainBody($body); + if (preg_match("/text\/plain/", self::$ENV["CONTENT_TYPE"])) { + $json = static::parsePlainBody($body); } else { $json = json_decode($body, true); } - $this->processSession(); + static::processSession(); $user = LeanUser::getCurrentUser(); if (strpos($matches[3], "/_ops/metadatas") === 0) { - if ($this->req["useMaster"]) { - $this->renderJSON(Cloud::getKeys()); + if (self::$ENV["useMaster"]) { + static::renderJSON(Cloud::getKeys()); } else { - $this->renderError("Unauthorized.", 401, 401); + static::renderError("Unauthorized.", 401, 401); } } @@ -255,34 +261,33 @@ private function dispatch($method, $url, $body=null) { if (count($params) == 1) { // {1,1.1}/functions/{funcName} $result = Cloud::runFunc($params[0], $data, $user); - $this->renderJSON(array("result" => $result)); + static::renderJSON(array("result" => $result)); } else if ($params[0] == "onVerified") { // {1,1.1}/functions/onVerified/sms Cloud::runOnVerified($params[1], $user); - $this->renderJSON(array("result" => "ok")); + static::renderJSON(array("result" => "ok")); } else if ($params[0] == "_User" && $params[1] == "onLogin") { // {1,1.1}/functions/_User/onLogin Cloud::runOnLogin($data["object"]); - $this->renderJSON(array("result" => "ok")); + static::renderJSON(array("result" => "ok")); } else if ($params[0] == "BigQuery" || $params[0] == "Insight") { // {1,1.1}/functions/BigQuery/onComplete Cloud::runOnInsight($data); - $this->renderJSON(array("result" => "ok")); + static::renderJSON(array("result" => "ok")); } else if (count($params) == 2) { // {1,1.1}/functions/{className}/beforeSave - $obj = $data["object"]; - $obj2 = Cloud::runHook($params[0], $params[1], - $obj, $user); + $obj = Cloud::runHook($params[0], $params[1], + $data["object"], $user); if ($params[1] == "beforeDelete") { - $this->renderJSON(array()); + static::renderJSON(array()); } else if (strpos($params[1], "after") === 0) { - $this->renderJSON(array("result" => "ok")); + static::renderJSON(array("result" => "ok")); } else { - $this->renderJSON($obj2); + static::renderJSON($obj->toJSON()); } } } catch (FunctionError $err) { - $this->renderError($err->getMessage(), $err->getCode()); + static::renderError($err->getMessage(), $err->getCode()); } } } @@ -292,9 +297,9 @@ private function dispatch($method, $url, $body=null) { * * @param array $data */ - private function renderJSON($data) { + private static function renderJSON($data) { header("Content-Type: application/json; charset=utf-8;"); - echo json_encode(LeanClient::encode($data)); + echo json_encode($data); exit; } @@ -305,7 +310,7 @@ private function renderJSON($data) { * @param string $code Error code * @param string $status Http response status code */ - private function renderError($message, $code=1, $status=400) { + private static function renderError($message, $code=1, $status=400) { http_response_code($status); header("Content-Type: application/json; charset=utf-8;"); echo json_encode(array( @@ -318,10 +323,10 @@ private function renderError($message, $code=1, $status=400) { /** * Start engine and process request */ - public function start() { - $this->parseHeaders($_SERVER); - $this->dispatch($_SERVER["REQUEST_METHOD"], - $_SERVER["REQUEST_URI"]); + public static function start() { + static::parseHeaders($_SERVER); + static::dispatch($_SERVER["REQUEST_METHOD"], + $_SERVER["REQUEST_URI"]); } /** @@ -346,10 +351,10 @@ public function start() { * @link http://laravel.com/docs/5.1/middleware */ public function handle($request, $next) { - $this->parseHeaders($request->header()); - $this->dispatch($request->method(), - $request->url(), - $request->getContent()); + static::parseHeaders($request->header()); + static::dispatch($request->method(), + $request->url(), + $request->getContent()); return $next($request); } } diff --git a/tests/engine/LeanEngineTest.php b/tests/engine/LeanEngineTest.php index 3b5b63c..2ea7458 100644 --- a/tests/engine/LeanEngineTest.php +++ b/tests/engine/LeanEngineTest.php @@ -107,5 +107,19 @@ public function testOnVerifiedSms() { $this->assertEquals("ok", $resp["result"]); } + public function testBeforeSave() { + $obj = array( + "__type" => "Object", + "className" => "TestObject", + "objectId" => "id002", + "name" => "alice" + ); + $resp = $this->request("/1/functions/TestObject/beforeSave", "POST", + array("object" => $obj)); + $obj2 = $resp; + $this->assertEquals($obj["objectId"], $obj2["objectId"]); + $this->assertEquals($obj["name"], $obj2["name"]); + $this->assertEquals(42, $obj2["__testKey"]); + } } diff --git a/tests/engine/index.php b/tests/engine/index.php index e8366ce..1d066d5 100644 --- a/tests/engine/index.php +++ b/tests/engine/index.php @@ -34,6 +34,10 @@ return; }); -$engine = new LeanEngine(); -$engine->start(); +Cloud::beforeSave("TestObject", function($obj, $user) { + $obj->set("__testKey", 42); + return $obj; +}); + +LeanEngine::start(); From 506df0594579fb3b1c6357c1b24701f8ce1b6748 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 11 Dec 2015 11:17:18 +0800 Subject: [PATCH 018/249] Allow object to be recusively encoded to literal or full JSON --- src/LeanCloud/LeanClient.php | 39 ++++++++++++++++++++++---- src/LeanCloud/LeanObject.php | 39 ++++++++++++++++++++++++++ tests/LeanClientTest.php | 54 ++++++++++++++++++++++++++++++++++++ 3 files changed, 127 insertions(+), 5 deletions(-) diff --git a/src/LeanCloud/LeanClient.php b/src/LeanCloud/LeanClient.php index 6bb7116..5d10731 100644 --- a/src/LeanCloud/LeanClient.php +++ b/src/LeanCloud/LeanClient.php @@ -577,12 +577,36 @@ public static function uploadToQiniu($token, $content, $name, } /** - * Encode value for sending to LeanCloud + * Recursively encode value as JSON representation * - * @param mixed $value + * By default LeanObject will be encoded as pointer, though + * `$encoder` could be provided to encode to customized type, such + * as full `__type` annotated json object. The $encoder must be + * name of instance method of LeanObject. + * + * To vaoid infinite loop in the case of circular LeanObject + * references, previously seen objects (`$seen`) are encoded + * in pointer, even a customized encoder was provided. + * + * ```php + * $obj = new TestObject(); + * $obj->set("owner", $user); + * + * // encode object to full JSON, with `__type` and `className` + * LeanClient::encode($obj, "toFullJSON"); + * + * // encode object to literal JSON, without `__type` and `className` + * LeanClient::encode($obj, "toJSON"); + * ``` + * + * @param mixed $value + * @param string $encoder LeanObject encoder name, e.g.: getPointer, toJSON + * @param array $seen Array of LeanObject that has been traversed * @return mixed */ - public static function encode($value) { + public static function encode($value, + $encoder=null, + $seen=array()) { if (is_null($value) || is_scalar($value)) { return $value; } else if (($value instanceof \DateTime) || @@ -590,7 +614,12 @@ public static function encode($value) { return array("__type" => "Date", "iso" => self::formatDate($value)); } else if ($value instanceof LeanObject) { - return $value->getPointer(); + if ($encoder && !in_array($value, $seen)) { + $seen[] = $value; + return call_user_func(array($value, $encoder), $seen); + } else { + return $value->getPointer(); + } } else if ($value instanceof IOperation || $value instanceof GeoPoint || $value instanceof LeanBytes || @@ -600,7 +629,7 @@ public static function encode($value) { } else if (is_array($value)) { $res = array(); forEach($value as $key => $val) { - $res[$key] = self::encode($val); + $res[$key] = self::encode($val, $encoder, $seen); } return $res; } else { diff --git a/src/LeanCloud/LeanObject.php b/src/LeanCloud/LeanObject.php index 3541e6b..da7d31b 100644 --- a/src/LeanCloud/LeanObject.php +++ b/src/LeanCloud/LeanObject.php @@ -149,6 +149,45 @@ public function getPointer() { ); } + /** + * Recursively encode object and its data to literal JSON + * + * Recursively encode object and its (snapshot) data to literal + * JSON. Literal means object will not have `__type` and + * `className` attributes. + * + * @param array $seen Objects that have been traversed + * @return array + * @see self::toFullJSON + */ + public function toJSON($seen=array()) { + $out = array(); + forEach($this->_data as $key => $val) { + $out[$key] = LeanClient::encode($val, "toJSON", $seen); + } + return $out; + } + + /** + * Recursively encode object and its data to full JSON + * + * Recursively encode object and its (snapshot) data to full JSON, the + * `__type` and `className` will be included in the attributes. + * + * @param array $seen Objects that have been traversed + * @return array + * @see self::toJSON + */ + public function toFullJSON($seen=array()) { + $out = array(); + forEach($this->_data as $key => $val) { + $out[$key] = LeanClient::encode($val, "toFullJSON", $seen); + } + $out["__type"] = "Object"; + $out["className"] = $this->getClassName(); + return $out; + } + /** * Get objectId of object * diff --git a/tests/LeanClientTest.php b/tests/LeanClientTest.php index 220ceec..7f96006 100644 --- a/tests/LeanClientTest.php +++ b/tests/LeanClientTest.php @@ -329,6 +329,60 @@ public function testDecodeGeoPoint() { $this->assertEquals(39.9, $val->getLatitude()); $this->assertEquals(116.4, $val->getLongitude()); } + + public function testEncodeObjectToJSON() { + $a = new LeanObject("TestObject", "id001"); + $b = new LeanObject("TestObject", "id002"); + $a->set("name", "A"); + $b->set("name", "B"); + $a->addIn("likes", $b); + $json = LeanClient::encode($a, "toJSON"); + $this->assertEquals("A", $json["name"]); + $this->assertEquals("id001", $json["objectId"]); + $this->assertEquals("B", $json["likes"][0]["name"]); + $this->assertEquals("id002", $json["likes"][0]["objectId"]); + + $this->assertNotContains("__type", $json); + $this->assertNotContains("className", $json["likes"][0]); + } + + public function testEncodeObjectToFullJSON() { + $a = new LeanObject("TestObject", "id001"); + $b = new LeanObject("TestObject", "id002"); + $a->set("name", "A"); + $b->set("name", "B"); + $a->addIn("likes", $b); + $json = LeanClient::encode($a, "toFullJSON"); + $this->assertEquals("A", $json["name"]); + $this->assertEquals("id001", $json["objectId"]); + $this->assertEquals("B", $json["likes"][0]["name"]); + $this->assertEquals("id002", $json["likes"][0]["objectId"]); + + $this->assertEquals("Object", $json["__type"]); + $this->assertEquals("TestObject", $json["className"]); + $this->assertEquals("Object", $json["likes"][0]["__type"]); + $this->assertEquals("TestObject", $json["likes"][0]["className"]); + } + + public function testEncodeCircularObjectAsPointer() { + $a = new LeanObject("TestObject", "id001"); + $b = new LeanObject("TestObject", "id002"); + $c = new LeanObject("TestObject", "id003"); + $a->set("name", "A"); + $b->set("name", "B"); + $c->set("name", "C"); + $a->addIn("likes", $b); + $b->addIn("likes", $c); + $c->addIn("likes", $a); + $jsonA = LeanClient::encode($a, "toFullJSON"); + $jsonB = $jsonA["likes"][0]; + $jsonC = $jsonB["likes"][0]; + + $this->assertEquals("Object", $jsonA["__type"]); + $this->assertEquals("Object", $jsonB["__type"]); + $this->assertEquals("Object", $jsonC["__type"]); + $this->assertEquals("Pointer", $jsonC["likes"][0]["__type"]); + } } From 9025892519be9cd3895ce20956838d21b42e523d Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 11 Dec 2015 12:16:57 +0800 Subject: [PATCH 019/249] Update doc for HttpsRedirect --- src/LeanCloud/Engine/HttpsRedirect.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/LeanCloud/Engine/HttpsRedirect.php b/src/LeanCloud/Engine/HttpsRedirect.php index 497c8c2..b72ddab 100644 --- a/src/LeanCloud/Engine/HttpsRedirect.php +++ b/src/LeanCloud/Engine/HttpsRedirect.php @@ -17,8 +17,9 @@ public static function redirect($permanet=false) { $reqHost = $_SERVER["HTTP_X_FORWARDED_HOST"]; } } else { - // Note: HTTPS is set non-empty when secure, except when ISAPI - // with IIS sets it as "off" to indicate non-secure request. + // Note: By default it will be set non-empty for https request, + // though ISAPI with IIS sets it as "off" to indicate non-secure + // request. if (!empty($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] != "off")){ $reqProto = "https"; } From 606db9beb7e7ae2b431cc433ca83ba3bda928b1f Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 11 Dec 2015 12:18:21 +0800 Subject: [PATCH 020/249] LeanEngine: encode object in function/hook result --- src/LeanCloud/Engine/LeanEngine.php | 17 +++++++++-- tests/engine/LeanEngineTest.php | 47 +++++++++++++++++++++++++++++ tests/engine/index.php | 16 ++++++++++ 3 files changed, 77 insertions(+), 3 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 20daeb6..e464b07 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -224,6 +224,9 @@ private static function dispatch($method, $url, $body=null) { } $matches = array(); if (preg_match("/^\/(1|1\.1)\/(functions|call)(.*)/", $url, $matches) === 1) { + $matches["version"] = $matches[1]; // 1 or 1.1 + $matches["endpoint"] = $matches[2]; // functions or call + $matches["extra"] = $matches[3]; // extra part after endpoint $origin = self::$ENV["ORIGIN"]; header("Access-Control-Allow-Origin: " . ($origin ? $origin : "*")); if ($method == "OPTIONS") { @@ -247,7 +250,7 @@ private static function dispatch($method, $url, $body=null) { static::processSession(); $user = LeanUser::getCurrentUser(); - if (strpos($matches[3], "/_ops/metadatas") === 0) { + if (strpos($matches["extra"], "/_ops/metadatas") === 0) { if (self::$ENV["useMaster"]) { static::renderJSON(Cloud::getKeys()); } else { @@ -256,12 +259,19 @@ private static function dispatch($method, $url, $body=null) { } $data = LeanClient::decode($json, null); - $params = explode("/", ltrim($matches[3], "/")); + $params = explode("/", ltrim($matches["extra"], "/")); try { if (count($params) == 1) { // {1,1.1}/functions/{funcName} $result = Cloud::runFunc($params[0], $data, $user); - static::renderJSON(array("result" => $result)); + if ($matches["endpoint"] === "functions") { + // Encode object to type-less literal JSON + $out = LeanClient::encode($result, "toJSON"); + } else { + // Encode object to full, type-annotated JSON + $out = LeanClient::encode($result, "toFullJSON"); + } + static::renderJSON(array("result" => $out)); } else if ($params[0] == "onVerified") { // {1,1.1}/functions/onVerified/sms Cloud::runOnVerified($params[1], $user); @@ -283,6 +293,7 @@ private static function dispatch($method, $url, $body=null) { } else if (strpos($params[1], "after") === 0) { static::renderJSON(array("result" => "ok")); } else { + // Encode object to type-less literal JSON static::renderJSON($obj->toJSON()); } } diff --git a/tests/engine/LeanEngineTest.php b/tests/engine/LeanEngineTest.php index 2ea7458..3c5f1bf 100644 --- a/tests/engine/LeanEngineTest.php +++ b/tests/engine/LeanEngineTest.php @@ -3,6 +3,13 @@ use LeanCloud\LeanClient; use LeanCloud\CloudException; +/** + * Test LeanEngine app server + * + * The test suite runs against a running server started at index.php, please + * see that for returned response. + */ + class LeanEngineTest extends PHPUnit_Framework_TestCase { public static function setUpBeforeClass() { LeanClient::initialize( @@ -67,6 +74,21 @@ public function testCloudFunctionHello() { $this->assertEquals("hello", $resp["result"]); } + public function testCallFunctionWithObject() { + $obj = array( + "__type" => "Object", + "className" => "TestObject", + "objectId" => "id001", + "name" => "alice" + ); + $resp = $this->request("/1/call/updateObject", "POST", array( + "object" => $obj + )); + $this->assertEquals($obj["className"], $resp["result"]["className"]); + $this->assertEquals($obj["objectId"], $resp["result"]["objectId"]); + $this->assertEquals(42, $resp["result"]["__testKey"]); + } + public function testFunctionWithParam() { $resp = $this->request("/1/functions/sayHello", "POST", array( "name" => "alice" @@ -121,5 +143,30 @@ public function testBeforeSave() { $this->assertEquals($obj["name"], $obj2["name"]); $this->assertEquals(42, $obj2["__testKey"]); } + + public function testAfterSave() { + $obj = array( + "__type" => "Object", + "className" => "TestObject", + "objectId" => "id002", + "name" => "alice" + ); + $resp = $this->request("/1/functions/TestObject/afterSave", "POST", + array("object" => $obj)); + $this->assertEquals("ok", $resp["result"]); + } + + public function testBeforeDelete() { + $obj = array( + "__type" => "Object", + "className" => "TestObject", + "objectId" => "id002", + "name" => "alice" + ); + $resp = $this->request("/1/functions/TestObject/beforeDelete", "POST", + array("object" => $obj)); + $this->assertEmpty($resp); + } + } diff --git a/tests/engine/index.php b/tests/engine/index.php index 1d066d5..d4cc97a 100644 --- a/tests/engine/index.php +++ b/tests/engine/index.php @@ -5,6 +5,7 @@ use LeanCloud\LeanClient; use LeanCloud\Engine\LeanEngine; use LeanCloud\Engine\Cloud; +use LeanCloud\Engine\HttpsRedirect; LeanClient::initialize( getenv("LC_APP_ID"), @@ -22,6 +23,12 @@ return "hello {$params['name']}"; }); +Cloud::define("updateObject", function($params, $user) { + $obj = $params["object"]; + $obj->set("__testKey", 42); + return $obj; +}); + Cloud::onLogin(function($user) { return; }); @@ -39,5 +46,14 @@ return $obj; }); +Cloud::afterSave("TestObject", function($obj, $user) { + return; +}); + +Cloud::beforeDelete("TestObject", function($obj, $user) { + return; +}); + +//HttpsRedirect::redirect(); LeanEngine::start(); From 9b0ed92b4323ad3b451efc8fef36c558d7a0f673 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 11 Dec 2015 16:43:10 +0800 Subject: [PATCH 021/249] LeanEngine: catch run function error independently --- src/LeanCloud/Engine/LeanEngine.php | 80 +++++++++++++++++------------ 1 file changed, 48 insertions(+), 32 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index e464b07..30ab802 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -260,45 +260,61 @@ private static function dispatch($method, $url, $body=null) { $data = LeanClient::decode($json, null); $params = explode("/", ltrim($matches["extra"], "/")); - try { - if (count($params) == 1) { - // {1,1.1}/functions/{funcName} + if (count($params) == 1) { + // {1,1.1}/functions/{funcName} + try { $result = Cloud::runFunc($params[0], $data, $user); - if ($matches["endpoint"] === "functions") { - // Encode object to type-less literal JSON - $out = LeanClient::encode($result, "toJSON"); - } else { - // Encode object to full, type-annotated JSON - $out = LeanClient::encode($result, "toFullJSON"); - } - static::renderJSON(array("result" => $out)); - } else if ($params[0] == "onVerified") { - // {1,1.1}/functions/onVerified/sms + } catch (FunctionError $err) { + static::renderError($err->getMessage(), $err->getCode()); + } + if ($matches["endpoint"] === "functions") { + // Encode object to type-less literal JSON + $out = LeanClient::encode($result, "toJSON"); + } else { + // Encode object to full, type-annotated JSON + $out = LeanClient::encode($result, "toFullJSON"); + } + static::renderJSON(array("result" => $out)); + } else if ($params[0] == "onVerified") { + // {1,1.1}/functions/onVerified/sms + try { Cloud::runOnVerified($params[1], $user); - static::renderJSON(array("result" => "ok")); - } else if ($params[0] == "_User" && $params[1] == "onLogin") { - // {1,1.1}/functions/_User/onLogin + } catch (FunctionError $err) { + static::renderError($err->getMessage(), $err->getCode()); + } + static::renderJSON(array("result" => "ok")); + } else if ($params[0] == "_User" && $params[1] == "onLogin") { + // {1,1.1}/functions/_User/onLogin + try { Cloud::runOnLogin($data["object"]); - static::renderJSON(array("result" => "ok")); - } else if ($params[0] == "BigQuery" || $params[0] == "Insight") { - // {1,1.1}/functions/BigQuery/onComplete + } catch (FunctionError $err) { + static::renderError($err->getMessage(), $err->getCode()); + } + static::renderJSON(array("result" => "ok")); + } else if ($params[0] == "BigQuery" || $params[0] == "Insight") { + // {1,1.1}/functions/BigQuery/onComplete + try { Cloud::runOnInsight($data); - static::renderJSON(array("result" => "ok")); - } else if (count($params) == 2) { - // {1,1.1}/functions/{className}/beforeSave + } catch (FunctionError $err) { + static::renderError($err->getMessage(), $err->getCode()); + } + static::renderJSON(array("result" => "ok")); + } else if (count($params) == 2) { + // {1,1.1}/functions/{className}/beforeSave + try { $obj = Cloud::runHook($params[0], $params[1], $data["object"], $user); - if ($params[1] == "beforeDelete") { - static::renderJSON(array()); - } else if (strpos($params[1], "after") === 0) { - static::renderJSON(array("result" => "ok")); - } else { - // Encode object to type-less literal JSON - static::renderJSON($obj->toJSON()); - } + } catch (FunctionError $err) { + static::renderError($err->getMessage(), $err->getCode()); + } + if ($params[1] == "beforeDelete") { + static::renderJSON(array()); + } else if (strpos($params[1], "after") === 0) { + static::renderJSON(array("result" => "ok")); + } else { + // Encode object to type-less literal JSON + static::renderJSON($obj->toJSON()); } - } catch (FunctionError $err) { - static::renderError($err->getMessage(), $err->getCode()); } } } From beb42fc2688c1a1ea387d90dbd2f60a63111e587 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 14 Dec 2015 17:18:39 +0800 Subject: [PATCH 022/249] LeanEngine: refactor dispatch routines * Decouple dispatch functions into separate routine * beforeUpdate: attach updatedKeys as $obj->updatedKeys * class hook: set hook marks to prevent inifinite hook loop * Expose LeanUser::saveCurrentUser as public function --- src/LeanCloud/Engine/LeanEngine.php | 218 ++++++++++++++++++++-------- src/LeanCloud/LeanUser.php | 2 +- 2 files changed, 155 insertions(+), 65 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 30ab802..a97ccb8 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -215,18 +215,22 @@ private static function processSession() { * @param array $body Request body */ private static function dispatch($method, $url, $body=null) { - $url = rtrim($url, "/"); - if (strpos($url, "/__engine/1/ping") === 0) { + $path = parse_url($url, PHP_URL_PATH); + $path = rtrim($path, "/"); + if (strpos($path, "/__engine/1/ping") === 0) { static::renderJSON(array( "runtime" => "PHP:TODO", "version" => LeanClient::VERSION )); } - $matches = array(); - if (preg_match("/^\/(1|1\.1)\/(functions|call)(.*)/", $url, $matches) === 1) { - $matches["version"] = $matches[1]; // 1 or 1.1 - $matches["endpoint"] = $matches[2]; // functions or call - $matches["extra"] = $matches[3]; // extra part after endpoint + + $pathParts = array(); // matched path components + if (preg_match("/^\/(1|1\.1)\/(functions|call)(.*)/", + $path, + $pathParts) === 1) { + $pathParts["version"] = $pathParts[1]; // 1 or 1.1 + $pathParts["endpoint"] = $pathParts[2]; // functions or call + $pathParts["extra"] = $pathParts[3]; // extra part after endpoint $origin = self::$ENV["ORIGIN"]; header("Access-Control-Allow-Origin: " . ($origin ? $origin : "*")); if ($method == "OPTIONS") { @@ -249,8 +253,7 @@ private static function dispatch($method, $url, $body=null) { } static::processSession(); - $user = LeanUser::getCurrentUser(); - if (strpos($matches["extra"], "/_ops/metadatas") === 0) { + if (strpos($pathParts["extra"], "/_ops/metadatas") === 0) { if (self::$ENV["useMaster"]) { static::renderJSON(Cloud::getKeys()); } else { @@ -258,67 +261,154 @@ private static function dispatch($method, $url, $body=null) { } } - $data = LeanClient::decode($json, null); - $params = explode("/", ltrim($matches["extra"], "/")); - if (count($params) == 1) { + // extract func params from path: + // /1.1/call/{0}/{1} + $funcParams = explode("/", ltrim($pathParts["extra"], "/")); + if (count($funcParams) == 1) { // {1,1.1}/functions/{funcName} - try { - $result = Cloud::runFunc($params[0], $data, $user); - } catch (FunctionError $err) { - static::renderError($err->getMessage(), $err->getCode()); - } - if ($matches["endpoint"] === "functions") { - // Encode object to type-less literal JSON - $out = LeanClient::encode($result, "toJSON"); - } else { - // Encode object to full, type-annotated JSON - $out = LeanClient::encode($result, "toFullJSON"); - } - static::renderJSON(array("result" => $out)); - } else if ($params[0] == "onVerified") { - // {1,1.1}/functions/onVerified/sms - try { - Cloud::runOnVerified($params[1], $user); - } catch (FunctionError $err) { - static::renderError($err->getMessage(), $err->getCode()); - } - static::renderJSON(array("result" => "ok")); - } else if ($params[0] == "_User" && $params[1] == "onLogin") { - // {1,1.1}/functions/_User/onLogin - try { - Cloud::runOnLogin($data["object"]); - } catch (FunctionError $err) { - static::renderError($err->getMessage(), $err->getCode()); - } - static::renderJSON(array("result" => "ok")); - } else if ($params[0] == "BigQuery" || $params[0] == "Insight") { - // {1,1.1}/functions/BigQuery/onComplete - try { - Cloud::runOnInsight($data); - } catch (FunctionError $err) { - static::renderError($err->getMessage(), $err->getCode()); - } - static::renderJSON(array("result" => "ok")); - } else if (count($params) == 2) { - // {1,1.1}/functions/{className}/beforeSave - try { - $obj = Cloud::runHook($params[0], $params[1], - $data["object"], $user); - } catch (FunctionError $err) { - static::renderError($err->getMessage(), $err->getCode()); - } - if ($params[1] == "beforeDelete") { - static::renderJSON(array()); - } else if (strpos($params[1], "after") === 0) { - static::renderJSON(array("result" => "ok")); - } else { - // Encode object to type-less literal JSON - static::renderJSON($obj->toJSON()); + static::dispatchFunc($funcParams[0], $json, + $pathParts["endpoint"] === "call"); + } else { + if ($funcParams[0] == "onVerified") { + // {1,1.1}/functions/onVerified/sms + static::dispatchOnVerified($funcParams[1], $json); + } else if ($funcParams[0] == "_User" && + $funcParams[1] == "onLogin") { + // {1,1.1}/functions/_User/onLogin + static::dispatchOnLogin($json); + } else if ($funcParams[0] == "BigQuery" || + $funcParams[0] == "Insight") { + // {1,1.1}/functions/Insight/onComplete + static::dispatchOnInsight($json); + } else if (count($funcParams) == 2) { + // {1,1.1}/functions/{className}/beforeSave + static::dispatchHook($funcParams[0], $funcParams[1], $json); } } } } + /** + * Dispatch function and render result + * + * @param string $funcName Function name + * @param array $body JSON decoded body params + * @param bool $decodeObj + */ + private static function dispatchFunc($funcName, $body, $decodeObj=false) { + $params = $body; + if ($decodeObj) { + $params = LeanClient::decode($body, null); + } + try { + $result = Cloud::runFunc($funcName, $params, + LeanUser::getCurrentUser()); + } catch (FunctionError $err) { + static::renderError($err->getMessage(), $err->getCode()); + } + if ($decodeObj) { + // Encode object to full, type-annotated JSON + $out = LeanClient::encode($result, "toFullJSON"); + } else { + // Encode object to type-less literal JSON + $out = LeanClient::encode($result, "toJSON"); + } + static::renderJSON(array("result" => $out)); + } + + /** + * Dispatch class hook and render result + * + * @param string $className + * @param string $hookName + * @param array $body JSON decoded body params + */ + private static function dispatchHook($className, $hookName, $body) { + $json = $body["object"]; + $json["__type"] = "Object"; + $json["className"] = $className; + $obj = LeanClient::decode($json, null); + + // set hook marks to prevent infinite loop. For example if user + // invokes `$obj->save` in an afterSave hook, API will not again + // invoke afterSave if we set hook marks. + forEach(array("__before", "__after", "__after_update") as $key) { + if (isset($json[$key])) { + $obj->set($key, $json[$key]); + } + } + + // in beforeUpdate hook, set updatedKeys so user can detect + // which keys are updated in the update. + if (isset($json["_updatedKeys"])) { + $obj->updatedKeys = $json["_updatedKeys"]; + } + + try { + $result = Cloud::runHook($className, + $hookName, + $obj, + LeanUser::getCurrentUser()); + } catch (FunctionError $err) { + static::renderError($err->getMessage(), $err->getCode()); + } + if ($hookName == "beforeDelete") { + static::renderJSON(array()); + } else if (strpos($hookName, "after") === 0) { + static::renderJSON(array("result" => "ok")); + } else { + $outObj = $result; + // Encode result object to type-less literal JSON + static::renderJSON($outObj->toJSON()); + } + } + + /** + * Dispatch onVerified hook + * + * @param string $type Verify type: email or sms + * @param array $body JSON decoded body params + */ + private static function dispatchOnVerified($type, $body) { + $userObj = LeanClient::decode($body["object"], null); + LeanUser::saveCurrentUser($userObj); + try { + Cloud::runOnVerified($type, $userObj); + } catch (FunctionError $err) { + static::renderError($err->getMessage(), $err->getCode()); + } + static::renderJSON(array("result" => "ok")); + } + + /** + * Dispatch onLogin hook + * + * @param array $body JSON decoded body params + */ + private static function dispatchOnLogin($body) { + $userObj = LeanClient::decode($body["object"], null); + try { + Cloud::runOnLogin($userObj); + } catch (FunctionError $err) { + static::renderError($err->getMessage(), $err->getCode()); + } + static::renderJSON(array("result" => "ok")); + } + + /** + * Dispatch onInsight hook + * + * @param array $body JSON decoded body params + */ + private static function dispatchOnInsight($body) { + try { + Cloud::runOnInsight($body); + } catch (FunctionError $err) { + static::renderError($err->getMessage(), $err->getCode()); + } + static::renderJSON(array("result" => "ok")); + } + /** * Render data as JSON output and end request * diff --git a/src/LeanCloud/LeanUser.php b/src/LeanCloud/LeanUser.php index c31508e..88f2d68 100644 --- a/src/LeanCloud/LeanUser.php +++ b/src/LeanCloud/LeanUser.php @@ -218,7 +218,7 @@ public static function getCurrentUser() { * * @param LeanUser */ - private static function saveCurrentUser($user) { + public static function saveCurrentUser($user) { self::$currentUser = $user; self::setCurrentSessionToken($user->getSessionToken()); } From e17ffb2a751f608c4999489d2c157f9efb11e6f4 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 14 Dec 2015 17:53:48 +0800 Subject: [PATCH 023/249] Fix: toJSON should only strip out __type from top-level object --- src/LeanCloud/LeanObject.php | 17 ++++++-------- tests/LeanClientTest.php | 44 ++++++++++++++++++++---------------- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/LeanCloud/LeanObject.php b/src/LeanCloud/LeanObject.php index da7d31b..5fc98a1 100644 --- a/src/LeanCloud/LeanObject.php +++ b/src/LeanCloud/LeanObject.php @@ -150,21 +150,18 @@ public function getPointer() { } /** - * Recursively encode object and its data to literal JSON + * Recursively encode object and its data to JSON * - * Recursively encode object and its (snapshot) data to literal - * JSON. Literal means object will not have `__type` and - * `className` attributes. + * Top level object are encoded to literal JSON, with __type and + * className stripped out. * - * @param array $seen Objects that have been traversed * @return array * @see self::toFullJSON */ - public function toJSON($seen=array()) { - $out = array(); - forEach($this->_data as $key => $val) { - $out[$key] = LeanClient::encode($val, "toJSON", $seen); - } + public function toJSON() { + $out = $this->toFullJSON(); + unset($out["__type"]); + unset($out["className"]); return $out; } diff --git a/tests/LeanClientTest.php b/tests/LeanClientTest.php index 7f96006..dfd6e68 100644 --- a/tests/LeanClientTest.php +++ b/tests/LeanClientTest.php @@ -336,14 +336,18 @@ public function testEncodeObjectToJSON() { $a->set("name", "A"); $b->set("name", "B"); $a->addIn("likes", $b); - $json = LeanClient::encode($a, "toJSON"); - $this->assertEquals("A", $json["name"]); - $this->assertEquals("id001", $json["objectId"]); - $this->assertEquals("B", $json["likes"][0]["name"]); - $this->assertEquals("id002", $json["likes"][0]["objectId"]); + $jsonA = LeanClient::encode($a, "toJSON"); + $jsonB = $jsonA["likes"][0]; + // top level object A will be encoded as literal json + $this->assertEquals("A", $jsonA["name"]); + $this->assertEquals("id001", $jsonA["objectId"]); + $this->assertEquals("B", $jsonB["name"]); + $this->assertEquals("id002", $jsonB["objectId"]); + $this->assertEquals("Object", $jsonB["__type"]); + $this->assertEquals("TestObject", $jsonB["className"]); - $this->assertNotContains("__type", $json); - $this->assertNotContains("className", $json["likes"][0]); + $this->assertArrayNotHasKey("__type", $jsonA); + $this->assertArrayNotHasKey("className", $jsonA); } public function testEncodeObjectToFullJSON() { @@ -352,16 +356,16 @@ public function testEncodeObjectToFullJSON() { $a->set("name", "A"); $b->set("name", "B"); $a->addIn("likes", $b); - $json = LeanClient::encode($a, "toFullJSON"); - $this->assertEquals("A", $json["name"]); - $this->assertEquals("id001", $json["objectId"]); - $this->assertEquals("B", $json["likes"][0]["name"]); - $this->assertEquals("id002", $json["likes"][0]["objectId"]); - - $this->assertEquals("Object", $json["__type"]); - $this->assertEquals("TestObject", $json["className"]); - $this->assertEquals("Object", $json["likes"][0]["__type"]); - $this->assertEquals("TestObject", $json["likes"][0]["className"]); + $jsonA = LeanClient::encode($a, "toFullJSON"); + $jsonB = $jsonA["likes"][0]; + $this->assertEquals("A", $jsonA["name"]); + $this->assertEquals("id001", $jsonA["objectId"]); + $this->assertEquals("Object", $jsonA["__type"]); + $this->assertEquals("TestObject", $jsonA["className"]); + $this->assertEquals("B", $jsonB["name"]); + $this->assertEquals("id002", $jsonB["objectId"]); + $this->assertEquals("Object", $jsonB["__type"]); + $this->assertEquals("TestObject", $jsonB["className"]); } public function testEncodeCircularObjectAsPointer() { @@ -378,9 +382,9 @@ public function testEncodeCircularObjectAsPointer() { $jsonB = $jsonA["likes"][0]; $jsonC = $jsonB["likes"][0]; - $this->assertEquals("Object", $jsonA["__type"]); - $this->assertEquals("Object", $jsonB["__type"]); - $this->assertEquals("Object", $jsonC["__type"]); + $this->assertEquals("Object", $jsonA["__type"]); + $this->assertEquals("Object", $jsonB["__type"]); + $this->assertEquals("Object", $jsonC["__type"]); $this->assertEquals("Pointer", $jsonC["likes"][0]["__type"]); } } From 3202ef0aea51751657a84b5f5b75fdeefe435570 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 15 Dec 2015 11:02:25 +0800 Subject: [PATCH 024/249] LeanEngine: start test index.php as router --- Makefile | 2 +- tests/engine/LeanEngineTest.php | 2 +- tests/engine/index.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 01a910e..769508f 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,6 @@ doc: vendor/bin/apigen generate --source src --destination docs test_engine: - php -t tests/engine -S $(LC_APP_HOST):$(LC_APP_PORT) + php -S ${LC_APP_HOST}:${LC_APP_PORT} tests/engine/index.php .PHONY: test doc test_engine diff --git a/tests/engine/LeanEngineTest.php b/tests/engine/LeanEngineTest.php index 3c5f1bf..a5d8d0b 100644 --- a/tests/engine/LeanEngineTest.php +++ b/tests/engine/LeanEngineTest.php @@ -163,7 +163,7 @@ public function testBeforeDelete() { "objectId" => "id002", "name" => "alice" ); - $resp = $this->request("/1/functions/TestObject/beforeDelete", "POST", + $resp = $this->request("/1.1/functions/TestObject/beforeDelete", "POST", array("object" => $obj)); $this->assertEmpty($resp); } diff --git a/tests/engine/index.php b/tests/engine/index.php index d4cc97a..889e7c4 100644 --- a/tests/engine/index.php +++ b/tests/engine/index.php @@ -1,6 +1,6 @@ Date: Tue, 15 Dec 2015 11:17:55 +0800 Subject: [PATCH 025/249] Rename cloud function Cloud::runFunc to Cloud::run --- src/LeanCloud/Engine/Cloud.php | 6 +++--- src/LeanCloud/Engine/LeanEngine.php | 4 ++-- tests/CloudTest.php | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/LeanCloud/Engine/Cloud.php b/src/LeanCloud/Engine/Cloud.php index 86146af..3c4ec01 100644 --- a/src/LeanCloud/Engine/Cloud.php +++ b/src/LeanCloud/Engine/Cloud.php @@ -69,7 +69,7 @@ private static function getHookPrefix($hookName) { * * @param string $funcName * @param callable $func - * @see self::runFunc + * @see self::run */ public static function define($funcName, $func) { self::$repo[$funcName] = $func; @@ -245,7 +245,7 @@ public static function onInsight($func) { * Example: * * ```php - * LeanEngine::runFunc("sayHello", array("name" => "alice"), $user); + * LeanEngine::run("sayHello", array("name" => "alice"), $user); * // sayHello(array("name" => "alice"), $user); * ``` * @@ -256,7 +256,7 @@ public static function onInsight($func) { * @throws FunctionError * @see self::define */ - public static function runFunc($funcName, $params, $user) { + public static function run($funcName, $params, $user) { $func = self::getFunc($funcName); if (!$func) { throw new FunctionError("Cloud function not found.", 404); diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index a97ccb8..6eb1481 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -301,8 +301,8 @@ private static function dispatchFunc($funcName, $body, $decodeObj=false) { $params = LeanClient::decode($body, null); } try { - $result = Cloud::runFunc($funcName, $params, - LeanUser::getCurrentUser()); + $result = Cloud::run($funcName, $params, + LeanUser::getCurrentUser()); } catch (FunctionError $err) { static::renderError($err->getMessage(), $err->getCode()); } diff --git a/tests/CloudTest.php b/tests/CloudTest.php index 1255599..a5c1804 100644 --- a/tests/CloudTest.php +++ b/tests/CloudTest.php @@ -16,7 +16,7 @@ public function testFunctionWithoutArg() { return "hello"; }); - $result = Cloud::runFunc("hello", array(), null); + $result = Cloud::run("hello", array(), null); $this->assertEquals("hello", $result); } @@ -25,7 +25,7 @@ public function testFunctionWithArg() { return "hello {$params['name']}"; }); - $result = Cloud::runFunc("sayHello", array("name" => "alice"), null); + $result = Cloud::run("sayHello", array("name" => "alice"), null); $this->assertEquals("hello alice", $result); } From aad7c9073e295e9b976f4921004f3a937c922d3d Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 15 Dec 2015 14:09:43 +0800 Subject: [PATCH 026/249] LeanEngine: pass remoteAddress as meta variables to user functions --- src/LeanCloud/Engine/Cloud.php | 44 +++++++++++++++++-------- src/LeanCloud/Engine/LeanEngine.php | 31 +++++++++++++----- tests/CloudTest.php | 50 +++++++++++++---------------- tests/engine/LeanEngineTest.php | 7 ++++ tests/engine/index.php | 4 +++ 5 files changed, 87 insertions(+), 49 deletions(-) diff --git a/src/LeanCloud/Engine/Cloud.php b/src/LeanCloud/Engine/Cloud.php index 3c4ec01..b2933fb 100644 --- a/src/LeanCloud/Engine/Cloud.php +++ b/src/LeanCloud/Engine/Cloud.php @@ -252,16 +252,18 @@ public static function onInsight($func) { * @param string $funcName Name of defined function * @param array $data Array of parameters passed to function * @param LeanUser $user Request user + * @param array $meta Optional parameters that will be passed to + * user function * @return mixed * @throws FunctionError * @see self::define */ - public static function run($funcName, $params, $user) { + public static function run($funcName, $params, $user=null, $meta=array()) { $func = self::getFunc($funcName); if (!$func) { throw new FunctionError("Cloud function not found.", 404); } - return call_user_func($func, $params, $user); + return call_user_func($func, $params, $user, $meta); } /** @@ -278,29 +280,34 @@ public static function run($funcName, $params, $user) { * @param string $hookName Hook name, e.g. beforeUpdate * @param LeanObject $object The object of attached hook * @param LeanUser $user Request user + * @param array $meta Optional parameters that will be passed to + * user function * @return mixed * @throws FunctionError */ public static function runHook($className, $hookName, $object, - $user=null) { + $user=null, + $meta=array()) { $name = self::getHookPrefix($hookName) . $className; $func = self::getFunc($name); if (!$func) { throw new FunctionError("Cloud hook `{$name}' not found.", 404); } - return call_user_func($func, $object, $user); + return call_user_func($func, $object, $user, $meta); } /** * Run hook when a user logs in * - * @param LeanUser $user The user that tries to login + * @param LeanUser $user The user object that tries to login + * @param array $meta Optional parameters that will be passed to + * user function * @throws FunctionError * @see self::onLogin */ - public static function runOnLogin($user) { - return self::runHook("_User", "onLogin", $user); + public static function runOnLogin($user, $meta=array()) { + return self::runHook("_User", "onLogin", $user, $meta); } /** @@ -308,44 +315,53 @@ public static function runOnLogin($user) { * * @param string $type Either "sms" or "email", case-sensitive * @param LeanUser $user The verifying user + * @param array $meta Optional parameters that will be passed to + * user function * @throws FunctionError * @see self::onVerified */ - public static function runOnVerified($type, $user) { + public static function runOnVerified($type, $user, $meta=array()) { $name = "__on_verified_{$type}"; $func = self::getFunc($name); if (!$func) { throw new FunctionError("Cloud hook `{$name}' not found.", 404); } - return call_user_func($func, $user); + return call_user_func($func, $user, $meta); } /** * Run hook when BigQuery complete * + * @param array $params Big query job info + * @param array $meta Optional parameters that will be passed to + * user function + * @return mixed + * @throws FunctionError * @see self::runOnInsight */ - public static function runOnBigQuery($params) { - return self::runOnInsight($params); + public static function runOnBigQuery($params, $meta=array()) { + return self::runOnInsight($params, $meta); } /** * Run hook on big query complete * - * @param array $job Big query job info + * @param array $params Big query job info + * @param array $meta Optional parameters that will be passed to + * user function * @return mixed * @throws FunctionError * @see self::onInsight */ - public static function runOnInsight($job) { + public static function runOnInsight($params, $meta=array()) { $name = "__on_complete_bigquery_job"; $func = self::getFunc($name); if (!$func) { throw new FunctionError("Cloud hook `{$name}' not found.", 404); } - return call_user_func($func, $job); + return call_user_func($func, $params, $meta); } } diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 6eb1481..00f5ad1 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -114,6 +114,13 @@ private static function parseHeaders($headers=null) { "CONTENT_TYPE", "HTTP_CONTENT_TYPE" )); + self::$ENV["REMOTE_ADDR"] = static::retrieveVal($headers, array( + "HTTP_X_REAL_IP", + "HTTP_X_FORWARDED_FOR" + )); + if (empty(self::$ENV["REMOTE_ADDR"])) { + self::$ENV["REMOTE_ADDR"] = $_SERVER["REMOTE_ADDR"]; + } self::$ENV["LC_ID"] = static::retrieveVal($headers, array( "HTTP_X_LC_ID", @@ -300,9 +307,12 @@ private static function dispatchFunc($funcName, $body, $decodeObj=false) { if ($decodeObj) { $params = LeanClient::decode($body, null); } + $meta["remoteAddress"] = self::$ENV["REMOTE_ADDR"]; try { - $result = Cloud::run($funcName, $params, - LeanUser::getCurrentUser()); + $result = Cloud::run($funcName, + $params, + LeanUser::getCurrentUser(), + $meta); } catch (FunctionError $err) { static::renderError($err->getMessage(), $err->getCode()); } @@ -338,17 +348,19 @@ private static function dispatchHook($className, $hookName, $body) { } } - // in beforeUpdate hook, set updatedKeys so user can detect - // which keys are updated in the update. + // in beforeUpdate hook, attach updatedKeys to object so user + // can detect changed keys in hook. if (isset($json["_updatedKeys"])) { $obj->updatedKeys = $json["_updatedKeys"]; } + $meta["remoteAddress"] = self::$ENV["REMOTE_ADDR"]; try { $result = Cloud::runHook($className, $hookName, $obj, - LeanUser::getCurrentUser()); + LeanUser::getCurrentUser(), + $meta); } catch (FunctionError $err) { static::renderError($err->getMessage(), $err->getCode()); } @@ -372,8 +384,9 @@ private static function dispatchHook($className, $hookName, $body) { private static function dispatchOnVerified($type, $body) { $userObj = LeanClient::decode($body["object"], null); LeanUser::saveCurrentUser($userObj); + $meta["remoteAddress"] = self::$ENV["REMOTE_ADDR"]; try { - Cloud::runOnVerified($type, $userObj); + Cloud::runOnVerified($type, $userObj, $meta); } catch (FunctionError $err) { static::renderError($err->getMessage(), $err->getCode()); } @@ -387,8 +400,9 @@ private static function dispatchOnVerified($type, $body) { */ private static function dispatchOnLogin($body) { $userObj = LeanClient::decode($body["object"], null); + $meta["remoteAddress"] = self::$ENV["REMOTE_ADDR"]; try { - Cloud::runOnLogin($userObj); + Cloud::runOnLogin($userObj, $meta); } catch (FunctionError $err) { static::renderError($err->getMessage(), $err->getCode()); } @@ -401,8 +415,9 @@ private static function dispatchOnLogin($body) { * @param array $body JSON decoded body params */ private static function dispatchOnInsight($body) { + $meta["remoteAddress"] = self::$ENV["REMOTE_ADDR"]; try { - Cloud::runOnInsight($body); + Cloud::runOnInsight($body, $meta); } catch (FunctionError $err) { static::renderError($err->getMessage(), $err->getCode()); } diff --git a/tests/CloudTest.php b/tests/CloudTest.php index a5c1804..24a56b9 100644 --- a/tests/CloudTest.php +++ b/tests/CloudTest.php @@ -11,6 +11,16 @@ public function testGetKeys() { $this->assertContains($name, Cloud::getKeys()); } + public function testDefineFunctionWithoutArg() { + // user function are free to accept positional arguments, + // this one should not error out. + Cloud::define("hello", function() { + return "hello"; + }); + $result = Cloud::run("hello", array("name" => "alice"), null); + $this->assertEquals("hello", $result); + } + public function testFunctionWithoutArg() { Cloud::define("hello", function($params, $user) { return "hello"; @@ -29,6 +39,19 @@ public function testFunctionWithArg() { $this->assertEquals("hello alice", $result); } + public function testFunctionAcceptMeta() { + Cloud::define("getMeta", function($params, $user, $meta) { + return $meta['remoteAddress']; + }); + + $result = Cloud::run("getMeta", + array("name" => "alice"), + null, + array("remoteAddress" => "10.0.0.1") + ); + $this->assertEquals("10.0.0.1 ", $result); + } + public function testClassHook() { forEach(array("beforeSave", "afterSave", "beforeUpdate", "afterUpdate", @@ -74,32 +97,5 @@ public function testOnInsight() { $this->assertEquals(43, $count); } - public function testAfterSave() { - $count = 42; - Cloud::afterSave("TestObject", function($obj, $user) use (&$count) { - $count += 1; - }); - Cloud::runHook("TestObject", "afterSave", null, null); - $this->assertEquals(43, $count); - } - - public function testBeforeUpdate() { - $count = 42; - Cloud::beforeUpdate("TestObject", function($obj, $user) use (&$count) { - $count += 1; - }); - Cloud::runHook("TestObject", "beforeUpdate", null, null); - $this->assertEquals(43, $count); - } - - public function testAfterUpdate() { - $count = 42; - Cloud::afterUpdate("TestObject", function($obj, $user) use (&$count) { - $count += 1; - }); - Cloud::runHook("TestObject", "afterUpdate", null, null); - $this->assertEquals(43, $count); - } - } diff --git a/tests/engine/LeanEngineTest.php b/tests/engine/LeanEngineTest.php index a5d8d0b..f5e591b 100644 --- a/tests/engine/LeanEngineTest.php +++ b/tests/engine/LeanEngineTest.php @@ -96,6 +96,13 @@ public function testFunctionWithParam() { $this->assertEquals("hello alice", $resp["result"]); } + public function testMetaParamsShouldHaveRemoteAddress() { + $resp = $this->request("/1/functions/getMeta", "POST", array( + "name" => "alice" + )); + $this->assertNotEmpty($resp["result"]["remoteAddress"]); + } + public function testOnInsight() { $resp = $this->request("/1/functions/BigQuery/onComplete", "POST", array( "id" => "id001", diff --git a/tests/engine/index.php b/tests/engine/index.php index 889e7c4..5a45264 100644 --- a/tests/engine/index.php +++ b/tests/engine/index.php @@ -23,6 +23,10 @@ return "hello {$params['name']}"; }); +Cloud::define("getMeta", function($params, $user, $meta) { + return array("remoteAddress" => $meta["remoteAddress"]); +}); + Cloud::define("updateObject", function($params, $user) { $obj = $params["object"]; $obj->set("__testKey", 42); From 33e7d05db22450faca5e514433b43a4502895eca Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 15 Dec 2015 15:04:01 +0800 Subject: [PATCH 027/249] LeanEngine: set runtime version --- src/LeanCloud/Engine/LeanEngine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 00f5ad1..74d4432 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -226,7 +226,7 @@ private static function dispatch($method, $url, $body=null) { $path = rtrim($path, "/"); if (strpos($path, "/__engine/1/ping") === 0) { static::renderJSON(array( - "runtime" => "PHP:TODO", + "runtime" => "php-" . phpversion(), "version" => LeanClient::VERSION )); } From b794ca152e5eb6fb09f214711fdabdd9d17b758e Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 21 Dec 2015 16:39:33 +0800 Subject: [PATCH 028/249] LeanEngine: refactor to support middleware subclassing --- src/LeanCloud/Engine/LeanEngine.php | 398 ++++++++++++++-------------- tests/engine/index.php | 3 +- 2 files changed, 207 insertions(+), 194 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 74d4432..a932918 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -31,170 +31,235 @@ class LeanEngine { ); /** - * Parsed env variables + * Parsed LeanEngine env variables * * @var array */ - public static $ENV = array(); + protected $env = array(); /** - * Retrieve value by multiple keys in array + * Get header value * - * @param array $arr The array to search in - * @param array $keys Keys in order - * @retrun mixed + * @param string $key + * @return string|null */ - private static function retrieveVal($arr, $keys) { - $val = null; - forEach($keys as $k) { - if (isset($arr[$k])) { - $val = $arr[$k]; - } - if ($val) { - return $val; - } + protected function getHeaderLine($key) { + if (isset($_SERVER[$key])) { + return $_SERVER[$key]; } - return $val; + return null; } /** - * Parse plain text body + * Set header * - * The CORS request might be sent as POST request with text/plain - * header, whence the app key info is attached in the body as - * JSON. + * @param string $key Header key + * @param string $val Header val + * @return self + */ + protected function withHeader($key, $val) { + header("{$key}: {$val}"); + return $this; + } + + /** + * Send response with body and status code * - * @param string $body - * @return array Decoded body array + * @param string $body Response body + * @param string $status Response status */ - private static function parsePlainBody($body) { - $data = json_decode($body, true); - if (!empty($data)) { - self::$ENV["LC_ID"] = isset($data["_ApplicationId"]) ? - $data["_ApplicationId"] : null; - self::$ENV["LC_KEY"] = isset($data["_ApplicationKey"]) ? - $data["_ApplicationKey"] : null; - self::$ENV["LC_MASTER_KEY"] = isset($data["_MasterKey"]) ? - $data["_MasterKey"] : null; - self::$ENV["LC_SESSION"] = isset($data["_SessionToken"]) ? - $data["_SessionToken"] : null; - self::$ENV["LC_SIGN"] = null; - self::$ENV["useProd"] = isset($data["_ApplicationProduction"]) ? - (true && $data["_ApplicationProduction"]) : - true; - self::$ENV["useMaster"] = false; - // remove internal fields set by API - forEach($data as $key) { - if ($key[0] === "_") { - unset($data[$key]); - } - } + protected function send($body, $status) { + http_response_code($status); + echo $body; + } + + /** + * Get request body string + * + * It reads body from `php://input`, which has cavets that it could be + * read only once prior to php 5.6. Thus it is recommended to override + * this method in subclass. + * + * @return string + */ + protected function getBody() { + $body = file_get_contents("php://input"); + return $body; + } + + /** + * Render data as JSON output and end request + * + * @param array $data + */ + private function renderJSON($data=null, $status=200) { + if (!is_null($data)) { + $out = json_encode($data); + $this->withHeader("Content-Type", + "application/json; charset=utf-8;") + ->send($out, $status); } - return $data; + exit; } /** - * Parse variant headers into standard names + * Render error and end request * - * The headers shall be an associative array that contains raw - * header keys. For example, in Laravel they are available at - * `$request->header()`. It will default to `$_SERVER` if not - * provided. + * @param string $message Error message + * @param string $code Error code + * @param string $status Http response status code + */ + private function renderError($message, $code=1, $status=400) { + $data = json_encode(array( + "code" => $code, + "error" => $message + )); + $this->withHeader("Content-Type", "application/json; charset=utf-8;") + ->send($data, $status); + exit; + } + + /** + * Retrieve header value with multiple version of keys * - * @param array $headers + * @param array $keys Keys in order + * @retrun mixed */ - private static function parseHeaders($headers=null) { - if (empty($headers)) { - $headers = $_SERVER; + private function retrieveHeader($keys) { + $val = null; + forEach($keys as $k) { + $val = $this->getHeaderLine($k); + if (!empty($val)) { + return $val; + } } - self::$ENV["ORIGIN"] = static::retrieveVal($headers, array( + return $val; + } + + /** + * Extract variant headers into env + */ + private function parseHeaders() { + $this->env["ORIGIN"] = $this->retrieveHeader(array( "HTTP_ORIGIN" )); - self::$ENV["CONTENT_TYPE"] = static::retrieveVal($headers, array( + $this->env["CONTENT_TYPE"] = $this->retrieveHeader(array( "CONTENT_TYPE", "HTTP_CONTENT_TYPE" )); - self::$ENV["REMOTE_ADDR"] = static::retrieveVal($headers, array( + $this->env["REMOTE_ADDR"] = $this->retrieveHeader(array( "HTTP_X_REAL_IP", - "HTTP_X_FORWARDED_FOR" + "HTTP_X_FORWARDED_FOR", + "REMOTE_ADDR" )); - if (empty(self::$ENV["REMOTE_ADDR"])) { - self::$ENV["REMOTE_ADDR"] = $_SERVER["REMOTE_ADDR"]; - } - self::$ENV["LC_ID"] = static::retrieveVal($headers, array( + $this->env["LC_ID"] = $this->retrieveHeader(array( "HTTP_X_LC_ID", "HTTP_X_AVOSCLOUD_APPLICATION_ID", "HTTP_X_ULURU_APPLICATION_ID" )); - self::$ENV["LC_KEY"] = static::retrieveVal($headers, array( + $this->env["LC_KEY"] = $this->retrieveHeader(array( "HTTP_X_LC_KEY", "HTTP_X_AVOSCLOUD_APPLICATION_KEY", "HTTP_X_ULURU_APPLICATION_KEY" )); - self::$ENV["LC_MASTER_KEY"] = static::retrieveVal($headers, array( + $this->env["LC_MASTER_KEY"] = $this->retrieveHeader(array( "HTTP_X_AVOSCLOUD_MASTER_KEY", "HTTP_X_ULURU_MASTER_KEY" )); - self::$ENV["LC_SESSION"] = static::retrieveVal($headers, array( + $this->env["LC_SESSION"] = $this->retrieveHeader(array( "HTTP_X_LC_SESSION", "HTTP_X_AVOSCLOUD_SESSION_TOKEN", "HTTP_X_ULURU_SESSION_TOKEN" )); - self::$ENV["LC_SIGN"] = static::retrieveVal($headers, array( + $this->env["LC_SIGN"] = $this->retrieveHeader(array( "HTTP_X_LC_SIGN", "HTTP_X_AVOSCLOUD_REQUEST_SIGN" )); - $prod = static::retrieveVal($headers, array( + $prod = $this->retrieveHeader(array( "HTTP_X_LC_PROD", "HTTP_X_AVOSCLOUD_APPLICATION_PRODUCTION", "HTTP_X_ULURU_APPLICATION_PRODUCTION" )); - self::$ENV["useProd"] = true; + $this->env["useProd"] = true; if ($prod === 0 || $prod === false) { - self::$ENV["useProd"] = false; + $this->env["useProd"] = false; } - self::$ENV["useMaster"] = false; + $this->env["useMaster"] = false; + } + + /** + * Parse plain text body + * + * The CORS request might be sent as POST request with text/plain + * header, whence the app key info is attached in the body as + * JSON. + * + * @param string $body + * @return array Decoded body array + */ + private function parsePlainBody($body) { + $data = json_decode($body, true); + if (!empty($data)) { + $this->env["LC_ID"] = isset($data["_ApplicationId"]) ? + $data["_ApplicationId"] : null; + $this->env["LC_KEY"] = isset($data["_ApplicationKey"]) ? + $data["_ApplicationKey"] : null; + $this->env["LC_MASTER_KEY"] = isset($data["_MasterKey"]) ? + $data["_MasterKey"] : null; + $this->env["LC_SESSION"] = isset($data["_SessionToken"]) ? + $data["_SessionToken"] : null; + $this->env["LC_SIGN"] = null; + $this->env["useProd"] = isset($data["_ApplicationProduction"]) ? + (true && $data["_ApplicationProduction"]) : + true; + $this->env["useMaster"] = false; + // remove internal fields set by API + forEach($data as $key) { + if ($key[0] === "_") { + unset($data[$key]); + } + } + } + return $data; } /** * Authenticate request by app ID and key */ - private static function authRequest() { - $appId = self::$ENV["LC_ID"]; - $sign = self::$ENV["LC_SIGN"]; + private function authRequest() { + $appId = $this->env["LC_ID"]; + $sign = $this->env["LC_SIGN"]; if ($sign && LeanClient::verifySign($appId, $sign)) { if (strpos($sign, "master") !== false) { - self::$ENV["useMaster"] = true; + $this->env["useMaster"] = true; } return true; } - $appKey = self::$ENV["LC_KEY"]; + $appKey = $this->env["LC_KEY"]; if ($appKey && LeanClient::verifyKey($appId, $appKey)) { if (strpos($appKey, "master") !== false) { - self::$ENV["useMaster"] = true; + $this->env["useMaster"] = true; } return true; } - $masterKey = self::$ENV["LC_MASTER_KEY"]; + $masterKey = $this->env["LC_MASTER_KEY"]; $key = "{$masterKey}, master"; if ($masterKey && LeanClient::verifyKey($appId, $key)) { - self::$ENV["useMaster"] = true; + $this->env["useMaster"] = true; return true; } - static::renderError("Unauthorized", 401, 401); + $this->renderError("Unauthorized", 401, 401); } /** * Set user session if sessionToken present - * */ - private static function processSession() { - static::authRequest(); - $token = self::$ENV["LC_SESSION"]; + private function processSession() { + $token = $this->env["LC_SESSION"]; if ($token) { LeanUser::become($token); } @@ -219,18 +284,19 @@ private static function processSession() { * * @param string $method Request method * @param string $url Request url - * @param array $body Request body */ - private static function dispatch($method, $url, $body=null) { + protected function dispatch($method, $url) { $path = parse_url($url, PHP_URL_PATH); $path = rtrim($path, "/"); if (strpos($path, "/__engine/1/ping") === 0) { - static::renderJSON(array( + $this->renderJSON(array( "runtime" => "php-" . phpversion(), "version" => LeanClient::VERSION )); } + $this->parseHeaders(); + $pathParts = array(); // matched path components if (preg_match("/^\/(1|1\.1)\/(functions|call)(.*)/", $path, @@ -238,33 +304,36 @@ private static function dispatch($method, $url, $body=null) { $pathParts["version"] = $pathParts[1]; // 1 or 1.1 $pathParts["endpoint"] = $pathParts[2]; // functions or call $pathParts["extra"] = $pathParts[3]; // extra part after endpoint - $origin = self::$ENV["ORIGIN"]; - header("Access-Control-Allow-Origin: " . ($origin ? $origin : "*")); + $origin = $this->env["ORIGIN"]; + $this->withHeader("Access-Control-Allow-Origin", + $origin ? $origin : "*"); if ($method == "OPTIONS") { - header("Access-Control-Max-Age: 86400"); - header("Access-Control-Allow-Methods: ". - "PUT, GET, POST, DELETE, OPTIONS"); - header("Access-Control-Allow-Headers: " . - implode(", ", self::$allowedHeaders)); - header("Content-Length: 0"); - exit; - } - if (($method == "POST" || $method == "PUT") && empty($body)) { - // Note input can be read only once prior to php 5.6. - $body = file_get_contents("php://input"); + $this->withHeader("Access-Control-Max-Age", 86400) + ->withHeader("Access-Control-Allow-Methods", + "PUT, GET, POST, DELETE, OPTIONS") + ->withHeader("Access-Control-Allow-Headers", + implode(", ", self::$allowedHeaders)) + ->withHeader("Content-Length", 0) + ->renderJSON(); } - if (preg_match("/text\/plain/", self::$ENV["CONTENT_TYPE"])) { - $json = static::parsePlainBody($body); + + $body = $this->getBody(); + if (preg_match("/text\/plain/", $this->env["CONTENT_TYPE"])) { + // To work around with CORS restriction, some requests are + // submit as text/palin body, where headers are attached + // in the body. + $json = $this->parsePlainBody($body); } else { $json = json_decode($body, true); } - static::processSession(); + $this->authRequest(); + $this->processSession(); if (strpos($pathParts["extra"], "/_ops/metadatas") === 0) { - if (self::$ENV["useMaster"]) { - static::renderJSON(Cloud::getKeys()); + if ($this->env["useMaster"]) { + $this->renderJSON(Cloud::getKeys()); } else { - static::renderError("Unauthorized.", 401, 401); + $this->renderError("Unauthorized.", 401, 401); } } @@ -273,23 +342,23 @@ private static function dispatch($method, $url, $body=null) { $funcParams = explode("/", ltrim($pathParts["extra"], "/")); if (count($funcParams) == 1) { // {1,1.1}/functions/{funcName} - static::dispatchFunc($funcParams[0], $json, - $pathParts["endpoint"] === "call"); + $this->dispatchFunc($funcParams[0], $json, + $pathParts["endpoint"] === "call"); } else { if ($funcParams[0] == "onVerified") { // {1,1.1}/functions/onVerified/sms - static::dispatchOnVerified($funcParams[1], $json); + $this->dispatchOnVerified($funcParams[1], $json); } else if ($funcParams[0] == "_User" && $funcParams[1] == "onLogin") { // {1,1.1}/functions/_User/onLogin - static::dispatchOnLogin($json); + $this->dispatchOnLogin($json); } else if ($funcParams[0] == "BigQuery" || $funcParams[0] == "Insight") { // {1,1.1}/functions/Insight/onComplete - static::dispatchOnInsight($json); + $this->dispatchOnInsight($json); } else if (count($funcParams) == 2) { // {1,1.1}/functions/{className}/beforeSave - static::dispatchHook($funcParams[0], $funcParams[1], $json); + $this->dispatchHook($funcParams[0], $funcParams[1], $json); } } } @@ -302,19 +371,19 @@ private static function dispatch($method, $url, $body=null) { * @param array $body JSON decoded body params * @param bool $decodeObj */ - private static function dispatchFunc($funcName, $body, $decodeObj=false) { + private function dispatchFunc($funcName, $body, $decodeObj=false) { $params = $body; if ($decodeObj) { $params = LeanClient::decode($body, null); } - $meta["remoteAddress"] = self::$ENV["REMOTE_ADDR"]; + $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; try { $result = Cloud::run($funcName, $params, LeanUser::getCurrentUser(), $meta); } catch (FunctionError $err) { - static::renderError($err->getMessage(), $err->getCode()); + $this->renderError($err->getMessage(), $err->getCode()); } if ($decodeObj) { // Encode object to full, type-annotated JSON @@ -323,7 +392,7 @@ private static function dispatchFunc($funcName, $body, $decodeObj=false) { // Encode object to type-less literal JSON $out = LeanClient::encode($result, "toJSON"); } - static::renderJSON(array("result" => $out)); + $this->renderJSON(array("result" => $out)); } /** @@ -333,7 +402,7 @@ private static function dispatchFunc($funcName, $body, $decodeObj=false) { * @param string $hookName * @param array $body JSON decoded body params */ - private static function dispatchHook($className, $hookName, $body) { + private function dispatchHook($className, $hookName, $body) { $json = $body["object"]; $json["__type"] = "Object"; $json["className"] = $className; @@ -354,7 +423,7 @@ private static function dispatchHook($className, $hookName, $body) { $obj->updatedKeys = $json["_updatedKeys"]; } - $meta["remoteAddress"] = self::$ENV["REMOTE_ADDR"]; + $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; try { $result = Cloud::runHook($className, $hookName, @@ -362,16 +431,16 @@ private static function dispatchHook($className, $hookName, $body) { LeanUser::getCurrentUser(), $meta); } catch (FunctionError $err) { - static::renderError($err->getMessage(), $err->getCode()); + $this->renderError($err->getMessage(), $err->getCode()); } if ($hookName == "beforeDelete") { - static::renderJSON(array()); + $this->renderJSON(array()); } else if (strpos($hookName, "after") === 0) { - static::renderJSON(array("result" => "ok")); + $this->renderJSON(array("result" => "ok")); } else { $outObj = $result; // Encode result object to type-less literal JSON - static::renderJSON($outObj->toJSON()); + $this->renderJSON($outObj->toJSON()); } } @@ -381,16 +450,16 @@ private static function dispatchHook($className, $hookName, $body) { * @param string $type Verify type: email or sms * @param array $body JSON decoded body params */ - private static function dispatchOnVerified($type, $body) { + private function dispatchOnVerified($type, $body) { $userObj = LeanClient::decode($body["object"], null); LeanUser::saveCurrentUser($userObj); - $meta["remoteAddress"] = self::$ENV["REMOTE_ADDR"]; + $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; try { Cloud::runOnVerified($type, $userObj, $meta); } catch (FunctionError $err) { - static::renderError($err->getMessage(), $err->getCode()); + $this->renderError($err->getMessage(), $err->getCode()); } - static::renderJSON(array("result" => "ok")); + $this->renderJSON(array("result" => "ok")); } /** @@ -398,15 +467,15 @@ private static function dispatchOnVerified($type, $body) { * * @param array $body JSON decoded body params */ - private static function dispatchOnLogin($body) { + private function dispatchOnLogin($body) { $userObj = LeanClient::decode($body["object"], null); - $meta["remoteAddress"] = self::$ENV["REMOTE_ADDR"]; + $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; try { Cloud::runOnLogin($userObj, $meta); } catch (FunctionError $err) { - static::renderError($err->getMessage(), $err->getCode()); + $this->renderError($err->getMessage(), $err->getCode()); } - static::renderJSON(array("result" => "ok")); + $this->renderJSON(array("result" => "ok")); } /** @@ -414,80 +483,23 @@ private static function dispatchOnLogin($body) { * * @param array $body JSON decoded body params */ - private static function dispatchOnInsight($body) { - $meta["remoteAddress"] = self::$ENV["REMOTE_ADDR"]; + private function dispatchOnInsight($body) { + $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; try { Cloud::runOnInsight($body, $meta); } catch (FunctionError $err) { - static::renderError($err->getMessage(), $err->getCode()); + $this->renderError($err->getMessage(), $err->getCode()); } - static::renderJSON(array("result" => "ok")); - } - - /** - * Render data as JSON output and end request - * - * @param array $data - */ - private static function renderJSON($data) { - header("Content-Type: application/json; charset=utf-8;"); - echo json_encode($data); - exit; - } - - /** - * Render error and end request - * - * @param string $message Error message - * @param string $code Error code - * @param string $status Http response status code - */ - private static function renderError($message, $code=1, $status=400) { - http_response_code($status); - header("Content-Type: application/json; charset=utf-8;"); - echo json_encode(array( - "code" => $code, - "error" => $message - )); - exit; + $this->renderJSON(array("result" => "ok")); } /** * Start engine and process request */ - public static function start() { - static::parseHeaders($_SERVER); - static::dispatch($_SERVER["REQUEST_METHOD"], - $_SERVER["REQUEST_URI"]); + public function start() { + $this->dispatch($_SERVER["REQUEST_METHOD"], + $_SERVER["REQUEST_URI"]); } - /** - * Handle Laravel request - * - * It exposes LeanEngine as a Laravel middleware, which can be - * registered in Laravel application. E.g. in - * `app/Http/Kernel.php`: - * - * ```php - * class Kernel extends HttpKernel { - * protected $middleware = [ - * ..., - * \LeanCloud\Engine\LeanEngine::class, - * ]; - * } - * ``` - * - * @param Request $request Laravel request - * @param Callable $next Laravel Closure - * @return mixed - * @link http://laravel.com/docs/5.1/middleware - */ - public function handle($request, $next) { - static::parseHeaders($request->header()); - static::dispatch($request->method(), - $request->url(), - $request->getContent()); - return $next($request); - } } diff --git a/tests/engine/index.php b/tests/engine/index.php index 5a45264..2c301f4 100644 --- a/tests/engine/index.php +++ b/tests/engine/index.php @@ -59,5 +59,6 @@ }); //HttpsRedirect::redirect(); -LeanEngine::start(); +$engine = new LeanEngine(); +$engine->start(); From 81f15a1d79169d42425ca5115e8a2e23d4b13719 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 22 Dec 2015 11:28:36 +0800 Subject: [PATCH 029/249] LeanEngine: add Slim middleware SlimEngine --- src/LeanCloud/Engine/LeanEngine.php | 13 +++--- src/LeanCloud/Engine/SlimEngine.php | 66 +++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 8 deletions(-) create mode 100644 src/LeanCloud/Engine/SlimEngine.php diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index a932918..8074425 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -71,6 +71,7 @@ protected function withHeader($key, $val) { protected function send($body, $status) { http_response_code($status); echo $body; + exit; } /** @@ -93,13 +94,10 @@ protected function getBody() { * @param array $data */ private function renderJSON($data=null, $status=200) { - if (!is_null($data)) { - $out = json_encode($data); - $this->withHeader("Content-Type", - "application/json; charset=utf-8;") - ->send($out, $status); - } - exit; + $out = is_null($data) ? "" : json_encode($data); + $this->withHeader("Content-Type", + "application/json; charset=utf-8;") + ->send($out, $status); } /** @@ -116,7 +114,6 @@ private function renderError($message, $code=1, $status=400) { )); $this->withHeader("Content-Type", "application/json; charset=utf-8;") ->send($data, $status); - exit; } /** diff --git a/src/LeanCloud/Engine/SlimEngine.php b/src/LeanCloud/Engine/SlimEngine.php new file mode 100644 index 0000000..51dfca9 --- /dev/null +++ b/src/LeanCloud/Engine/SlimEngine.php @@ -0,0 +1,66 @@ +add(new SlimEngine()); + * ``` + * + * @link http://www.slimframework.com/docs/concepts/middleware.html + */ +class SlimEngine extends LeanEngine { + + /** + * Get request header value + * + * @param string $key Header key + * @return string + */ + protected function getHeaderLine($key) { + return $this->request->getHeaderLine($key); + } + + /** + * Get request body string + * + * @return string + */ + protected function getBody() { + return $this->response->getBody()->getContents(); + } + + /* + * Ideally we would like to write to Slim response and send + * the response to client. But we did not yet find a good way + * to end the request as Slime middleware. As a work around, + * we fallback to PHP native functions to do that. Pull request + * is welcome. + * + * @see LeanEngine::withHeader LeanEngine::send + */ + // protected function withHeader($key, $val) {} + // protected function send($key, $val) {} + + /** + * Slim middleware entry point + * + * @param \Psr\Http\Message\ServerRequestInterface $request PSR7 request + * @param \Psr\Http\Message\ResponseInterface $response PSR7 response + * @param callable $next Next middleware + * @return \Psr\Http\Message\ResponseInterface + */ + public function __invoke($request, $response, $next) { + $this->request = $request; + $this->response = $response; + $this->dispatch($request->getMethod(), + $request->getUri()); + return $next($this->request, $this->response); + } +} + From 2bd1fbfe95525c1a33ac9c016499a1f8fbed9c56 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 22 Dec 2015 12:22:05 +0800 Subject: [PATCH 030/249] Integrate HttpsRedirect into LeanEngine Keep only one middleware class so it is simpler to add different middleware in many 3rd party frameworks. --- src/LeanCloud/Engine/HttpsRedirect.php | 67 -------------------------- src/LeanCloud/Engine/LeanEngine.php | 55 +++++++++++++++++++++ 2 files changed, 55 insertions(+), 67 deletions(-) delete mode 100644 src/LeanCloud/Engine/HttpsRedirect.php diff --git a/src/LeanCloud/Engine/HttpsRedirect.php b/src/LeanCloud/Engine/HttpsRedirect.php deleted file mode 100644 index b72ddab..0000000 --- a/src/LeanCloud/Engine/HttpsRedirect.php +++ /dev/null @@ -1,67 +0,0 @@ -httpsRedirect(); + } $path = parse_url($url, PHP_URL_PATH); $path = rtrim($path, "/"); if (strpos($path, "/__engine/1/ping") === 0) { @@ -498,5 +518,40 @@ public function start() { $_SERVER["REQUEST_URI"]); } + /** + * Redirect to http request to https + */ + private function httpsRedirect() { + $reqProto = "http"; // request protocol + $reqHost = $this->getHeaderLine('HTTP_X_FORWARDED_HOST'); + if ($reqHost) { + // request forwarded by proxy + $reqProto = $this->getHeaderLine("HTTP_X_FORWARDED_PROTO"); + $reqProto = strtolower($reqProto); + } else { + $reqHost = $this->getHeaderLine('HTTP_HOST'); + // ISAPI with IIS set HTTPS to off for non-secure request + if (empty($_SERVER['HTTPS']) || ($_SERVER['HTTPS'] == "off") ) { + $reqProto = "http"; + } else { + $reqProto = "https"; + } + } + + // Only redirect in production environment + $prod = (getenv("LC_APP_ENV") == "production"); + if ($prod && $reqProto != "https") { + $url = "https://{$reqHost}{$_SERVER['REQUEST_URI']}"; + $this->redirect($url); + } + } + + /** + * Enable https redirect + */ + public static function enableHttpsRedirect() { + static::$useHttpsRedirect = true; + } + } From faa41d82aeaec58d4a1aea38220b3cbda4988c69 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 22 Dec 2015 14:04:45 +0800 Subject: [PATCH 031/249] Remove HttpsRedirect from test --- tests/engine/index.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/engine/index.php b/tests/engine/index.php index 2c301f4..b96c04b 100644 --- a/tests/engine/index.php +++ b/tests/engine/index.php @@ -5,7 +5,6 @@ use LeanCloud\LeanClient; use LeanCloud\Engine\LeanEngine; use LeanCloud\Engine\Cloud; -use LeanCloud\Engine\HttpsRedirect; LeanClient::initialize( getenv("LC_APP_ID"), @@ -58,7 +57,6 @@ return; }); -//HttpsRedirect::redirect(); $engine = new LeanEngine(); $engine->start(); From aa8862d5fd20cf8945b6a35e893298d4a5ec61ef Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 22 Dec 2015 14:31:06 +0800 Subject: [PATCH 032/249] LeanEngine: remove hook onBigQuery, use onInsight --- src/LeanCloud/Engine/Cloud.php | 24 ------------------------ tests/CloudTest.php | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) diff --git a/src/LeanCloud/Engine/Cloud.php b/src/LeanCloud/Engine/Cloud.php index b2933fb..23287c4 100644 --- a/src/LeanCloud/Engine/Cloud.php +++ b/src/LeanCloud/Engine/Cloud.php @@ -209,16 +209,6 @@ public static function onVerified($type, $func) { self::define("__on_verified_{$type}", $func); } - /** - * Define on complete hook for big query - * - * @param callable $func - * @alias self::onInsight() - */ - public static function onBigQuery($func) { - self::onInsight($func); - } - /** * Define on complete hook for big query * @@ -330,20 +320,6 @@ public static function runOnVerified($type, $user, $meta=array()) { return call_user_func($func, $user, $meta); } - /** - * Run hook when BigQuery complete - * - * @param array $params Big query job info - * @param array $meta Optional parameters that will be passed to - * user function - * @return mixed - * @throws FunctionError - * @see self::runOnInsight - */ - public static function runOnBigQuery($params, $meta=array()) { - return self::runOnInsight($params, $meta); - } - /** * Run hook on big query complete * diff --git a/tests/CloudTest.php b/tests/CloudTest.php index 24a56b9..47e2c65 100644 --- a/tests/CloudTest.php +++ b/tests/CloudTest.php @@ -49,7 +49,7 @@ public function testFunctionAcceptMeta() { null, array("remoteAddress" => "10.0.0.1") ); - $this->assertEquals("10.0.0.1 ", $result); + $this->assertEquals("10.0.0.1", $result); } public function testClassHook() { From d2f372e0bb3590c0e9fd17b2dd7e6927c89bc894 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 13 Jan 2016 12:08:08 +0800 Subject: [PATCH 033/249] Fix: get body from slim request instead of response --- src/LeanCloud/Engine/SlimEngine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LeanCloud/Engine/SlimEngine.php b/src/LeanCloud/Engine/SlimEngine.php index 51dfca9..a118d96 100644 --- a/src/LeanCloud/Engine/SlimEngine.php +++ b/src/LeanCloud/Engine/SlimEngine.php @@ -32,7 +32,7 @@ protected function getHeaderLine($key) { * @return string */ protected function getBody() { - return $this->response->getBody()->getContents(); + return $this->request->getBody()->getContents(); } /* From 1abdb9ae91b0e51dec0484f93d04e1075a01aea6 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 13 Jan 2016 14:31:44 +0800 Subject: [PATCH 034/249] LeanEngine: add Laravel middleware --- src/LeanCloud/Engine/LaravelEngine.php | 54 ++++++++++++++++++++++++++ src/LeanCloud/Engine/LeanEngine.php | 26 +++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 src/LeanCloud/Engine/LaravelEngine.php diff --git a/src/LeanCloud/Engine/LaravelEngine.php b/src/LeanCloud/Engine/LaravelEngine.php new file mode 100644 index 0000000..22e7c45 --- /dev/null +++ b/src/LeanCloud/Engine/LaravelEngine.php @@ -0,0 +1,54 @@ +request->header($key); + } + + /** + * Get request body string + * + * @return string + */ + protected function getBody() { + return $this->request->getContent(); + } + + /** + * Laravel middleware entry point + * + * @param \Illuminate\Http\Reuqest $request Laravel request + * @param \Closure $next Laravel closure + * @return mixed + */ + public function handle($request, $next) { + $this->request = $request; + $this->dispatch($request->method(), + $request->url()); + return $next($this->request); + } +} + diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 47477b1..ed3e590 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -152,9 +152,17 @@ private function retrieveHeader($keys) { /** * Extract variant headers into env + * + * PHP prepends `HTTP_` to user-defined headers, so `X-MY-VAR` + * would be populated as `HTTP_X_MY_VAR`. But 3rd party frameworks + * (e.g. Laravel) may overwrite the behavior, and populate it as + * cleaner `X_MY_VAR`. So we try to retrieve header value from both + * versions. + * */ private function parseHeaders() { $this->env["ORIGIN"] = $this->retrieveHeader(array( + "ORIGIN", "HTTP_ORIGIN" )); $this->env["CONTENT_TYPE"] = $this->retrieveHeader(array( @@ -162,37 +170,55 @@ private function parseHeaders() { "HTTP_CONTENT_TYPE" )); $this->env["REMOTE_ADDR"] = $this->retrieveHeader(array( + "X_REAL_IP", "HTTP_X_REAL_IP", + "X_FORWARDED_FOR", "HTTP_X_FORWARDED_FOR", "REMOTE_ADDR" )); $this->env["LC_ID"] = $this->retrieveHeader(array( + "X_LC_ID", "HTTP_X_LC_ID", + "X_AVOSCLOUD_APPLICATION_ID", "HTTP_X_AVOSCLOUD_APPLICATION_ID", + "X_ULURU_APPLICATION_ID", "HTTP_X_ULURU_APPLICATION_ID" )); $this->env["LC_KEY"] = $this->retrieveHeader(array( + "X_LC_KEY", "HTTP_X_LC_KEY", + "X_AVOSCLOUD_APPLICATION_KEY", "HTTP_X_AVOSCLOUD_APPLICATION_KEY", + "X_ULURU_APPLICATION_KEY", "HTTP_X_ULURU_APPLICATION_KEY" )); $this->env["LC_MASTER_KEY"] = $this->retrieveHeader(array( + "X_AVOSCLOUD_MASTER_KEY", "HTTP_X_AVOSCLOUD_MASTER_KEY", + "X_ULURU_MASTER_KEY", "HTTP_X_ULURU_MASTER_KEY" )); $this->env["LC_SESSION"] = $this->retrieveHeader(array( + "X_LC_SESSION", "HTTP_X_LC_SESSION", + "X_AVOSCLOUD_SESSION_TOKEN", "HTTP_X_AVOSCLOUD_SESSION_TOKEN", + "X_ULURU_SESSION_TOKEN", "HTTP_X_ULURU_SESSION_TOKEN" )); $this->env["LC_SIGN"] = $this->retrieveHeader(array( + "X_LC_SIGN", "HTTP_X_LC_SIGN", + "X_AVOSCLOUD_REQUEST_SIGN", "HTTP_X_AVOSCLOUD_REQUEST_SIGN" )); $prod = $this->retrieveHeader(array( + "X_LC_PROD", "HTTP_X_LC_PROD", + "X_AVOSCLOUD_APPLICATION_PRODUCTION", "HTTP_X_AVOSCLOUD_APPLICATION_PRODUCTION", + "X_ULURU_APPLICATION_PRODUCTION", "HTTP_X_ULURU_APPLICATION_PRODUCTION" )); $this->env["useProd"] = true; From 9a6225c6c10958dea99f7f49f33fe759a95afbec Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 13 Jan 2016 16:10:55 +0800 Subject: [PATCH 035/249] Send travis events to bearychat --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 7176fd4..77d5113 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,3 +14,6 @@ script: after_success: - bash <(curl -s https://codecov.io/bash) + +notifications: + webhooks: https://hook.bearychat.com/=bw52Y/travis/6e26f4422b2871c20a5b2d40e1d49f73 From 09e0498b7242345c63dc2117808eca4da1a259d3 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 6 May 2016 16:52:03 +0800 Subject: [PATCH 036/249] LeanEngine: Preserve __type field in hook functions --- src/LeanCloud/Engine/LeanEngine.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index ed3e590..10312c8 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -255,8 +255,10 @@ private function parsePlainBody($body) { true; $this->env["useMaster"] = false; // remove internal fields set by API + // note we need to preserve `__type` field for object decoding + // see #61 forEach($data as $key) { - if ($key[0] === "_") { + if ($key[0] === "_" && $key[1] !== "_") { unset($data[$key]); } } From caacf0503dfc4d2e627862bc374cc236605756bb Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Thu, 12 May 2016 17:53:57 +0800 Subject: [PATCH 037/249] Ops metadatas should return result object instead of array --- src/LeanCloud/Engine/LeanEngine.php | 2 +- tests/engine/LeanEngineTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 10312c8..b1bfb00 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -376,7 +376,7 @@ protected function dispatch($method, $url) { $this->processSession(); if (strpos($pathParts["extra"], "/_ops/metadatas") === 0) { if ($this->env["useMaster"]) { - $this->renderJSON(Cloud::getKeys()); + $this->renderJSON(array("result" => Cloud::getKeys())); } else { $this->renderError("Unauthorized.", 401, 401); } diff --git a/tests/engine/LeanEngineTest.php b/tests/engine/LeanEngineTest.php index f5e591b..3a96841 100644 --- a/tests/engine/LeanEngineTest.php +++ b/tests/engine/LeanEngineTest.php @@ -66,7 +66,7 @@ public function testPingEngine() { public function testGetFuncitonMetadata() { $resp = $this->request("/1/functions/_ops/metadatas", "GET"); - $this->assertContains("hello", $resp); + $this->assertContains("hello", $resp["result"]); } public function testCloudFunctionHello() { From da36d41903e55c0f5aae7ee2738c344a520dc582 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 24 Jun 2016 00:02:19 +0800 Subject: [PATCH 038/249] Catch exceptions and return as json response --- src/LeanCloud/Engine/LeanEngine.php | 45 +++++++++++++++++------------ 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 47477b1..b0a2253 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -4,6 +4,7 @@ use LeanCloud\LeanClient; use LeanCloud\LeanUser; +use LeanCloud\CloudException; class LeanEngine { @@ -357,26 +358,32 @@ protected function dispatch($method, $url) { // extract func params from path: // /1.1/call/{0}/{1} $funcParams = explode("/", ltrim($pathParts["extra"], "/")); - if (count($funcParams) == 1) { - // {1,1.1}/functions/{funcName} - $this->dispatchFunc($funcParams[0], $json, - $pathParts["endpoint"] === "call"); - } else { - if ($funcParams[0] == "onVerified") { - // {1,1.1}/functions/onVerified/sms - $this->dispatchOnVerified($funcParams[1], $json); - } else if ($funcParams[0] == "_User" && - $funcParams[1] == "onLogin") { - // {1,1.1}/functions/_User/onLogin - $this->dispatchOnLogin($json); - } else if ($funcParams[0] == "BigQuery" || - $funcParams[0] == "Insight") { - // {1,1.1}/functions/Insight/onComplete - $this->dispatchOnInsight($json); - } else if (count($funcParams) == 2) { - // {1,1.1}/functions/{className}/beforeSave - $this->dispatchHook($funcParams[0], $funcParams[1], $json); + try { + if (count($funcParams) == 1) { + // {1,1.1}/functions/{funcName} + $this->dispatchFunc($funcParams[0], $json, + $pathParts["endpoint"] === "call"); + } else { + if ($funcParams[0] == "onVerified") { + // {1,1.1}/functions/onVerified/sms + $this->dispatchOnVerified($funcParams[1], $json); + } else if ($funcParams[0] == "_User" && + $funcParams[1] == "onLogin") { + // {1,1.1}/functions/_User/onLogin + $this->dispatchOnLogin($json); + } else if ($funcParams[0] == "BigQuery" || + $funcParams[0] == "Insight") { + // {1,1.1}/functions/Insight/onComplete + $this->dispatchOnInsight($json); + } else if (count($funcParams) == 2) { + // {1,1.1}/functions/{className}/beforeSave + $this->dispatchHook($funcParams[0], $funcParams[1], $json); + } } + } catch (CloudException $ex) { + $this->renderError($ex->getMessage(), $ex->getCode()); + } catch (\Exception $ex) { + $this->renderError("Cloud script error: {$ex->getMessage()}", 141); } } } From 36562ebe8ccf853a7614ec4150078dd02f2d0b44 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Sun, 26 Jun 2016 20:39:36 +0800 Subject: [PATCH 039/249] Test geopoint field on object --- tests/LeanObjectTest.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/LeanObjectTest.php b/tests/LeanObjectTest.php index e5580de..226d07b 100644 --- a/tests/LeanObjectTest.php +++ b/tests/LeanObjectTest.php @@ -374,5 +374,15 @@ public function testSetGeoPoint() { $this->assertEquals(116.4, $loc->getLongitude()); } + public function testGeoPointLocation() { + $point = new GeoPoint(25.269876, 110.333061); + + $location = new LeanObject("Location"); + $location->set("location", $point); + $location->save(); + + $location->destroy(); + } + } From 1982a6948383c16fec6419c1bc0dd2a9d9c379c5 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 27 Jun 2016 09:41:46 +0800 Subject: [PATCH 040/249] Feat: Add and verify sign on hook --- src/LeanCloud/Engine/LeanEngine.php | 47 +++++++++++++++++++++++++++-- src/LeanCloud/LeanClient.php | 27 +++++++++++++++++ src/LeanCloud/LeanObject.php | 12 ++++++++ tests/engine/LeanEngineTest.php | 32 +++++++++++++++----- 4 files changed, 107 insertions(+), 11 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index b0a2253..14a806a 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -427,6 +427,20 @@ private function dispatchFunc($funcName, $body, $decodeObj=false) { * @param array $body JSON decoded body params */ private function dispatchHook($className, $hookName, $body) { + $verified = false; + if (strpos($hookName, "before") === 0) { + $verified = LeanClient::verifyHookSign("__before_for_{$className}", + $body["object"]["__before"]); + } else { + $verified = LeanClient::verifyHookSign("__after_for_{$className}", + $body["object"]["__after"]); + } + if (!$verified) { + error_log("Invalid hook sign for {$hookName} {$className}" . + " from {$this->env['REMOTE_ADDR']}"); + $this->renderError("Unauthorized.", 401, 401); + } + $json = $body["object"]; $json["__type"] = "Object"; $json["className"] = $className; @@ -435,9 +449,15 @@ private function dispatchHook($className, $hookName, $body) { // set hook marks to prevent infinite loop. For example if user // invokes `$obj->save` in an afterSave hook, API will not again // invoke afterSave if we set hook marks. - forEach(array("__before", "__after", "__after_update") as $key) { - if (isset($json[$key])) { - $obj->set($key, $json[$key]); + forEach(array("__before", "__after", "__after_update") as $mark) { + if (isset($json[$mark])) { + $obj->set($mark, $json[$mark]); + } else { + if (strpos($mark, "__before") === 0) { + $obj->disableBeforeHook(); + } else if (strpos($mark, "__after") === 0) { + $obj->disableAfterHook(); + } } } @@ -475,6 +495,13 @@ private function dispatchHook($className, $hookName, $body) { * @param array $body JSON decoded body params */ private function dispatchOnVerified($type, $body) { + if (!LeanClient::verifyHookSign("__on_verified_{$type}", + $body["object"]["__sign"])) { + error_log("Invalid hook sign for onVerified {$type}" . + " from {$this->env['REMOTE_ADDR']}"); + $this->renderError("Unauthorized.", 401, 401); + } + $userObj = LeanClient::decode($body["object"], null); LeanUser::saveCurrentUser($userObj); $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; @@ -492,6 +519,13 @@ private function dispatchOnVerified($type, $body) { * @param array $body JSON decoded body params */ private function dispatchOnLogin($body) { + if (!LeanClient::verifyHookSign("__on_login__User", + $body["object"]["__sign"])) { + error_log("Invalid hook sign for onLogin User" . + " from {$this->env['REMOTE_ADDR']}"); + $this->renderError("Unauthorized.", 401, 401); + } + $userObj = LeanClient::decode($body["object"], null); $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; try { @@ -508,6 +542,13 @@ private function dispatchOnLogin($body) { * @param array $body JSON decoded body params */ private function dispatchOnInsight($body) { + if (!LeanClient::verifyHookSign("__on_complete_bigquery_job", + $body["__sign"])) { + error_log("Invalid hook sign for onComplete Insight" . + " from {$this->env['REMOTE_ADDR']}"); + $this->renderError("Unauthorized.", 401, 401); + } + $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; try { Cloud::runOnInsight($body, $meta); diff --git a/src/LeanCloud/LeanClient.php b/src/LeanCloud/LeanClient.php index 0326381..03f0a1a 100644 --- a/src/LeanCloud/LeanClient.php +++ b/src/LeanCloud/LeanClient.php @@ -282,6 +282,33 @@ public static function verifyKey($appId, $key) { return self::$appKey === $parts[0]; } + /** + * Generate a sign used to auth hook invocation on LeanEngine + * + * @param string $hookName E.g. "__before_for_Object" + * @param integer $msec Timestamap in microseconds + * @return string + */ + public static function signHook($hookName, $msec) { + $hash = hash_hmac("sha1", "{$hookName}:{$msec}", self::$appMasterKey); + return "{$msec},{$hash}"; + } + + /** + * Verify a signed hook + * + * @param string $hookName + * @param string $sign + * @return bool + */ + public static function verifyHookSign($hookName, $sign) { + if ($sign) { + $ts = explode(",", $sign)[0]; + return self::signHook($hookName, $ts) === $sign; + } + return false; + } + /** * Issue request to LeanCloud * diff --git a/src/LeanCloud/LeanObject.php b/src/LeanCloud/LeanObject.php index a5fc360..4994423 100644 --- a/src/LeanCloud/LeanObject.php +++ b/src/LeanCloud/LeanObject.php @@ -132,6 +132,18 @@ public function getClassName() { return $this->_className; } + public function disableBeforeHook() { + $this->set("__before", + LeanClient::signHook("__before_for_{$this->getClassName()}", + round(microtime(true) * 1000))); + } + + public function disableAfterHook() { + $this->set("__after", + LeanClient::signHook("__after_for_{$this->getClassName()}", + round(microtime(true) * 1000))); + } + /** * Pointer representation of object * diff --git a/tests/engine/LeanEngineTest.php b/tests/engine/LeanEngineTest.php index f5e591b..5e583de 100644 --- a/tests/engine/LeanEngineTest.php +++ b/tests/engine/LeanEngineTest.php @@ -58,6 +58,16 @@ function($k, $v) {return "$k: $v";}, return $data; } + private function signHook($hookName, $msec=null) { + if (!$msec) { + $msec = round(microtime(true) * 1000); + } + $hash = hash_hmac("sha1", + "{$hookName}:{$msec}", + getenv("LC_APP_MASTER_KEY")); + return "{$msec},{$hash}"; + } + public function testPingEngine() { $resp = $this->request("/__engine/1/ping", "GET"); $this->assertArrayHasKey("runtime", $resp); @@ -105,9 +115,10 @@ public function testMetaParamsShouldHaveRemoteAddress() { public function testOnInsight() { $resp = $this->request("/1/functions/BigQuery/onComplete", "POST", array( - "id" => "id001", - "status" => "OK", - "message" => "Big query completed successfully." + "id" => "id001", + "status" => "OK", + "message" => "Big query completed successfully.", + "__sign" => $this->signHook("__on_complete_bigquery_job") )); $this->assertEquals("ok", $resp["result"]); } @@ -118,7 +129,8 @@ public function testOnLogin() { "__type" => "Object", "className" => "_User", "objectId" => "id002", - "username" => "alice" + "username" => "alice", + "__sign" => $this->signHook("__on_login__User") ) )); $this->assertEquals("ok", $resp["result"]); @@ -130,7 +142,8 @@ public function testOnVerifiedSms() { "__type" => "Object", "className" => "_User", "objectId" => "id002", - "username" => "alice" + "username" => "alice", + "__sign" => $this->signHook("__on_verified_sms") ) )); $this->assertEquals("ok", $resp["result"]); @@ -141,7 +154,8 @@ public function testBeforeSave() { "__type" => "Object", "className" => "TestObject", "objectId" => "id002", - "name" => "alice" + "name" => "alice", + "__before" => $this->signHook("__before_for_TestObject") ); $resp = $this->request("/1/functions/TestObject/beforeSave", "POST", array("object" => $obj)); @@ -156,7 +170,8 @@ public function testAfterSave() { "__type" => "Object", "className" => "TestObject", "objectId" => "id002", - "name" => "alice" + "name" => "alice", + "__after" => $this->signHook("__after_for_TestObject") ); $resp = $this->request("/1/functions/TestObject/afterSave", "POST", array("object" => $obj)); @@ -168,7 +183,8 @@ public function testBeforeDelete() { "__type" => "Object", "className" => "TestObject", "objectId" => "id002", - "name" => "alice" + "name" => "alice", + "__before" => $this->signHook("__before_for_TestObject") ); $resp = $this->request("/1.1/functions/TestObject/beforeDelete", "POST", array("object" => $obj)); From 48f307b756f3ae45aa7c3cbf2971042cc0a78062 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 27 Jun 2016 11:52:10 +0800 Subject: [PATCH 041/249] Fix function return array syntax error for 5.3 --- src/LeanCloud/LeanClient.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/LeanCloud/LeanClient.php b/src/LeanCloud/LeanClient.php index 03f0a1a..27ba30a 100644 --- a/src/LeanCloud/LeanClient.php +++ b/src/LeanCloud/LeanClient.php @@ -303,8 +303,9 @@ public static function signHook($hookName, $msec) { */ public static function verifyHookSign($hookName, $sign) { if ($sign) { - $ts = explode(",", $sign)[0]; - return self::signHook($hookName, $ts) === $sign; + $parts = explode(",", $sign); + $msec = $parts[0]; + return self::signHook($hookName, $msec) === $sign; } return false; } From 4ee7860f3a8b7e437cf7f87ae84e016c4d0558a4 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 28 Jun 2016 11:56:50 +0800 Subject: [PATCH 042/249] Remove __after_update hook mark --- src/LeanCloud/Engine/LeanEngine.php | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index c1f9ed4..3897c2c 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -477,15 +477,17 @@ private function dispatchHook($className, $hookName, $body) { // set hook marks to prevent infinite loop. For example if user // invokes `$obj->save` in an afterSave hook, API will not again // invoke afterSave if we set hook marks. - forEach(array("__before", "__after", "__after_update") as $mark) { - if (isset($json[$mark])) { - $obj->set($mark, $json[$mark]); + if (strpos($hookName, "before") === 0) { + if (isset($json["__before"])) { + $obj->set("__before", $json["__before"]); } else { - if (strpos($mark, "__before") === 0) { - $obj->disableBeforeHook(); - } else if (strpos($mark, "__after") === 0) { - $obj->disableAfterHook(); - } + $obj->disableBeforeHook(); + } + } else { + if (isset($json["__after"])) { + $obj->set("__after", $json["__after"]); + } else { + $obj->disableAfterHook(); } } From 8a6833af2143c72ac31ac692d1b7f0ad68d84794 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 28 Jun 2016 11:57:54 +0800 Subject: [PATCH 043/249] Add header X-LC-UA for pre-flight request --- src/LeanCloud/Engine/LeanEngine.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 3897c2c..61ea0ce 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -15,6 +15,7 @@ class LeanEngine { */ private static $allowedHeaders = array( 'X-LC-Id', 'X-LC-Key', 'X-LC-Session', 'X-LC-Sign', 'X-LC-Prod', + 'X-LC-UA', 'X-Uluru-Application-Key', 'X-Uluru-Application-Id', 'X-Uluru-Application-Production', From 081fc3b7140d372eb536b670d57e63d0a54d1d5a Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 28 Jun 2016 22:58:36 +0800 Subject: [PATCH 044/249] Fix https redirect --- src/LeanCloud/Engine/LeanEngine.php | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 61ea0ce..1956918 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -601,26 +601,10 @@ public function start() { * Redirect to http request to https */ private function httpsRedirect() { - $reqProto = "http"; // request protocol - $reqHost = $this->getHeaderLine('HTTP_X_FORWARDED_HOST'); - if ($reqHost) { - // request forwarded by proxy - $reqProto = $this->getHeaderLine("HTTP_X_FORWARDED_PROTO"); - $reqProto = strtolower($reqProto); - } else { - $reqHost = $this->getHeaderLine('HTTP_HOST'); - // ISAPI with IIS set HTTPS to off for non-secure request - if (empty($_SERVER['HTTPS']) || ($_SERVER['HTTPS'] == "off") ) { - $reqProto = "http"; - } else { - $reqProto = "https"; - } - } - - // Only redirect in production environment - $prod = (getenv("LC_APP_ENV") == "production"); - if ($prod && $reqProto != "https") { - $url = "https://{$reqHost}{$_SERVER['REQUEST_URI']}"; + $reqProto = $this->getHeaderLine("HTTP_X_FORWARDED_PROTO"); + if ($reqProto === "http" && + getenv("LC_APP_ENV") === "production") { + $url = "https://{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"; $this->redirect($url); } } From 8242217163e740850d4ee29bdff5e8ce3402d96b Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Thu, 30 Jun 2016 14:29:25 +0800 Subject: [PATCH 045/249] Release version 0.3.0 --- Changelog.md | 6 ++++++ README.md | 3 ++- src/LeanCloud/LeanClient.php | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 46debbd..5fee0f2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,12 @@ +0.3.0 发布日期：2016-06-30 +---- + +* 支持云引擎，及 Slim 框架的中间件 + 0.2.6 发布日期：2016-05-16 ---- + * LeanPush 支持同时向多平台发送推送 * LeanObject::save, fetch, destroy 不再返回批量查询错误 * 修复 LeanACL 为空时被编码为 array 的问题 diff --git a/README.md b/README.md index f6fdf4e..21eb940 100644 --- a/README.md +++ b/README.md @@ -228,7 +228,8 @@ try { } ``` -完整的 API 文档请参考: https://leancloud.cn/api-docs/php +更多文档请参考 +[PHP 数据存储开发指南](https://leancloud.cn/docs/leanstorage_guide-php.html) 贡献 ---- diff --git a/src/LeanCloud/LeanClient.php b/src/LeanCloud/LeanClient.php index 27ba30a..eadcb9b 100644 --- a/src/LeanCloud/LeanClient.php +++ b/src/LeanCloud/LeanClient.php @@ -23,7 +23,7 @@ class LeanClient { /** * Client version */ - const VERSION = '0.2.6'; + const VERSION = '0.3.0'; /** * API Endpoints for Regions From d2b46241a034610d5fc2940f312f0be33959d033 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Sat, 2 Jul 2016 23:34:51 +0800 Subject: [PATCH 046/249] Refactor Qiniu uploader --- src/LeanCloud/LeanClient.php | 59 +--------------- src/LeanCloud/LeanFile.php | 37 ++++++++-- src/LeanCloud/Uploader/AbstractUploader.php | 78 +++++++++++++++++++++ src/LeanCloud/Uploader/QiniuUploader.php | 75 ++++++++++++++++++++ tests/LeanFileTest.php | 8 +-- 5 files changed, 188 insertions(+), 69 deletions(-) create mode 100644 src/LeanCloud/Uploader/AbstractUploader.php create mode 100644 src/LeanCloud/Uploader/QiniuUploader.php diff --git a/src/LeanCloud/LeanClient.php b/src/LeanCloud/LeanClient.php index eadcb9b..82b419e 100644 --- a/src/LeanCloud/LeanClient.php +++ b/src/LeanCloud/LeanClient.php @@ -156,7 +156,7 @@ private static function assertInitialized() { * * @return string */ - private static function getVersionString() { + public static function getVersionString() { return "LeanCloud PHP SDK " . self::VERSION; } @@ -560,63 +560,6 @@ public static function multipartEncode($file, $params, return $body; } - /** - * Upload file content to Qiniu storage - * - * @param string $token Qiniu token - * @param string $content File content - * @param string $name File name - * @param string $mimeType MIME type of file - * @return array JSON response from qiniu - * @throws CloudException, RuntimeException - */ - public static function uploadToQiniu($token, $content, $name, - $mimeType=null) { - $boundary = md5(microtime()); - $file = array("name" => $name, - "content" => $content, - "mimeType" => $mimeType); - $params = array("token" => $token, "key" => $name); - $body = static::multipartEncode($file, $params, $boundary); - - $headers[] = "User-Agent: " . self::getVersionString(); - $headers[] = "Content-Type: multipart/form-data;" . - " boundary={$boundary}"; - $headers[] = "Content-Length: " . strlen($body); - - $url = "http://upload.qiniu.com"; - $ch = curl_init($url); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); - curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_POST, 1); - curl_setopt($ch, CURLOPT_POSTFIELDS, $body); - $resp = curl_exec($ch); - $respCode = curl_getinfo($ch, CURLINFO_HTTP_CODE); - $respType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE); - $error = curl_errno($ch); - $errno = curl_errno($ch); - curl_close($ch); - - /** type of error: - * - curl error - * - http status error 4xx, 5xx - * - rest api error - */ - if ($errno > 0) { - throw new \RuntimeException("CURL connection ($url) error: " . - "$errno $error", - $errno); - } - - $data = json_decode($resp, true); - if (isset($data["error"])) { - $code = isset($data["code"]) ? $data["code"] : -1; - throw new CloudException("{$code} {$data['error']}", $code); - } - return $data; - } - /** * Recursively encode value as JSON representation * diff --git a/src/LeanCloud/LeanFile.php b/src/LeanCloud/LeanFile.php index f9af878..fea2326 100644 --- a/src/LeanCloud/LeanFile.php +++ b/src/LeanCloud/LeanFile.php @@ -5,6 +5,9 @@ use LeanCloud\LeanClient; use LeanCloud\CloudException; use LeanCloud\MIMEType; +use LeanCloud\Uploader\QiniuUploader; +use LeanCloud\Uploader\S3Uploader; +use LeanCloud\Uploader\QCloudUploader; /** * File object on LeanCloud @@ -366,16 +369,36 @@ public function save() { $this->mergeAfterSave($resp); } else { $key = static::genFileKey(); - $key .= "." . pathinfo($this->getName(), PATHINFO_EXTENSION); - $data["key"] = $key; - $resp = LeanClient::post("/qiniu", $data); - $token = $resp["token"]; - unset($resp["token"]); + $data["key"] = $key; + $data["__type"] = "File"; + $resp = LeanClient::post("/fileTokens", $data); + + try { + $uploader = static::getFileUploader($resp["provider"]); + $uploader->initialize($resp["upload_url"], $resp["token"]); + $uploader->upload($this->_source, $this->getMimeType(), $key); + } catch (\Exception $ex) { + $this->destroy(); + throw $ex; + } + forEach(array("upload_url", "token") as $k) { + if (isset($resp[$k])) { + unset($resp[$k]); + } + } $this->mergeAfterSave($resp); + } + } - LeanClient::uploadToQiniu($token, $this->_source, $key, - $this->getMimeType()); + public function getFileUploader($provider) { + if ($provider === "qiniu") { + return new QiniuUploader(); + } else if ($provider === "s3") { + return new S3Uploader(); + } else if ($provider === "qcloud") { + return new QCloudUploader(); } + throw new \Exception("File provider not supported: {$provider}"); } /** diff --git a/src/LeanCloud/Uploader/AbstractUploader.php b/src/LeanCloud/Uploader/AbstractUploader.php new file mode 100644 index 0000000..45dd4d7 --- /dev/null +++ b/src/LeanCloud/Uploader/AbstractUploader.php @@ -0,0 +1,78 @@ + $val) { + $body .= <<uploadUrl = $url; + $this->authToken = $token; + } + + public function getUploadUrl() { + return $this->uploadUrl; + } + + abstract public function upload($content, $mimeType, $key); +} \ No newline at end of file diff --git a/src/LeanCloud/Uploader/QiniuUploader.php b/src/LeanCloud/Uploader/QiniuUploader.php new file mode 100644 index 0000000..73e639f --- /dev/null +++ b/src/LeanCloud/Uploader/QiniuUploader.php @@ -0,0 +1,75 @@ + $key, + "mimeType" => $mimeType, + "content" => $content, + ), array( + "token" => $this->authToken, + "key" => $key, + ), $boundary); + + $headers[] = "User-Agent: " . LeanClient::getVersionString(); + $headers[] = "Content-Type: multipart/form-data;" . + " boundary={$boundary}"; + $headers[] = "Content-Length: " . strlen($body); + + $url = static::getUploadUrl(); + $ch = curl_init($url); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); + curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_POST, 1); + curl_setopt($ch, CURLOPT_POSTFIELDS, $body); + $resp = curl_exec($ch); + $respCode = curl_getinfo($ch, CURLINFO_HTTP_CODE); + $respType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE); + $error = curl_errno($ch); + $errno = curl_errno($ch); + curl_close($ch); + + /** type of error: + * - curl error + * - http status error 4xx, 5xx + * - rest api error + */ + if ($errno > 0) { + throw new \RuntimeException("CURL ($url) error: " . + "{$errno} {$error}", + $errno); + } + + $data = json_decode($resp, true); + if (isset($data["error"])) { + $code = isset($data["code"]) ? $data["code"] : -1; + throw new \RuntimeException("{$code} {$data['error']}", $code); + } + return $data; + } + +} diff --git a/tests/LeanFileTest.php b/tests/LeanFileTest.php index 7abdd7b..a683115 100644 --- a/tests/LeanFileTest.php +++ b/tests/LeanFileTest.php @@ -47,7 +47,7 @@ public function testSaveTextFile() { } public function testSaveUTF8TextFile() { - $file = LeanFile::createWithData("test.txt", "你好，中国!"); + $file = LeanFile::createWithData("testChinese.txt", "你好，中国!"); $file->save(); $this->assertNotEmpty($file->getUrl()); $this->assertEquals("text/plain", $file->getMimeType()); @@ -58,7 +58,7 @@ public function testSaveUTF8TextFile() { } public function testFetchFile() { - $file = LeanFile::createWithData("test.txt", "你好，中国!"); + $file = LeanFile::createWithData("testFetch.txt", "你好，中国!"); $file->save(); $file2 = LeanFile::fetch($file->getObjectId()); $this->assertEquals($file->getUrl(), $file2->getUrl()); @@ -69,7 +69,7 @@ public function testFetchFile() { } public function testGetCreatedAtAndUpdatedAt() { - $file = LeanFile::createWithData("test.txt", "你好，中国!"); + $file = LeanFile::createWithData("testTimestamp.txt", "你好，中国!"); $file->save(); $this->assertNotEmpty($file->getUrl()); $this->assertNotEmpty($file->getCreatedAt()); @@ -79,7 +79,7 @@ public function testGetCreatedAtAndUpdatedAt() { } public function testMetaData() { - $file = LeanFile::createWithData("test.txt", "你好，中国!"); + $file = LeanFile::createWithData("testMetadata.txt", "你好，中国!"); $file->setMeta("language", "zh-CN"); $file->setMeta("bool", false); $file->setMeta("downloads", 100); From 4dba30fe8229f2d7ec0327792f4e08527724dcc9 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Sat, 2 Jul 2016 23:59:30 +0800 Subject: [PATCH 047/249] Add S3 Uploader --- src/LeanCloud/LeanFile.php | 4 +++ src/LeanCloud/Uploader/S3Uploader.php | 44 +++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 src/LeanCloud/Uploader/S3Uploader.php diff --git a/src/LeanCloud/LeanFile.php b/src/LeanCloud/LeanFile.php index fea2326..1380a1b 100644 --- a/src/LeanCloud/LeanFile.php +++ b/src/LeanCloud/LeanFile.php @@ -372,6 +372,10 @@ public function save() { $data["key"] = $key; $data["__type"] = "File"; $resp = LeanClient::post("/fileTokens", $data); + if (!isset($resp["token"])) { + // adapt for S3, when there is no token + $resp["token"] = null; + } try { $uploader = static::getFileUploader($resp["provider"]); diff --git a/src/LeanCloud/Uploader/S3Uploader.php b/src/LeanCloud/Uploader/S3Uploader.php new file mode 100644 index 0000000..a4be745 --- /dev/null +++ b/src/LeanCloud/Uploader/S3Uploader.php @@ -0,0 +1,44 @@ +getUploadUrl()) { + throw new \RuntimeException("Please initialize with pre-signed url."); + } + $headers[] = "Content-Type: $mimeType"; + $ch = curl_init($this->getUploadUrl()); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); + curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "PUT"); + curl_setopt($ch, CURLOPT_POSTFIELDS, $content); + $resp = curl_exec($ch); + $respCode = curl_getinfo($ch, CURLINFO_HTTP_CODE); + $respType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE); + $error = curl_errno($ch); + $errno = curl_errno($ch); + curl_close($ch); + + if ($errno > 0) { + throw new \RuntimeException("CURL ({$this->getUploadUrl()}) error: " . + "{$errno} {$error}", + $errno); + } + + if ($respCode >= "300") { + $S3Error = simplexml_load_string($resp); + throw new \RuntimeException("Upload to S3 failed: " . + "{$S3Error->Code} {$S3Error->Message}"); + } + return true; + } +} \ No newline at end of file From 62bc65832685e5fb0f08e11b461ab73a998ffdfe Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Sun, 3 Jul 2016 22:47:01 +0800 Subject: [PATCH 048/249] Move multipartEncode to Uploader --- src/LeanCloud/LeanClient.php | 57 ++------------------- src/LeanCloud/Uploader/AbstractUploader.php | 25 ++++++--- src/LeanCloud/Uploader/QiniuUploader.php | 13 ++--- src/LeanCloud/Uploader/S3Uploader.php | 9 ++-- 4 files changed, 34 insertions(+), 70 deletions(-) diff --git a/src/LeanCloud/LeanClient.php b/src/LeanCloud/LeanClient.php index 82b419e..4cff1a9 100644 --- a/src/LeanCloud/LeanClient.php +++ b/src/LeanCloud/LeanClient.php @@ -32,7 +32,9 @@ class LeanClient { */ private static $api = array( "CN" => "https://api.leancloud.cn", - "US" => "https://us-api.leancloud.cn"); + "US" => "https://us-api.leancloud.cn", + "E1" => "https://e1-api.leancloud.cn", + ); /** * API Region @@ -507,59 +509,6 @@ public static function batch($requests, $sessionToken=null, return $response; } - /** - * Encode file with params in multipart format - * - * @param array $file File data and attributes - * @param array $params Key-value params - * @param string $boundary Boundary string used for frontier - * @return string Multipart encoded string - */ - public static function multipartEncode($file, $params, - $boundary=null) { - if (!$boundary) { - $boundary = md5(microtime()); - } - - $body = ""; - forEach($params as $key => $val) { - $body .= << $val) { @@ -41,13 +41,14 @@ public static function multipartEncode($file, $params, $boundary) { if (isset($file["mimeType"])) { $mimeType = $file["mimeType"]; } + $fieldname = static::getFileFieldName(); // escape quotes in file name $filename = filter_var($file["name"], FILTER_SANITIZE_MAGIC_QUOTES); $body .= <<uploadUrl = $url; - $this->authToken = $token; + /** + * Initialize uploader with url and auth token + * + * @param string $uploadUrl File provider url + * @param string $authToken Auth token for file provider + */ + public function initialize($uploadUrl, $authToken) { + $this->uploadUrl = $uploadUrl; + $this->authToken = $authToken; } public function getUploadUrl() { return $this->uploadUrl; } + public function getAuthToken() { + return $this->authToken; + } + abstract public function upload($content, $mimeType, $key); } \ No newline at end of file diff --git a/src/LeanCloud/Uploader/QiniuUploader.php b/src/LeanCloud/Uploader/QiniuUploader.php index 73e639f..65899da 100644 --- a/src/LeanCloud/Uploader/QiniuUploader.php +++ b/src/LeanCloud/Uploader/QiniuUploader.php @@ -25,12 +25,12 @@ public function getUploadUrl() { public function upload($content, $mimeType, $key) { $boundary = md5(microtime(true)); - $body = LeanClient::multipartEncode(array( - "name" => $key, + $body = $this->multipartEncode(array( + "name" => $key, "mimeType" => $mimeType, "content" => $content, ), array( - "token" => $this->authToken, + "token" => $this->getAuthToken(), "key" => $key, ), $boundary); @@ -39,7 +39,7 @@ public function upload($content, $mimeType, $key) { " boundary={$boundary}"; $headers[] = "Content-Length: " . strlen($body); - $url = static::getUploadUrl(); + $url = $this->getUploadUrl(); $ch = curl_init($url); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); @@ -66,8 +66,9 @@ public function upload($content, $mimeType, $key) { $data = json_decode($resp, true); if (isset($data["error"])) { - $code = isset($data["code"]) ? $data["code"] : -1; - throw new \RuntimeException("{$code} {$data['error']}", $code); + $code = isset($data["code"]) ? $data["code"] : 1; + throw new \RuntimeException("Upload to Qiniu failed: {$url}". + "{$code} {$data['error']}", $code); } return $data; } diff --git a/src/LeanCloud/Uploader/S3Uploader.php b/src/LeanCloud/Uploader/S3Uploader.php index a4be745..d3c24ea 100644 --- a/src/LeanCloud/Uploader/S3Uploader.php +++ b/src/LeanCloud/Uploader/S3Uploader.php @@ -1,6 +1,7 @@ getUploadUrl()) { throw new \RuntimeException("Please initialize with pre-signed url."); } + $headers[] = "User-Agent: " . LeanClient::getVersionString(); $headers[] = "Content-Type: $mimeType"; - $ch = curl_init($this->getUploadUrl()); + $url = $this->getUploadUrl(); + $ch = curl_init($url); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); @@ -29,14 +32,14 @@ public function upload($content, $mimeType, $name=null) { curl_close($ch); if ($errno > 0) { - throw new \RuntimeException("CURL ({$this->getUploadUrl()}) error: " . + throw new \RuntimeException("CURL ({$url}) error: " . "{$errno} {$error}", $errno); } if ($respCode >= "300") { $S3Error = simplexml_load_string($resp); - throw new \RuntimeException("Upload to S3 failed: " . + throw new \RuntimeException("Upload to S3 failed: {$url} " . "{$S3Error->Code} {$S3Error->Message}"); } return true; From dac0ee5d65adbc08a68192e85daa741fdef466bd Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 4 Jul 2016 10:36:54 +0800 Subject: [PATCH 049/249] Add crc32 check for Qiniu uploader --- src/LeanCloud/Uploader/QiniuUploader.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/LeanCloud/Uploader/QiniuUploader.php b/src/LeanCloud/Uploader/QiniuUploader.php index 65899da..95c7fd3 100644 --- a/src/LeanCloud/Uploader/QiniuUploader.php +++ b/src/LeanCloud/Uploader/QiniuUploader.php @@ -15,6 +15,12 @@ public function getUploadUrl() { return "https://up.qbox.me/"; } + public function crc32Data($data) { + $hex = hash("crc32b", $data); + $ints = unpack("N", pack("H*", $hex)); + return sprintf("%u", $ints[1]); + } + /** * Upload file to qiniu * @@ -32,6 +38,7 @@ public function upload($content, $mimeType, $key) { ), array( "token" => $this->getAuthToken(), "key" => $key, + "crc32" => $this->crc32Data($content) ), $boundary); $headers[] = "User-Agent: " . LeanClient::getVersionString(); From 58c7b7e6cbae4ca4fe05bb2160fb591ee6414a3b Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 4 Jul 2016 17:01:48 +0800 Subject: [PATCH 050/249] Add qcloud uploader --- src/LeanCloud/Uploader/AbstractUploader.php | 30 +++------ src/LeanCloud/Uploader/QCloudUploader.php | 69 +++++++++++++++++++++ src/LeanCloud/Uploader/QiniuUploader.php | 2 +- 3 files changed, 79 insertions(+), 22 deletions(-) create mode 100644 src/LeanCloud/Uploader/QCloudUploader.php diff --git a/src/LeanCloud/Uploader/AbstractUploader.php b/src/LeanCloud/Uploader/AbstractUploader.php index c32914f..1ff5045 100644 --- a/src/LeanCloud/Uploader/AbstractUploader.php +++ b/src/LeanCloud/Uploader/AbstractUploader.php @@ -24,16 +24,12 @@ protected static function getFileFieldName() { * @return string Multipart encoded string */ public function multipartEncode($file, $params, $boundary) { - $body = ""; + $body = "\r\n"; forEach($params as $key => $val) { - $body .= <<multipartEncode(array( + "name" => $key, + "mimeType" => $mimeType, + "content" => $content, + ), array( + "op" => "upload", + "sha" => hash("sha1", $content) + ), $boundary); + + $headers[] = "User-Agent: " . LeanClient::getVersionString(); + $headers[] = "Content-Type: multipart/form-data;" . + " boundary={$boundary}"; + // $headers[] = "Content-Length: " . strlen($body); + $headers[] = "Authorization: {$this->getAuthToken()}"; + $url = $this->getUploadUrl(); + $ch = curl_init($url); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true); + curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_POST, 1); + curl_setopt($ch, CURLOPT_POSTFIELDS, $body); + $resp = curl_exec($ch); + $respCode = curl_getinfo($ch, CURLINFO_HTTP_CODE); + $respType = curl_getinfo($ch, CURLINFO_CONTENT_TYPE); + $error = curl_errno($ch); + $errno = curl_errno($ch); + curl_close($ch); + + /** type of error: + * - curl error + * - http status error 4xx, 5xx + * - rest api error + */ + if ($errno > 0) { + throw new \RuntimeException("CURL ($url) error: " . + "{$errno} {$error}", + $errno); + } + + $data = json_decode($resp, true); + if ($data["code"] != 0) { + throw new \RuntimeException("Upload to Qcloud failed: {$url} ". + "{$data['code']} {$data['message']}", + $data["code"]); + } + return $data; + } + +} diff --git a/src/LeanCloud/Uploader/QiniuUploader.php b/src/LeanCloud/Uploader/QiniuUploader.php index 95c7fd3..d9ba189 100644 --- a/src/LeanCloud/Uploader/QiniuUploader.php +++ b/src/LeanCloud/Uploader/QiniuUploader.php @@ -74,7 +74,7 @@ public function upload($content, $mimeType, $key) { $data = json_decode($resp, true); if (isset($data["error"])) { $code = isset($data["code"]) ? $data["code"] : 1; - throw new \RuntimeException("Upload to Qiniu failed: {$url}". + throw new \RuntimeException("Upload to Qiniu failed: {$url} ". "{$code} {$data['error']}", $code); } return $data; From 4c5a1ff39d98cdf61035d5119e99cfb4adc5b5a8 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 4 Jul 2016 17:07:40 +0800 Subject: [PATCH 051/249] Fix error message in uploader --- src/LeanCloud/Uploader/QCloudUploader.php | 2 +- src/LeanCloud/Uploader/QiniuUploader.php | 2 +- src/LeanCloud/Uploader/S3Uploader.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/LeanCloud/Uploader/QCloudUploader.php b/src/LeanCloud/Uploader/QCloudUploader.php index db0e681..fa9eac0 100644 --- a/src/LeanCloud/Uploader/QCloudUploader.php +++ b/src/LeanCloud/Uploader/QCloudUploader.php @@ -59,7 +59,7 @@ public function upload($content, $mimeType, $key) { $data = json_decode($resp, true); if ($data["code"] != 0) { - throw new \RuntimeException("Upload to Qcloud failed: {$url} ". + throw new \RuntimeException("Upload to Qcloud ({$url}) failed: ". "{$data['code']} {$data['message']}", $data["code"]); } diff --git a/src/LeanCloud/Uploader/QiniuUploader.php b/src/LeanCloud/Uploader/QiniuUploader.php index d9ba189..246518a 100644 --- a/src/LeanCloud/Uploader/QiniuUploader.php +++ b/src/LeanCloud/Uploader/QiniuUploader.php @@ -74,7 +74,7 @@ public function upload($content, $mimeType, $key) { $data = json_decode($resp, true); if (isset($data["error"])) { $code = isset($data["code"]) ? $data["code"] : 1; - throw new \RuntimeException("Upload to Qiniu failed: {$url} ". + throw new \RuntimeException("Upload to Qiniu ({$url}) failed: ". "{$code} {$data['error']}", $code); } return $data; diff --git a/src/LeanCloud/Uploader/S3Uploader.php b/src/LeanCloud/Uploader/S3Uploader.php index d3c24ea..5c983f4 100644 --- a/src/LeanCloud/Uploader/S3Uploader.php +++ b/src/LeanCloud/Uploader/S3Uploader.php @@ -39,7 +39,7 @@ public function upload($content, $mimeType, $name=null) { if ($respCode >= "300") { $S3Error = simplexml_load_string($resp); - throw new \RuntimeException("Upload to S3 failed: {$url} " . + throw new \RuntimeException("Upload to S3 ({$url}) failed: " . "{$S3Error->Code} {$S3Error->Message}"); } return true; From e529c75231bd09393eaa4d7cfdac9415f390bc4c Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 4 Jul 2016 20:19:22 +0800 Subject: [PATCH 052/249] Add file extension when uploading --- src/LeanCloud/LeanFile.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/LeanCloud/LeanFile.php b/src/LeanCloud/LeanFile.php index 1380a1b..98f29b9 100644 --- a/src/LeanCloud/LeanFile.php +++ b/src/LeanCloud/LeanFile.php @@ -369,6 +369,7 @@ public function save() { $this->mergeAfterSave($resp); } else { $key = static::genFileKey(); + $key = "{$key}." . pathinfo($this->getName(), PATHINFO_EXTENSION); $data["key"] = $key; $data["__type"] = "File"; $resp = LeanClient::post("/fileTokens", $data); From 24495b779c9e65f2f699463743898b34012ee572 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 6 Jul 2016 10:42:15 +0800 Subject: [PATCH 053/249] Rename abstract uploader to simple uploader --- src/LeanCloud/LeanFile.php | 17 ++--------------- src/LeanCloud/Uploader/QCloudUploader.php | 2 +- src/LeanCloud/Uploader/QiniuUploader.php | 2 +- src/LeanCloud/Uploader/S3Uploader.php | 2 +- ...bstractUploader.php => SimpleUploader.php} | 19 ++++++++++++++++++- 5 files changed, 23 insertions(+), 19 deletions(-) rename src/LeanCloud/Uploader/{AbstractUploader.php => SimpleUploader.php} (79%) diff --git a/src/LeanCloud/LeanFile.php b/src/LeanCloud/LeanFile.php index 98f29b9..ae247f6 100644 --- a/src/LeanCloud/LeanFile.php +++ b/src/LeanCloud/LeanFile.php @@ -5,9 +5,7 @@ use LeanCloud\LeanClient; use LeanCloud\CloudException; use LeanCloud\MIMEType; -use LeanCloud\Uploader\QiniuUploader; -use LeanCloud\Uploader\S3Uploader; -use LeanCloud\Uploader\QCloudUploader; +use LeanCloud\Uploader\SimpleUploader; /** * File object on LeanCloud @@ -379,7 +377,7 @@ public function save() { } try { - $uploader = static::getFileUploader($resp["provider"]); + $uploader = SimpleUploader::createUploader($resp["provider"]); $uploader->initialize($resp["upload_url"], $resp["token"]); $uploader->upload($this->_source, $this->getMimeType(), $key); } catch (\Exception $ex) { @@ -395,17 +393,6 @@ public function save() { } } - public function getFileUploader($provider) { - if ($provider === "qiniu") { - return new QiniuUploader(); - } else if ($provider === "s3") { - return new S3Uploader(); - } else if ($provider === "qcloud") { - return new QCloudUploader(); - } - throw new \Exception("File provider not supported: {$provider}"); - } - /** * Fetch file object by id * diff --git a/src/LeanCloud/Uploader/QCloudUploader.php b/src/LeanCloud/Uploader/QCloudUploader.php index fa9eac0..c9870c8 100644 --- a/src/LeanCloud/Uploader/QCloudUploader.php +++ b/src/LeanCloud/Uploader/QCloudUploader.php @@ -9,7 +9,7 @@ * @link https://www.qcloud.com/doc/product/227/3377 */ -class QCloudUploader extends AbstractUploader { +class QCloudUploader extends SimpleUploader { protected static function getFileFieldName() { return "filecontent"; diff --git a/src/LeanCloud/Uploader/QiniuUploader.php b/src/LeanCloud/Uploader/QiniuUploader.php index 246518a..8f8f007 100644 --- a/src/LeanCloud/Uploader/QiniuUploader.php +++ b/src/LeanCloud/Uploader/QiniuUploader.php @@ -9,7 +9,7 @@ * * @link http://developer.qiniu.com/code/v6/api/kodo-api/up/upload.html */ -class QiniuUploader extends AbstractUploader { +class QiniuUploader extends SimpleUploader { public function getUploadUrl() { return "https://up.qbox.me/"; diff --git a/src/LeanCloud/Uploader/S3Uploader.php b/src/LeanCloud/Uploader/S3Uploader.php index 5c983f4..019edd6 100644 --- a/src/LeanCloud/Uploader/S3Uploader.php +++ b/src/LeanCloud/Uploader/S3Uploader.php @@ -9,7 +9,7 @@ * @link http://docs.aws.amazon.com/AmazonS3/latest/dev/PresignedUrlUploadObject.html */ -class S3Uploader extends AbstractUploader { +class S3Uploader extends SimpleUploader { public function upload($content, $mimeType, $name=null) { if (!$this->getUploadUrl()) { diff --git a/src/LeanCloud/Uploader/AbstractUploader.php b/src/LeanCloud/Uploader/SimpleUploader.php similarity index 79% rename from src/LeanCloud/Uploader/AbstractUploader.php rename to src/LeanCloud/Uploader/SimpleUploader.php index 1ff5045..54aab24 100644 --- a/src/LeanCloud/Uploader/AbstractUploader.php +++ b/src/LeanCloud/Uploader/SimpleUploader.php @@ -2,10 +2,27 @@ namespace LeanCloud\Uploader; -abstract class AbstractUploader { +abstract class SimpleUploader { protected $uploadUrl; protected $authToken; + /** + * Create uploader by provider + * + * @param string $provider File provider: qiniu, s3, etc + * @return SimpleUploader + */ + public static function createUploader($provider) { + if ($provider === "qiniu") { + return new QiniuUploader(); + } else if ($provider === "s3") { + return new S3Uploader(); + } else if ($provider === "qcloud") { + return new QCloudUploader(); + } + throw new \RuntimeException("File provider not supported: {$provider}"); + } + /** * The form field name of file content in multipart encoded data * From 737c90bed530727b295af71cfb36b74e3035cc2b Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Thu, 28 Jul 2016 14:55:48 +0800 Subject: [PATCH 054/249] Feat: Rename LeanObject to Object --- src/LeanCloud/{LeanACL.php => ACL.php} | 48 ++--- src/LeanCloud/{LeanBytes.php => Bytes.php} | 16 +- src/LeanCloud/{LeanClient.php => Client.php} | 68 +++---- src/LeanCloud/Engine/Cloud.php | 10 +- src/LeanCloud/Engine/FunctionError.php | 2 +- src/LeanCloud/Engine/LeanEngine.php | 42 ++--- src/LeanCloud/{LeanFile.php => File.php} | 38 ++-- src/LeanCloud/GeoPoint.php | 4 +- src/LeanCloud/{LeanObject.php => Object.php} | 72 ++++---- src/LeanCloud/Operation/ArrayOperation.php | 8 +- src/LeanCloud/Operation/RelationOperation.php | 14 +- src/LeanCloud/Operation/SetOperation.php | 4 +- src/LeanCloud/{LeanPush.php => Push.php} | 10 +- src/LeanCloud/{LeanQuery.php => Query.php} | 48 ++--- .../{LeanRelation.php => Relation.php} | 28 +-- src/LeanCloud/{LeanRole.php => Role.php} | 12 +- src/LeanCloud/Storage/IStorage.php | 4 +- src/LeanCloud/Uploader/QCloudUploader.php | 4 +- src/LeanCloud/Uploader/QiniuUploader.php | 4 +- src/LeanCloud/Uploader/S3Uploader.php | 6 +- src/LeanCloud/Uploader/SimpleUploader.php | 2 +- src/LeanCloud/{LeanUser.php => User.php} | 60 +++---- tests/GeoPointTest.php | 2 +- tests/LeanACLTest.php | 38 ++-- tests/LeanAPITest.php | 72 ++++---- tests/LeanBytesTest.php | 16 +- tests/LeanClientTest.php | 170 +++++++++--------- tests/LeanFileTest.php | 38 ++-- tests/LeanObjectTest.php | 110 ++++++------ tests/LeanPushTest.php | 32 ++-- tests/LeanQueryTest.php | 154 ++++++++-------- tests/LeanRelationTest.php | 28 +-- tests/LeanRoleTest.php | 36 ++-- tests/LeanUserTest.php | 88 ++++----- tests/RelationOperationTest.php | 44 ++--- tests/SetOperationTest.php | 4 +- tests/engine/LeanEngineTest.php | 6 +- tests/engine/index.php | 5 +- 38 files changed, 674 insertions(+), 673 deletions(-) rename src/LeanCloud/{LeanACL.php => ACL.php} (87%) rename src/LeanCloud/{LeanBytes.php => Bytes.php} (83%) rename src/LeanCloud/{LeanClient.php => Client.php} (91%) rename src/LeanCloud/{LeanFile.php => File.php} (92%) rename src/LeanCloud/{LeanObject.php => Object.php} (91%) rename src/LeanCloud/{LeanPush.php => Push.php} (95%) rename src/LeanCloud/{LeanQuery.php => Query.php} (94%) rename src/LeanCloud/{LeanRelation.php => Relation.php} (83%) rename src/LeanCloud/{LeanRole.php => Role.php} (86%) rename src/LeanCloud/{LeanUser.php => User.php} (89%) diff --git a/src/LeanCloud/LeanACL.php b/src/LeanCloud/ACL.php similarity index 87% rename from src/LeanCloud/LeanACL.php rename to src/LeanCloud/ACL.php index 91685d3..bf8002d 100644 --- a/src/LeanCloud/LeanACL.php +++ b/src/LeanCloud/ACL.php @@ -9,9 +9,9 @@ * users and roles. There can be as many users and roles as possible * in an ACL. * - * @see LeanRole + * @see Role */ -class LeanACL { +class ACL { /** * Public access key in ACL field */ @@ -33,12 +33,12 @@ class LeanACL { * * With empty param, it creates an ACL with no permission granted. * - * @param mixed $val LeanUser or JSON encoded ACL array + * @param mixed $val User or JSON encoded ACL array */ public function __construct($val=array()) { $this->data = array(); - if ($val instanceof LeanUser) { + if ($val instanceof User) { $this->setReadAccess($val, true); $this->setWriteAccess($val, true); } else if (is_array($val)) { @@ -151,11 +151,11 @@ public function setPublicWriteAccess($flag) { * Even if it returns false, the group may still be able to access * object if object is accessible to public. * - * @param string|LeanRole Role object or name + * @param string|Role Role object or name * @return bool */ public function getRoleReadAccess($role) { - if ($role instanceof LeanRole) { + if ($role instanceof Role) { $role = $role->getName(); } return $this->getAccess("role:$role", "read"); @@ -167,11 +167,11 @@ public function getRoleReadAccess($role) { * Even if it returns false, the group may still be able to access * object if object is accessible to public. * - * @param string|LeanRole Role object or name + * @param string|Role Role object or name * @return bool */ public function getRoleWriteAccess($role) { - if ($role instanceof LeanRole) { + if ($role instanceof Role) { $role = $role->getName(); } return $this->getAccess("role:$role", "write"); @@ -180,17 +180,17 @@ public function getRoleWriteAccess($role) { /** * Set read access for role * - * @param string|LeanRole $role Role object or role name + * @param string|Role $role Role object or role name * @param bool $flag * @return self */ public function setRoleReadAccess($role, $flag) { - if ($role instanceof LeanRole) { + if ($role instanceof Role) { $role = $role->getName(); } if (!is_string($role)) { throw new \InvalidArgumentException("role must be either " . - "LeanRole or string."); + "Role or string."); } $this->setAccess("role:$role", "read", $flag); return $this; @@ -199,17 +199,17 @@ public function setRoleReadAccess($role, $flag) { /** * Set write access for role * - * @param string|LeanRole $role Role object or role name + * @param string|Role $role Role object or role name * @param bool $flag * @return self */ public function setRoleWriteAccess($role, $flag) { - if ($role instanceof LeanRole) { + if ($role instanceof Role) { $role = $role->getName(); } if (!is_string($role)) { throw new \InvalidArgumentException("role must be either " . - "LeanRole or string."); + "Role or string."); } $this->setAccess("role:$role", "write", $flag); return $this; @@ -222,11 +222,11 @@ public function setRoleWriteAccess($role, $flag) { * object if object is accessible to public or a role the user * belongs to. * - * @param string|LeanUser $user Target user or user id + * @param string|User $user Target user or user id * @return bool */ public function getReadAccess($user) { - if ($user instanceof LeanUser) { + if ($user instanceof User) { $user = $user->getObjectId(); } return $this->getAccess($user, "read"); @@ -239,11 +239,11 @@ public function getReadAccess($user) { * object if object is accessible to public or a role the user * belongs to. * - * @param string|LeanUser $user Target user or user id + * @param string|User $user Target user or user id * @return bool */ public function getWriteAccess($user) { - if ($user instanceof LeanUser) { + if ($user instanceof User) { $user = $user->getObjectId(); } return $this->getAccess($user, "write"); @@ -252,12 +252,12 @@ public function getWriteAccess($user) { /** * Set read access for user * - * @param string|LeanUser $user Target user or user id + * @param string|User $user Target user or user id * @param bool $flag Enable or disable read for user * @return self */ public function setReadAccess($user, $flag) { - if ($user instanceof LeanUser) { + if ($user instanceof User) { if (!$user->getObjectId()) { throw new \RuntimeException("user must be saved before " . "being assigned in ACL."); @@ -266,7 +266,7 @@ public function setReadAccess($user, $flag) { } if (!is_string($user)) { throw new \InvalidArgumentException("user must be either " . - " LeanUser or objectId."); + " User or objectId."); } $this->setAccess($user, "read", $flag); return $this; @@ -275,12 +275,12 @@ public function setReadAccess($user, $flag) { /** * Set write access for user * - * @param string|LeanUser $user Target user or user id + * @param string|User $user Target user or user id * @param bool $flag Enable or disable write for user * @return self */ public function setWriteAccess($user, $flag) { - if ($user instanceof LeanUser) { + if ($user instanceof User) { if (!$user->getObjectId()) { throw new \RuntimeException("user must be saved before " . "being assigned in ACL."); @@ -289,7 +289,7 @@ public function setWriteAccess($user, $flag) { } if (!is_string($user)) { throw new \InvalidArgumentException("user must be either " . - " LeanUser or objectId."); + " User or objectId."); } $this->setAccess($user, "write", $flag); return $this; diff --git a/src/LeanCloud/LeanBytes.php b/src/LeanCloud/Bytes.php similarity index 83% rename from src/LeanCloud/LeanBytes.php rename to src/LeanCloud/Bytes.php index 31b5e82..8c9aa9c 100644 --- a/src/LeanCloud/LeanBytes.php +++ b/src/LeanCloud/Bytes.php @@ -3,9 +3,9 @@ namespace LeanCloud; /** - * Byte array data type for LeanObject + * Byte array data type for Object */ -class LeanBytes { +class Bytes { /** * Byte array * @@ -14,25 +14,25 @@ class LeanBytes { private $byteArray = array(); /** - * Create LeanBytes from byte array + * Create Bytes from byte array * * @param array $byteArray - * @return LeanBytes + * @return Bytes */ public static function createFromByteArray(array $byteArray) { - $bytes = new LeanBytes(); + $bytes = new Bytes(); $bytes->byteArray = $byteArray; return $bytes; } /** - * Create LeanBytes from base64 encoded string + * Create Bytes from base64 encoded string * * @param string $data Base64 encoded string - * @return LeanBytes + * @return Bytes */ public static function createFromBase64Data($data) { - $bytes = new LeanBytes(); + $bytes = new Bytes(); // convert unpacked associative array to sequence array $byteMap = unpack('C*', base64_decode($data)); diff --git a/src/LeanCloud/LeanClient.php b/src/LeanCloud/Client.php similarity index 91% rename from src/LeanCloud/LeanClient.php rename to src/LeanCloud/Client.php index 4cff1a9..a9f6c50 100644 --- a/src/LeanCloud/LeanClient.php +++ b/src/LeanCloud/Client.php @@ -2,11 +2,11 @@ namespace LeanCloud; -use LeanCloud\LeanBytes; -use LeanCloud\LeanObject; -use LeanCloud\LeanACL; -use LeanCloud\LeanFile; -use LeanCloud\LeanUser; +use LeanCloud\Bytes; +use LeanCloud\Object; +use LeanCloud\ACL; +use LeanCloud\File; +use LeanCloud\User; use LeanCloud\Operation\IOperation; use LeanCloud\Storage\IStorage; use LeanCloud\Storage\SessionStorage; @@ -19,7 +19,7 @@ * such as `::randomFloat` to generate a random float number. * */ -class LeanClient { +class Client { /** * Client version */ @@ -134,8 +134,8 @@ public static function initialize($appId, $appKey, $appMasterKey) { self::$storage = new SessionStorage(); } - LeanUser::registerClass(); - LeanRole::registerClass(); + User::registerClass(); + Role::registerClass(); } /** @@ -149,7 +149,7 @@ private static function assertInitialized() { !isset(self::$appMasterKey)) { throw new \RuntimeException("Client is not initialized, " . "please specify application key " . - "with LeanClient::initialize."); + "with Client::initialize."); } } @@ -209,7 +209,7 @@ public static function getAPIEndPoint() { /** * Build authentication headers * - * @param string $sessionToken Session token of a LeanUser + * @param string $sessionToken Session token of a User * @param bool $useMasterKey * @return array */ @@ -231,7 +231,7 @@ public static function buildHeaders($sessionToken, $useMasterKey) { } if (!$sessionToken) { - $sessionToken = LeanUser::getCurrentSessionToken(); + $sessionToken = User::getCurrentSessionToken(); } if ($sessionToken) { @@ -325,7 +325,7 @@ public static function verifyHookSign($hookName, $sign) { * @param string $method GET, POST, PUT, DELETE * @param string $path Request path (without version string) * @param array $data Payload data - * @param string $sessionToken Session token of a LeanUser + * @param string $sessionToken Session token of a User * @param array $headers Optional headers * @param bool $useMasterkey Use master key or not * @return array JSON decoded associative array @@ -415,7 +415,7 @@ public static function request($method, $path, $data, * * @param string $path Request path (without version string) * @param array $data Payload data - * @param string $sessionToken Session token of a LeanUser + * @param string $sessionToken Session token of a User * @param array $headers Optional headers * @param bool $useMasterkey Use master key or not * @return array JSON decoded associated array @@ -432,7 +432,7 @@ public static function get($path, $data=null, $sessionToken=null, * * @param string $path Request path (without version string) * @param array $data Payload data - * @param string $sessionToken Session token of a LeanUser + * @param string $sessionToken Session token of a User * @param array $headers Optional headers * @param bool $useMasterkey Use master key or not, optional * @return array JSON decoded associated array @@ -449,7 +449,7 @@ public static function post($path, $data, $sessionToken=null, * * @param string $path Request path (without version string) * @param array $data Payload data - * @param string $sessionToken Session token of a LeanUser + * @param string $sessionToken Session token of a User * @param array $headers Optional headers * @param bool $useMasterkey Use master key or not, optional * @return array JSON decoded associated array @@ -465,7 +465,7 @@ public static function put($path, $data, $sessionToken=null, * Issue DELETE request to LeanCloud * * @param string $path Request path (without version string) - * @param string $sessionToken Session token of a LeanUser + * @param string $sessionToken Session token of a User * @param array $headers Optional headers * @param bool $useMasterkey Use master key or not, optional * @return array JSON decoded associated array @@ -481,7 +481,7 @@ public static function delete($path, $sessionToken=null, * Issue a batch request * * @param array $requests Array of requests in batch op - * @param string $sessionToken Session token of a LeanUser + * @param string $sessionToken Session token of a User * @param array $headers Optional headers * @param bool $useMasterkey Use master key or not, optional * @return array JSON decoded associated array @@ -489,7 +489,7 @@ public static function delete($path, $sessionToken=null, */ public static function batch($requests, $sessionToken=null, $headers=array(), $useMasterKey=null) { - $response = LeanClient::post("/batch", + $response = Client::post("/batch", array("requests" => $requests), $sessionToken, $headers, @@ -512,12 +512,12 @@ public static function batch($requests, $sessionToken=null, /** * Recursively encode value as JSON representation * - * By default LeanObject will be encoded as pointer, though + * By default Object will be encoded as pointer, though * `$encoder` could be provided to encode to customized type, such * as full `__type` annotated json object. The $encoder must be - * name of instance method of LeanObject. + * name of instance method of Object. * - * To vaoid infinite loop in the case of circular LeanObject + * To vaoid infinite loop in the case of circular Object * references, previously seen objects (`$seen`) are encoded * in pointer, even a customized encoder was provided. * @@ -526,15 +526,15 @@ public static function batch($requests, $sessionToken=null, * $obj->set("owner", $user); * * // encode object to full JSON, with `__type` and `className` - * LeanClient::encode($obj, "toFullJSON"); + * Client::encode($obj, "toFullJSON"); * * // encode object to literal JSON, without `__type` and `className` - * LeanClient::encode($obj, "toJSON"); + * Client::encode($obj, "toJSON"); * ``` * * @param mixed $value - * @param string $encoder LeanObject encoder name, e.g.: getPointer, toJSON - * @param array $seen Array of LeanObject that has been traversed + * @param string $encoder Object encoder name, e.g.: getPointer, toJSON + * @param array $seen Array of Object that has been traversed * @return mixed */ public static function encode($value, @@ -546,7 +546,7 @@ public static function encode($value, ($value instanceof \DateTimeImmutable)) { return array("__type" => "Date", "iso" => self::formatDate($value)); - } else if ($value instanceof LeanObject) { + } else if ($value instanceof Object) { if ($encoder && !in_array($value, $seen)) { $seen[] = $value; return call_user_func(array($value, $encoder), $seen); @@ -555,9 +555,9 @@ public static function encode($value, } } else if ($value instanceof IOperation || $value instanceof GeoPoint || - $value instanceof LeanBytes || - $value instanceof LeanACL || - $value instanceof LeanFile) { + $value instanceof Bytes || + $value instanceof ACL || + $value instanceof File) { return $value->encode(); } else if (is_array($value)) { $res = array(); @@ -600,7 +600,7 @@ public static function decode($value, $key) { return $value; } if ($key === 'ACL') { - return new LeanACL($value); + return new ACL($value); } if (!isset($value["__type"])) { $out = array(); @@ -618,18 +618,18 @@ public static function decode($value, $key) { return new \DateTime($value["iso"]); } if ($type === "Bytes") { - return LeanBytes::createFromBase64Data($value["base64"]); + return Bytes::createFromBase64Data($value["base64"]); } if ($type === "GeoPoint") { return new GeoPoint($value["latitude"], $value["longitude"]); } if ($type === "File") { - $file = new LeanFile($value["name"]); + $file = new File($value["name"]); $file->mergeAfterFetch($value); return $file; } if ($type === "Pointer" || $type === "Object") { - $obj = LeanObject::create($value["className"], $value["objectId"]); + $obj = Object::create($value["className"], $value["objectId"]); unset($value["__type"]); unset($value["className"]); if (!empty($value)) { @@ -638,7 +638,7 @@ public static function decode($value, $key) { return $obj; } if ($type === "Relation") { - return new LeanRelation(null, $key, $value["className"]); + return new Relation(null, $key, $value["className"]); } } diff --git a/src/LeanCloud/Engine/Cloud.php b/src/LeanCloud/Engine/Cloud.php index 23287c4..fdf2947 100644 --- a/src/LeanCloud/Engine/Cloud.php +++ b/src/LeanCloud/Engine/Cloud.php @@ -241,7 +241,7 @@ public static function onInsight($func) { * * @param string $funcName Name of defined function * @param array $data Array of parameters passed to function - * @param LeanUser $user Request user + * @param User $user Request user * @param array $meta Optional parameters that will be passed to * user function * @return mixed @@ -268,8 +268,8 @@ public static function run($funcName, $params, $user=null, $meta=array()) { * * @param string $className Classname * @param string $hookName Hook name, e.g. beforeUpdate - * @param LeanObject $object The object of attached hook - * @param LeanUser $user Request user + * @param Object $object The object of attached hook + * @param User $user Request user * @param array $meta Optional parameters that will be passed to * user function * @return mixed @@ -290,7 +290,7 @@ public static function runHook($className, $hookName, $object, /** * Run hook when a user logs in * - * @param LeanUser $user The user object that tries to login + * @param User $user The user object that tries to login * @param array $meta Optional parameters that will be passed to * user function * @throws FunctionError @@ -304,7 +304,7 @@ public static function runOnLogin($user, $meta=array()) { * Run hook when user verified by Email or SMS * * @param string $type Either "sms" or "email", case-sensitive - * @param LeanUser $user The verifying user + * @param User $user The verifying user * @param array $meta Optional parameters that will be passed to * user function * @throws FunctionError diff --git a/src/LeanCloud/Engine/FunctionError.php b/src/LeanCloud/Engine/FunctionError.php index 6ac036b..b5a5b6c 100644 --- a/src/LeanCloud/Engine/FunctionError.php +++ b/src/LeanCloud/Engine/FunctionError.php @@ -12,4 +12,4 @@ public function __construct($message, $code = 0) { public function __toString() { return __CLASS__ . ": [{$this->code}]: {$this->message}\n"; } -} \ No newline at end of file +} diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 1956918..750b1ab 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -2,8 +2,8 @@ namespace LeanCloud\Engine; -use LeanCloud\LeanClient; -use LeanCloud\LeanUser; +use LeanCloud\Client; +use LeanCloud\User; use LeanCloud\CloudException; class LeanEngine { @@ -274,7 +274,7 @@ private function parsePlainBody($body) { private function authRequest() { $appId = $this->env["LC_ID"]; $sign = $this->env["LC_SIGN"]; - if ($sign && LeanClient::verifySign($appId, $sign)) { + if ($sign && Client::verifySign($appId, $sign)) { if (strpos($sign, "master") !== false) { $this->env["useMaster"] = true; } @@ -282,7 +282,7 @@ private function authRequest() { } $appKey = $this->env["LC_KEY"]; - if ($appKey && LeanClient::verifyKey($appId, $appKey)) { + if ($appKey && Client::verifyKey($appId, $appKey)) { if (strpos($appKey, "master") !== false) { $this->env["useMaster"] = true; } @@ -291,7 +291,7 @@ private function authRequest() { $masterKey = $this->env["LC_MASTER_KEY"]; $key = "{$masterKey}, master"; - if ($masterKey && LeanClient::verifyKey($appId, $key)) { + if ($masterKey && Client::verifyKey($appId, $key)) { $this->env["useMaster"] = true; return true; } @@ -305,7 +305,7 @@ private function authRequest() { private function processSession() { $token = $this->env["LC_SESSION"]; if ($token) { - LeanUser::become($token); + User::become($token); } } @@ -338,7 +338,7 @@ protected function dispatch($method, $url) { if (strpos($path, "/__engine/1/ping") === 0) { $this->renderJSON(array( "runtime" => "php-" . phpversion(), - "version" => LeanClient::VERSION + "version" => Client::VERSION )); } @@ -427,23 +427,23 @@ protected function dispatch($method, $url) { private function dispatchFunc($funcName, $body, $decodeObj=false) { $params = $body; if ($decodeObj) { - $params = LeanClient::decode($body, null); + $params = Client::decode($body, null); } $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; try { $result = Cloud::run($funcName, $params, - LeanUser::getCurrentUser(), + User::getCurrentUser(), $meta); } catch (FunctionError $err) { $this->renderError($err->getMessage(), $err->getCode()); } if ($decodeObj) { // Encode object to full, type-annotated JSON - $out = LeanClient::encode($result, "toFullJSON"); + $out = Client::encode($result, "toFullJSON"); } else { // Encode object to type-less literal JSON - $out = LeanClient::encode($result, "toJSON"); + $out = Client::encode($result, "toJSON"); } $this->renderJSON(array("result" => $out)); } @@ -458,10 +458,10 @@ private function dispatchFunc($funcName, $body, $decodeObj=false) { private function dispatchHook($className, $hookName, $body) { $verified = false; if (strpos($hookName, "before") === 0) { - $verified = LeanClient::verifyHookSign("__before_for_{$className}", + $verified = Client::verifyHookSign("__before_for_{$className}", $body["object"]["__before"]); } else { - $verified = LeanClient::verifyHookSign("__after_for_{$className}", + $verified = Client::verifyHookSign("__after_for_{$className}", $body["object"]["__after"]); } if (!$verified) { @@ -473,7 +473,7 @@ private function dispatchHook($className, $hookName, $body) { $json = $body["object"]; $json["__type"] = "Object"; $json["className"] = $className; - $obj = LeanClient::decode($json, null); + $obj = Client::decode($json, null); // set hook marks to prevent infinite loop. For example if user // invokes `$obj->save` in an afterSave hook, API will not again @@ -503,7 +503,7 @@ private function dispatchHook($className, $hookName, $body) { $result = Cloud::runHook($className, $hookName, $obj, - LeanUser::getCurrentUser(), + User::getCurrentUser(), $meta); } catch (FunctionError $err) { $this->renderError($err->getMessage(), $err->getCode()); @@ -526,15 +526,15 @@ private function dispatchHook($className, $hookName, $body) { * @param array $body JSON decoded body params */ private function dispatchOnVerified($type, $body) { - if (!LeanClient::verifyHookSign("__on_verified_{$type}", + if (!Client::verifyHookSign("__on_verified_{$type}", $body["object"]["__sign"])) { error_log("Invalid hook sign for onVerified {$type}" . " from {$this->env['REMOTE_ADDR']}"); $this->renderError("Unauthorized.", 401, 401); } - $userObj = LeanClient::decode($body["object"], null); - LeanUser::saveCurrentUser($userObj); + $userObj = Client::decode($body["object"], null); + User::saveCurrentUser($userObj); $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; try { Cloud::runOnVerified($type, $userObj, $meta); @@ -550,14 +550,14 @@ private function dispatchOnVerified($type, $body) { * @param array $body JSON decoded body params */ private function dispatchOnLogin($body) { - if (!LeanClient::verifyHookSign("__on_login__User", + if (!Client::verifyHookSign("__on_login__User", $body["object"]["__sign"])) { error_log("Invalid hook sign for onLogin User" . " from {$this->env['REMOTE_ADDR']}"); $this->renderError("Unauthorized.", 401, 401); } - $userObj = LeanClient::decode($body["object"], null); + $userObj = Client::decode($body["object"], null); $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; try { Cloud::runOnLogin($userObj, $meta); @@ -573,7 +573,7 @@ private function dispatchOnLogin($body) { * @param array $body JSON decoded body params */ private function dispatchOnInsight($body) { - if (!LeanClient::verifyHookSign("__on_complete_bigquery_job", + if (!Client::verifyHookSign("__on_complete_bigquery_job", $body["__sign"])) { error_log("Invalid hook sign for onComplete Insight" . " from {$this->env['REMOTE_ADDR']}"); diff --git a/src/LeanCloud/LeanFile.php b/src/LeanCloud/File.php similarity index 92% rename from src/LeanCloud/LeanFile.php rename to src/LeanCloud/File.php index ae247f6..5ee7a39 100644 --- a/src/LeanCloud/LeanFile.php +++ b/src/LeanCloud/File.php @@ -1,8 +1,8 @@ _data["mime_type"] = $mimeType; $this->_metaData["owner"] = "unknown"; - if (LeanUser::$currentUser) { - $this->_metaData["owner"] = LeanUser::$currentUser->getObjectId(); + if (User::$currentUser) { + $this->_metaData["owner"] = User::$currentUser->getObjectId(); } if ($this->_source) { $this->_metaData["size"] = strlen($this->_source); @@ -73,10 +73,10 @@ public function __construct($name, $data=null, $mimeType=null) { * @param string $name File base name * @param string $url Public URL * @param string $mimeType (optional) - * @return LeanFile + * @return File */ public static function createWithUrl($name, $url, $mimeType=null) { - $file = new LeanFile($name, null, $mimeType); + $file = new File($name, null, $mimeType); $file->_data["url"] = $url; $file->_metaData["__source"] = "external"; return $file; @@ -88,10 +88,10 @@ public static function createWithUrl($name, $url, $mimeType=null) { * @param string $name File name * @param string $data File content * @param string $mimeType - * @return LeanFile + * @return File */ public static function createWithData($name, $data, $mimeType=null) { - $file = new LeanFile($name, $data, $mimeType); + $file = new File($name, $data, $mimeType); return $file; } @@ -100,7 +100,7 @@ public static function createWithData($name, $data, $mimeType=null) { * * @param string $filepath Absolute file path * @param string $mimeType - * @return LeanFile + * @return File * @throws RuntimeException */ public static function createWithLocalFile($filepath, $mimeType=null) { @@ -262,7 +262,7 @@ public function getMeta($key=null) { */ private static function genFileKey() { $octets = array_map(function() { - $num = floor((1 + LeanClient::randomFloat()) * 0x10000); + $num = floor((1 + Client::randomFloat()) * 0x10000); return substr(dechex($num), 1); }, range(0, 4)); return implode("", $octets); @@ -294,11 +294,11 @@ private function _mergeData($data, $meta=array()) { } forEach($data as $key => $val) { - $this->_data[$key] = LeanClient::decode($val, $key); + $this->_data[$key] = Client::decode($val, $key); } forEach($meta as $key => $val) { - $this->_metaData[$key] = LeanClient::decode($val, $key); + $this->_metaData[$key] = Client::decode($val, $key); } } @@ -363,14 +363,14 @@ public function save() { if ($this->isExternal()) { $data["url"] = $this->getUrl(); - $resp = LeanClient::post("/files/{$this->getName()}", $data); + $resp = Client::post("/files/{$this->getName()}", $data); $this->mergeAfterSave($resp); } else { $key = static::genFileKey(); $key = "{$key}." . pathinfo($this->getName(), PATHINFO_EXTENSION); $data["key"] = $key; $data["__type"] = "File"; - $resp = LeanClient::post("/fileTokens", $data); + $resp = Client::post("/fileTokens", $data); if (!isset($resp["token"])) { // adapt for S3, when there is no token $resp["token"] = null; @@ -399,11 +399,11 @@ public function save() { * Note it fetches descriptive data from LeanCloud, but not file content. * The content should be fetched from file URL. * - * @return LeanFile + * @return File */ public static function fetch($objectId) { - $file = new LeanFile(""); - $resp = LeanClient::get("/files/{$objectId}"); + $file = new File(""); + $resp = Client::get("/files/{$objectId}"); $file->mergeAfterFetch($resp); return $file; } @@ -417,7 +417,7 @@ public function destroy() { if (!$this->getObjectId()) { return false; } - LeanClient::delete("/files/{$this->getObjectId()}"); + Client::delete("/files/{$this->getObjectId()}"); } /** diff --git a/src/LeanCloud/GeoPoint.php b/src/LeanCloud/GeoPoint.php index 5a18fbc..78bae64 100644 --- a/src/LeanCloud/GeoPoint.php +++ b/src/LeanCloud/GeoPoint.php @@ -6,10 +6,10 @@ * GeoPoint type representation * * It represents a geographic point, and supports computing geo - * distance from point to point. It can also be used in LeanQuery to + * distance from point to point. It can also be used in Query to * build proximity-based queries. * - * @see LeanQuery + * @see Query */ class GeoPoint { /** diff --git a/src/LeanCloud/LeanObject.php b/src/LeanCloud/Object.php similarity index 91% rename from src/LeanCloud/LeanObject.php rename to src/LeanCloud/Object.php index 4994423..4b1c0bd 100644 --- a/src/LeanCloud/LeanObject.php +++ b/src/LeanCloud/Object.php @@ -1,7 +1,7 @@ registerClass` to register - * itself to LeanObject. Such that LeanObject maintains a map of + * itself to Object. Such that Object maintains a map of * className to sub-classes. * * It is only callable on sub-class. @@ -134,13 +134,13 @@ public function getClassName() { public function disableBeforeHook() { $this->set("__before", - LeanClient::signHook("__before_for_{$this->getClassName()}", + Client::signHook("__before_for_{$this->getClassName()}", round(microtime(true) * 1000))); } public function disableAfterHook() { $this->set("__after", - LeanClient::signHook("__after_for_{$this->getClassName()}", + Client::signHook("__after_for_{$this->getClassName()}", round(microtime(true) * 1000))); } @@ -190,7 +190,7 @@ public function toJSON() { public function toFullJSON($seen=array()) { $out = array(); forEach($this->_data as $key => $val) { - $out[$key] = LeanClient::encode($val, "toFullJSON", $seen); + $out[$key] = Client::encode($val, "toFullJSON", $seen); } $out["__type"] = "Object"; $out["className"] = $this->getClassName(); @@ -244,17 +244,17 @@ public function set($key, $val) { /** * Set ACL for object * - * @param LeanACL $acl + * @param ACL $acl * @return self */ - public function setACL(LeanACL $acl) { + public function setACL(ACL $acl) { return $this->set("ACL", $acl); } /** * Get ACL for object * - * @return null|LeanACL + * @return null|ACL */ public function getACL() { return $this->get("ACL"); @@ -282,7 +282,7 @@ public function get($key) { return null; } $val = $this->_data[$key]; - if ($val instanceof LeanRelation) { + if ($val instanceof Relation) { return $this->getRelation($key); } return $this->_data[$key]; @@ -392,7 +392,7 @@ public function isDirty() { * @return array */ private function getSaveData() { - return LeanClient::encode($this->_operationSet); + return Client::encode($this->_operationSet); } /** @@ -428,7 +428,7 @@ private function _mergeData($data) { } forEach($data as $key => $val) { - $this->_data[$key] = LeanClient::decode($val, $key); + $this->_data[$key] = Client::decode($val, $key); } } @@ -507,8 +507,8 @@ public function fetchAll($objects) { $objects[] = $obj; } - $sessionToken = LeanUser::getCurrentSessionToken(); - $response = LeanClient::batch($requests, $sessionToken); + $sessionToken = User::getCurrentSessionToken(); + $response = Client::batch($requests, $sessionToken); $batchRequestError = new BatchRequestError(); forEach($objects as $i => $obj) { @@ -550,36 +550,36 @@ public function destroy() { /** * Return query object based on the object class * - * @return LeanQuery + * @return Query */ public function getQuery() { - return new LeanQuery($this->getClassName()); + return new Query($this->getClassName()); } /** * Get (or build) relation on field * * @param string $key Field key - * @return LeanRelation + * @return Relation * @throws RuntimeException */ public function getRelation($key) { $val = isset($this->_data[$key]) ? $this->_data[$key] : null; if ($val) { - if ($val instanceof LeanRelation) { + if ($val instanceof Relation) { $val->setParentAndKey($this, $key); return $val; } else { throw new \RuntimeException("Field {$key} is not relation."); } } - return new LeanRelation($this, $key); + return new Relation($this, $key); } /** * Traverse value in a hierarchy of arrays and objects * - * Array and data attributes of LeanObject will be traversed, each time + * Array and data attributes of Object will be traversed, each time * a non-array value found the func will be invoked with the value as * arguement. * @@ -587,7 +587,7 @@ public function getRelation($key) { * @param function $func A function to call when non-array value found. */ public static function traverse($value, &$seen, $func) { - if ($value instanceof LeanObject) { + if ($value instanceof Object) { if (!in_array($value, $seen)) { $seen[] = $value; static::traverse($value->_data, $seen, $func); @@ -597,7 +597,7 @@ public static function traverse($value, &$seen, $func) { forEach($value as $val) { if (is_array($val)) { static::traverse($val, $seen, $func); - } else if ($val instanceof LeanObject) { + } else if ($val instanceof Object) { static::traverse($val, $seen, $func); } else { $func($val); @@ -618,8 +618,8 @@ public function findUnsavedChildren() { $seen = array($this); // excluding object itself static::traverse($this->_data, $seen, function($val) use (&$unsavedChildren) { - if (($val instanceof LeanObject) || - ($val instanceof LeanFile)) { + if (($val instanceof Object) || + ($val instanceof File)) { if ($val->isDirty()) { $unsavedChildren[] = $val; } @@ -646,9 +646,9 @@ public static function saveAll($objects) { $children = array(); // Array of unsaved objects excluding files forEach($unsavedChildren as $obj) { - if ($obj instanceof LeanFile) { + if ($obj instanceof File) { $obj->save(); - } else if ($obj instanceof LeanObject) { + } else if ($obj instanceof Object) { if (!in_array($obj, $children)) { $children[] = $obj; } @@ -704,8 +704,8 @@ private static function batchSave($objects, $batchSize=20) { $objects[] = $obj; } - $sessionToken = LeanUser::getCurrentSessionToken(); - $response = LeanClient::batch($requests, $sessionToken); + $sessionToken = User::getCurrentSessionToken(); + $response = Client::batch($requests, $sessionToken); forEach($objects as $i => $obj) { if (isset($response[$i]["success"])) { @@ -720,7 +720,7 @@ private static function batchSave($objects, $batchSize=20) { /** * Delete objects in batch * - * @param array $objects Array of LeanObjects to destroy + * @param array $objects Array of Objects to destroy */ public static function destroyAll($objects) { $batch = array(); @@ -744,8 +744,8 @@ public static function destroyAll($objects) { $objects[] = $obj; } - $sessionToken = LeanUser::getCurrentSessionToken(); - $response = LeanClient::batch($requests, $sessionToken); + $sessionToken = User::getCurrentSessionToken(); + $response = Client::batch($requests, $sessionToken); } } diff --git a/src/LeanCloud/Operation/ArrayOperation.php b/src/LeanCloud/Operation/ArrayOperation.php index a81e2f2..49f5ed4 100644 --- a/src/LeanCloud/Operation/ArrayOperation.php +++ b/src/LeanCloud/Operation/ArrayOperation.php @@ -1,7 +1,7 @@ $this->getOpType(), - "objects" => LeanClient::encode($this->value), + "objects" => Client::encode($this->value), ); } @@ -112,12 +112,12 @@ private function addUnique($oldval) { $newval = $oldval; // New result array $found = array(); // Hash map of objects with objectId as key forEach($oldval as $obj) { - if (($obj instanceof LeanObject) && ($obj->getObjectId())) { + if (($obj instanceof Object) && ($obj->getObjectId())) { $found[$obj->getObjectId()] = true; } } forEach($this->getValue() as $obj) { - if (($obj instanceof LeanObject) && ($obj->getObjectId())) { + if (($obj instanceof Object) && ($obj->getObjectId())) { if (isset($found[$obj->getObjectId()])) { // skip duplicate object } else { diff --git a/src/LeanCloud/Operation/RelationOperation.php b/src/LeanCloud/Operation/RelationOperation.php index f50a3b6..f8837a8 100644 --- a/src/LeanCloud/Operation/RelationOperation.php +++ b/src/LeanCloud/Operation/RelationOperation.php @@ -1,12 +1,12 @@ getKey(), + return new Relation($object, $this->getKey(), $this->getTargetClassName()); } - if (!($relation instanceof LeanRelation)) { + if (!($relation instanceof Relation)) { throw new \RuntimeException("Operation incompatible with " . "previous value."); } diff --git a/src/LeanCloud/Operation/SetOperation.php b/src/LeanCloud/Operation/SetOperation.php index 51911d3..fa1aeb0 100644 --- a/src/LeanCloud/Operation/SetOperation.php +++ b/src/LeanCloud/Operation/SetOperation.php @@ -1,7 +1,7 @@ value); + return Client::encode($this->value); } /** diff --git a/src/LeanCloud/LeanPush.php b/src/LeanCloud/Push.php similarity index 95% rename from src/LeanCloud/LeanPush.php rename to src/LeanCloud/Push.php index f97957e..39545d0 100644 --- a/src/LeanCloud/LeanPush.php +++ b/src/LeanCloud/Push.php @@ -5,7 +5,7 @@ /** * Send Push notification to mobile devices */ -class LeanPush { +class Push { /** * Notification data * @@ -86,11 +86,11 @@ public function setChannels($channels) { * * The query must be over _Installation table. * - * @param LeanQuery $query A query over _Installation + * @param Query $query A query over _Installation * @return self * @see self::setOption() */ - public function setWhere(LeanQuery $query) { + public function setWhere(Query $query) { if ($query->getClassName() != "_Installation") { throw new \RuntimeException("Query must be over " . "_Installation table."); @@ -159,7 +159,7 @@ public function encode() { */ public function send() { $out = $this->encode(); - $resp = LeanClient::post("/push", $out); + $resp = Client::post("/push", $out); return $resp; } -} \ No newline at end of file +} diff --git a/src/LeanCloud/LeanQuery.php b/src/LeanCloud/Query.php similarity index 94% rename from src/LeanCloud/LeanQuery.php rename to src/LeanCloud/Query.php index 337f3a7..70ef981 100644 --- a/src/LeanCloud/LeanQuery.php +++ b/src/LeanCloud/Query.php @@ -1,13 +1,13 @@ className = $queryClass; - } else if (is_subclass_of($queryClass, "LeanObject")) { + } else if (is_subclass_of($queryClass, "Object")) { $this->className = $queryClass::$className; } else { throw new \InvalidArgumentException("Query class invalid."); @@ -96,7 +96,7 @@ public function getClassName() { * @param mixed $val Condition value(s) */ private function _addCondition($key, $op, $val) { - $this->where[$key][$op] = LeanClient::encode($val); + $this->where[$key][$op] = Client::encode($val); } /** @@ -112,7 +112,7 @@ private function _addCondition($key, $op, $val) { * @return self */ public function equalTo($key, $val) { - $this->where[$key] = LeanClient::encode($val); + $this->where[$key] = Client::encode($val); return $this; } @@ -323,7 +323,7 @@ public function matches($key, $regex, $modifiers="") { * Matches result objects returned from a sub-query * * @param string $key - * @param LeanQuery $query The sub-query + * @param Query $query The sub-query * @return self */ public function matchesInQuery($key, $query) { @@ -338,7 +338,7 @@ public function matchesInQuery($key, $query) { * Not-match result objects returned from a sub-query * * @param string $key - * @param LeanQuery $query The sub-query + * @param Query $query The sub-query * @return self */ public function notMatchInQuery($key, $query) { @@ -354,7 +354,7 @@ public function notMatchInQuery($key, $query) { * * @param string $key * @param string $queryKey Target field key in sub-query - * @param LeanQuery $query The sub-query + * @param Query $query The sub-query * @return self */ public function matchesFieldInQuery($key, $queryKey, $query) { @@ -373,7 +373,7 @@ public function matchesFieldInQuery($key, $queryKey, $query) { * * @param string $key * @param string $queryKey Target field key in sub-query - * @param LeanQuery $query The sub-query + * @param Query $query The sub-query * @return self */ public function notMatchFieldInQuery($key, $queryKey, $query) { @@ -391,7 +391,7 @@ public function notMatchFieldInQuery($key, $queryKey, $query) { * Relation field related to an object * * @param string $key A relation field key - * @param LeanObject $obj Target object to relate + * @param Object $obj Target object to relate * @return self */ public function relatedTo($key, $obj) { @@ -598,8 +598,8 @@ public function addDescend($key) { * Compose AND/OR query from queries * * @param string $op Operator string, either `$and` or `$or` - * @param array $queries Array of LeanQuery - * @return LeanQuery + * @param array $queries Array of Query + * @return Query */ private static function composeQuery($op, $queries) { $className = $queries[0]->getClassName(); @@ -610,7 +610,7 @@ private static function composeQuery($op, $queries) { } $conds[] = $q->where; } - $query = new LeanQuery($className); + $query = new Query($className); $query->where[$op] = $conds; return $query; } @@ -622,7 +622,7 @@ private static function composeQuery($op, $queries) { * LeanQueries. * * @param ... - * @return LeanQuery + * @return Query */ public static function orQuery($queries) { if (!is_array($queries)) { @@ -638,7 +638,7 @@ public static function orQuery($queries) { * LeanQueries. * * @param ... - * @return LeanQuery + * @return Query */ public static function andQuery($queries) { if (!is_array($queries)) { @@ -698,7 +698,7 @@ public function encode() { * Query object by id * * @param string $objectId - * @return LeanObject + * @return Object */ public function get($objectId) { $this->equalTo('objectId', $objectId); @@ -708,7 +708,7 @@ public function get($objectId) { /** * Find the first object by the query * - * @return LeanObject + * @return Object */ public function first() { $objects = $this->find($this->skip, 1); @@ -738,10 +738,10 @@ public function find($skip=-1, $limit=-1) { $params["limit"] = $limit; } - $resp = LeanClient::get("/classes/{$this->getClassName()}", $params); + $resp = Client::get("/classes/{$this->getClassName()}", $params); $objects = array(); forEach($resp["results"] as $props) { - $obj = LeanObject::create($this->getClassName()); + $obj = Object::create($this->getClassName()); $obj->mergeAfterFetch($props); $objects[] = $obj; } @@ -757,7 +757,7 @@ public function count() { $params = $this->encode(); $params["limit"] = 0; $params["count"] = 1; - $resp = LeanClient::get("/classes/{$this->getClassName()}", $params); + $resp = Client::get("/classes/{$this->getClassName()}", $params); return $resp["count"]; } @@ -778,12 +778,12 @@ public function count() { public static function doCloudQuery($cql, $pvalues=array()) { $data = array("cql" => $cql); if (!empty($pvalues)) { - $data["pvalues"] = json_encode(LeanClient::encode($pvalues)); + $data["pvalues"] = json_encode(Client::encode($pvalues)); } - $resp = LeanClient::get('/cloudQuery', $data); + $resp = Client::get('/cloudQuery', $data); $objects = array(); forEach($resp["results"] as $val) { - $obj = LeanObject::create($resp["className"], $val["objectId"]); + $obj = Object::create($resp["className"], $val["objectId"]); $obj->mergeAfterFetch($val); $objects[] = $obj; } diff --git a/src/LeanCloud/LeanRelation.php b/src/LeanCloud/Relation.php similarity index 83% rename from src/LeanCloud/LeanRelation.php rename to src/LeanCloud/Relation.php index 70f7983..c4a1664 100644 --- a/src/LeanCloud/LeanRelation.php +++ b/src/LeanCloud/Relation.php @@ -5,17 +5,17 @@ use LeanCloud\Operation\RelationOperation; /** - * Many-to-many relationship for LeanObject + * Many-to-many relationship for Object * * A relation consists of an array of objects, of which items can be * added to, and removed from. Each field could only have one kind of * object. */ -class LeanRelation { +class Relation { /** * The parent object of relation. * - * @var LeanObject + * @var Object */ private $parent; @@ -39,7 +39,7 @@ class LeanRelation { * Build a relation on parent field. It shall be rarely used * directly, use `$parent->getRelation($key)` instead. * - * @param LeanObject $parent Parent object + * @param Object $parent Parent object * @param string $key Field key on parent object * @param string $className ClassName the object relatedTo */ @@ -62,7 +62,7 @@ public function encode() { /** * Attempt to set and validate parent of relation * - * @param LeanObject $parent Parent object of relation + * @param Object $parent Parent object of relation * @param string $key Field key * @throws RuntimeException */ @@ -89,7 +89,7 @@ public function getTargetClassName() { /** * Add object(s) to the field as relation * - * @param object|array $objects LeanObject(s) to add + * @param object|array $objects Object(s) to add */ public function add($objects) { if (!is_array($objects)) { $objects = array($objects); } @@ -103,7 +103,7 @@ public function add($objects) { /** * Remove object(s) from the field * - * @param object|array $objects LeanObject(s) to remove + * @param object|array $objects Object(s) to remove */ public function remove($objects) { if (!is_array($objects)) { $objects = array($objects); } @@ -117,13 +117,13 @@ public function remove($objects) { /** * Query on the target class of relation * - * @return LeanQuery + * @return Query */ public function getQuery() { if ($this->targetClassName) { - $query = new LeanQuery($this->targetClassName); + $query = new Query($this->targetClassName); } else { - $query = new LeanQuery($this->parent->getClassName()); + $query = new Query($this->parent->getClassName()); $query->addOption("redirectClassNameForKey", $this->key); } $query->relatedTo($this->key, $this->parent); @@ -133,11 +133,11 @@ public function getQuery() { /** * Query on the parent class where child is in the relation * - * @param LeanObject $child Child object - * @return LeanQuery + * @param Object $child Child object + * @return Query */ - public function getReverseQuery(LeanObject $child) { - $query = new LeanQuery($this->parent->getClassName()); + public function getReverseQuery(Object $child) { + $query = new Query($this->parent->getClassName()); $query->equalTo($this->key, $child->getPointer()); return $query; } diff --git a/src/LeanCloud/LeanRole.php b/src/LeanCloud/Role.php similarity index 86% rename from src/LeanCloud/LeanRole.php rename to src/LeanCloud/Role.php index 780cecc..c13f54f 100644 --- a/src/LeanCloud/LeanRole.php +++ b/src/LeanCloud/Role.php @@ -10,15 +10,15 @@ * write permission. * * All users of a role could be queried by `$role->getUsers()`, which - * is an instance of LeanRelation, where users can be added or + * is an instance of Relation, where users can be added or * removed. * * Roles can belong to role as well, which can be got by * `$role->getRoles()`, where roles can be added or removed. * - * @see LeanACL, LeanRelation + * @see ACL, Relation */ -class LeanRole extends LeanObject { +class Role extends Object { /** * Table name on LeanCloud * @var string @@ -31,7 +31,7 @@ class LeanRole extends LeanObject { * The name can contain only alphanumeric characters, _, -, and * space. It cannot be changed after being saved. * - * @return LeanRole + * @return Role */ public function setName($name) { $this->set("name", $name); @@ -50,7 +50,7 @@ public function getName() { /** * Get a relation of users that belongs to this role * - * @return LeanRelation + * @return Relation */ public function getUsers() { return $this->getRelation("users"); @@ -59,7 +59,7 @@ public function getUsers() { /** * Get a relation of roles that belongs to this role * - * @return LeanRelation + * @return Relation */ public function getRoles() { return $this->getRelation("roles"); diff --git a/src/LeanCloud/Storage/IStorage.php b/src/LeanCloud/Storage/IStorage.php index cd783bc..5d8a2ad 100644 --- a/src/LeanCloud/Storage/IStorage.php +++ b/src/LeanCloud/Storage/IStorage.php @@ -6,8 +6,8 @@ * Storage Interface * * Simple key-value storage interface for persisting session related - * data. At SDK level, it is attached to LeanClient, and used for - * storing session token of a logged-in LeanUser. + * data. At SDK level, it is attached to Client, and used for + * storing session token of a logged-in User. * */ interface IStorage { diff --git a/src/LeanCloud/Uploader/QCloudUploader.php b/src/LeanCloud/Uploader/QCloudUploader.php index c9870c8..7a5b66b 100644 --- a/src/LeanCloud/Uploader/QCloudUploader.php +++ b/src/LeanCloud/Uploader/QCloudUploader.php @@ -1,7 +1,7 @@ hash("sha1", $content) ), $boundary); - $headers[] = "User-Agent: " . LeanClient::getVersionString(); + $headers[] = "User-Agent: " . Client::getVersionString(); $headers[] = "Content-Type: multipart/form-data;" . " boundary={$boundary}"; // $headers[] = "Content-Length: " . strlen($body); diff --git a/src/LeanCloud/Uploader/QiniuUploader.php b/src/LeanCloud/Uploader/QiniuUploader.php index 8f8f007..aed8f80 100644 --- a/src/LeanCloud/Uploader/QiniuUploader.php +++ b/src/LeanCloud/Uploader/QiniuUploader.php @@ -2,7 +2,7 @@ namespace LeanCloud\Uploader; -use LeanCloud\LeanClient; +use LeanCloud\Client; /** * Qiniu file uploader @@ -41,7 +41,7 @@ public function upload($content, $mimeType, $key) { "crc32" => $this->crc32Data($content) ), $boundary); - $headers[] = "User-Agent: " . LeanClient::getVersionString(); + $headers[] = "User-Agent: " . Client::getVersionString(); $headers[] = "Content-Type: multipart/form-data;" . " boundary={$boundary}"; $headers[] = "Content-Length: " . strlen($body); diff --git a/src/LeanCloud/Uploader/S3Uploader.php b/src/LeanCloud/Uploader/S3Uploader.php index 019edd6..f620abd 100644 --- a/src/LeanCloud/Uploader/S3Uploader.php +++ b/src/LeanCloud/Uploader/S3Uploader.php @@ -1,7 +1,7 @@ getUploadUrl()) { throw new \RuntimeException("Please initialize with pre-signed url."); } - $headers[] = "User-Agent: " . LeanClient::getVersionString(); + $headers[] = "User-Agent: " . Client::getVersionString(); $headers[] = "Content-Type: $mimeType"; $url = $this->getUploadUrl(); $ch = curl_init($url); @@ -44,4 +44,4 @@ public function upload($content, $mimeType, $name=null) { } return true; } -} \ No newline at end of file +} diff --git a/src/LeanCloud/Uploader/SimpleUploader.php b/src/LeanCloud/Uploader/SimpleUploader.php index 54aab24..a6bf293 100644 --- a/src/LeanCloud/Uploader/SimpleUploader.php +++ b/src/LeanCloud/Uploader/SimpleUploader.php @@ -91,4 +91,4 @@ public function getAuthToken() { } abstract public function upload($content, $mimeType, $key); -} \ No newline at end of file +} diff --git a/src/LeanCloud/LeanUser.php b/src/LeanCloud/User.php similarity index 89% rename from src/LeanCloud/LeanUser.php rename to src/LeanCloud/User.php index 6028ab6..b3edf91 100644 --- a/src/LeanCloud/LeanUser.php +++ b/src/LeanCloud/User.php @@ -1,8 +1,8 @@ getObjectId()) { $path = "/users/{$this->getObjectId()}/updatePassword"; - $resp = LeanClient::put($path, array("old_password" => $old, + $resp = Client::put($path, array("old_password" => $old, "new_password" => $new), $this->getSessionToken()); $this->mergeAfterFetch($resp); @@ -186,7 +186,7 @@ public function getSessionToken() { * @param string $token Session token of logged-in user */ public static function setCurrentSessionToken($token) { - LeanClient::getStorage()->set("LC_SessionToken", $token); + Client::getStorage()->set("LC_SessionToken", $token); } /** @@ -195,16 +195,16 @@ public static function setCurrentSessionToken($token) { * @return string */ public static function getCurrentSessionToken() { - return LeanClient::getStorage()->get("LC_SessionToken"); + return Client::getStorage()->get("LC_SessionToken"); } /** * Get currently logged-in user * - * @return LeanUser + * @return User */ public static function getCurrentUser() { - if (self::$currentUser instanceof LeanUser) { + if (self::$currentUser instanceof User) { return self::$currentUser; } $token = static::getCurrentSessionToken(); @@ -216,7 +216,7 @@ public static function getCurrentUser() { /** * Save logged-in user and session token * - * @param LeanUser + * @param User */ public static function saveCurrentUser($user) { self::$currentUser = $user; @@ -237,11 +237,11 @@ private static function clearCurrentUser() { * And set current user. * * @param string $token Session token - * @return LeanUser + * @return User * @throws CloudException */ public static function become($token) { - $resp = LeanClient::get("/users/me", + $resp = Client::get("/users/me", array("session_token" => $token)); $user = new static(); $user->mergeAfterFetch($resp); @@ -257,11 +257,11 @@ public static function become($token) { * * @param string $username * @param string $password - * @return LeanUser + * @return User * @throws CloudException */ public static function logIn($username, $password) { - $resp = LeanClient::post("/login", array("username" => $username, + $resp = Client::post("/login", array("username" => $username, "password" => $password)); $user = new static(); $user->mergeAfterFetch($resp); @@ -276,7 +276,7 @@ public static function logOut() { $user = static::getCurrentUser(); if ($user) { try { - LeanClient::post("/logout", null, $user->getSessionToken()); + Client::post("/logout", null, $user->getSessionToken()); } catch (CloudException $exp) { // skip } @@ -289,12 +289,12 @@ public static function logOut() { * * @param string $phoneNumber * @param string $password - * @return LeanUser + * @return User */ public static function logInWithMobilePhoneNumber($phoneNumber, $password) { $params = array("mobilePhoneNumber" => $phoneNumber, "password" => $password); - $resp = LeanClient::post("/login", $params); + $resp = Client::post("/login", $params); $user = new static(); $user->mergeAfterFetch($resp); static::saveCurrentUser($user); @@ -309,12 +309,12 @@ public static function logInWithMobilePhoneNumber($phoneNumber, $password) { * * @param string $phoneNumber Registered mobile phone number * @param string $smsCode - * @return LeanUser + * @return User */ public static function logInWithSmsCode($phoneNumber, $smsCode) { $params = array("mobilePhoneNumber" => $phoneNumber, "smsCode" => $smsCode); - $resp = LeanClient::get("/login", $params); + $resp = Client::get("/login", $params); $user = new static(); $user->mergeAfterFetch($resp); static::saveCurrentUser($user); @@ -330,7 +330,7 @@ public static function logInWithSmsCode($phoneNumber, $smsCode) { * @param string $phoneNumber Register mobile phone number */ public static function requestLoginSmsCode($phoneNumber) { - LeanClient::post("/requestLoginSmsCode", + Client::post("/requestLoginSmsCode", array("mobilePhoneNumber" => $phoneNumber)); } @@ -342,7 +342,7 @@ public static function requestLoginSmsCode($phoneNumber) { * @param string $email */ public static function requestEmailVerify($email) { - LeanClient::post("/requestEmailVerify", array("email" => $email)); + Client::post("/requestEmailVerify", array("email" => $email)); } /** @@ -351,7 +351,7 @@ public static function requestEmailVerify($email) { * @param string $email Registered email */ public static function requestPasswordReset($email) { - LeanClient::post("/requestPasswordReset", array("email" => $email)); + Client::post("/requestPasswordReset", array("email" => $email)); } /** @@ -362,7 +362,7 @@ public static function requestPasswordReset($email) { * @param string $phoneNumber Registered mobile phone number */ public static function requestPasswordResetBySmsCode($phoneNumber) { - LeanClient::post("/requestPasswordResetBySmsCode", + Client::post("/requestPasswordResetBySmsCode", array("mobilePhoneNumber" => $phoneNumber)); } @@ -373,7 +373,7 @@ public static function requestPasswordResetBySmsCode($phoneNumber) { * @param string $newPassword */ public static function resetPasswordBySmsCode($smsCode, $newPassword) { - LeanClient::put("/resetPasswordBySmsCode/{$smsCode}", + Client::put("/resetPasswordBySmsCode/{$smsCode}", array("password" => $newPassword)); } @@ -385,7 +385,7 @@ public static function resetPasswordBySmsCode($smsCode, $newPassword) { * @param string $phoneNumber */ public static function requestMobilePhoneVerify($phoneNumber) { - LeanClient::post("/requestMobilePhoneVerify", + Client::post("/requestMobilePhoneVerify", array("mobilePhoneNumber" => $phoneNumber)); } @@ -395,7 +395,7 @@ public static function requestMobilePhoneVerify($phoneNumber) { * @param string $smsCode */ public static function verifyMobilePhone($smsCode) { - LeanClient::post("/verifyMobilePhone/{$smsCode}", null); + Client::post("/verifyMobilePhone/{$smsCode}", null); } @@ -425,7 +425,7 @@ public static function verifyMobilePhone($smsCode) { * * @param string $provider Provider name * @param array $authToken Auth token - * @return LeanUser + * @return User */ public static function logInWith($provider, $authToken) { $user = new static(); diff --git a/tests/GeoPointTest.php b/tests/GeoPointTest.php index 7454cbf..721374c 100644 --- a/tests/GeoPointTest.php +++ b/tests/GeoPointTest.php @@ -48,4 +48,4 @@ public function testRadiansDistance() { $this->assertEquals(39.9 * M_PI / 180.0, $rad, '', 0.0000001); } -} \ No newline at end of file +} diff --git a/tests/LeanACLTest.php b/tests/LeanACLTest.php index 630516c..cd694bd 100644 --- a/tests/LeanACLTest.php +++ b/tests/LeanACLTest.php @@ -1,22 +1,22 @@ encode(); $this->assertEquals(true, $out["id123"]["read"]); $this->assertEquals(true, $out["id123"]["write"]); @@ -28,27 +28,27 @@ public function testInitializeUserACL() { * @link https://github.com/leancloud/php-sdk/issues/84 */ public function testEmptyACL() { - $acl = new LeanACL(); + $acl = new ACL(); $out = $acl->encode(); $this->assertEquals("{}", json_encode($out)); } public function testSetPublicAccess() { - $acl = new LeanACL(); + $acl = new ACL(); $acl->setPublicReadAccess(true); $out = $acl->encode(); - $this->assertEquals(true, $out[LeanACL::PUBLIC_KEY]["read"]); + $this->assertEquals(true, $out[ACL::PUBLIC_KEY]["read"]); $this->assertEquals(true, $acl->getPublicReadAccess()); $acl->setPublicWriteAccess(false); $out = $acl->encode(); - $this->assertEquals(false, $out[LeanACL::PUBLIC_KEY]["write"]); + $this->assertEquals(false, $out[ACL::PUBLIC_KEY]["write"]); $this->assertEquals(false, $acl->getPublicWriteAccess()); } public function testSetUserAccess() { - $user = new LeanUser(null, "id123"); - $acl = new LeanACL(); + $user = new User(null, "id123"); + $acl = new ACL(); $acl->setReadAccess($user, true); $out = $acl->encode(); $this->assertEquals(true, $out[$user->getObjectId()]["read"]); @@ -61,10 +61,10 @@ public function testSetUserAccess() { } public function testSetRoleAccess() { - $role = new LeanRole(); + $role = new Role(); $role->setName("admin"); - $role->setACL(new LeanACL()); - $acl = new LeanACL(); + $role->setACL(new ACL()); + $acl = new ACL(); $acl->setRoleReadAccess($role, true); $out = $acl->encode(); $this->assertEquals(true, $out["role:admin"]["read"]); @@ -77,7 +77,7 @@ public function testSetRoleAccess() { } public function testSetRoleAccessWithRoleName() { - $acl = new LeanACL(); + $acl = new ACL(); $acl->setRoleReadAccess("admin", true); $out = $acl->encode(); $this->assertEquals(true, $out["role:admin"]["read"]); diff --git a/tests/LeanAPITest.php b/tests/LeanAPITest.php index cc42d3b..f20125e 100644 --- a/tests/LeanAPITest.php +++ b/tests/LeanAPITest.php @@ -1,5 +1,5 @@ "alice"); - $resp = LeanClient::post("/classes/TestObject", $obj); + $resp = Client::post("/classes/TestObject", $obj); $this->setExpectedException("LeanCloud\CloudException", "111 Invalid value type for field", 111); - $resp2 = LeanClient::put("/classes/TestObject/" . $resp["objectId"], + $resp2 = Client::put("/classes/TestObject/" . $resp["objectId"], array("name" => array("__op" => "Increment", "amount" => 1))); - LeanClient::delete("/classes/TestObject/{$resp['objectId']}"); + Client::delete("/classes/TestObject/{$resp['objectId']}"); } /** @@ -35,7 +35,7 @@ public function testIncrementOnNewObject() { $obj = array("name" => "alice", "score" => array("__op" => "Increment", "amount" => 1)); - $resp = LeanClient::post("/classes/TestObject", $obj); + $resp = Client::post("/classes/TestObject", $obj); $this->assertNotEmpty($resp["objectId"]); } @@ -43,56 +43,56 @@ public function testAddOnNewObject() { $obj = array("name" => "alice", "tags" => array("__op" => "Add", "objects" => array("frontend"))); - $resp = LeanClient::post("/classes/TestObject", $obj); + $resp = Client::post("/classes/TestObject", $obj); $this->assertNotEmpty($resp["objectId"]); - LeanClient::delete("/classes/TestObject/{$resp['objectId']}"); + Client::delete("/classes/TestObject/{$resp['objectId']}"); } public function testAddUniqueOnAddField() { $obj = array("name" => "alice", "tags" => array("__op" => "Add", "objects" => array("frontend", "frontend"))); - $resp = LeanClient::post("/classes/TestObject", $obj); + $resp = Client::post("/classes/TestObject", $obj); $this->assertNotEmpty($resp["objectId"]); - $resp2 = LeanClient::get("/classes/TestObject/{$resp["objectId"]}"); + $resp2 = Client::get("/classes/TestObject/{$resp["objectId"]}"); $this->assertEquals(array("frontend", "frontend"), $resp2["tags"]); - $resp3 = LeanClient::put("/classes/TestObject/{$resp["objectId"]}", + $resp3 = Client::put("/classes/TestObject/{$resp["objectId"]}", array("tags" => array("__op" => "AddUnique", "objects" => array("css")))); // AddUnique will not remove exsiting duplicate items - $resp4 = LeanClient::get("/classes/TestObject/{$resp["objectId"]}"); + $resp4 = Client::get("/classes/TestObject/{$resp["objectId"]}"); $this->assertEquals(array("frontend", "frontend", "css"), $resp4["tags"]); - LeanClient::delete("/classes/TestObject/{$resp['objectId']}"); + Client::delete("/classes/TestObject/{$resp['objectId']}"); } public function testHeterogeneousObjectsInArray() { $obj = array("name" => "alice", "tags" => array("foo", 42, array("a", "b"))); - $resp = LeanClient::post("/classes/TestObject", $obj); + $resp = Client::post("/classes/TestObject", $obj); $this->assertNotEmpty($resp["objectId"]); - LeanClient::delete("/classes/TestObject/{$resp['objectId']}"); + Client::delete("/classes/TestObject/{$resp['objectId']}"); } public function testSetHashValue() { $obj = array("name" => "alice", "attr" => array("age" => 12, "gender" => "female")); - $resp = LeanClient::post("/classes/TestObject", $obj); + $resp = Client::post("/classes/TestObject", $obj); $this->assertNotEmpty($resp["objectId"]); // Add hash pair to hash field is not valid $this->setExpectedException("LeanCloud\CloudException", null, 1); - $resp2 = LeanClient::put("/classes/TestObject/{$resp["objectId"]}", + $resp2 = Client::put("/classes/TestObject/{$resp["objectId"]}", array("attr" => array( "__op" => "add", "objects" => array("favColor" => "Orange")))); - LeanClient::delete("/classes/TestObject/{$resp['objectId']}"); + Client::delete("/classes/TestObject/{$resp['objectId']}"); } public function testAddRelation() { @@ -103,10 +103,10 @@ public function testAddRelation() { "objectId" => "abc001"))); $obj = array("name" => "alice", "likes" => $adds); - $resp = LeanClient::post("/classes/TestObject", $obj); + $resp = Client::post("/classes/TestObject", $obj); $this->assertNotEmpty($resp["objectId"]); - LeanClient::delete("/classes/TestObject/{$resp['objectId']}"); + Client::delete("/classes/TestObject/{$resp['objectId']}"); } public function testRelationBatchOp() { @@ -124,9 +124,9 @@ public function testRelationBatchOp() { "likes" => array("__op" => "Batch", "ops" => array($adds, $removes))); $this->setExpectedException("LeanCloud\CloudException", null, 301); - $resp = LeanClient::post("/classes/TestObject", $obj); + $resp = Client::post("/classes/TestObject", $obj); // $this->assertNotEmpty($resp["objectId"]); - // LeanClient::delete("/classes/TestObject/{$resp['objectId']}"); + // Client::delete("/classes/TestObject/{$resp['objectId']}"); } /** @@ -137,7 +137,7 @@ public function testRelationBatchOp() { */ public function testBatchOperationOnArray() { $obj = array("name" => "Batch test", "tags" => array()); - $resp = LeanClient::post("/classes/TestObject", $obj); + $resp = Client::post("/classes/TestObject", $obj); $this->assertNotEmpty($resp["objectId"]); @@ -149,17 +149,17 @@ public function testBatchOperationOnArray() { "ops" => array($adds, $removes))); $this->setExpectedException("LeanCloud\CloudException", null, 301); - $resp = LeanClient::put("/classes/TestObject/{$resp['objectId']}", + $resp = Client::put("/classes/TestObject/{$resp['objectId']}", $obj); - LeanClient::delete("/classes/TestObject/{$obj['objectId']}"); + Client::delete("/classes/TestObject/{$obj['objectId']}"); } public function testBatchGet() { $obj1 = array("name" => "alice 1"); $obj2 = array("name" => "alice 2"); - $resp1 = LeanClient::post("/classes/TestObject", $obj1); - $resp2 = LeanClient::post("/classes/TestObject", $obj2); + $resp1 = Client::post("/classes/TestObject", $obj1); + $resp2 = Client::post("/classes/TestObject", $obj2); $this->assertNotEmpty($resp1["objectId"]); $this->assertNotEmpty($resp2["objectId"]); @@ -167,7 +167,7 @@ public function testBatchGet() { "method" => "GET"); $req[] = array("path" => "/1.1/classes/TestObject/{$resp2['objectId']}", "method" => "GET"); - $resp = LeanClient::post("/batch", array("requests" => $req)); + $resp = Client::post("/batch", array("requests" => $req)); $this->assertEquals(2, count($resp)); $this->assertEquals($resp1["objectId"], $resp[0]["success"]["objectId"]); $this->assertEquals($resp2["objectId"], $resp[1]["success"]["objectId"]); @@ -175,35 +175,35 @@ public function testBatchGet() { public function testBatchGetNotFound() { $obj = array("name" => "alice"); - $resp = LeanClient::post("/classes/TestObject", $obj); + $resp = Client::post("/classes/TestObject", $obj); $this->assertNotEmpty($resp["objectId"]); $req[] = array("path" => "/1.1/classes/TestObject/{$resp['objectId']}", "method" => "GET"); $req[] = array("path" => "/1.1/classes/TestObject/nonexistent_id", "method" => "GET"); - $resp2 = LeanClient::batch($req); + $resp2 = Client::batch($req); $this->assertNotEmpty($resp2[0]["success"]); $this->assertEmpty($resp2[1]["success"]); // empty when not found - LeanClient::delete("/classes/TestObject/{$resp['objectId']}"); + Client::delete("/classes/TestObject/{$resp['objectId']}"); } public function testUserLogin() { $data = array("username" => "testuser", "password" => "5akf#a?^G", "phone" => "18612340000"); - $resp = LeanClient::post("/users", $data); + $resp = Client::post("/users", $data); $this->assertNotEmpty($resp["objectId"]); $this->assertNotEmpty($resp["sessionToken"]); $id = $resp["objectId"]; - $resp = LeanClient::get("/users/me", + $resp = Client::get("/users/me", array("session_token" => $resp["sessionToken"])); $this->assertNotEmpty($resp["objectId"]); - LeanClient::delete("/users/{$id}", $resp["sessionToken"]); + Client::delete("/users/{$id}", $resp["sessionToken"]); // Raise 211: Could not find user. $this->setExpectedException("LeanCloud\CloudException", null, 211); - $resp = LeanClient::get("/users/me", + $resp = Client::get("/users/me", array("session_token" => "non-existent-token")); } diff --git a/tests/LeanBytesTest.php b/tests/LeanBytesTest.php index be06f1e..fd45398 100644 --- a/tests/LeanBytesTest.php +++ b/tests/LeanBytesTest.php @@ -1,38 +1,38 @@ encode(); $this->assertEquals("Bytes", $out["__type"]); $this->assertEquals("", $out["base64"]); } public function testEncodeArray() { - $bytes = LeanBytes::createFromByteArray(array(72, 101, 108, 108, 111)); + $bytes = Bytes::createFromByteArray(array(72, 101, 108, 108, 111)); $out = $bytes->encode(); $this->assertEquals("Bytes", $out["__type"]); $this->assertEquals(base64_encode("Hello"), $out["base64"]); } public function testCreateFromEmptyString() { - $bytes = LeanBytes::createFromBase64Data(base64_encode("")); + $bytes = Bytes::createFromBase64Data(base64_encode("")); $this->assertEmpty($bytes->getByteArray()); $this->assertEquals("", $bytes->asString()); } public function testCreateFromBase64() { - $bytes = LeanBytes::createFromByteArray(array(72, 101, 108, 108, 111)); - $bytes1 = LeanBytes::createFromBase64Data(base64_encode("Hello")); + $bytes = Bytes::createFromByteArray(array(72, 101, 108, 108, 111)); + $bytes1 = Bytes::createFromBase64Data(base64_encode("Hello")); $this->assertEquals($bytes->getByteArray(), $bytes1->getByteArray()); $this->assertEquals("Hello", $bytes->asString()); $this->assertEquals("Hello", $bytes1->asString()); } public function testEncodeCreateFromBase64() { - $bytes = LeanBytes::createFromBase64Data(base64_encode("Hello")); + $bytes = Bytes::createFromBase64Data(base64_encode("Hello")); $out = $bytes->encode(); $this->assertEquals(base64_encode("Hello"), $out["base64"]); } diff --git a/tests/LeanClientTest.php b/tests/LeanClientTest.php index 87ed6ab..035c9da 100644 --- a/tests/LeanClientTest.php +++ b/tests/LeanClientTest.php @@ -1,45 +1,45 @@ assertEquals(LeanClient::getAPIEndpoint(), + Client::useRegion("CN"); + $this->assertEquals(Client::getAPIEndpoint(), "https://api.leancloud.cn/1.1"); } public function testUseInvalidRegion() { $this->setExpectedException("RuntimeException", "Invalid API region"); - LeanClient::useRegion("cn-bla"); + Client::useRegion("cn-bla"); } public function testUseRegion() { - LeanClient::useRegion("US"); - $this->assertEquals(LeanClient::getAPIEndpoint(), + Client::useRegion("US"); + $this->assertEquals(Client::getAPIEndpoint(), "https://us-api.leancloud.cn/1.1"); } public function testVerifyKey() { - $result = LeanClient::verifyKey( + $result = Client::verifyKey( getenv("LC_APP_ID"), getenv("LC_APP_KEY") ); @@ -47,7 +47,7 @@ public function testVerifyKey() { } public function testVerifyKeyMaster() { - $result = LeanClient::verifyKey( + $result = Client::verifyKey( getenv("LC_APP_ID"), getenv("LC_APP_MASTER_KEY") . ",master" ); @@ -57,61 +57,61 @@ public function testVerifyKeyMaster() { public function testVerifySign() { $time = time(); $sign = md5($time . getenv("LC_APP_KEY")) . ",{$time}"; - $result = LeanClient::verifySign(getenv("LC_APP_ID"), $sign); + $result = Client::verifySign(getenv("LC_APP_ID"), $sign); $this->assertTrue($result); } public function testVerifySignMaster() { $time = time(); $sign = md5($time . getenv("LC_APP_MASTER_KEY")) . ",{$time},master"; - $result = LeanClient::verifySign(getenv("LC_APP_ID"), $sign); + $result = Client::verifySign(getenv("LC_APP_ID"), $sign); $this->assertTrue($result); } public function testUseMasterKeyByDefault() { - LeanClient::useMasterKey(true); - $headers = LeanClient::buildHeaders("token", null); + Client::useMasterKey(true); + $headers = Client::buildHeaders("token", null); $this->assertContains("master", $headers["X-LC-Sign"]); - $headers = LeanClient::buildHeaders("token", true); + $headers = Client::buildHeaders("token", true); $this->assertContains("master", $headers["X-LC-Sign"]); - $headers = LeanClient::buildHeaders("token", false); + $headers = Client::buildHeaders("token", false); $this->assertNotContains("master", $headers["X-LC-Sign"]); } public function testNotUseMasterKeyByDefault() { - LeanClient::useMasterKey(false); - $headers = LeanClient::buildHeaders("token", null); + Client::useMasterKey(false); + $headers = Client::buildHeaders("token", null); $this->assertNotContains("master", $headers["X-LC-Sign"]); - $headers = LeanClient::buildHeaders("token", false); + $headers = Client::buildHeaders("token", false); $this->assertNotContains("master", $headers["X-LC-Sign"]); - $headers = LeanClient::buildHeaders("token", true); + $headers = Client::buildHeaders("token", true); $this->assertContains("master", $headers["X-LC-Sign"]); } public function testRequestServerDate() { - $data = LeanClient::request("GET", "/date", null); + $data = Client::request("GET", "/date", null); $this->assertEquals($data["__type"], "Date"); } public function testRequestUnauthorized() { - LeanClient::initialize(getenv("LC_APP_ID"), + Client::initialize(getenv("LC_APP_ID"), "invalid key", "invalid master key"); $this->setExpectedException("LeanCloud\CloudException", "Unauthorized"); - $data = LeanClient::request("POST", + $data = Client::request("POST", "/classes/TestObject", array("name" => "alice", "story" => "in wonderland")); - LeanClient::delete("/classes/TestObject/{$data['objectId']}"); + Client::delete("/classes/TestObject/{$data['objectId']}"); } public function testRequestTestObject() { - $data = LeanClient::request("POST", + $data = Client::request("POST", "/classes/TestObject", array( "name" => "alice", @@ -119,69 +119,69 @@ public function testRequestTestObject() { $this->assertArrayHasKey("objectId", $data); $id = $data["objectId"]; - $data = LeanClient::request("GET", + $data = Client::request("GET", "/classes/TestObject/" . $id, null); $this->assertEquals($data["name"], "alice"); - LeanClient::delete("/classes/TestObject/{$data['objectId']}"); + Client::delete("/classes/TestObject/{$data['objectId']}"); } public function testPostCreateTestObject() { - $data = LeanClient::post("/classes/TestObject", + $data = Client::post("/classes/TestObject", array("name" => "alice", "story" => "in wonderland")); $this->assertArrayHasKey("objectId", $data); - LeanClient::delete("/classes/TestObject/{$data['objectId']}"); + Client::delete("/classes/TestObject/{$data['objectId']}"); } public function testGetTestObject() { - $data = LeanClient::post("/classes/TestObject", + $data = Client::post("/classes/TestObject", array("name" => "alice", "story" => "in wonderland")); $this->assertArrayHasKey("objectId", $data); - $obj = LeanClient::get("/classes/TestObject/{$data['objectId']}"); + $obj = Client::get("/classes/TestObject/{$data['objectId']}"); $this->assertEquals($obj["name"], "alice"); $this->assertEquals($obj["story"], "in wonderland"); - LeanClient::delete("/classes/TestObject/{$obj['objectId']}"); + Client::delete("/classes/TestObject/{$obj['objectId']}"); } public function testUpdateTestObject() { - $data = LeanClient::post("/classes/TestObject", + $data = Client::post("/classes/TestObject", array("name" => "alice", "story" => "in wonderland")); $this->assertArrayHasKey("objectId", $data); - LeanClient::put("/classes/TestObject/{$data['objectId']}", + Client::put("/classes/TestObject/{$data['objectId']}", array("name" => "Hiccup", "story" => "How to train your dragon")); - $obj = LeanClient::get("/classes/TestObject/{$data['objectId']}"); + $obj = Client::get("/classes/TestObject/{$data['objectId']}"); $this->assertEquals($obj["name"], "Hiccup"); $this->assertEquals($obj["story"], "How to train your dragon"); - LeanClient::delete("/classes/TestObject/{$obj['objectId']}"); + Client::delete("/classes/TestObject/{$obj['objectId']}"); } public function testDeleteTestObject() { - $data = LeanClient::post("/classes/TestObject", + $data = Client::post("/classes/TestObject", array("name" => "alice", "story" => "in wonderland")); $this->assertArrayHasKey("objectId", $data); - LeanClient::delete("/classes/TestObject/{$data['objectId']}"); + Client::delete("/classes/TestObject/{$data['objectId']}"); - $obj = LeanClient::get("/classes/TestObject/{$data['objectId']}"); + $obj = Client::get("/classes/TestObject/{$data['objectId']}"); $this->assertEmpty($obj); } public function testDecodeDate() { $date = new DateTime(); $type = array("__type" => "Date", - "iso" => LeanClient::formatDate($date)); - $this->assertEquals($date, LeanClient::decode($type, null)); + "iso" => Client::formatDate($date)); + $this->assertEquals($date, Client::decode($type, null)); } public function testDecodeDateWithTimeZone() { @@ -190,16 +190,16 @@ public function testDecodeDateWithTimeZone() { forEach($zones as $zone) { $date = new DateTime("now", new DateTimeZone($zone)); $type = array("__type" => "Date", - "iso" => LeanClient::formatDate($date)); - $this->assertEquals($date, LeanClient::decode($type, null)); + "iso" => Client::formatDate($date)); + $this->assertEquals($date, Client::decode($type, null)); } } public function testDecodeRelation() { $type = array("__type" => "Relation", "className" => "TestObject"); - $val = LeanClient::decode($type, null); - $this->assertTrue($val instanceof LeanRelation); + $val = Client::decode($type, null); + $this->assertTrue($val instanceof Relation); $this->assertEquals("TestObject", $val->getTargetClassName()); } @@ -207,9 +207,9 @@ public function testDecodePointer() { $type = array("__type" => "Pointer", "className" => "TestObject", "objectId" => "abc101"); - $val = LeanClient::decode($type, null); + $val = Client::decode($type, null); - $this->assertTrue($val instanceof LeanObject); + $this->assertTrue($val instanceof Object); $this->assertEquals("TestObject", $val->getClassName()); } @@ -219,9 +219,9 @@ public function testDecodeObject() { "objectId" => "abc101", "name" => "alice", "tags" => array("fiction", "bar")); - $val = LeanClient::decode($type, null); + $val = Client::decode($type, null); - $this->assertTrue($val instanceof LeanObject); + $this->assertTrue($val instanceof Object); $this->assertEquals("TestObject", $val->getClassName()); $this->assertEquals($type["name"], $val->get("name")); $this->assertEquals($type["tags"], $val->get("tags")); @@ -230,8 +230,8 @@ public function testDecodeObject() { public function testDecodeBytes() { $type = array("__type" => "Bytes", "base64" => base64_encode("Hello")); - $val = LeanClient::decode($type, null); - $this->assertTrue($val instanceof LeanBytes); + $val = Client::decode($type, null); + $this->assertTrue($val instanceof Bytes); $this->assertEquals(array(72, 101, 108, 108, 111), $val->getByteArray()); } @@ -242,9 +242,9 @@ public function testDecodeUserObject() { "objectId" => "abc101", "username" => "alice", "email" => "alice@example.com"); - $val = LeanClient::decode($type, null); + $val = Client::decode($type, null); - $this->assertTrue($val instanceof LeanUser); + $this->assertTrue($val instanceof User); $this->assertEquals($type["objectId"], $val->getObjectId()); $this->assertEquals($type["username"], $val->getUsername()); $this->assertEquals($type["email"], $val->getEmail()); @@ -254,9 +254,9 @@ public function testDecodeUserPointer() { $type = array("__type" => "Pointer", "className" => "_User", "objectId" => "abc101"); - $val = LeanClient::decode($type, null); + $val = Client::decode($type, null); - $this->assertTrue($val instanceof LeanUser); + $this->assertTrue($val instanceof User); $this->assertEquals($type["objectId"], $val->getObjectId()); } @@ -265,9 +265,9 @@ public function testDecodeFile() { "objectId" => "abc101", "name" => "favicon.ico", "url" => "https://leancloud.cn/favicon.ico"); - $val = LeanClient::decode($type, null); + $val = Client::decode($type, null); - $this->assertTrue($val instanceof LeanFile); + $this->assertTrue($val instanceof File); $this->assertEquals($type["objectId"], $val->getObjectId()); $this->assertEquals($type["name"], $val->getName()); $this->assertEquals($type["url"], $val->getUrl()); @@ -279,8 +279,8 @@ public function testDecodeACL() { "user123" => array("write" => true), "role:admin" => array("write" => true) ); - $val = LeanClient::decode($type, 'ACL'); - $this->assertTrue($val instanceof LeanACL); + $val = Client::decode($type, 'ACL'); + $this->assertTrue($val instanceof ACL); $this->assertTrue($val->getPublicReadAccess()); $this->assertFalse($val->getPublicWriteAccess()); $this->assertTrue($val->getRoleWriteAccess("admin")); @@ -307,15 +307,15 @@ public function testDecodeRecursiveObjectWithACL() { 'ACL' => $acl ) ); - $val = LeanClient::decode($type, null); - $this->assertTrue($val instanceof LeanObject); + $val = Client::decode($type, null); + $this->assertTrue($val instanceof Object); $this->assertEquals('alice', $val->get('name')); - $this->assertTrue($val->getACL() instanceof LeanACL); + $this->assertTrue($val->getACL() instanceof ACL); $parent = $val->get("parent"); - $this->assertTrue($parent instanceof LeanObject); + $this->assertTrue($parent instanceof Object); $this->assertEquals('jill', $parent->get('name')); - $this->assertTrue($parent->getACL() instanceof LeanACL); + $this->assertTrue($parent->getACL() instanceof ACL); } /* @@ -326,12 +326,12 @@ public function testDecodeRecursiveObjectWithACL() { * @link bug #43: https://github.com/leancloud/php-sdk/issues/43 */ public function testDecodeIndexedArrayValue() { - $val = LeanClient::decode(array( + $val = Client::decode(array( '__type' => 'Pointer', 'className' => 'TestObject', 'objectId' => '5682bd' ), 0); - $this->assertTrue($val instanceof LeanObject); + $this->assertTrue($val instanceof Object); } public function testDecodeGeoPoint() { @@ -340,19 +340,19 @@ public function testDecodeGeoPoint() { 'latitude' => 39.9, 'longitude' => 116.4 ); - $val = LeanClient::decode($type, null); + $val = Client::decode($type, null); $this->assertTrue($val instanceof GeoPoint); $this->assertEquals(39.9, $val->getLatitude()); $this->assertEquals(116.4, $val->getLongitude()); } public function testEncodeObjectToJSON() { - $a = new LeanObject("TestObject", "id001"); - $b = new LeanObject("TestObject", "id002"); + $a = new Object("TestObject", "id001"); + $b = new Object("TestObject", "id002"); $a->set("name", "A"); $b->set("name", "B"); $a->addIn("likes", $b); - $jsonA = LeanClient::encode($a, "toJSON"); + $jsonA = Client::encode($a, "toJSON"); $jsonB = $jsonA["likes"][0]; // top level object A will be encoded as literal json $this->assertEquals("A", $jsonA["name"]); @@ -367,12 +367,12 @@ public function testEncodeObjectToJSON() { } public function testEncodeObjectToFullJSON() { - $a = new LeanObject("TestObject", "id001"); - $b = new LeanObject("TestObject", "id002"); + $a = new Object("TestObject", "id001"); + $b = new Object("TestObject", "id002"); $a->set("name", "A"); $b->set("name", "B"); $a->addIn("likes", $b); - $jsonA = LeanClient::encode($a, "toFullJSON"); + $jsonA = Client::encode($a, "toFullJSON"); $jsonB = $jsonA["likes"][0]; $this->assertEquals("A", $jsonA["name"]); $this->assertEquals("id001", $jsonA["objectId"]); @@ -385,16 +385,16 @@ public function testEncodeObjectToFullJSON() { } public function testEncodeCircularObjectAsPointer() { - $a = new LeanObject("TestObject", "id001"); - $b = new LeanObject("TestObject", "id002"); - $c = new LeanObject("TestObject", "id003"); + $a = new Object("TestObject", "id001"); + $b = new Object("TestObject", "id002"); + $c = new Object("TestObject", "id003"); $a->set("name", "A"); $b->set("name", "B"); $c->set("name", "C"); $a->addIn("likes", $b); $b->addIn("likes", $c); $c->addIn("likes", $a); - $jsonA = LeanClient::encode($a, "toFullJSON"); + $jsonA = Client::encode($a, "toFullJSON"); $jsonB = $jsonA["likes"][0]; $jsonC = $jsonB["likes"][0]; diff --git a/tests/LeanFileTest.php b/tests/LeanFileTest.php index a683115..7ac95d4 100644 --- a/tests/LeanFileTest.php +++ b/tests/LeanFileTest.php @@ -1,40 +1,40 @@ assertEquals("", $file->getName()); } public function testInitializeMimeType() { - $file = new LeanFile("test.txt"); + $file = new File("test.txt"); $this->assertEquals("text/plain", $file->getMimeType()); - $file = new LeanFile("test.txt", null, "image/png"); + $file = new File("test.txt", null, "image/png"); $this->assertEquals("image/png", $file->getMimeType()); } public function testCreateWithURL() { - $file = LeanFile::createWithUrl("blabla.png", "https://leancloud.cn/favicon.png"); + $file = File::createWithUrl("blabla.png", "https://leancloud.cn/favicon.png"); $this->assertEquals("blabla.png", $file->getName()); $this->assertEquals("https://leancloud.cn/favicon.png", $file->getUrl()); $this->assertEquals("image/png", $file->getMimeType()); } public function testSaveTextFile() { - $file = LeanFile::createWithData("test.txt", "Hello World!"); + $file = File::createWithData("test.txt", "Hello World!"); $file->save(); $this->assertNotEmpty($file->getObjectId()); $this->assertNotEmpty($file->getUrl()); @@ -47,7 +47,7 @@ public function testSaveTextFile() { } public function testSaveUTF8TextFile() { - $file = LeanFile::createWithData("testChinese.txt", "你好，中国!"); + $file = File::createWithData("testChinese.txt", "你好，中国!"); $file->save(); $this->assertNotEmpty($file->getUrl()); $this->assertEquals("text/plain", $file->getMimeType()); @@ -58,9 +58,9 @@ public function testSaveUTF8TextFile() { } public function testFetchFile() { - $file = LeanFile::createWithData("testFetch.txt", "你好，中国!"); + $file = File::createWithData("testFetch.txt", "你好，中国!"); $file->save(); - $file2 = LeanFile::fetch($file->getObjectId()); + $file2 = File::fetch($file->getObjectId()); $this->assertEquals($file->getUrl(), $file2->getUrl()); $this->assertEquals($file->getName(), $file2->getName()); $this->assertEquals($file->getSize(), $file2->getSize()); @@ -69,7 +69,7 @@ public function testFetchFile() { } public function testGetCreatedAtAndUpdatedAt() { - $file = LeanFile::createWithData("testTimestamp.txt", "你好，中国!"); + $file = File::createWithData("testTimestamp.txt", "你好，中国!"); $file->save(); $this->assertNotEmpty($file->getUrl()); $this->assertNotEmpty($file->getCreatedAt()); @@ -79,12 +79,12 @@ public function testGetCreatedAtAndUpdatedAt() { } public function testMetaData() { - $file = LeanFile::createWithData("testMetadata.txt", "你好，中国!"); + $file = File::createWithData("testMetadata.txt", "你好，中国!"); $file->setMeta("language", "zh-CN"); $file->setMeta("bool", false); $file->setMeta("downloads", 100); $file->save(); - $file2 = LeanFile::fetch($file->getObjectId()); + $file2 = File::fetch($file->getObjectId()); $this->assertEquals("zh-CN", $file2->getMeta("language")); $this->assertEquals(false, $file2->getMeta("bool")); $this->assertEquals(100, $file2->getMeta("downloads")); @@ -96,10 +96,10 @@ public function testMetaData() { * leancloud/php-sdk#46 */ public function testSaveObjectWithFile() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->set("name", "alice"); - $file = LeanFile::createWithData("test.txt", "你好，中国!"); + $file = File::createWithData("test.txt", "你好，中国!"); $obj->addIn("files", $file); $obj->save(); diff --git a/tests/LeanObjectTest.php b/tests/LeanObjectTest.php index 226d07b..5cca535 100644 --- a/tests/LeanObjectTest.php +++ b/tests/LeanObjectTest.php @@ -1,42 +1,42 @@ setExpectedException("InvalidArgumentException", "className is invalid."); - new LeanObject(); + new Object(); } public function testInitializeSubClass() { $movie = new Movie(); $this->assertTrue($movie instanceof Movie); - $this->assertTrue($movie instanceof LeanObject); + $this->assertTrue($movie instanceof Object); } public function testInitializePlainObject() { - $movie = new LeanObject("Movie"); + $movie = new Object("Movie"); $this->assertFalse($movie instanceof Movie); - $this->assertTrue($movie instanceof LeanObject); + $this->assertTrue($movie instanceof Object); } public function testSetGet() { @@ -75,7 +75,7 @@ public function testIncrement() { } public function testSaveNewObject() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->set("name", "Alice in wonderland"); $obj->set("score", 81); $obj->save(); @@ -88,14 +88,14 @@ public function testSaveNewObject() { } public function testSaveFetchObject() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->set("name", "Alice in wonderland"); $obj->set("score", 81); $obj->save(); $this->assertNotEmpty($obj->getObjectId()); $id = $obj->getObjectId(); - $obj2 = new LeanObject("TestObject", $id); + $obj2 = new Object("TestObject", $id); $obj2->fetch(); $this->assertEquals($obj2->get("name"), "Alice in wonderland"); $this->assertEquals($obj2->get("score"), 81); @@ -104,7 +104,7 @@ public function testSaveFetchObject() { } public function testSaveExistingObject() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->set("foo", "bar"); $obj->save(); $this->assertNotEmpty($obj->getObjectId()); @@ -114,7 +114,7 @@ public function testSaveExistingObject() { $obj->save(); $this->assertNotEmpty($obj->getUpdatedAt()); - $obj2 = new LeanObject("TestObject", $obj->getObjectId()); + $obj2 = new Object("TestObject", $obj->getObjectId()); $obj2->fetch(); $this->assertEquals($obj2->get("name"), "Alice in wonderland"); $this->assertEquals($obj2->get("score"), 81); @@ -123,7 +123,7 @@ public function testSaveExistingObject() { } public function testGetCreatedAtAndUpdatedAt() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->set("foo", "bar"); $obj->save(); $this->assertNotEmpty($obj->getCreatedAt()); @@ -138,12 +138,12 @@ public function testGetCreatedAtAndUpdatedAt() { } public function testCreateObjectWithId() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->set("foo", "bar"); $obj->save(); $this->assertNotEmpty($obj->getCreatedAt()); - $obj2 = LeanObject::create("TestObject", $obj->getObjectId()); + $obj2 = Object::create("TestObject", $obj->getObjectId()); $obj2->fetch(); $this->assertEquals("bar", $obj2->get("foo")); @@ -155,12 +155,12 @@ public function testCreateObjectWithId() { */ public function testGetDateShouldReturnDateTime() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $date = new DateTime(); $obj->set("release", $date); $obj->save(); $this->assertNotEmpty($obj->getObjectId()); - $obj2 = new LeanObject("TestObject", $obj->getObjectId()); + $obj2 = new Object("TestObject", $obj->getObjectId()); $obj2->fetch(); $this->assertTrue($obj2->get("release") instanceof DateTime); $this->assertEquals($obj->get("release"), $obj2->get("release")); @@ -169,23 +169,23 @@ public function testGetDateShouldReturnDateTime() { } public function testRelationDecode() { - $a = new LeanObject("TestObject"); + $a = new Object("TestObject"); $a->set("name", "Pap"); $rel = $a->getRelation("likes_relation"); - $b = new LeanObject("TestObject"); + $b = new Object("TestObject"); $b->set("name", "alice"); $b->save(); $rel->add($b); $a->save(); $this->assertNotEmpty($a->getObjectId()); - $a2 = new LeanObject("TestObject", $a->getObjectId()); + $a2 = new Object("TestObject", $a->getObjectId()); $a2->fetch(); $val = $a2->get("likes_relation"); - $this->assertTrue($val instanceof LeanRelation); + $this->assertTrue($val instanceof Relation); $this->assertEquals("TestObject", $val->getTargetClassName()); - LeanObject::destroyAll(array($a, $b)); + Object::destroyAll(array($a, $b)); } /** @@ -193,7 +193,7 @@ public function testRelationDecode() { */ public function testAddField() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->addIn("tags", "frontend"); $this->assertEquals(array("frontend"), $obj->get("tags")); @@ -208,7 +208,7 @@ public function testAddField() { } public function testAddUniqueOnField() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->addUniqueIn("tags", "frontend"); $this->assertEquals(array("frontend"), $obj->get("tags")); @@ -220,7 +220,7 @@ public function testAddUniqueOnField() { } public function testRemoveOnField() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->removeIn("tags", "frontend"); $this->assertEquals(array(), $obj->get("tags")); @@ -232,7 +232,7 @@ public function testRemoveOnField() { } public function testDeleteField() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->delete("tags"); $this->assertNull($obj->get("tags")); @@ -247,7 +247,7 @@ public function testDeleteField() { } public function testDestroyObject() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->set("tags", array("frontend")); $obj->save(); @@ -263,15 +263,15 @@ public function testDestroyObject() { */ public function testAddRelation() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $rel = $obj->getRelation("authors"); - $rel->add(new LeanObject("TestAuthor", "abc101")); + $rel->add(new Object("TestAuthor", "abc101")); $out = $rel->encode(); $this->assertEquals("Relation", $out["__type"]); $this->assertEquals("TestAuthor", $out["className"]); $val = $obj->get("authors"); - $this->assertTrue($val instanceof LeanRelation); + $this->assertTrue($val instanceof Relation); $out = $val->encode(); $this->assertEquals("Relation", $out["__type"]); $this->assertEquals("TestAuthor", $out["className"]); @@ -282,17 +282,17 @@ public function testAddRelation() { */ public function testObjectTraverseACycle() { - $a = new LeanObject("TestObject"); - $b = new LeanObject("TestObject"); - $c = new LeanObject("TestObject"); + $a = new Object("TestObject"); + $b = new Object("TestObject"); + $c = new Object("TestObject"); $a->set("likes", array($b, "foo")); $b->set("likes", array($c, 42)); $c->set("likes", $a); $objects = array(); // collected objects $seen = array(); - LeanObject::traverse($a, $seen, + Object::traverse($a, $seen, function($val) use (&$objects) { - if ($val instanceof LeanObject) { + if ($val instanceof Object) { $objects[] = $val; } }); @@ -302,9 +302,9 @@ function($val) use (&$objects) { // now start from $c $objects = array(); // collected objects $seen = array(); - LeanObject::traverse($c, $seen, + Object::traverse($c, $seen, function($val) use (&$objects) { - if ($val instanceof LeanObject) { + if ($val instanceof Object) { $objects[] = $val; } }); @@ -313,9 +313,9 @@ function($val) use (&$objects) { } public function testFindUnsavedChildren() { - $a = new LeanObject("TestObject"); - $b = new LeanObject("TestObject"); - $c = new LeanObject("TestObject"); + $a = new Object("TestObject"); + $b = new Object("TestObject"); + $c = new Object("TestObject"); $a->set("likes", array($b, "foo")); $b->set("likes", array($c, 42)); $c->set("likes", $a); @@ -328,9 +328,9 @@ public function testFindUnsavedChildren() { } public function testSaveObjectWithNewChildren() { - $a = new LeanObject("TestObject"); - $b = new LeanObject("TestObject"); - $c = new LeanObject("TestObject"); + $a = new Object("TestObject"); + $b = new Object("TestObject"); + $c = new Object("TestObject"); $a->set("foo", "aar"); $b->set("foo", "bar"); $c->set("foo", "car"); @@ -342,14 +342,14 @@ public function testSaveObjectWithNewChildren() { $this->assertNotEmpty($b->getObjectId()); $this->assertNotEmpty($c->getObjectId()); - LeanObject::destroyAll(array($a, $b, $c)); + Object::destroyAll(array($a, $b, $c)); } // it cannnot save when children's children is new public function testSaveWithNewGrandChildren() { - $a = new LeanObject("TestObject"); - $b = new LeanObject("TestObject"); - $c = new LeanObject("TestObject"); + $a = new Object("TestObject"); + $b = new Object("TestObject"); + $c = new Object("TestObject"); $a->set("foo", "aar"); $b->set("foo", "bar"); $c->set("foo", "car"); @@ -362,11 +362,11 @@ public function testSaveWithNewGrandChildren() { } public function testSetGeoPoint() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->set("location", new GeoPoint(39.9, 116.4)); $obj->save(); - $obj2 = new LeanObject("TestObject", $obj->getObjectId()); + $obj2 = new Object("TestObject", $obj->getObjectId()); $obj2->fetch(); $loc = $obj2->get("location"); $this->assertTrue($loc instanceof GeoPoint); @@ -377,7 +377,7 @@ public function testSetGeoPoint() { public function testGeoPointLocation() { $point = new GeoPoint(25.269876, 110.333061); - $location = new LeanObject("Location"); + $location = new Object("Location"); $location->set("location", $point); $location->save(); diff --git a/tests/LeanPushTest.php b/tests/LeanPushTest.php index 8cb135e..8610184 100644 --- a/tests/LeanPushTest.php +++ b/tests/LeanPushTest.php @@ -1,23 +1,23 @@ "Hello world!", "badge" => 20, "sound" => "APP/media/sound.mp3" ); - $push = new LeanPush($data); + $push = new Push($data); $out = $push->encode(); $this->assertEquals($data, $out["data"]); } public function testSetData() { - $push = new LeanPush(array( + $push = new Push(array( "alert" => "Hello world!" )); $push->setData("badge", 20); @@ -48,13 +48,13 @@ public function testSetPushForMultiplatform() { "wp-param" => "/chat.xaml?NavigatedFrom=Toast Notification" ) ); - $push = new LeanPush($data); + $push = new Push($data); $out = $push->encode(); $this->assertEquals($data, $out["data"]); } public function testSetProd() { - $push = new LeanPush(array( + $push = new Push(array( "alert" => "Hello world!" )); $push->setOption("prod", "dev"); @@ -63,7 +63,7 @@ public function testSetProd() { } public function testSetChannels() { - $push = new LeanPush(array( + $push = new Push(array( "alert" => "Hello world!" )); $channels = array("vip", "premium"); @@ -73,7 +73,7 @@ public function testSetChannels() { } public function testSetPushTime() { - $push = new LeanPush(array( + $push = new Push(array( "alert" => "Hello world!" )); $time = new DateTime(); @@ -83,7 +83,7 @@ public function testSetPushTime() { } public function testSetExpirationInterval() { - $push = new LeanPush(array( + $push = new Push(array( "alert" => "Hello world!" )); $push->setExpirationInterval(86400); @@ -92,7 +92,7 @@ public function testSetExpirationInterval() { } public function testSetExpirationTime() { - $push = new LeanPush(array( + $push = new Push(array( "alert" => "Hello world!" )); $date = new DateTime(); @@ -102,18 +102,18 @@ public function testSetExpirationTime() { } public function testSetWhere() { - $push = new LeanPush(array( + $push = new Push(array( "alert" => "Hello world!" )); - $query = new LeanQuery("_Installation"); + $query = new Query("_Installation"); $date = new DateTime(); $query->lessThan("updatedAt", $date); $push->setWhere($query); $out = $push->encode(); $this->assertEquals(array( "updatedAt" => array( - '$lt' => LeanClient::encode($date) + '$lt' => Client::encode($date) ) ), $out["where"]); } -} \ No newline at end of file +} diff --git a/tests/LeanQueryTest.php b/tests/LeanQueryTest.php index 242f594..f241136 100644 --- a/tests/LeanQueryTest.php +++ b/tests/LeanQueryTest.php @@ -1,37 +1,37 @@ assertEquals("TestObject", $query->getClassName()); } public function testEmptyQuery() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $out = $query->encode(); $this->assertEmpty($out); } public function testCount() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $cnt = $query->count(); $this->assertGreaterThanOrEqual(0, $cnt); - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $id = microtime(); $obj->set("testid", $id); $obj->save(); @@ -44,12 +44,12 @@ public function testCount() { } public function testGetById() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $id = microtime(); $obj->set("testid", $id); $obj->save(); - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $obj2 = $query->get($obj->getObjectId()); $this->assertEquals($obj->get("testid"), $obj2->get("testid")); @@ -58,12 +58,12 @@ public function testGetById() { } public function testFind() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $id = microtime(); $obj->set("testid", $id); $obj->save(); - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->equalTo("testid", $id); $objects = $query->find(); $this->assertEquals(1, count($objects)); @@ -73,7 +73,7 @@ public function testFind() { } public function testAddExtraOption() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->equalTo("testid", microtime()); $query->addOption("redirectClassNameForKey", "relationKey"); $out = $query->encode(); @@ -81,7 +81,7 @@ public function testAddExtraOption() { } public function testAddExtraOptionCannotOverwitePreservedOption() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->skip(100); $query->addOption("skip", 50); $out = $query->encode(); @@ -89,7 +89,7 @@ public function testAddExtraOptionCannotOverwitePreservedOption() { } public function testEqualTo() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->equalTo("age", 24); $out = $query->encode(); $this->assertEquals(json_encode(array("age" => 24)), $out["where"]); @@ -100,7 +100,7 @@ public function testEqualTo() { } public function testNotEqualTo() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->notEqualTo("age", 24); $out = $query->encode(); $expect = json_encode(array("age" => array('$ne' => 24))); @@ -110,7 +110,7 @@ public function testNotEqualTo() { // Only the last will survive when repeatedly applying not-equal-to // on same field. public function testRepeatNotEqualTo() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->notEqualTo("age", 24); $query->notEqualTo("age", 20); $query->notEqualTo("age", 22); @@ -121,7 +121,7 @@ public function testRepeatNotEqualTo() { } public function testLessThan() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->lessThan("age", 24); $out = $query->encode(); $expect = json_encode(array("age" => array('$lt' => 24))); @@ -129,7 +129,7 @@ public function testLessThan() { } public function testLessThanOrEqualTo() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->lessThanOrEqualTo("age", 24); $out = $query->encode(); $expect = json_encode(array("age" => array('$lte' => 24))); @@ -137,7 +137,7 @@ public function testLessThanOrEqualTo() { } public function testGreaterThan() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->greaterThan("age", 24); $out = $query->encode(); $expect = json_encode(array("age" => array('$gt' => 24))); @@ -145,7 +145,7 @@ public function testGreaterThan() { } public function testGreaterThanOrEqualTo() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->greaterThanOrEqualTo("age", 24); $out = $query->encode(); $expect = json_encode(array("age" => array('$gte' => 24))); @@ -153,7 +153,7 @@ public function testGreaterThanOrEqualTo() { } public function testContainedIn() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->containedIn("category", array("foo", "bar")); $out = $query->encode(); $expect = json_encode(array("category" => @@ -162,7 +162,7 @@ public function testContainedIn() { } public function testNotContainedIn() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->notContainedIn("category", array("foo", "bar")); $out = $query->encode(); $expect = json_encode(array("category" => @@ -171,7 +171,7 @@ public function testNotContainedIn() { } public function testContainsAll() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->containsAll("tags", array("foo", "bar")); $out = $query->encode(); $expect = json_encode(array("tags" => @@ -180,7 +180,7 @@ public function testContainsAll() { } public function testSizeEqualTo() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->sizeEqualTo("tags", 2); $out = $query->encode(); $expect = json_encode(array("tags" => array('$size' => 2))); @@ -188,7 +188,7 @@ public function testSizeEqualTo() { } public function testFieldExists() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->exists("tags"); $out = $query->encode(); $expect = json_encode(array("tags" => array('$exists' => true))); @@ -196,7 +196,7 @@ public function testFieldExists() { } public function testFieldNotExists() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->notExists("tags"); $out = $query->encode(); $expect = json_encode(array("tags" => array('$exists' => false))); @@ -204,7 +204,7 @@ public function testFieldNotExists() { } public function testFieldContains() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->contains("title", "clojure"); $out = $query->encode(); $expect = json_encode(array("title" => @@ -213,7 +213,7 @@ public function testFieldContains() { } public function testStartsWith() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->startsWith("title", "clojure"); $out = $query->encode(); $expect = json_encode(array("title" => @@ -222,7 +222,7 @@ public function testStartsWith() { } public function testEndsWith() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->endsWith("title", "clojure"); $out = $query->encode(); $expect = json_encode(array("title" => @@ -231,7 +231,7 @@ public function testEndsWith() { } public function testRegexMatches() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->matches("title", '(cl.?jre)[0-9]', "im"); $out = $query->encode(); $expect = json_encode(array("title" => @@ -242,13 +242,13 @@ public function testRegexMatches() { public function testMatchesInQuery() { - $q1 = new LeanQuery("Post"); + $q1 = new Query("Post"); $q1->exists("image"); $out1 = $q1->encode(); $where1 = array("image" => array('$exists' => true)); $this->assertEquals(json_encode($where1), $out1["where"]); - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->matchesInQuery("post", $q1); $out = $query->encode(); $where = array("post" => array('$inQuery' => array( @@ -257,7 +257,7 @@ public function testMatchesInQuery() { ))); $this->assertEquals(json_encode($where), $out["where"]); - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->notMatchInQuery("post", $q1); $out = $query->encode(); $where = array("post" => array('$notInQuery' => array( @@ -268,13 +268,13 @@ public function testMatchesInQuery() { } public function testMatchesFieldInQuery() { - $q1 = new LeanQuery("Post"); + $q1 = new Query("Post"); $q1->contains("title", "clojure"); $out1 = $q1->encode(); $where1 = array("title" => array('$regex' => "clojure")); $this->assertEquals(json_encode($where1), $out1["where"]); - $query = new LeanQuery("Comment"); + $query = new Query("Comment"); $query->matchesFieldInQuery("author", "author", $q1); $out = $query->encode(); $where = array("author" => array('$select' => array( @@ -286,7 +286,7 @@ public function testMatchesFieldInQuery() { ))); $this->assertEquals(json_encode($where), $out["where"]); - $query = new LeanQuery("Comment"); + $query = new Query("Comment"); $query->notMatchFieldInQuery("author", "author", $q1); $out = $query->encode(); $where = array("author" => array('$dontSelect' => array( @@ -300,8 +300,8 @@ public function testMatchesFieldInQuery() { } public function testRelatedTo() { - $obj = new LeanObject("TestObject", "id123"); - $query = new LeanQuery("TestObject"); + $obj = new Object("TestObject", "id123"); + $query = new Query("TestObject"); $query->relatedTo("relField", $obj); $out = $query->encode(); @@ -312,7 +312,7 @@ public function testRelatedTo() { } public function testNearGeoPoint() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->near('location', new GeoPoint(39.9, 116.4)); $out = $query->encode(); $expect = json_encode(array( @@ -328,7 +328,7 @@ public function testNearGeoPoint() { } public function testWithinRadians() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->withinRadians('location', new GeoPoint(39.9, 116.4), 0.5); $out = $query->encode(); $expect = json_encode(array( @@ -345,7 +345,7 @@ public function testWithinRadians() { } public function testWithinKilometers() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->withinKilometers('location', new GeoPoint(39.9, 116.4), 0.5); $out = $query->encode(); $expect = json_encode(array( @@ -362,7 +362,7 @@ public function testWithinKilometers() { } public function testWithinMiles() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->withinMiles('location', new GeoPoint(39.9, 116.4), 0.5); $out = $query->encode(); $expect = json_encode(array( @@ -379,7 +379,7 @@ public function testWithinMiles() { } public function testWithinBox() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->withinBox('location', new GeoPoint(39.9, 116.4), new GeoPoint(40.0, 118.0)); @@ -406,13 +406,13 @@ public function testWithinBox() { } public function testSelectFields() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->select("name", "color", "foo", "bar"); $out = $query->encode(); $this->assertEquals("name,color,foo,bar", $out["keys"]); // it accepts variable number of keys - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->select("name"); $query->select("color"); $query->select("foo", "bar"); @@ -420,7 +420,7 @@ public function testSelectFields() { $this->assertEquals("name,color,foo,bar", $out["keys"]); // it also accepts an array of keys - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->select(array("name", "color", "foo", "bar")); $out = $query->encode(); $this->assertEquals("name,color,foo,bar", $out["keys"]); @@ -433,21 +433,21 @@ public function testSelectFields() { public function testIncludeNestObjects() { // it accepts nested objects - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->_include("creator"); $query->_include("object.creator"); $out = $query->encode(); $this->assertEquals("creator,object.creator", $out["include"]); // it accepts variable number of keys - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->_include("creator"); $query->_include("object.creator", "foo"); $out = $query->encode(); $this->assertEquals("creator,object.creator,foo", $out["include"]); // it accepts array of fields - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->_include("creator"); $query->_include(array("object.creator", "foo")); $out = $query->encode(); @@ -455,7 +455,7 @@ public function testIncludeNestObjects() { } public function testSkipAndLimit() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->limit(100); $out = $query->encode(); $this->assertEquals(100, $out["limit"]); @@ -476,7 +476,7 @@ public function testSkipAndLimit() { } public function testOrdering() { - $query = new LeanQuery("TestObject"); + $query = new Query("TestObject"); $query->addAscend("number"); $out = $query->encode(); $this->assertEquals("number", $out["order"]); @@ -495,16 +495,16 @@ public function testOrdering() { } public function testComposeSimpleAndQuery() { - $q1 = new LeanQuery("TestObject"); + $q1 = new Query("TestObject"); $q1->lessThan("number", 42); - $q2 = new LeanQuery("TestObject"); + $q2 = new Query("TestObject"); $q2->greaterThanOrEqualTo("number", 24); - $q3 = new LeanQuery("TestObject"); + $q3 = new Query("TestObject"); $q3->contains("title", "clojure"); - $q = LeanQuery::andQuery($q1, $q2); + $q = Query::andQuery($q1, $q2); $out = $q->encode(); $where = array( '$and' => array( @@ -514,7 +514,7 @@ public function testComposeSimpleAndQuery() { ); $this->assertEquals(json_encode($where), $out["where"]); - $q = LeanQuery::andQuery($q1, $q2, $q3); + $q = Query::andQuery($q1, $q2, $q3); $out = $q->encode(); $where = array( '$and' => array( @@ -528,16 +528,16 @@ public function testComposeSimpleAndQuery() { } public function testComposeSimpleOrQuery() { - $q1 = new LeanQuery("TestObject"); + $q1 = new Query("TestObject"); $q1->greaterThanOrEqualTo("number", 42); - $q2 = new LeanQuery("TestObject"); + $q2 = new Query("TestObject"); $q2->lessThan("number", 24); - $q3 = new LeanQuery("TestObject"); + $q3 = new Query("TestObject"); $q3->contains("title", "clojure"); - $q = LeanQuery::orQuery($q1, $q2); + $q = Query::orQuery($q1, $q2); $out = $q->encode(); $where = array( '$or' => array( @@ -547,7 +547,7 @@ public function testComposeSimpleOrQuery() { ); $this->assertEquals(json_encode($where), $out["where"]); - $q = LeanQuery::orQuery($q1, $q2, $q3); + $q = Query::orQuery($q1, $q2, $q3); $out = $q->encode(); $where = array( '$or' => array( @@ -560,16 +560,16 @@ public function testComposeSimpleOrQuery() { } public function testComposeCompexLogicalQuery() { - $q1 = new LeanQuery("TestObject"); + $q1 = new Query("TestObject"); $q1->greaterThanOrEqualTo("number", 42); - $q2 = new LeanQuery("TestObject"); + $q2 = new Query("TestObject"); $q2->lessThan("number", 24); - $q3 = new LeanQuery("TestObject"); + $q3 = new Query("TestObject"); $q3->contains("title", "clojure"); - $q = LeanQuery::orQuery($q1, $q2); + $q = Query::orQuery($q1, $q2); $out = $q->encode(); $where = array( '$or' => array( @@ -579,7 +579,7 @@ public function testComposeCompexLogicalQuery() { ); $this->assertEquals(json_encode($where), $out["where"]); - $q = LeanQuery::andQuery($q, $q3); + $q = Query::andQuery($q, $q3); $out = $q->encode(); $where = array( '$and' => array( @@ -598,20 +598,20 @@ public function testComposeCompexLogicalQuery() { } public function testDoCloudQueryCount() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->set("name", "alice"); $obj->save(); - $resp = LeanQuery::doCloudQuery("SELECT count(*) FROM TestObject"); + $resp = Query::doCloudQuery("SELECT count(*) FROM TestObject"); $this->assertTrue(is_int($resp["count"])); $this->assertEquals("TestObject", $resp["className"]); $obj->destroy(); } public function testDoCloudQueryWithPvalues() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->set("name", "alice"); $obj->save(); - $resp = LeanQuery::doCloudQuery("SELECT * FROM TestObject ". + $resp = Query::doCloudQuery("SELECT * FROM TestObject ". "WHERE name = ? LIMIT ?", array("alice", 1)); $this->assertGreaterThan(0, count($resp["results"])); @@ -620,11 +620,11 @@ public function testDoCloudQueryWithPvalues() { /* public function testDoCloudQueryWithDate() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->set("name", "alice"); $obj->save(); $date = $obj->getCreatedAt(); - $resp = LeanQuery::doCloudQuery("SELECT * FROM TestObject ". + $resp = Query::doCloudQuery("SELECT * FROM TestObject ". "WHERE createdAt = ?", array($date)); $this->assertGreaterThan(0, count($resp["results"])); @@ -633,11 +633,11 @@ public function testDoCloudQueryWithDate() { public function testDoCloudQueryGeoPoint() { $point = new GeoPoint(39.9, 116.4); - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $obj->set("name", "alice"); $obj->set("location", $point); $obj->save(); - $resp = LeanQuery::doCloudQuery("SELECT * FROM TestObject " . + $resp = Query::doCloudQuery("SELECT * FROM TestObject " . "WHERE location NEAR ?", array($point)); $this->assertEquals("TestObject", $resp["className"]); diff --git a/tests/LeanRelationTest.php b/tests/LeanRelationTest.php index 1009dc7..f6794db 100644 --- a/tests/LeanRelationTest.php +++ b/tests/LeanRelationTest.php @@ -1,45 +1,45 @@ getRelation("likes"); $out = $rel->encode(); $this->assertEquals("Relation", $out["__type"]); } public function testRelationClassEncode() { - $obj = new LeanObject("TestObject"); + $obj = new Object("TestObject"); $rel = $obj->getRelation("likes"); $out = $rel->encode(); $this->assertEquals("Relation", $out["__type"]); - $child1 = new LeanObject("User", "abc101"); + $child1 = new Object("User", "abc101"); $rel->add($child1); $out = $rel->encode(); $this->assertEquals("User", $out["className"]); } public function testGetRelationOnTargetClass() { - $obj = new LeanObject("TestObject", "id123"); - $rel = new LeanRelation($obj, "likes", "User"); + $obj = new Object("TestObject", "id123"); + $rel = new Relation($obj, "likes", "User"); $query = $rel->getQuery(); $this->assertEquals("User", $query->getClassName()); } public function testGetRelationQueryWithoutTargetClass() { - $obj = new LeanObject("TestObject", "id123"); - $rel = new LeanRelation($obj, "likes"); + $obj = new Object("TestObject", "id123"); + $rel = new Relation($obj, "likes"); $query = $rel->getQuery(); // the query should be made against the parent class, with @@ -51,9 +51,9 @@ public function testGetRelationQueryWithoutTargetClass() { } public function getReverseQueryOnChildObject() { - $obj = new LeanObject("TestObject", "id123"); - $rel = new LeanRelation($obj, "likes", "User"); - $child = new LeanObject("User", "id124"); + $obj = new Object("TestObject", "id123"); + $rel = new Relation($obj, "likes", "User"); + $child = new Object("User", "id124"); $query = $rel->getReverseQuery($child); $this->assertEquals("TestObject", $query->getClassName()); } diff --git a/tests/LeanRoleTest.php b/tests/LeanRoleTest.php index 8b77829..59687c4 100644 --- a/tests/LeanRoleTest.php +++ b/tests/LeanRoleTest.php @@ -1,47 +1,47 @@ assertEquals("id123", $role->getObjectId()); } public function testGetChildrenAsRelation() { - $role = new LeanRole(); - $this->assertTrue($role->getUsers() instanceof LeanRelation); - $this->assertTrue($role->getRoles() instanceof LeanRelation); + $role = new Role(); + $this->assertTrue($role->getUsers() instanceof Relation); + $this->assertTrue($role->getRoles() instanceof Relation); } public function testSaveRole() { - $role = new LeanRole(); + $role = new Role(); $role->setName("admin"); - $acl = new LeanACL(); + $acl = new ACL(); $acl->setPublicWriteAccess(true); // so it can be destroyed $role->setACL($acl); $role->save(); $this->assertNotEmpty($role->getObjectId()); - $this->assertTrue($role->getUsers() instanceof LeanRelation); - $this->assertTrue($role->getRoles() instanceof LeanRelation); + $this->assertTrue($role->getUsers() instanceof Relation); + $this->assertTrue($role->getRoles() instanceof Relation); $role->destroy(); } diff --git a/tests/LeanUserTest.php b/tests/LeanUserTest.php index a078d8d..e22b5c0 100644 --- a/tests/LeanUserTest.php +++ b/tests/LeanUserTest.php @@ -1,23 +1,23 @@ setUsername("alice"); $user->setPassword("blabla"); try { @@ -30,7 +30,7 @@ public static function setUpBeforeClass() { public static function tearDownAfterClass() { // destroy default user if present try { - $user = LeanUser::logIn("alice", "blabla"); + $user = User::logIn("alice", "blabla"); $user->destroy(); } catch (CloudException $ex) { // skip @@ -39,7 +39,7 @@ public static function tearDownAfterClass() { public function setUp() { // logout current user if any - LeanUser::logOut(); + User::logOut(); $this->openToken = array(); $this->openToken["openid"] = "0395BA18A"; $this->openToken["expires_in"] = "36000"; @@ -47,7 +47,7 @@ public function setUp() { } public function testSetGetFields() { - $user = new LeanUser(); + $user = new User(); $user->setUsername("alice"); $user->setEmail("alice@example.com"); $user->setMobilePhoneNumber("18612340000"); @@ -62,7 +62,7 @@ public function testSetGetFields() { } public function testSaveNewUser() { - $user = new LeanUser(); + $user = new User(); $user->setUsername("alice"); $user->setPassword("blabla"); $this->setExpectedException("LeanCloud\CloudException", @@ -71,7 +71,7 @@ public function testSaveNewUser() { } public function testUserSignUp() { - $user = new LeanUser(); + $user = new User(); $user->setUsername("alice2"); $user->setPassword("blabla"); @@ -83,54 +83,54 @@ public function testUserSignUp() { } public function testUserUpdate() { - $user = LeanUser::logIn("alice", "blabla"); + $user = User::logIn("alice", "blabla"); $user->setEmail("alice@example.com"); $user->set("age", 24); $user->save(); $this->assertNotEmpty($user->getUpdatedAt()); - $user2 = LeanUser::become($user->getSessionToken()); + $user2 = User::become($user->getSessionToken()); $this->assertEquals("alice@example.com", $user2->getEmail()); $this->assertEquals(24, $user2->get("age")); } public function testUserLogIn() { - $user = LeanUser::logIn("alice", "blabla"); + $user = User::logIn("alice", "blabla"); $this->assertNotEmpty($user->getObjectId()); - $this->assertEquals($user, LeanUser::getCurrentUser()); + $this->assertEquals($user, User::getCurrentUser()); } public function testLoginWithMobilePhoneNumber() { - $user = LeanUser::logIn("alice", "blabla"); + $user = User::logIn("alice", "blabla"); $user->setMobilePhoneNumber("18612340000"); $user->save(); $user->logOut(); - $this->assertNull(LeanUser::getCurrentUser()); + $this->assertNull(User::getCurrentUser()); - LeanUser::logInWithMobilePhoneNumber("18612340000", "blabla"); - $user2 = LeanUser::getCurrentUser(); + User::logInWithMobilePhoneNumber("18612340000", "blabla"); + $user2 = User::getCurrentUser(); $this->assertEquals("alice", $user2->getUsername()); } public function testBecome() { - $user = LeanUser::logIn("alice", "blabla"); + $user = User::logIn("alice", "blabla"); - $user2 = LeanUser::become($user->getSessionToken()); + $user2 = User::become($user->getSessionToken()); $this->assertNotEmpty($user2->getObjectId()); - $this->assertEquals($user2, LeanUser::getCurrentUser()); + $this->assertEquals($user2, User::getCurrentUser()); } public function testLogOut() { - $user = LeanUser::logIn("alice", "blabla"); - $this->assertEquals($user, LeanUser::getCurrentUser()); - LeanUser::logOut(); - $this->assertNull(LeanUser::getCurrentUser()); + $user = User::logIn("alice", "blabla"); + $this->assertEquals($user, User::getCurrentUser()); + User::logOut(); + $this->assertNull(User::getCurrentUser()); } public function testUpdatePassword() { - $user = new LeanUser(); + $user = new User(); $user->setUsername("alice3"); $user->setPassword("blabla"); $user->signUp(); @@ -148,17 +148,17 @@ public function testUpdatePassword() { public function testVerifyMobilePhone() { // Ensure the post format is correct $this->setExpectedException("LeanCloud\CloudException", null, 603); - LeanUser::verifyMobilePhone("000000"); + User::verifyMobilePhone("000000"); } public function testLogInWithLinkedService() { - $user = LeanUser::logIn("alice", "blabla"); + $user = User::logIn("alice", "blabla"); $user->linkWith("weixin", $this->openToken); $auth = $user->get("authData"); $this->assertEquals($this->openToken, $auth["weixin"]); - $user2 = LeanUser::logInWith("weixin", $this->openToken); + $user2 = User::logInWith("weixin", $this->openToken); $this->assertEquals($user->getUsername(), $user2->getUsername()); $this->assertEquals($user->getSessionToken(), @@ -168,23 +168,23 @@ public function testLogInWithLinkedService() { } public function testSignUpWithLinkedService() { - $user = LeanUser::logInWith("weixin", $this->openToken); + $user = User::logInWith("weixin", $this->openToken); $this->assertNotEmpty($user->getSessionToken()); $this->assertNotEmpty($user->getObjectId()); - $this->assertEquals($user, LeanUser::getCurrentUser()); + $this->assertEquals($user, User::getCurrentUser()); $user->destroy(); } public function testUnlinkService() { - $user = LeanUser::logInWith("weixin", $this->openToken); + $user = User::logInWith("weixin", $this->openToken); $token = $user->getSessionToken(); $authData = $user->get("authData"); $this->assertEquals($this->openToken, $authData["weixin"]); $user->unlinkWith("weixin"); // re-login with user session token - $user2 = LeanUser::become($token); + $user2 = User::become($token); $authData = $user2->get("authData"); $this->assertTrue(!isset($authData["weixin"])); @@ -200,15 +200,15 @@ public function testUnlinkService() { public function testCircularGetCurrentUser() { // ensure getCurrentUser neither run indefinetely, nor throw maximum // function call error - $avatar = LeanFile::createWithUrl("alice.png", "https://leancloud.cn/favicon.png"); - $user = LeanUser::logIn("alice", "blabla"); + $avatar = File::createWithUrl("alice.png", "https://leancloud.cn/favicon.png"); + $user = User::logIn("alice", "blabla"); $user->set("avatar", $avatar); $user->save(); - $token = LeanUser::getCurrentSessionToken(); + $token = User::getCurrentSessionToken(); $user->logOut(); - LeanUser::setCurrentSessionToken($token); + User::setCurrentSessionToken($token); - $user2 = LeanUser::getCurrentUser(); + $user2 = User::getCurrentUser(); $this->assertEquals($user2->getUsername(), "alice"); } @@ -219,8 +219,8 @@ public function testCircularGetCurrentUser() { * @link https://github.com/leancloud/php-sdk/issues/62 */ public function testFindUserWithSession() { - $user = LeanUser::logIn("alice", "blabla"); - $query = new LeanQuery("_User"); + $user = User::logIn("alice", "blabla"); + $query = new Query("_User"); // it should not raise: 1 Forbidden to find by class permission. $query->first(); } diff --git a/tests/RelationOperationTest.php b/tests/RelationOperationTest.php index a047a39..9dc8984 100644 --- a/tests/RelationOperationTest.php +++ b/tests/RelationOperationTest.php @@ -1,17 +1,17 @@ encode(); $this->assertEquals("AddRelation", $out["__op"]); @@ -29,14 +29,14 @@ public function testAddOpEncode() { } public function testAddUnsavedObjects() { - $child1 = new LeanObject("TestObject"); + $child1 = new Object("TestObject"); $this->setExpectedException("RuntimeException", "Cannot add unsaved object to relation."); $op = new RelationOperation("foo", array($child1), null); } public function testAddDuplicateObjects() { - $child1 = new LeanObject("TestObject", "ab123"); + $child1 = new Object("TestObject", "ab123"); $op = new RelationOperation("foo", array($child1, $child1), null); $out = $op->encode(); $this->assertEquals("AddRelation", $out["__op"]); @@ -45,7 +45,7 @@ public function testAddDuplicateObjects() { } public function testRemoveOpEncode() { - $child1 = new LeanObject("TestObject", "ab123"); + $child1 = new Object("TestObject", "ab123"); $op = new RelationOperation("foo", null, array($child1)); $out = $op->encode(); $this->assertEquals("RemoveRelation", $out["__op"]); @@ -53,7 +53,7 @@ public function testRemoveOpEncode() { } public function testRemoveDuplicateObjects() { - $child1 = new LeanObject("TestObject", "ab123"); + $child1 = new Object("TestObject", "ab123"); $op = new RelationOperation("foo", null, array($child1, $child1)); $out = $op->encode(); $this->assertEquals("RemoveRelation", $out["__op"]); @@ -62,7 +62,7 @@ public function testRemoveDuplicateObjects() { } public function testAddWinsOverRemove() { - $child1 = new LeanObject("TestObject", "ab101"); + $child1 = new Object("TestObject", "ab101"); $op = new RelationOperation("foo", array($child1), array($child1)); @@ -73,9 +73,9 @@ public function testAddWinsOverRemove() { } public function testAddAndRemove() { - $child1 = new LeanObject("TestObject", "ab101"); - $child2 = new LeanObject("TestObject", "ab102"); - $child3 = new LeanObject("TestObject", "ab103"); + $child1 = new Object("TestObject", "ab101"); + $child2 = new Object("TestObject", "ab102"); + $child3 = new Object("TestObject", "ab103"); $op = new RelationOperation("foo", array($child1, $child2), array($child2, $child3)); @@ -93,8 +93,8 @@ public function testAddAndRemove() { } public function testMultipleClassesNotAllowed() { - $child1 = new LeanObject("TestObject", "abc101"); - $child2 = new LeanObject("Test2Object", "bac102"); + $child1 = new Object("TestObject", "abc101"); + $child2 = new Object("Test2Object", "bac102"); $this->setExpectedException("RuntimeException", "Object type incompatible with " . "relation."); @@ -104,17 +104,17 @@ public function testMultipleClassesNotAllowed() { } public function testApplyOperation() { - $child1 = new LeanObject("TestObject", "abc101"); + $child1 = new Object("TestObject", "abc101"); $op = new RelationOperation("foo", array($child1), null); - $parent = new LeanObject("Test2Object"); + $parent = new Object("Test2Object"); $val = $op->applyOn(null, $parent); - $this->assertTrue($val instanceof LeanRelation); + $this->assertTrue($val instanceof Relation); $out = $val->encode(); $this->assertEquals("TestObject", $out["className"]); } public function testMergeWithNull() { - $child1 = new LeanObject("TestObject", "abc101"); + $child1 = new Object("TestObject", "abc101"); $op = new RelationOperation("foo", array($child1), null); $op2 = $op->mergeWith(null); $this->assertTrue($op2 instanceof RelationOperation); @@ -122,10 +122,10 @@ public function testMergeWithNull() { } public function testMergeWithRelationOperation() { - $child1 = new LeanObject("TestObject", "abc101"); + $child1 = new Object("TestObject", "abc101"); $op = new RelationOperation("foo", array($child1), null); - $child2 = new LeanObject("TestObject", "abc102"); + $child2 = new Object("TestObject", "abc102"); $op2 = new RelationOperation("foo", null, array($child2)); $op3 = $op->mergeWith($op2); diff --git a/tests/SetOperationTest.php b/tests/SetOperationTest.php index fae5f61..8ec1cb0 100644 --- a/tests/SetOperationTest.php +++ b/tests/SetOperationTest.php @@ -4,7 +4,7 @@ use LeanCloud\Operation\ArrayOperation; use LeanCloud\Operation\DeleteOperation; use LeanCloud\Operation\IncrementOperation; -use LeanCloud\LeanClient; +use LeanCloud\Client; class SetOperationTest extends PHPUnit_Framework_TestCase { public function testGetKey() { @@ -35,7 +35,7 @@ public function testOperationEncode() { $out = $op->encode(); $this->assertEquals($out['__type'], "Date"); $this->assertEquals($out['iso'], - LeanClient::formatDate($date)); + Client::formatDate($date)); } public function testMergeWithAnyOp() { diff --git a/tests/engine/LeanEngineTest.php b/tests/engine/LeanEngineTest.php index 8a49909..0bc532c 100644 --- a/tests/engine/LeanEngineTest.php +++ b/tests/engine/LeanEngineTest.php @@ -1,6 +1,6 @@ Date: Thu, 28 Jul 2016 15:57:32 +0800 Subject: [PATCH 055/249] (Feat) Update examples in README --- README.md | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 21eb940..58034f6 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ mv php-sdk-X.X.X vendor/leancloud require_once("vendor/leancloud/src/autoload.php"); // 参数依次为 app-id, app-key, master-key -LeanCloud\LeanClient::initialize("app_id", "app_key", "master_key"); +LeanCloud\Client::initialize("app_id", "app_key", "master_key"); ``` 使用示例 @@ -66,10 +66,10 @@ LeanCloud\LeanClient::initialize("app_id", "app_key", "master_key"); 注册一个用户: ```php -use LeanCloud\LeanUser; +use LeanCloud\User; use LeanCloud\CloudException; -$user = new LeanUser(); +$user = new User(); $user->setUsername("alice"); $user->setEmail("alice@example.net"); $user->setPassword("passpass"); @@ -82,32 +82,32 @@ try { // 注册成功后，用户被自动登录。可以通过以下方法拿到当前登录用户和 // 授权码。 -LeanUser::getCurrentUser(); -LeanUser::getCurrentSessionToken(); +User::getCurrentUser(); +User::getCurrentSessionToken(); ``` 登录一个用户: ```php -LeanUser::logIn("alice", "passpass"); -$user = LeanUser::getCurrentUser(); -$token = LeanUser::getCurrentSessionToken(); +User::logIn("alice", "passpass"); +$user = User::getCurrentUser(); +$token = User::getCurrentSessionToken(); // 给定一个 token 可以很容易的拿到用户 -LeanUser::become($token); +User::become($token); // 我们还支持短信验证码，及第三方授权码登录 -LeanUser::logInWithSmsCode("phone number", "sms code"); -LeanUser::logInWith("weibo", array("openid" => "...")); +User::logInWithSmsCode("phone number", "sms code"); +User::logInWith("weibo", array("openid" => "...")); ``` #### 对象存储 ```php -use LeanCloud\LeanObject; +use LeanCloud\Object; use LeanCloud\CloudException; -$obj = new LeanObject("TestObject"); +$obj = new Object("TestObject"); $obj->set("name", "alice"); $obj->set("height", 60.0); $obj->set("weight", 4.5); @@ -142,7 +142,7 @@ $obj->destroy(); 我们同样支持子类继承，子类中需要定义静态变量 `$className` ，并注册到存储类: ```php -class TestObject extends LeanObject { +class TestObject extends Object { protected static $className = "TestObject"; public setName($name) { $this->set("name", $name); @@ -163,16 +163,16 @@ $obj->set("eyeColor", "blue"); 给定一个 objectId，可以如下获取对象。 ```php -use LeanCloud\LeanQuery; +use LeanCloud\Query; -$query = new LeanQuery("TestObject"); +$query = new Query("TestObject"); $obj = $query->get($objectId); ``` 更为复杂的条件查询： ```php -$query = new LeanQuery("TestObject"); +$query = new Query("TestObject"); $query->lessThan("height", 100.0); // 小于 $query->greaterThanOrEqualTo("weight", 5.0); // 大于等于 $query->addAscend("birthdate"); // 递增排序 @@ -190,8 +190,8 @@ $objects = $query->find(); // 返回查询到的对象 直接创建文件: ```php -use LeanCloud\LeanFile; -$file = LeanFile::createWithData("hello.txt", "Hello LeanCloud!"); +use LeanCloud\File; +$file = File::createWithData("hello.txt", "Hello LeanCloud!"); try { $file->save(); } catch (CloudException $ex) { @@ -206,7 +206,7 @@ $file->getUrl(); 由本地文件创建： ```php -$file = LeanFile::createWithLocalFile("/tmp/myfile.png"); +$file = File::createWithLocalFile("/tmp/myfile.png"); try { $file->save(); } catch (CloudException $ex) { @@ -220,7 +220,7 @@ $url = $file->getThumbUrl(); 由已知的 URL 创建文件: ```php -$file = LeanFile::createWithUrl("image.png", "http://example.net/image.png"); +$file = File::createWithUrl("image.png", "http://example.net/image.png"); try { $file->save(); } catch (CloudException $ex) { From 0ef73c55d78e1103f464c392bf4ab069cb9b76cc Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 10 Aug 2016 16:34:25 +0800 Subject: [PATCH 056/249] Rename test file names --- Makefile | 4 ++-- tests/LeanACLTest.php => test/ACLTest.php | 0 tests/LeanAPITest.php => test/APITest.php | 0 {tests => test}/ArrayOperationTest.php | 0 tests/LeanBytesTest.php => test/BytesTest.php | 0 tests/LeanClientTest.php => test/ClientTest.php | 0 {tests => test}/CloudTest.php | 0 {tests => test}/DeleteOperationTest.php | 0 tests/LeanFileTest.php => test/FileTest.php | 0 {tests => test}/GeoPointTest.php | 0 {tests => test}/IncrementOperationTest.php | 0 tests/LeanObjectTest.php => test/ObjectTest.php | 0 tests/LeanPushTest.php => test/PushTest.php | 0 tests/LeanQueryTest.php => test/QueryTest.php | 0 {tests => test}/RelationOperationTest.php | 0 tests/LeanRelationTest.php => test/RelationTest.php | 0 tests/LeanRoleTest.php => test/RoleTest.php | 0 {tests => test}/SetOperationTest.php | 0 {tests => test}/StorageTest.php | 0 tests/LeanUserTest.php => test/UserTest.php | 0 {tests => test}/engine/LeanEngineTest.php | 0 {tests => test}/engine/index.php | 0 22 files changed, 2 insertions(+), 2 deletions(-) rename tests/LeanACLTest.php => test/ACLTest.php (100%) rename tests/LeanAPITest.php => test/APITest.php (100%) rename {tests => test}/ArrayOperationTest.php (100%) rename tests/LeanBytesTest.php => test/BytesTest.php (100%) rename tests/LeanClientTest.php => test/ClientTest.php (100%) rename {tests => test}/CloudTest.php (100%) rename {tests => test}/DeleteOperationTest.php (100%) rename tests/LeanFileTest.php => test/FileTest.php (100%) rename {tests => test}/GeoPointTest.php (100%) rename {tests => test}/IncrementOperationTest.php (100%) rename tests/LeanObjectTest.php => test/ObjectTest.php (100%) rename tests/LeanPushTest.php => test/PushTest.php (100%) rename tests/LeanQueryTest.php => test/QueryTest.php (100%) rename {tests => test}/RelationOperationTest.php (100%) rename tests/LeanRelationTest.php => test/RelationTest.php (100%) rename tests/LeanRoleTest.php => test/RoleTest.php (100%) rename {tests => test}/SetOperationTest.php (100%) rename {tests => test}/StorageTest.php (100%) rename tests/LeanUserTest.php => test/UserTest.php (100%) rename {tests => test}/engine/LeanEngineTest.php (100%) rename {tests => test}/engine/index.php (100%) diff --git a/Makefile b/Makefile index 769508f..1521619 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ test: - vendor/bin/phpunit + vendor/bin/phpunit test release: ./release.sh $V @@ -8,6 +8,6 @@ doc: vendor/bin/apigen generate --source src --destination docs test_engine: - php -S ${LC_APP_HOST}:${LC_APP_PORT} tests/engine/index.php + php -S ${LC_APP_HOST}:${LC_APP_PORT} test/engine/index.php .PHONY: test doc test_engine diff --git a/tests/LeanACLTest.php b/test/ACLTest.php similarity index 100% rename from tests/LeanACLTest.php rename to test/ACLTest.php diff --git a/tests/LeanAPITest.php b/test/APITest.php similarity index 100% rename from tests/LeanAPITest.php rename to test/APITest.php diff --git a/tests/ArrayOperationTest.php b/test/ArrayOperationTest.php similarity index 100% rename from tests/ArrayOperationTest.php rename to test/ArrayOperationTest.php diff --git a/tests/LeanBytesTest.php b/test/BytesTest.php similarity index 100% rename from tests/LeanBytesTest.php rename to test/BytesTest.php diff --git a/tests/LeanClientTest.php b/test/ClientTest.php similarity index 100% rename from tests/LeanClientTest.php rename to test/ClientTest.php diff --git a/tests/CloudTest.php b/test/CloudTest.php similarity index 100% rename from tests/CloudTest.php rename to test/CloudTest.php diff --git a/tests/DeleteOperationTest.php b/test/DeleteOperationTest.php similarity index 100% rename from tests/DeleteOperationTest.php rename to test/DeleteOperationTest.php diff --git a/tests/LeanFileTest.php b/test/FileTest.php similarity index 100% rename from tests/LeanFileTest.php rename to test/FileTest.php diff --git a/tests/GeoPointTest.php b/test/GeoPointTest.php similarity index 100% rename from tests/GeoPointTest.php rename to test/GeoPointTest.php diff --git a/tests/IncrementOperationTest.php b/test/IncrementOperationTest.php similarity index 100% rename from tests/IncrementOperationTest.php rename to test/IncrementOperationTest.php diff --git a/tests/LeanObjectTest.php b/test/ObjectTest.php similarity index 100% rename from tests/LeanObjectTest.php rename to test/ObjectTest.php diff --git a/tests/LeanPushTest.php b/test/PushTest.php similarity index 100% rename from tests/LeanPushTest.php rename to test/PushTest.php diff --git a/tests/LeanQueryTest.php b/test/QueryTest.php similarity index 100% rename from tests/LeanQueryTest.php rename to test/QueryTest.php diff --git a/tests/RelationOperationTest.php b/test/RelationOperationTest.php similarity index 100% rename from tests/RelationOperationTest.php rename to test/RelationOperationTest.php diff --git a/tests/LeanRelationTest.php b/test/RelationTest.php similarity index 100% rename from tests/LeanRelationTest.php rename to test/RelationTest.php diff --git a/tests/LeanRoleTest.php b/test/RoleTest.php similarity index 100% rename from tests/LeanRoleTest.php rename to test/RoleTest.php diff --git a/tests/SetOperationTest.php b/test/SetOperationTest.php similarity index 100% rename from tests/SetOperationTest.php rename to test/SetOperationTest.php diff --git a/tests/StorageTest.php b/test/StorageTest.php similarity index 100% rename from tests/StorageTest.php rename to test/StorageTest.php diff --git a/tests/LeanUserTest.php b/test/UserTest.php similarity index 100% rename from tests/LeanUserTest.php rename to test/UserTest.php diff --git a/tests/engine/LeanEngineTest.php b/test/engine/LeanEngineTest.php similarity index 100% rename from tests/engine/LeanEngineTest.php rename to test/engine/LeanEngineTest.php diff --git a/tests/engine/index.php b/test/engine/index.php similarity index 100% rename from tests/engine/index.php rename to test/engine/index.php From 6c98f9798e9fdca4e768a8d88459883013ab8956 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 10 Aug 2016 16:48:28 +0800 Subject: [PATCH 057/249] Ready to release 0.4.0 --- Changelog.md | 15 +++++++++++++++ release.sh | 2 +- src/LeanCloud/Client.php | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 5fee0f2..5c82a38 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,19 @@ +0.4.0 发布日期：2016-08-10 +---- + +**不兼容改动** + +为了与其它语言 SDK 类型名保持一致，将主要类型名称的 Lean 前缀去掉。如 +果升级，请注意同步修改代码。 + +以下是去掉 `Lean` 前缀的类型列表： + +``` +LeanACL LeanBytes LeanClient LeanFile LeanObject LeanPush +LeanQuery LeanRelation LeanRole LeanUser +``` + 0.3.0 发布日期：2016-06-30 ---- diff --git a/release.sh b/release.sh index 6eb87a1..e61e46d 100755 --- a/release.sh +++ b/release.sh @@ -24,7 +24,7 @@ mv Changelog.md.0 Changelog.md # portable solution in perl perl -pi -e "s/const VERSION = .*\;/const VERSION = \'$version\'\;/" \ - src/LeanCloud/LeanClient.php + src/LeanCloud/Client.php echo "Done! Ready to commit and release $version!" diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index a9f6c50..06338f9 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -23,7 +23,7 @@ class Client { /** * Client version */ - const VERSION = '0.3.0'; + const VERSION = '0.4.0'; /** * API Endpoints for Regions From fce807df1a00af514c8bb76081b92cd90298ec00 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 12 Sep 2016 14:37:42 +0800 Subject: [PATCH 058/249] Add hooks for rtm messages --- src/LeanCloud/Engine/LeanEngine.php | 14 ++++++++++++++ test/engine/LeanEngineTest.php | 12 ++++++++++++ test/engine/index.php | 8 ++++++++ 3 files changed, 34 insertions(+) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 750b1ab..da46e8b 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -425,10 +425,24 @@ protected function dispatch($method, $url) { * @param bool $decodeObj */ private function dispatchFunc($funcName, $body, $decodeObj=false) { + // verify hook sign for RTM hooks + if (in_array($funcName, array( + '_messageReceived', '_receiversOffline', '_messageSent', + '_conversationStart', '_conversationStarted', + '_conversationAdd', '_conversationRemove', '_conversationUpdate' + ))) { + if (!Client::verifyHookSign($funcName, $body["__sign"])) { + error_log("Invalid hook sign for message {$funcName}" . + " from {$this->env['REMOTE_ADDR']}"); + $this->renderError("Unauthorized.", 401, 401); + } + } + $params = $body; if ($decodeObj) { $params = Client::decode($body, null); } + $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; try { $result = Cloud::run($funcName, diff --git a/test/engine/LeanEngineTest.php b/test/engine/LeanEngineTest.php index 0bc532c..a23e275 100644 --- a/test/engine/LeanEngineTest.php +++ b/test/engine/LeanEngineTest.php @@ -191,5 +191,17 @@ public function testBeforeDelete() { $this->assertEmpty($resp); } + public function test_messageReceived() { + $resp = $this->request("/1.1/functions/_messageReceived", "POST", array( + "convId" => '5789a33a1b8694ad267d8040', + "fromPeer" => "Tom", + "receipt" => false, + "toPeers" => array("Jerry"), + "content" => '{"_lctext":"耗子，起床！","_lctype":-1}', + "__sign" => $this->signHook("_messageReceived") + )); + $this->assertEquals(false, $resp["result"]["drop"]); + } + } diff --git a/test/engine/index.php b/test/engine/index.php index e634348..370f2ee 100644 --- a/test/engine/index.php +++ b/test/engine/index.php @@ -22,6 +22,14 @@ return "hello {$params['name']}"; }); +Cloud::define("_messageReceived", function($params, $user){ + if ($params["convId"]) { + return array("drop" => false); + } else { + return array("drop" => true); + } +}); + Cloud::define("getMeta", function($params, $user, $meta) { return array("remoteAddress" => $meta["remoteAddress"]); }); From 6cde297727a3b0388dbc7d3304e9cd1a6f2d5e55 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 13 Sep 2016 13:38:53 +0800 Subject: [PATCH 059/249] Add SMS module for general sms api --- src/LeanCloud/SMS.php | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/LeanCloud/SMS.php diff --git a/src/LeanCloud/SMS.php b/src/LeanCloud/SMS.php new file mode 100644 index 0000000..3662e61 --- /dev/null +++ b/src/LeanCloud/SMS.php @@ -0,0 +1,53 @@ + $v) { + if (!isset($options[$k])) { + unset($options[$k]); + } + } + $options["mobilePhoneNumber"] = $phoneNumber; + Client::post("/requestSmsCode", $options); + } + + /** + * Verify SMS code + * + * @param string $phoneNumber + * @param string $smsCode + */ + public static function verifySmsCode($phoneNumber, $smsCode) { + Client::post("/verifySmsCode/{$smsCode}?mobilePhoneNumber={$phoneNumber}", + null); + } + +} From 3b11fc41e46fc5ffdfd17c9073f15e38d78a01b7 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 13 Sep 2016 16:51:18 +0800 Subject: [PATCH 060/249] Ready to release 0.4.1 --- Changelog.md | 6 ++++++ src/LeanCloud/Client.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 5c82a38..d4ddf40 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,10 @@ +0.4.1 发布日期：2016-09-13 +---- + +* 支持实时通信的相关 hook 及校验 +* 支持通用短信发送接口 + 0.4.0 发布日期：2016-08-10 ---- diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index 06338f9..f9b37e8 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -23,7 +23,7 @@ class Client { /** * Client version */ - const VERSION = '0.4.0'; + const VERSION = '0.4.1'; /** * API Endpoints for Regions From ff50705f734708f9e1adc834e6ff0f927c2c93b2 Mon Sep 17 00:00:00 2001 From: junwen Date: Tue, 17 Nov 2015 16:09:05 +0800 Subject: [PATCH 061/249] add api doc publish script --- fabfile.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 fabfile.py diff --git a/fabfile.py b/fabfile.py new file mode 100644 index 0000000..ffb8403 --- /dev/null +++ b/fabfile.py @@ -0,0 +1,49 @@ +import os + +# Usage: +# fab -H username@hostname deploy_docs:local_dir='folder',platform='php' +# +# + +from fabric.api import run, sudo, env, cd, local, prefix, put, lcd, settings +from fabric.contrib.files import exists, sed +from fabric.contrib.project import rsync_project + +env.use_ssh_config = True + +user = 'deploy' +doc_dir = '/var/www/avoscloud-api-docs' + +project_dir = "." +dist = 'debian' +host_count = len(env.hosts) + +def _set_user_dir(): + global dist,user,doc_dir + with settings(warn_only=True): + issue = run('id ubuntu').lower() + if 'id: ubuntu' in issue: + dist = 'debian' + elif 'uid=' in issue: + dist = 'ubuntu' + user = 'ubuntu' + doc_dir = '/mnt/avos/avoscloud-api-docs' + +def prepare_remote_dirs(remote_dir): + _set_user_dir() + if not exists(remote_dir): + sudo('mkdir -p %s' % remote_dir) + sudo('chown %s %s' % (user, remote_dir)) + +def deploy_docs(local_dir='', platform='unknown'): + global host_count + _set_user_dir() + remote_dir = '%s/%s/' % (doc_dir, platform) + + prepare_remote_dirs(remote_dir) + rsync_project(local_dir=local_dir + '/', + remote_dir=remote_dir, + delete=True) + host_count -= 1 + if (host_count == 0): + print("Finished to public api docs!") From 4ef88e3dffaad705d4e965b390a6de80d38bd7db Mon Sep 17 00:00:00 2001 From: junwen Date: Sat, 8 Oct 2016 16:07:26 +0800 Subject: [PATCH 062/249] add pullapprove --- .pullapprove.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .pullapprove.yml diff --git a/.pullapprove.yml b/.pullapprove.yml new file mode 100644 index 0000000..94043ea --- /dev/null +++ b/.pullapprove.yml @@ -0,0 +1,10 @@ +approve_by_comment: true +approve_regex: '^(Reviewed|Approved|LGTM)' +reject_regex: '^Rejected' +reset_on_push: false +reviewers: + required: 1 + members: + - juvenn + - jwfing + name: default From a4617efd23e8d67cb5a1f66b4ce222149b8061e1 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 14 Oct 2016 18:47:15 +0800 Subject: [PATCH 063/249] Fix zero-ed microseconds bug --- src/LeanCloud/Client.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index f9b37e8..52feb8f 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -578,12 +578,10 @@ public static function encode($value, * @return string */ public static function formatDate($date) { - $utc = new \DateTime($date->format("c")); + $utc = clone $date; $utc->setTimezone(new \DateTimezone("UTC")); $iso = $utc->format("Y-m-d\TH:i:s.u"); - // PHP does not support sub seconds well, it will always gives 6 zero - // digits as microseconds. We chop 3 zeros off: - // `2015-09-18T08:06:20.000000Z` -> `2015-09-18T08:06:20.000Z` + // chops 3 zeros of microseconds to comply with cloud date format $iso = substr($iso, 0, 23) . "Z"; return $iso; } From 0b84b0dd9f9a6c907c088ca898fc9f6b0c2ea727 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 28 Oct 2016 15:20:26 +0800 Subject: [PATCH 064/249] (fix) Set push prod by default close #111 --- src/LeanCloud/Client.php | 10 +++++----- src/LeanCloud/Push.php | 1 + test/PushTest.php | 8 ++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index 52feb8f..218e172 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -90,11 +90,11 @@ class Client { private static $useMasterKey = false; /** - * Use production or not + * Is in production or not * * @var bool */ - private static $useProduction = false; + public static $isProduction = false; /** * Default request headers @@ -179,10 +179,10 @@ public static function useRegion($region) { /** * Use production or not * - * @param bool $flag + * @param bool $flag Default `false` */ public static function useProduction($flag) { - self::$useProduction = $flag ? true : false; + self::$isProduction = $flag ? true : false; } /** @@ -219,7 +219,7 @@ public static function buildHeaders($sessionToken, $useMasterKey) { } $h = self::$defaultHeaders; - $h['X-LC-Prod'] = self::$useProduction ? 1 : 0; + $h['X-LC-Prod'] = self::$isProduction ? 1 : 0; $timestamp = time(); $key = $useMasterKey ? self::$appMasterKey : self::$appKey; diff --git a/src/LeanCloud/Push.php b/src/LeanCloud/Push.php index 39545d0..0bdde59 100644 --- a/src/LeanCloud/Push.php +++ b/src/LeanCloud/Push.php @@ -30,6 +30,7 @@ class Push { public function __construct($data=array(), $options=array()) { $this->data = $data; $this->options = $options; + $this->options["prod"] = Client::$isProduction ? "prod": "dev"; } /** diff --git a/test/PushTest.php b/test/PushTest.php index 8610184..ad7b289 100644 --- a/test/PushTest.php +++ b/test/PushTest.php @@ -53,6 +53,14 @@ public function testSetPushForMultiplatform() { $this->assertEquals($data, $out["data"]); } + public function testDefaultProd() { + $push = new Push(array( + "alert" => "Hello world!" + )); + $out = $push->encode(); + $this->assertEquals(Client::$isProduction, $out["prod"] == "prod"); + } + public function testSetProd() { $push = new Push(array( "alert" => "Hello world!" From fbc5a9c9b02239b9d65b1addcc0d52be79eab364 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 28 Oct 2016 15:56:35 +0800 Subject: [PATCH 065/249] (fix) Encode relation close #110 --- src/LeanCloud/Client.php | 5 +++-- test/ClientTest.php | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index 218e172..9b28c12 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -555,8 +555,9 @@ public static function encode($value, } } else if ($value instanceof IOperation || $value instanceof GeoPoint || - $value instanceof Bytes || - $value instanceof ACL || + $value instanceof Bytes || + $value instanceof ACL || + $value instanceof Relation || $value instanceof File) { return $value->encode(); } else if (is_array($value)) { diff --git a/test/ClientTest.php b/test/ClientTest.php index 035c9da..7366183 100644 --- a/test/ClientTest.php +++ b/test/ClientTest.php @@ -346,6 +346,14 @@ public function testDecodeGeoPoint() { $this->assertEquals(116.4, $val->getLongitude()); } + public function testEncodeRelation() { + $a = new Object("TestObject", "id001"); + $rel = $a->getRelation("likes"); + $out = Client::encode($rel); + $this->assertEquals("Relation", + $out["__type"]); + } + public function testEncodeObjectToJSON() { $a = new Object("TestObject", "id001"); $b = new Object("TestObject", "id002"); From c9c286d4a3dcff41c05b41b78847e0e1192e626d Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Sat, 29 Oct 2016 12:43:24 +0800 Subject: [PATCH 066/249] (feat) Add debug mode close #108 --- src/LeanCloud/Client.php | 33 +++++++++++++++++++++++++++++---- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index 9b28c12..644595f 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -96,6 +96,13 @@ class Client { */ public static $isProduction = false; + /** + * Is in debug mode or not + * + * @var bool + */ + private static $debugMode = false; + /** * Default request headers * @@ -110,7 +117,6 @@ class Client { */ private static $storage; - /** * Initialize application key and settings * @@ -179,12 +185,23 @@ public static function useRegion($region) { /** * Use production or not * - * @param bool $flag Default `false` + * @param bool $flag Default false */ public static function useProduction($flag) { self::$isProduction = $flag ? true : false; } + /** + * Set debug mode + * + * Enable debug mode to log request params and response. + * + * @param bool $flag Default false + */ + public static function setDebug($flag) { + self::$debugMode = $flag ? true : false; + } + /** * Use master key or not * @@ -364,8 +381,8 @@ public static function request($method, $path, $data, case "GET": if ($data) { // append GET data as query string - curl_setopt($req, CURLOPT_URL, - $url ."?". http_build_query($data)); + $url .= "?" . http_build_query($data); + curl_setopt($req, CURLOPT_URL, $url); } break; case "POST": @@ -381,6 +398,10 @@ public static function request($method, $path, $data, default: break; } + $reqId = rand(100,999); + if (self::$debugMode) { + error_log("[DEBUG] REQUEST {$reqId}: {$method} {$url} {$json}"); + } $resp = curl_exec($req); $respCode = curl_getinfo($req, CURLINFO_HTTP_CODE); $respType = curl_getinfo($req, CURLINFO_CONTENT_TYPE); @@ -388,6 +409,10 @@ public static function request($method, $path, $data, $errno = curl_errno($req); curl_close($req); + if (self::$debugMode) { + error_log("[DEBUG] RESPONSE {$reqId}: {$resp}"); + } + /** type of error: * - curl connection error * - http status error 4xx, 5xx From f2b034dd178c413d2b74d1b48bf750a5a2a04966 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Sat, 29 Oct 2016 13:19:59 +0800 Subject: [PATCH 067/249] (feat) Enable https redirect in stg mode close #53 --- src/LeanCloud/Engine/LeanEngine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index da46e8b..1ae717e 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -617,7 +617,7 @@ public function start() { private function httpsRedirect() { $reqProto = $this->getHeaderLine("HTTP_X_FORWARDED_PROTO"); if ($reqProto === "http" && - getenv("LC_APP_ENV") === "production") { + in_array(getenv("LC_APP_ENV"), array("production", "stg"))) { $url = "https://{$_SERVER['HTTP_HOST']}{$_SERVER['REQUEST_URI']}"; $this->redirect($url); } From 28fe1c06ada755b7c5c2e2113f348f787f4d94a7 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Sat, 29 Oct 2016 17:38:45 +0800 Subject: [PATCH 068/249] (feat) Add SaveOption to support fetchWhenSave and where option close #83 #49 --- src/LeanCloud/BatchRequestError.php | 12 +++----- src/LeanCloud/Object.php | 17 +++++++++- src/LeanCloud/SaveOption.php | 44 ++++++++++++++++++++++++++ src/LeanCloud/User.php | 5 +-- test/ObjectTest.php | 48 +++++++++++++++++++++++++++++ 5 files changed, 115 insertions(+), 11 deletions(-) create mode 100644 src/LeanCloud/SaveOption.php diff --git a/src/LeanCloud/BatchRequestError.php b/src/LeanCloud/BatchRequestError.php index d250cc3..4279f2e 100644 --- a/src/LeanCloud/BatchRequestError.php +++ b/src/LeanCloud/BatchRequestError.php @@ -32,14 +32,10 @@ public function __construct($message="", $code = 1) { * @return BatchRequestError */ public function add($request, $response) { - if (!isset($response["error"])) { - throw new \InvalidArgumentException("Invalid error response."); - } - if (!isset($response["code"])) { - $response["code"] = 1; - } - $response["request"] = $request; - $this->errors[] = $response; + $error["code"] = isset($response["code"]) ? $response["code"] : 1; + $error["error"] = "{$error['code']} {$response['error']}:" + . json_encode($request); + $this->errors[] = $error; return $this; } diff --git a/src/LeanCloud/Object.php b/src/LeanCloud/Object.php index 4b1c0bd..a302758 100644 --- a/src/LeanCloud/Object.php +++ b/src/LeanCloud/Object.php @@ -41,6 +41,14 @@ class Object { */ private $_operationSet; + /** + * Save option of object + * + * @var SaveOption + * @see SaveOption + */ + private $_saveOption; + /** * Make a new *plain* Object. * @@ -398,10 +406,14 @@ private function getSaveData() { /** * Save object and its children objects and files * + * @param SaveOption $option * @throws CloudException */ - public function save() { + public function save($option=null) { if (!$this->isDirty()) {return;} + if ($option) { + $this->_saveOption = $option; + } try { $result = self::saveAll(array($this)); } catch (BatchRequestError $batchRequestError) { @@ -700,6 +712,9 @@ private static function batchSave($objects, $batchSize=20) { $req["method"] = "POST"; $req["path"] = "{$path}/{$obj->getClassName()}"; } + if ($obj->_saveOption) { + $req["params"] = $obj->_saveOption->encode(); + } $requests[] = $req; $objects[] = $obj; } diff --git a/src/LeanCloud/SaveOption.php b/src/LeanCloud/SaveOption.php new file mode 100644 index 0000000..0fea222 --- /dev/null +++ b/src/LeanCloud/SaveOption.php @@ -0,0 +1,44 @@ +fetchWhenSave)) { + $params["fetchWhenSave"] = $this->fetchWhenSave ? true : false; + } + if (!is_null($this->where)) { + if ($this->where instanceof Query) { + $out = $this->where->encode(); + $params["where"] = $out["where"]; + } else { + throw new \RuntimeException("where of SaveOption must be Query object."); + } + } + return $params; + } +} diff --git a/src/LeanCloud/User.php b/src/LeanCloud/User.php index b3edf91..e5e1da7 100644 --- a/src/LeanCloud/User.php +++ b/src/LeanCloud/User.php @@ -113,11 +113,12 @@ public function signUp() { /** * Save a signed-up user * + * @param SaveOption $option * @throws CloudException */ - public function save() { + public function save($option=null) { if ($this->getObjectId()) { - parent::save(); + parent::save($option); } else { throw new CloudException("Cannot save new user, please signUp ". "first."); diff --git a/test/ObjectTest.php b/test/ObjectTest.php index 5cca535..3c03abf 100644 --- a/test/ObjectTest.php +++ b/test/ObjectTest.php @@ -1,6 +1,8 @@ destroy(); } + public function testSaveOptionEncode() { + $option = new SaveOption(); + $this->assertEquals(array(), $option->encode()); + $option->fetchWhenSave = true; + $this->assertEquals(array("fetchWhenSave" => true), $option->encode()); + } + + public function testFetchWhenSave() { + $obj = new Object("TestObject"); + $obj->set("score", 1); + $obj->save(); + $this->assertNotEmpty($obj->getObjectId()); + $obj2 = new Object("TestObject", $obj->getObjectId()); + $obj2->increment("score"); + + $option = new SaveOption(); + $option->fetchWhenSave = true; + $obj2->save($option); + $this->assertEquals(2, $obj2->get("score")); + + $obj->set("name", "Alice in wonderland"); + $obj->increment("score"); + $obj->save($option); + $this->assertEquals(3, $obj->get("score")); + } + + public function testSaveWhenWhere() { + $obj = new Object("TestObject"); + $obj->set("score", 6); + $obj->save(); + $this->assertNotEmpty($obj->getObjectId()); + $obj->set("level", "good"); + $query = new Query("TestObject"); + $query->greaterThanOrEqualTo("score",8); + $option = new SaveOption(); + $option->where = $query; + $this->setExpectedException("LeanCloud\CloudException"); + $obj->save($option); + + $query->greaterThanOrEqualTo("score",6); + $option->where = $query; + $obj->increment("score"); + $obj->save($option); + $this->assertEquals(7, $obj->get("score")); + } + public function testGetCreatedAtAndUpdatedAt() { $obj = new Object("TestObject"); $obj->set("foo", "bar"); From 3a8e2feff7e7532f845aaa6222386556d1c1e793 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Thu, 3 Nov 2016 16:48:06 +0800 Subject: [PATCH 069/249] Add reviewers to approve --- .pullapprove.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.pullapprove.yml b/.pullapprove.yml index 94043ea..3c28ba1 100644 --- a/.pullapprove.yml +++ b/.pullapprove.yml @@ -6,5 +6,7 @@ reviewers: required: 1 members: - juvenn + - aisk + - jysperm - jwfing name: default From 4b7bdd8648232de80285ef440192954e1eb43025 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Thu, 3 Nov 2016 16:55:58 +0800 Subject: [PATCH 070/249] Ready to release v0.4.2 --- Changelog.md | 9 +++++++++ src/LeanCloud/Client.php | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index d4ddf40..bb04440 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,13 @@ +0.4.2 发布日期：2016-11-03 +---- + +* 修复毫秒丢失的问题 #114 +* 修复 Relation 不能编码的异常 #110 +* Push 设置默认的 prod 参数 #111 +* 增加 `Client::setDebug(true)` 支持调试模式 #108 +* 添加 OptionSave 类支持 fetchWhenSave 以及 where #49 #83 + 0.4.1 发布日期：2016-09-13 ---- diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index 644595f..1ed250d 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -23,7 +23,7 @@ class Client { /** * Client version */ - const VERSION = '0.4.1'; + const VERSION = '0.4.2'; /** * API Endpoints for Regions From 9a6c8e8a12e17ad239a43651008210a402434111 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 16 Nov 2016 12:22:32 +0800 Subject: [PATCH 071/249] Add User#getRoles close #116 --- src/LeanCloud/User.php | 15 +++++++++++++++ test/UserTest.php | 27 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/src/LeanCloud/User.php b/src/LeanCloud/User.php index e5e1da7..5087948 100644 --- a/src/LeanCloud/User.php +++ b/src/LeanCloud/User.php @@ -232,6 +232,21 @@ private static function clearCurrentUser() { self::setCurrentSessionToken(null); } + /** + * Get roles the user belongs to + * + * @return array Array of Role + */ + public function getRoles() { + if (!$this->getObjectId()) { + return array(); + } + $query = new Query("_Role"); + $query->equalTo("users", $this); + $roles = $query->find(); + return $roles; + } + /** * Log-in user by session token * diff --git a/test/UserTest.php b/test/UserTest.php index e22b5c0..8d5c1ff 100644 --- a/test/UserTest.php +++ b/test/UserTest.php @@ -2,6 +2,8 @@ use LeanCloud\Client; use LeanCloud\User; +use LeanCloud\Role; +use LeanCloud\ACL; use LeanCloud\File; use LeanCloud\Query; use LeanCloud\CloudException; @@ -191,6 +193,31 @@ public function testUnlinkService() { $user2->destroy(); } + public function testGetRoles() { + $user = new User(); + $user->setUsername("alice3"); + $user->setPassword("blabla"); + $user->signUp(); + + $role = new Role(); + $role->setName("test_role"); + $acl = new ACL(); + $acl->setPublicWriteAccess(true); + $acl->setPublicReadAccess(true); + + $role->setACL($acl); + $rel = $role->getUsers(); + $rel->add($user); + $role->save(); + $this->assertNotEmpty($role->getObjectId()); + + $roles = $user->getRoles(); + $this->assertEquals("test_role", $roles[0]->getName()); + + $user->destroy(); + $role->destroy(); + } + /* * Get current user with file attribute shall not * circularly invoke getCurrentUser. From 7577a877225195cd7f4cff5f487c24b19de00c50 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 16 Nov 2016 14:15:10 +0800 Subject: [PATCH 072/249] Add User#isAuthenticated close #118 --- src/LeanCloud/User.php | 21 +++++++++++++++++++++ test/UserTest.php | 11 +++++++++++ 2 files changed, 32 insertions(+) diff --git a/src/LeanCloud/User.php b/src/LeanCloud/User.php index 5087948..33533aa 100644 --- a/src/LeanCloud/User.php +++ b/src/LeanCloud/User.php @@ -232,6 +232,27 @@ private static function clearCurrentUser() { self::setCurrentSessionToken(null); } + /** + * Test if user logged in and session token is valid. + * + * @return bool + */ + public function isAuthenticated() { + $token = $this->getSessionToken(); + if (!$token) { + return false; + } + try { + static::become($token); + } catch(CloudException $ex) { + if ($ex->getCode() === 211) { + return false; + } + throw ex; + } + return true; + } + /** * Get roles the user belongs to * diff --git a/test/UserTest.php b/test/UserTest.php index 8d5c1ff..3c786a3 100644 --- a/test/UserTest.php +++ b/test/UserTest.php @@ -218,6 +218,17 @@ public function testGetRoles() { $role->destroy(); } + public function testIsAuthenticated() { + $user = User::logIn("alice", "blabla"); + $this->assertTrue($user->isAuthenticated()); + + $user->mergeAfterFetch(array("sessionToken" => "invalid-token")); + $this->assertFalse($user->isAuthenticated()); + + $user = new User(); + $this->assertFalse($user->isAuthenticated()); + } + /* * Get current user with file attribute shall not * circularly invoke getCurrentUser. From ff0c2a2bc6c0c0f6c9c79e7c99af87576f9ae97a Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 16 Nov 2016 16:16:38 +0800 Subject: [PATCH 073/249] Add User#refreshSessionToken close #117 --- src/LeanCloud/Client.php | 1 + src/LeanCloud/User.php | 9 +++++++++ test/UserTest.php | 8 ++++++++ 3 files changed, 18 insertions(+) diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index 1ed250d..b9a7719 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -400,6 +400,7 @@ public static function request($method, $path, $data, } $reqId = rand(100,999); if (self::$debugMode) { + error_log("[DEBUG] HEADERS {$reqId}:" . json_encode($headersList)); error_log("[DEBUG] REQUEST {$reqId}: {$method} {$url} {$json}"); } $resp = curl_exec($req); diff --git a/src/LeanCloud/User.php b/src/LeanCloud/User.php index 33533aa..5d813d8 100644 --- a/src/LeanCloud/User.php +++ b/src/LeanCloud/User.php @@ -232,6 +232,15 @@ private static function clearCurrentUser() { self::setCurrentSessionToken(null); } + /** + * Refresh session token + */ + public function refreshSessionToken() { + $resp = Client::put("/users/{$this->getObjectId()}/refreshSessionToken", + null); + $this->mergeAfterFetch($resp); + } + /** * Test if user logged in and session token is valid. * diff --git a/test/UserTest.php b/test/UserTest.php index 3c786a3..e5f6f07 100644 --- a/test/UserTest.php +++ b/test/UserTest.php @@ -124,6 +124,14 @@ public function testBecome() { $this->assertEquals($user2, User::getCurrentUser()); } + public function testRefreshSessionToken() { + $user = User::logIn("alice", "blabla"); + $token = $user->getSessionToken(); + $user->refreshSessionToken(); + $this->assertNotEmpty($user->getSessionToken()); + $this->assertNotEquals($token, $user->getSessionToken()); + } + public function testLogOut() { $user = User::logIn("alice", "blabla"); $this->assertEquals($user, User::getCurrentUser()); From 88dce178cf269c336e384bf2be12de5c221c9484 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 16 Nov 2016 16:59:20 +0800 Subject: [PATCH 074/249] Fix global session token not updated after refresh --- src/LeanCloud/User.php | 1 + test/UserTest.php | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/LeanCloud/User.php b/src/LeanCloud/User.php index 5d813d8..334204b 100644 --- a/src/LeanCloud/User.php +++ b/src/LeanCloud/User.php @@ -239,6 +239,7 @@ public function refreshSessionToken() { $resp = Client::put("/users/{$this->getObjectId()}/refreshSessionToken", null); $this->mergeAfterFetch($resp); + static::saveCurrentUser($this); } /** diff --git a/test/UserTest.php b/test/UserTest.php index e5f6f07..1023802 100644 --- a/test/UserTest.php +++ b/test/UserTest.php @@ -125,11 +125,16 @@ public function testBecome() { } public function testRefreshSessionToken() { - $user = User::logIn("alice", "blabla"); + $user = new User(); + $user->setUsername("alice4"); + $user->setPassword("blabla"); + $user->signUp(); + $token = $user->getSessionToken(); $user->refreshSessionToken(); $this->assertNotEmpty($user->getSessionToken()); $this->assertNotEquals($token, $user->getSessionToken()); + $user->destroy(); } public function testLogOut() { From 71379af9357b08976d391b52b33513b2a32b9fdc Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 16 Nov 2016 17:02:46 +0800 Subject: [PATCH 075/249] Add preserved_keys close #119 --- src/LeanCloud/Object.php | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/src/LeanCloud/Object.php b/src/LeanCloud/Object.php index a302758..4c0f40a 100644 --- a/src/LeanCloud/Object.php +++ b/src/LeanCloud/Object.php @@ -13,6 +13,9 @@ * */ class Object { + + const PRESERVED_KEYS = array("objectId", "ACL", + "updatedAt", "createdAt"); /** * Map of registered className to class. * @@ -141,15 +144,15 @@ public function getClassName() { } public function disableBeforeHook() { - $this->set("__before", - Client::signHook("__before_for_{$this->getClassName()}", - round(microtime(true) * 1000))); + $this->_set("__before", + Client::signHook("__before_for_{$this->getClassName()}", + round(microtime(true) * 1000))); } public function disableAfterHook() { - $this->set("__after", - Client::signHook("__after_for_{$this->getClassName()}", - round(microtime(true) * 1000))); + $this->_set("__after", + Client::signHook("__after_for_{$this->getClassName()}", + round(microtime(true) * 1000))); } /** @@ -230,6 +233,14 @@ public function getUpdatedAt() { return $this->get("updatedAt"); } + private function _set($key, $val) { + if (!($val instanceof IOperation)) { + $val = new SetOperation($key, $val); + } + $this->_applyOperation($val); + return $this; + } + /** * Set field value by key * @@ -239,14 +250,10 @@ public function getUpdatedAt() { * @throws RuntimeException */ public function set($key, $val) { - if (in_array($key, array("objectId", "createdAt", "updatedAt"))) { + if (in_array($key, self::PRESERVED_KEYS)) { throw new \RuntimeException("Preserved field could not be set."); } - if (!($val instanceof IOperation)) { - $val = new SetOperation($key, $val); - } - $this->_applyOperation($val); - return $this; + return $this->_set($key, $val); } /** @@ -256,7 +263,7 @@ public function set($key, $val) { * @return self */ public function setACL(ACL $acl) { - return $this->set("ACL", $acl); + return $this->_set("ACL", $acl); } /** From d55643732d7d5b6bf3dba3de7a0efac604d38120 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 16 Nov 2016 17:36:02 +0800 Subject: [PATCH 076/249] Remove side effects in User#isAuthenticated --- src/LeanCloud/User.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/LeanCloud/User.php b/src/LeanCloud/User.php index 334204b..377bb1d 100644 --- a/src/LeanCloud/User.php +++ b/src/LeanCloud/User.php @@ -253,7 +253,8 @@ public function isAuthenticated() { return false; } try { - static::become($token); + $resp = Client::get("/users/me", + array("session_token" => $token)); } catch(CloudException $ex) { if ($ex->getCode() === 211) { return false; From 997d72fd3d8ab382feb0deaa0de753e1f9b52d94 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Wed, 16 Nov 2016 17:36:38 +0800 Subject: [PATCH 077/249] Use setACL prompt --- src/LeanCloud/Object.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/LeanCloud/Object.php b/src/LeanCloud/Object.php index 4c0f40a..aff7acb 100644 --- a/src/LeanCloud/Object.php +++ b/src/LeanCloud/Object.php @@ -250,6 +250,10 @@ private function _set($key, $val) { * @throws RuntimeException */ public function set($key, $val) { + if ($key === "ACL") { + throw new \RuntimeException("`ACL` is preserved,". + " please use setACL instead."); + } if (in_array($key, self::PRESERVED_KEYS)) { throw new \RuntimeException("Preserved field could not be set."); } From 1225abcfe516510c1063c0d3896a7d9377b07d02 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Thu, 17 Nov 2016 15:15:32 +0800 Subject: [PATCH 078/249] Allow set ACL --- src/LeanCloud/Object.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/LeanCloud/Object.php b/src/LeanCloud/Object.php index aff7acb..be8df91 100644 --- a/src/LeanCloud/Object.php +++ b/src/LeanCloud/Object.php @@ -14,8 +14,7 @@ */ class Object { - const PRESERVED_KEYS = array("objectId", "ACL", - "updatedAt", "createdAt"); + const PRESERVED_KEYS = array("objectId", "updatedAt", "createdAt"); /** * Map of registered className to class. * @@ -234,6 +233,10 @@ public function getUpdatedAt() { } private function _set($key, $val) { + if ($key === "ACL" && + !($val instanceof ACL)) { + throw new RuntimeException("Invalid ACL."); + } if (!($val instanceof IOperation)) { $val = new SetOperation($key, $val); } @@ -250,10 +253,6 @@ private function _set($key, $val) { * @throws RuntimeException */ public function set($key, $val) { - if ($key === "ACL") { - throw new \RuntimeException("`ACL` is preserved,". - " please use setACL instead."); - } if (in_array($key, self::PRESERVED_KEYS)) { throw new \RuntimeException("Preserved field could not be set."); } From 4513625c88b8a0e9cffd92d596f4076a23bc10a0 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 18 Nov 2016 11:54:36 +0800 Subject: [PATCH 079/249] Release 0.5.0 --- Changelog.md | 7 +++++++ src/LeanCloud/Client.php | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index bb04440..91c78f4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,11 @@ +0.5.0 发布日期：2016-11-18 +---- + +* 添加 User#getRoles 方法获取角色 +* 添加 User#isAuthenticated 方法检测用户是否登录 +* 添加 User#refreshSessionToken 方法重置 token + 0.4.2 发布日期：2016-11-03 ---- diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index b9a7719..56bba60 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -23,7 +23,7 @@ class Client { /** * Client version */ - const VERSION = '0.4.2'; + const VERSION = '0.5.0'; /** * API Endpoints for Regions From 28e3f4dc9ce20e0ea813f33a68d13b4c1af4da17 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 18 Nov 2016 12:18:06 +0800 Subject: [PATCH 080/249] Fix doc string --- src/LeanCloud/Object.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/LeanCloud/Object.php b/src/LeanCloud/Object.php index be8df91..9731f95 100644 --- a/src/LeanCloud/Object.php +++ b/src/LeanCloud/Object.php @@ -14,7 +14,13 @@ */ class Object { + /** + * Preserved keys + * + * @var array + */ const PRESERVED_KEYS = array("objectId", "updatedAt", "createdAt"); + /** * Map of registered className to class. * From 591ce62fde400395a22ec76fb077c3198db0f116 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 25 Nov 2016 15:26:23 +0800 Subject: [PATCH 081/249] Fix array constant for php < 5.6 --- src/LeanCloud/Object.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LeanCloud/Object.php b/src/LeanCloud/Object.php index 9731f95..ecdd2e4 100644 --- a/src/LeanCloud/Object.php +++ b/src/LeanCloud/Object.php @@ -19,7 +19,7 @@ class Object { * * @var array */ - const PRESERVED_KEYS = array("objectId", "updatedAt", "createdAt"); + public static $PRESERVED_KEYS = array("objectId", "updatedAt", "createdAt"); /** * Map of registered className to class. @@ -259,7 +259,7 @@ private function _set($key, $val) { * @throws RuntimeException */ public function set($key, $val) { - if (in_array($key, self::PRESERVED_KEYS)) { + if (in_array($key, self::$PRESERVED_KEYS)) { throw new \RuntimeException("Preserved field could not be set."); } return $this->_set($key, $val); From 76976f0019bec3253f0f898e5e3ea2228b7456dc Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 25 Nov 2016 15:28:14 +0800 Subject: [PATCH 082/249] Ready to release 0.5.1 --- Changelog.md | 5 +++++ src/LeanCloud/Client.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 91c78f4..90ec5c3 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,9 @@ +0.5.1 发布日期：2016-11-25 +---- + +* 修复 PHP 5.6 一下版本不能定义 array 常量的 bug + 0.5.0 发布日期：2016-11-18 ---- diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index 56bba60..3f4772c 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -23,7 +23,7 @@ class Client { /** * Client version */ - const VERSION = '0.5.0'; + const VERSION = '0.5.1'; /** * API Endpoints for Regions From 479303603cb1b37152b5da4d068869cabf031aa2 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 25 Nov 2016 15:46:23 +0800 Subject: [PATCH 083/249] Fix travis not executing test --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c10a9c4..bc95e99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,8 @@ env: - LC_API_REGION=US script: - - phpunit --coverage-clover=coverage.xml + - make test_engine + - phpunit --coverage-clover=coverage.xml test after_success: - bash <(curl -s https://codecov.io/bash) From 42289e71319836e91478e1218d21006359e5ef2a Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 25 Nov 2016 15:52:05 +0800 Subject: [PATCH 084/249] Specify engine host port for travis test --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index bc95e99..f758d3e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,8 @@ php: env: - LC_API_REGION=US + - LC_APP_HOST=127.0.0.1 + - LC_APP_PORT=8081 script: - make test_engine From 0acc7c7b9614d5c07df2db9e7d48269bcb3f538b Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 25 Nov 2016 16:18:09 +0800 Subject: [PATCH 085/249] Run travis run --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f758d3e..3456791 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,11 +7,8 @@ php: env: - LC_API_REGION=US - - LC_APP_HOST=127.0.0.1 - - LC_APP_PORT=8081 script: - - make test_engine - phpunit --coverage-clover=coverage.xml test after_success: @@ -19,3 +16,4 @@ after_success: notifications: webhooks: https://hook.bearychat.com/=bw52Y/travis/6e26f4422b2871c20a5b2d40e1d49f73 + From be6e3b35794fbfa58120136fbd61a46427a23ece Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 25 Nov 2016 16:36:56 +0800 Subject: [PATCH 086/249] Add app key to travis --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3456791..ff0fc36 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,8 @@ php: env: - LC_API_REGION=US + - LC_APP_ID=wnDg0lPt0wcYGJSiHRwHBhD4 + - LC_APP_KEY=u9ekx9HFSFFBErWwyWHFmPDy script: - phpunit --coverage-clover=coverage.xml test From ce01811459d75cd43a20112d9f4bbdef2c03db4c Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 25 Nov 2016 16:44:36 +0800 Subject: [PATCH 087/249] Fix travis env list --- .travis.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff0fc36..b84530d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,7 @@ php: - 7.0 env: - - LC_API_REGION=US - - LC_APP_ID=wnDg0lPt0wcYGJSiHRwHBhD4 - - LC_APP_KEY=u9ekx9HFSFFBErWwyWHFmPDy + - LC_API_REGION=US LC_APP_ID=wnDg0lPt0wcYGJSiHRwHBhD4 LC_APP_KEY=u9ekx9HFSFFBErWwyWHFmPDy script: - phpunit --coverage-clover=coverage.xml test From c1fe0b12b36b1f98b4a58e37d821c5fa37d0fd88 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 25 Nov 2016 17:07:48 +0800 Subject: [PATCH 088/249] Run leanengine test on travis --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b84530d..0cb87ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,10 @@ php: - 7.0 env: - - LC_API_REGION=US LC_APP_ID=wnDg0lPt0wcYGJSiHRwHBhD4 LC_APP_KEY=u9ekx9HFSFFBErWwyWHFmPDy + - LC_API_REGION=US LC_APP_ID=wnDg0lPt0wcYGJSiHRwHBhD4 LC_APP_KEY=u9ekx9HFSFFBErWwyWHFmPDy LC_APP_HOST=127.0.0.1 LC_APP_PORT=8081 script: + - "make test_engine &" - phpunit --coverage-clover=coverage.xml test after_success: From 9b61a9f10bab587eb9da7429460aaf46d1f69a70 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 25 Nov 2016 17:09:01 +0800 Subject: [PATCH 089/249] Comment out masterkey verify for travis test --- test/ClientTest.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/ClientTest.php b/test/ClientTest.php index 7366183..521a64a 100644 --- a/test/ClientTest.php +++ b/test/ClientTest.php @@ -46,13 +46,13 @@ public function testVerifyKey() { $this->assertTrue($result); } - public function testVerifyKeyMaster() { - $result = Client::verifyKey( - getenv("LC_APP_ID"), - getenv("LC_APP_MASTER_KEY") . ",master" - ); - $this->assertTrue($result); - } + # public function testVerifyKeyMaster() { + # $result = Client::verifyKey( + # getenv("LC_APP_ID"), + # getenv("LC_APP_MASTER_KEY") . ",master" + # ); + # $this->assertTrue($result); + # } public function testVerifySign() { $time = time(); From ad99bd9e3c91431f3d28cb88bc14157e66732d8a Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Fri, 25 Nov 2016 18:06:12 +0800 Subject: [PATCH 090/249] Run test on php5.4 in place of php5.3 PHP 5.3 does not support `php -S` to start builtin server. --- .travis.yml | 2 +- phpunit.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0cb87ac..b02ed82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: php php: - - 5.3 + - 5.4 - 5.5 - 7.0 diff --git a/phpunit.xml b/phpunit.xml index ba43e77..b4242cc 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -4,7 +4,7 @@ forceCoversAnnotation="false"> - tests + test tests/engine From 865a780e8437ee20a3cc82a83bc9c83ac5ff0fe0 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 3 Jan 2017 16:04:01 +0800 Subject: [PATCH 091/249] Create local file with name close #124 --- src/LeanCloud/File.php | 10 +++++++--- test/FileTest.php | 5 +++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/LeanCloud/File.php b/src/LeanCloud/File.php index 5ee7a39..a42c82f 100644 --- a/src/LeanCloud/File.php +++ b/src/LeanCloud/File.php @@ -99,16 +99,20 @@ public static function createWithData($name, $data, $mimeType=null) { * Create file from disk * * @param string $filepath Absolute file path - * @param string $mimeType + * @param string $mimeType E.g. "image/png" + * @param string $name Name of file * @return File * @throws RuntimeException */ - public static function createWithLocalFile($filepath, $mimeType=null) { + public static function createWithLocalFile($filepath, $mimeType=null, $name=null) { $content = file_get_contents($filepath); if ($content === false) { throw new \RuntimeException("Read file error at $filepath"); } - return static::createWithData(basename($filepath), $content, $mimeType); + if (!$name) { + $name = basename($filepath); + } + return static::createWithData($name, $content, $mimeType); } /** diff --git a/test/FileTest.php b/test/FileTest.php index 7ac95d4..0787863 100644 --- a/test/FileTest.php +++ b/test/FileTest.php @@ -33,6 +33,11 @@ public function testCreateWithURL() { $this->assertEquals("image/png", $file->getMimeType()); } + public function testCreateWithLocalFile() { + $file = File::createWithLocalFile(__FILE__); + $this->assertEquals("FileTest.php", $file->getName()); + } + public function testSaveTextFile() { $file = File::createWithData("test.txt", "Hello World!"); $file->save(); From 38ed24eb714b07be27e583ddf1ed88d13b680f35 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 3 Jan 2017 16:32:59 +0800 Subject: [PATCH 092/249] Use region in LeanEngine test --- test/engine/LeanEngineTest.php | 1 + 1 file changed, 1 insertion(+) diff --git a/test/engine/LeanEngineTest.php b/test/engine/LeanEngineTest.php index a23e275..534c126 100644 --- a/test/engine/LeanEngineTest.php +++ b/test/engine/LeanEngineTest.php @@ -16,6 +16,7 @@ public static function setUpBeforeClass() { getenv("LC_APP_ID"), getenv("LC_APP_KEY"), getenv("LC_APP_MASTER_KEY")); + Client::useRegion(getenv("LC_API_REGION")); } private function request($url, $method, $data=null) { From 1490a98837a601aeb826757340cdec55513a1ebe Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 3 Jan 2017 17:12:21 +0800 Subject: [PATCH 093/249] Fix use region in leanegine test app --- test/engine/index.php | 1 + 1 file changed, 1 insertion(+) diff --git a/test/engine/index.php b/test/engine/index.php index 370f2ee..73334b1 100644 --- a/test/engine/index.php +++ b/test/engine/index.php @@ -11,6 +11,7 @@ getenv("LC_APP_KEY"), getenv("LC_APP_MASTER_KEY") ); +Client::useRegion(getenv("LC_API_REGION")); // define a function Cloud::define("hello", function() { From 8aa6b84b93d517afe9e47dbbac571c5416360856 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 9 Jan 2017 14:03:05 +0800 Subject: [PATCH 094/249] Accept gzip --- src/LeanCloud/Client.php | 4 ++++ test/APITest.php | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index 3f4772c..abf162f 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -132,6 +132,7 @@ public static function initialize($appId, $appKey, $appMasterKey) { self::$defaultHeaders = array( 'X-LC-Id' => self::$appId, 'Content-Type' => 'application/json;charset=utf-8', + 'Accept-Encoding' => 'gzip, deflate', 'User-Agent' => self::getVersionString() ); @@ -377,6 +378,8 @@ public static function request($method, $path, $data, curl_setopt($req, CURLOPT_RETURNTRANSFER, true); curl_setopt($req, CURLOPT_TIMEOUT, self::$apiTimeout); // curl_setopt($req, CURLINFO_HEADER_OUT, true); + // curl_setopt($req, CURLOPT_HEADER, true); + curl_setopt($req, CURLOPT_ENCODING, ''); switch($method) { case "GET": if ($data) { @@ -403,6 +406,7 @@ public static function request($method, $path, $data, error_log("[DEBUG] HEADERS {$reqId}:" . json_encode($headersList)); error_log("[DEBUG] REQUEST {$reqId}: {$method} {$url} {$json}"); } + // list($headers, $resp) = explode("\r\n\r\n", curl_exec($req), 2); $resp = curl_exec($req); $respCode = curl_getinfo($req, CURLINFO_HTTP_CODE); $respType = curl_getinfo($req, CURLINFO_CONTENT_TYPE); diff --git a/test/APITest.php b/test/APITest.php index f20125e..e670140 100644 --- a/test/APITest.php +++ b/test/APITest.php @@ -207,5 +207,22 @@ public function testUserLogin() { array("session_token" => "non-existent-token")); } + public function testGzipCompatibility() { + // Test that enable server-side gzip shall not break client decoding. + // minimum "Content-Length: 512" to trigger server gzip + $obj = array( + "name" => "alice131", + "text" => "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." + ); + $resp = Client::post("/classes/TestObject", $obj); + $this->assertNotEmpty($resp["objectId"]); + + $resp2 = Client::get("/classes/TestObject", array("where" => json_encode(array("name" => "alice131")))); + $this->assertNotEmpty($resp2["results"]); + $this->assertEquals($resp2["results"][0]["objectId"], $resp["objectId"]); + + Client::delete("/classes/TestObject/{$resp['objectId']}"); + } + } From f4fe321f2b39dfd38ec46e810635157483d0f938 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 9 Jan 2017 16:03:19 +0800 Subject: [PATCH 095/249] Fix polluted session token in leanengine test --- src/LeanCloud/User.php | 2 +- test/engine/LeanEngineTest.php | 2 ++ test/engine/index.php | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/LeanCloud/User.php b/src/LeanCloud/User.php index 377bb1d..6fc6ed7 100644 --- a/src/LeanCloud/User.php +++ b/src/LeanCloud/User.php @@ -227,7 +227,7 @@ public static function saveCurrentUser($user) { /** * Clear logged-in user and session token. */ - private static function clearCurrentUser() { + public static function clearCurrentUser() { self::$currentUser = null; self::setCurrentSessionToken(null); } diff --git a/test/engine/LeanEngineTest.php b/test/engine/LeanEngineTest.php index 534c126..d77ce8a 100644 --- a/test/engine/LeanEngineTest.php +++ b/test/engine/LeanEngineTest.php @@ -2,6 +2,7 @@ use LeanCloud\Client; use LeanCloud\CloudException; +use LeanCloud\User; /** * Test LeanEngine app server @@ -17,6 +18,7 @@ public static function setUpBeforeClass() { getenv("LC_APP_KEY"), getenv("LC_APP_MASTER_KEY")); Client::useRegion(getenv("LC_API_REGION")); + User::clearCurrentUser(); } private function request($url, $method, $data=null) { diff --git a/test/engine/index.php b/test/engine/index.php index 73334b1..9324928 100644 --- a/test/engine/index.php +++ b/test/engine/index.php @@ -5,12 +5,14 @@ use LeanCloud\Client; use LeanCloud\Engine\LeanEngine; use LeanCloud\Engine\Cloud; +use LeanCloud\Storage\CookieStorage; Client::initialize( getenv("LC_APP_ID"), getenv("LC_APP_KEY"), getenv("LC_APP_MASTER_KEY") ); +Client::setStorage(new CookieStorage()); Client::useRegion(getenv("LC_API_REGION")); // define a function From 392d3adb946bc6f56fe147fe77fda9ce9ba3809e Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Sat, 21 Jan 2017 15:37:16 +0800 Subject: [PATCH 096/249] Fix pointer being encoded to object close #128 --- src/LeanCloud/Client.php | 4 ++-- src/LeanCloud/Object.php | 2 +- test/ClientTest.php | 22 ++++++++++++++++++++++ 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index 3f4772c..13ef90d 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -654,8 +654,8 @@ public static function decode($value, $key) { return $file; } if ($type === "Pointer" || $type === "Object") { - $obj = Object::create($value["className"], $value["objectId"]); - unset($value["__type"]); + $id = isset($value["objectId"]) ? $value["objectId"] : null; + $obj = Object::create($value["className"], $id); unset($value["className"]); if (!empty($value)) { $obj->mergeAfterFetch($value); diff --git a/src/LeanCloud/Object.php b/src/LeanCloud/Object.php index ecdd2e4..7a16dd9 100644 --- a/src/LeanCloud/Object.php +++ b/src/LeanCloud/Object.php @@ -208,7 +208,7 @@ public function toFullJSON($seen=array()) { forEach($this->_data as $key => $val) { $out[$key] = Client::encode($val, "toFullJSON", $seen); } - $out["__type"] = "Object"; + if (!isset($out["__type"])) $out["__type"] = "Object"; $out["className"] = $this->getClassName(); return $out; } diff --git a/test/ClientTest.php b/test/ClientTest.php index 521a64a..a20408a 100644 --- a/test/ClientTest.php +++ b/test/ClientTest.php @@ -411,6 +411,28 @@ public function testEncodeCircularObjectAsPointer() { $this->assertEquals("Object", $jsonC["__type"]); $this->assertEquals("Pointer", $jsonC["likes"][0]["__type"]); } + + public function testEncodePointerObject() { + $json = array( + "__type" => "Object", + "objectId" => "id001", + "className" => "TestObject", + "name" => "A", + "likes" => array( + "__type" => "Pointer", + "objectId" => "id002", + "className" => "TestObject" + ) + ); + $a = Client::decode($json, null); + $this->assertTrue($a instanceof Object); + $this->assertTrue($a->get("likes") instanceof Object); + + $out = $a->toFullJSON(); + $this->assertEquals("A", $out["name"]); + $this->assertEquals("Pointer", $out["likes"]["__type"]); + $this->assertEquals("TestObject", $out["likes"]["className"]); + } } From d65aa2ad07e5bc935dc1cbbcc6fce79917fe5e7d Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Sun, 22 Jan 2017 14:24:22 +0800 Subject: [PATCH 097/249] (fix) Encode as pointer for object has no data --- src/LeanCloud/Client.php | 3 ++- src/LeanCloud/Object.php | 12 +++++++++++- test/ClientTest.php | 1 + test/ObjectTest.php | 12 ++++++++++++ 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index 13ef90d..f8e06c2 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -573,7 +573,7 @@ public static function encode($value, return array("__type" => "Date", "iso" => self::formatDate($value)); } else if ($value instanceof Object) { - if ($encoder && !in_array($value, $seen)) { + if ($encoder && $value->hasData() && !in_array($value, $seen)) { $seen[] = $value; return call_user_func(array($value, $encoder), $seen); } else { @@ -656,6 +656,7 @@ public static function decode($value, $key) { if ($type === "Pointer" || $type === "Object") { $id = isset($value["objectId"]) ? $value["objectId"] : null; $obj = Object::create($value["className"], $id); + unset($value["__type"]); unset($value["className"]); if (!empty($value)) { $obj->mergeAfterFetch($value); diff --git a/src/LeanCloud/Object.php b/src/LeanCloud/Object.php index 7a16dd9..2254342 100644 --- a/src/LeanCloud/Object.php +++ b/src/LeanCloud/Object.php @@ -208,7 +208,7 @@ public function toFullJSON($seen=array()) { forEach($this->_data as $key => $val) { $out[$key] = Client::encode($val, "toFullJSON", $seen); } - if (!isset($out["__type"])) $out["__type"] = "Object"; + $out["__type"] = "Object"; $out["className"] = $this->getClassName(); return $out; } @@ -400,6 +400,16 @@ public function removeIn($key, $val) { return $this; } + /** + * If object has data attributes. + * + * @return bool + */ + public function hasData() { + $keys = array_keys($this->_data); + return $keys !== array("objectId"); + } + /** * If there are unsaved operations. * diff --git a/test/ClientTest.php b/test/ClientTest.php index a20408a..bec249c 100644 --- a/test/ClientTest.php +++ b/test/ClientTest.php @@ -433,6 +433,7 @@ public function testEncodePointerObject() { $this->assertEquals("Pointer", $out["likes"]["__type"]); $this->assertEquals("TestObject", $out["likes"]["className"]); } + } diff --git a/test/ObjectTest.php b/test/ObjectTest.php index 3c03abf..db14e57 100644 --- a/test/ObjectTest.php +++ b/test/ObjectTest.php @@ -432,5 +432,17 @@ public function testGeoPointLocation() { $location->destroy(); } + public function testPointerObjectHasNoData() { + $json = array( + "__type" => "Pointer", + "className" => "TestObject", + "objectId" => "id001" + ); + $obj = Client::decode($json, null); + $this->assertTrue($obj instanceof Object); + $this->assertEquals("id001", $obj->getObjectId()); + + $this->assertFalse($obj->hasData()); + } } From 269da6a5905752999c9598ab40fdd8536d129f38 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Sun, 22 Jan 2017 17:22:04 +0800 Subject: [PATCH 098/249] Ready to release 0.5.2 --- Changelog.md | 6 ++++++ src/LeanCloud/Client.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 90ec5c3..30fad08 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,10 @@ +0.5.2 发布日期：2017-01-22 +---- + +* 修复 pointer 对象序列化为 object +* 创建本地文件时支持传入文件名 + 0.5.1 发布日期：2016-11-25 ---- diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index 7551768..22949fc 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -23,7 +23,7 @@ class Client { /** * Client version */ - const VERSION = '0.5.1'; + const VERSION = '0.5.2'; /** * API Endpoints for Regions From f49774feb2fce3c7b6721464814202f2630a4cd9 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 24 Jan 2017 15:39:12 +0800 Subject: [PATCH 099/249] Test beforeSave with pointers --- test/engine/LeanEngineTest.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/engine/LeanEngineTest.php b/test/engine/LeanEngineTest.php index d77ce8a..736eb30 100644 --- a/test/engine/LeanEngineTest.php +++ b/test/engine/LeanEngineTest.php @@ -154,18 +154,21 @@ public function testOnVerifiedSms() { public function testBeforeSave() { $obj = array( - "__type" => "Object", - "className" => "TestObject", - "objectId" => "id002", "name" => "alice", + "likes" => array( + "__type" => "Pointer", + "className" => "TestObject", + "objectId" => "id002" + ), "__before" => $this->signHook("__before_for_TestObject") ); $resp = $this->request("/1/functions/TestObject/beforeSave", "POST", array("object" => $obj)); $obj2 = $resp; - $this->assertEquals($obj["objectId"], $obj2["objectId"]); $this->assertEquals($obj["name"], $obj2["name"]); $this->assertEquals(42, $obj2["__testKey"]); + $this->assertEquals("Pointer", $obj2["likes"]["__type"]); + $this->assertEquals("id002", $obj2["likes"]["objectId"]); } public function testAfterSave() { From 042644a0a3b9103283d0441541d3d26abd9657c0 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 24 Jan 2017 16:06:58 +0800 Subject: [PATCH 100/249] Print error stack to console on exception close #131 --- src/LeanCloud/Engine/LeanEngine.php | 50 +++++++++++------------------ 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/src/LeanCloud/Engine/LeanEngine.php b/src/LeanCloud/Engine/LeanEngine.php index 1ae717e..6d0e2cd 100644 --- a/src/LeanCloud/Engine/LeanEngine.php +++ b/src/LeanCloud/Engine/LeanEngine.php @@ -409,9 +409,15 @@ protected function dispatch($method, $url) { $this->dispatchHook($funcParams[0], $funcParams[1], $json); } } + } catch (FunctionError $ex) { + // intended error in user defined function + error_log($ex->getTraceAsString()); + $this->renderError($ex->getMessage(), $ex->getCode()); } catch (CloudException $ex) { + error_log($ex->getTraceAsString()); $this->renderError($ex->getMessage(), $ex->getCode()); } catch (\Exception $ex) { + error_log($ex->getTraceAsString()); $this->renderError("Cloud script error: {$ex->getMessage()}", 141); } } @@ -444,14 +450,10 @@ private function dispatchFunc($funcName, $body, $decodeObj=false) { } $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; - try { - $result = Cloud::run($funcName, - $params, - User::getCurrentUser(), - $meta); - } catch (FunctionError $err) { - $this->renderError($err->getMessage(), $err->getCode()); - } + $result = Cloud::run($funcName, + $params, + User::getCurrentUser(), + $meta); if ($decodeObj) { // Encode object to full, type-annotated JSON $out = Client::encode($result, "toFullJSON"); @@ -513,15 +515,11 @@ private function dispatchHook($className, $hookName, $body) { } $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; - try { - $result = Cloud::runHook($className, - $hookName, - $obj, - User::getCurrentUser(), - $meta); - } catch (FunctionError $err) { - $this->renderError($err->getMessage(), $err->getCode()); - } + $result = Cloud::runHook($className, + $hookName, + $obj, + User::getCurrentUser(), + $meta); if ($hookName == "beforeDelete") { $this->renderJSON(array()); } else if (strpos($hookName, "after") === 0) { @@ -550,11 +548,7 @@ private function dispatchOnVerified($type, $body) { $userObj = Client::decode($body["object"], null); User::saveCurrentUser($userObj); $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; - try { - Cloud::runOnVerified($type, $userObj, $meta); - } catch (FunctionError $err) { - $this->renderError($err->getMessage(), $err->getCode()); - } + Cloud::runOnVerified($type, $userObj, $meta); $this->renderJSON(array("result" => "ok")); } @@ -573,11 +567,7 @@ private function dispatchOnLogin($body) { $userObj = Client::decode($body["object"], null); $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; - try { - Cloud::runOnLogin($userObj, $meta); - } catch (FunctionError $err) { - $this->renderError($err->getMessage(), $err->getCode()); - } + Cloud::runOnLogin($userObj, $meta); $this->renderJSON(array("result" => "ok")); } @@ -595,11 +585,7 @@ private function dispatchOnInsight($body) { } $meta["remoteAddress"] = $this->env["REMOTE_ADDR"]; - try { - Cloud::runOnInsight($body, $meta); - } catch (FunctionError $err) { - $this->renderError($err->getMessage(), $err->getCode()); - } + Cloud::runOnInsight($body, $meta); $this->renderJSON(array("result" => "ok")); } From 48d2bfc682ca41acdeb1582b69214d263c98a412 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Tue, 24 Jan 2017 17:40:14 +0800 Subject: [PATCH 101/249] Invoke fileCallback after file uploaded (or failed so) --- src/LeanCloud/File.php | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/LeanCloud/File.php b/src/LeanCloud/File.php index a42c82f..511e755 100644 --- a/src/LeanCloud/File.php +++ b/src/LeanCloud/File.php @@ -380,14 +380,23 @@ public function save() { $resp["token"] = null; } + $callbackParams = array("token" => $resp["token"]); try { $uploader = SimpleUploader::createUploader($resp["provider"]); $uploader->initialize($resp["upload_url"], $resp["token"]); $uploader->upload($this->_source, $this->getMimeType(), $key); + $callbackParams["result"] = false; } catch (\Exception $ex) { - $this->destroy(); + $callbackParams["result"] = false; throw $ex; + } finally { + try { + Client::post("/fileCallback", $callbackParams); + } catch (\Exception $ex) { + error_log("Request /fileCallback failed."); + } } + forEach(array("upload_url", "token") as $k) { if (isset($resp[$k])) { unset($resp[$k]); From 61d8af9d5532000f97eb0091182ac455296f497b Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 13 Feb 2017 17:35:48 +0800 Subject: [PATCH 102/249] Allow use lowercase region close #137 --- src/LeanCloud/Client.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index 22949fc..805f0ed 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -172,11 +172,12 @@ public static function getVersionString() { /** * Set API region * - * Available regions are "CN" and "US". + * Available regions are "CN", "US", "E1". * * @param string $region */ public static function useRegion($region) { + $region = strtoupper($region); if (!isset(self::$api[$region])) { throw new \RuntimeException("Invalid API region: {$region}."); } From 75b6c606f38f70030bad00a0d2f1afe3a1387f24 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 13 Feb 2017 17:54:10 +0800 Subject: [PATCH 103/249] Release 0.5.3 --- Changelog.md | 5 +++++ src/LeanCloud/Client.php | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 30fad08..f24cdaa 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,4 +1,9 @@ +0.5.3 发布日期：2017-02-13 +---- + +* 支持小写的 region + 0.5.2 发布日期：2017-01-22 ---- diff --git a/src/LeanCloud/Client.php b/src/LeanCloud/Client.php index 805f0ed..01fefbf 100644 --- a/src/LeanCloud/Client.php +++ b/src/LeanCloud/Client.php @@ -23,7 +23,7 @@ class Client { /** * Client version */ - const VERSION = '0.5.2'; + const VERSION = '0.5.3'; /** * API Endpoints for Regions From 574252f248bd2a5b4a5e2aace2988b5664e161e4 Mon Sep 17 00:00:00 2001 From: Juvenn Woo Date: Mon, 20 Feb 2017 14:50:47 +0800 Subject: [PATCH 104/249] (chore) Add docs to github pages --- docs/404.html | 149 ++ docs/class-LeanCloud.ACL.html | 765 +++++++ docs/class-LeanCloud.BatchRequestError.html | 431 ++++ docs/class-LeanCloud.Bytes.html | 352 +++ docs/class-LeanCloud.Client.html | 1260 ++++++++++ docs/class-LeanCloud.CloudException.html | 281 +++ docs/class-LeanCloud.Engine.Cloud.html | 900 ++++++++ .../class-LeanCloud.Engine.FunctionError.html | 266 +++ .../class-LeanCloud.Engine.LaravelEngine.html | 323 +++ docs/class-LeanCloud.Engine.LeanEngine.html | 516 +++++ docs/class-LeanCloud.Engine.SlimEngine.html | 324 +++ docs/class-LeanCloud.File.html | 1029 +++++++++ docs/class-LeanCloud.GeoPoint.html | 434 ++++ docs/class-LeanCloud.MIMEType.html | 425 ++++ docs/class-LeanCloud.Object.html | 1510 ++++++++++++ ...ss-LeanCloud.Operation.ArrayOperation.html | 438 ++++ ...s-LeanCloud.Operation.DeleteOperation.html | 358 +++ .../class-LeanCloud.Operation.IOperation.html | 282 +++ ...eanCloud.Operation.IncrementOperation.html | 394 ++++ ...LeanCloud.Operation.RelationOperation.html | 408 ++++ ...lass-LeanCloud.Operation.SetOperation.html | 396 ++++ docs/class-LeanCloud.Push.html | 602 +++++ docs/class-LeanCloud.Query.html | 2039 +++++++++++++++++ docs/class-LeanCloud.Relation.html | 470 ++++ docs/class-LeanCloud.Role.html | 416 ++++ docs/class-LeanCloud.SMS.html | 264 +++ docs/class-LeanCloud.SaveOption.html | 259 +++ ...class-LeanCloud.Storage.CookieStorage.html | 386 ++++ docs/class-LeanCloud.Storage.IStorage.html | 321 +++ ...lass-LeanCloud.Storage.SessionStorage.html | 368 +++ ...ass-LeanCloud.Uploader.QCloudUploader.html | 260 +++ ...lass-LeanCloud.Uploader.QiniuUploader.html | 295 +++ docs/class-LeanCloud.Uploader.S3Uploader.html | 225 ++ ...ass-LeanCloud.Uploader.SimpleUploader.html | 456 ++++ docs/class-LeanCloud.User.html | 1547 +++++++++++++ docs/elementlist.js | 3 + docs/index.html | 165 ++ docs/namespace-LeanCloud.Engine.html | 147 ++ docs/namespace-LeanCloud.Operation.html | 152 ++ docs/namespace-LeanCloud.Storage.html | 137 ++ docs/namespace-LeanCloud.Uploader.html | 136 ++ docs/namespace-LeanCloud.html | 217 ++ docs/resources/collapsed.png | Bin 0 -> 238 bytes docs/resources/combined.js | 1347 +++++++++++ docs/resources/footer.png | Bin 0 -> 7948 bytes docs/resources/inherit.png | Bin 0 -> 152 bytes docs/resources/resize.png | Bin 0 -> 216 bytes docs/resources/sort.png | Bin 0 -> 171 bytes docs/resources/style.css | 619 +++++ docs/resources/tree-cleaner.png | Bin 0 -> 126 bytes docs/resources/tree-hasnext.png | Bin 0 -> 128 bytes docs/resources/tree-last.png | Bin 0 -> 172 bytes docs/resources/tree-vertical.png | Bin 0 -> 127 bytes docs/source-class-LeanCloud.ACL.html | 456 ++++ ...rce-class-LeanCloud.BatchRequestError.html | 226 ++ docs/source-class-LeanCloud.Bytes.html | 224 ++ docs/source-class-LeanCloud.Client.html | 848 +++++++ ...source-class-LeanCloud.CloudException.html | 161 ++ docs/source-class-LeanCloud.Engine.Cloud.html | 488 ++++ ...-class-LeanCloud.Engine.FunctionError.html | 160 ++ ...-class-LeanCloud.Engine.LaravelEngine.html | 199 ++ ...rce-class-LeanCloud.Engine.LeanEngine.html | 779 +++++++ ...rce-class-LeanCloud.Engine.SlimEngine.html | 211 ++ docs/source-class-LeanCloud.File.html | 585 +++++ docs/source-class-LeanCloud.GeoPoint.html | 251 ++ docs/source-class-LeanCloud.MIMEType.html | 356 +++ docs/source-class-LeanCloud.Object.html | 925 ++++++++ ...ss-LeanCloud.Operation.ArrayOperation.html | 363 +++ ...s-LeanCloud.Operation.DeleteOperation.html | 204 ++ ...-class-LeanCloud.Operation.IOperation.html | 176 ++ ...eanCloud.Operation.IncrementOperation.html | 246 ++ ...LeanCloud.Operation.RelationOperation.html | 343 +++ ...lass-LeanCloud.Operation.SetOperation.html | 230 ++ docs/source-class-LeanCloud.Push.html | 311 +++ docs/source-class-LeanCloud.Query.html | 940 ++++++++ docs/source-class-LeanCloud.Relation.html | 291 +++ docs/source-class-LeanCloud.Role.html | 213 ++ docs/source-class-LeanCloud.SMS.html | 198 ++ docs/source-class-LeanCloud.SaveOption.html | 189 ++ ...class-LeanCloud.Storage.CookieStorage.html | 250 ++ ...urce-class-LeanCloud.Storage.IStorage.html | 191 ++ ...lass-LeanCloud.Storage.SessionStorage.html | 222 ++ ...ass-LeanCloud.Uploader.QCloudUploader.html | 214 ++ ...lass-LeanCloud.Uploader.QiniuUploader.html | 228 ++ ...e-class-LeanCloud.Uploader.S3Uploader.html | 192 ++ ...ass-LeanCloud.Uploader.SimpleUploader.html | 239 ++ docs/source-class-LeanCloud.User.html | 678 ++++++ 87 files changed, 33859 insertions(+) create mode 100644 docs/404.html create mode 100644 docs/class-LeanCloud.ACL.html create mode 100644 docs/class-LeanCloud.BatchRequestError.html create mode 100644 docs/class-LeanCloud.Bytes.html create mode 100644 docs/class-LeanCloud.Client.html create mode 100644 docs/class-LeanCloud.CloudException.html create mode 100644 docs/class-LeanCloud.Engine.Cloud.html create mode 100644 docs/class-LeanCloud.Engine.FunctionError.html create mode 100644 docs/class-LeanCloud.Engine.LaravelEngine.html create mode 100644 docs/class-LeanCloud.Engine.LeanEngine.html create mode 100644 docs/class-LeanCloud.Engine.SlimEngine.html create mode 100644 docs/class-LeanCloud.File.html create mode 100644 docs/class-LeanCloud.GeoPoint.html create mode 100644 docs/class-LeanCloud.MIMEType.html create mode 100644 docs/class-LeanCloud.Object.html create mode 100644 docs/class-LeanCloud.Operation.ArrayOperation.html create mode 100644 docs/class-LeanCloud.Operation.DeleteOperation.html create mode 100644 docs/class-LeanCloud.Operation.IOperation.html create mode 100644 docs/class-LeanCloud.Operation.IncrementOperation.html create mode 100644 docs/class-LeanCloud.Operation.RelationOperation.html create mode 100644 docs/class-LeanCloud.Operation.SetOperation.html create mode 100644 docs/class-LeanCloud.Push.html create mode 100644 docs/class-LeanCloud.Query.html create mode 100644 docs/class-LeanCloud.Relation.html create mode 100644 docs/class-LeanCloud.Role.html create mode 100644 docs/class-LeanCloud.SMS.html create mode 100644 docs/class-LeanCloud.SaveOption.html create mode 100644 docs/class-LeanCloud.Storage.CookieStorage.html create mode 100644 docs/class-LeanCloud.Storage.IStorage.html create mode 100644 docs/class-LeanCloud.Storage.SessionStorage.html create mode 100644 docs/class-LeanCloud.Uploader.QCloudUploader.html create mode 100644 docs/class-LeanCloud.Uploader.QiniuUploader.html create mode 100644 docs/class-LeanCloud.Uploader.S3Uploader.html create mode 100644 docs/class-LeanCloud.Uploader.SimpleUploader.html create mode 100644 docs/class-LeanCloud.User.html create mode 100644 docs/elementlist.js create mode 100644 docs/index.html create mode 100644 docs/namespace-LeanCloud.Engine.html create mode 100644 docs/namespace-LeanCloud.Operation.html create mode 100644 docs/namespace-LeanCloud.Storage.html create mode 100644 docs/namespace-LeanCloud.Uploader.html create mode 100644 docs/namespace-LeanCloud.html create mode 100644 docs/resources/collapsed.png create mode 100644 docs/resources/combined.js create mode 100644 docs/resources/footer.png create mode 100644 docs/resources/inherit.png create mode 100644 docs/resources/resize.png create mode 100644 docs/resources/sort.png create mode 100644 docs/resources/style.css create mode 100644 docs/resources/tree-cleaner.png create mode 100644 docs/resources/tree-hasnext.png create mode 100644 docs/resources/tree-last.png create mode 100644 docs/resources/tree-vertical.png create mode 100644 docs/source-class-LeanCloud.ACL.html create mode 100644 docs/source-class-LeanCloud.BatchRequestError.html create mode 100644 docs/source-class-LeanCloud.Bytes.html create mode 100644 docs/source-class-LeanCloud.Client.html create mode 100644 docs/source-class-LeanCloud.CloudException.html create mode 100644 docs/source-class-LeanCloud.Engine.Cloud.html create mode 100644 docs/source-class-LeanCloud.Engine.FunctionError.html create mode 100644 docs/source-class-LeanCloud.Engine.LaravelEngine.html create mode 100644 docs/source-class-LeanCloud.Engine.LeanEngine.html create mode 100644 docs/source-class-LeanCloud.Engine.SlimEngine.html create mode 100644 docs/source-class-LeanCloud.File.html create mode 100644 docs/source-class-LeanCloud.GeoPoint.html create mode 100644 docs/source-class-LeanCloud.MIMEType.html create mode 100644 docs/source-class-LeanCloud.Object.html create mode 100644 docs/source-class-LeanCloud.Operation.ArrayOperation.html create mode 100644 docs/source-class-LeanCloud.Operation.DeleteOperation.html create mode 100644 docs/source-class-LeanCloud.Operation.IOperation.html create mode 100644 docs/source-class-LeanCloud.Operation.IncrementOperation.html create mode 100644 docs/source-class-LeanCloud.Operation.RelationOperation.html create mode 100644 docs/source-class-LeanCloud.Operation.SetOperation.html create mode 100644 docs/source-class-LeanCloud.Push.html create mode 100644 docs/source-class-LeanCloud.Query.html create mode 100644 docs/source-class-LeanCloud.Relation.html create mode 100644 docs/source-class-LeanCloud.Role.html create mode 100644 docs/source-class-LeanCloud.SMS.html create mode 100644 docs/source-class-LeanCloud.SaveOption.html create mode 100644 docs/source-class-LeanCloud.Storage.CookieStorage.html create mode 100644 docs/source-class-LeanCloud.Storage.IStorage.html create mode 100644 docs/source-class-LeanCloud.Storage.SessionStorage.html create mode 100644 docs/source-class-LeanCloud.Uploader.QCloudUploader.html create mode 100644 docs/source-class-LeanCloud.Uploader.QiniuUploader.html create mode 100644 docs/source-class-LeanCloud.Uploader.S3Uploader.html create mode 100644 docs/source-class-LeanCloud.Uploader.SimpleUploader.html create mode 100644 docs/source-class-LeanCloud.User.html diff --git a/docs/404.html b/docs/404.html new file mode 100644 index 0000000..ffae2e6 --- /dev/null +++ b/docs/404.html @@ -0,0 +1,149 @@ + + + + + + + Page not found + + + + + + + + +
+ + + + + + diff --git a/docs/class-LeanCloud.ACL.html b/docs/class-LeanCloud.ACL.html new file mode 100644 index 0000000..7b4763c --- /dev/null +++ b/docs/class-LeanCloud.ACL.html @@ -0,0 +1,765 @@ + + + + + + Class LeanCloud\ACL + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.BatchRequestError.html b/docs/class-LeanCloud.BatchRequestError.html new file mode 100644 index 0000000..43a3adf --- /dev/null +++ b/docs/class-LeanCloud.BatchRequestError.html @@ -0,0 +1,431 @@ + + + + + + Class LeanCloud\BatchRequestError + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Bytes.html b/docs/class-LeanCloud.Bytes.html new file mode 100644 index 0000000..c0a97fb --- /dev/null +++ b/docs/class-LeanCloud.Bytes.html @@ -0,0 +1,352 @@ + + + + + + Class LeanCloud\Bytes + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Client.html b/docs/class-LeanCloud.Client.html new file mode 100644 index 0000000..f5385c8 --- /dev/null +++ b/docs/class-LeanCloud.Client.html @@ -0,0 +1,1260 @@ + + + + + + Class LeanCloud\Client + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.CloudException.html b/docs/class-LeanCloud.CloudException.html new file mode 100644 index 0000000..077e276 --- /dev/null +++ b/docs/class-LeanCloud.CloudException.html @@ -0,0 +1,281 @@ + + + + + + Class LeanCloud\CloudException + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Engine.Cloud.html b/docs/class-LeanCloud.Engine.Cloud.html new file mode 100644 index 0000000..9fef04f --- /dev/null +++ b/docs/class-LeanCloud.Engine.Cloud.html @@ -0,0 +1,900 @@ + + + + + + Class LeanCloud\Engine\Cloud + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Engine.FunctionError.html b/docs/class-LeanCloud.Engine.FunctionError.html new file mode 100644 index 0000000..566672f --- /dev/null +++ b/docs/class-LeanCloud.Engine.FunctionError.html @@ -0,0 +1,266 @@ + + + + + + Class LeanCloud\Engine\FunctionError + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Engine.LaravelEngine.html b/docs/class-LeanCloud.Engine.LaravelEngine.html new file mode 100644 index 0000000..6931eb0 --- /dev/null +++ b/docs/class-LeanCloud.Engine.LaravelEngine.html @@ -0,0 +1,323 @@ + + + + + + Class LeanCloud\Engine\LaravelEngine + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Engine.LeanEngine.html b/docs/class-LeanCloud.Engine.LeanEngine.html new file mode 100644 index 0000000..9139712 --- /dev/null +++ b/docs/class-LeanCloud.Engine.LeanEngine.html @@ -0,0 +1,516 @@ + + + + + + Class LeanCloud\Engine\LeanEngine + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Engine.SlimEngine.html b/docs/class-LeanCloud.Engine.SlimEngine.html new file mode 100644 index 0000000..faaa135 --- /dev/null +++ b/docs/class-LeanCloud.Engine.SlimEngine.html @@ -0,0 +1,324 @@ + + + + + + Class LeanCloud\Engine\SlimEngine + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.File.html b/docs/class-LeanCloud.File.html new file mode 100644 index 0000000..863174a --- /dev/null +++ b/docs/class-LeanCloud.File.html @@ -0,0 +1,1029 @@ + + + + + + Class LeanCloud\File + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.GeoPoint.html b/docs/class-LeanCloud.GeoPoint.html new file mode 100644 index 0000000..a184f93 --- /dev/null +++ b/docs/class-LeanCloud.GeoPoint.html @@ -0,0 +1,434 @@ + + + + + + Class LeanCloud\GeoPoint + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.MIMEType.html b/docs/class-LeanCloud.MIMEType.html new file mode 100644 index 0000000..bff70a6 --- /dev/null +++ b/docs/class-LeanCloud.MIMEType.html @@ -0,0 +1,425 @@ + + + + + + Class LeanCloud\MIMEType + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Object.html b/docs/class-LeanCloud.Object.html new file mode 100644 index 0000000..ac8b0fb --- /dev/null +++ b/docs/class-LeanCloud.Object.html @@ -0,0 +1,1510 @@ + + + + + + Class LeanCloud\Object + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Operation.ArrayOperation.html b/docs/class-LeanCloud.Operation.ArrayOperation.html new file mode 100644 index 0000000..fe41e38 --- /dev/null +++ b/docs/class-LeanCloud.Operation.ArrayOperation.html @@ -0,0 +1,438 @@ + + + + + + Class LeanCloud\Operation\ArrayOperation + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Operation.DeleteOperation.html b/docs/class-LeanCloud.Operation.DeleteOperation.html new file mode 100644 index 0000000..808344a --- /dev/null +++ b/docs/class-LeanCloud.Operation.DeleteOperation.html @@ -0,0 +1,358 @@ + + + + + + Class LeanCloud\Operation\DeleteOperation + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Operation.IOperation.html b/docs/class-LeanCloud.Operation.IOperation.html new file mode 100644 index 0000000..6c680f8 --- /dev/null +++ b/docs/class-LeanCloud.Operation.IOperation.html @@ -0,0 +1,282 @@ + + + + + + Interface LeanCloud\Operation\IOperation + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Operation.IncrementOperation.html b/docs/class-LeanCloud.Operation.IncrementOperation.html new file mode 100644 index 0000000..7d438a1 --- /dev/null +++ b/docs/class-LeanCloud.Operation.IncrementOperation.html @@ -0,0 +1,394 @@ + + + + + + Class LeanCloud\Operation\IncrementOperation + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Operation.RelationOperation.html b/docs/class-LeanCloud.Operation.RelationOperation.html new file mode 100644 index 0000000..0a7fe68 --- /dev/null +++ b/docs/class-LeanCloud.Operation.RelationOperation.html @@ -0,0 +1,408 @@ + + + + + + Class LeanCloud\Operation\RelationOperation + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Operation.SetOperation.html b/docs/class-LeanCloud.Operation.SetOperation.html new file mode 100644 index 0000000..cdfbb80 --- /dev/null +++ b/docs/class-LeanCloud.Operation.SetOperation.html @@ -0,0 +1,396 @@ + + + + + + Class LeanCloud\Operation\SetOperation + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Push.html b/docs/class-LeanCloud.Push.html new file mode 100644 index 0000000..6d1839a --- /dev/null +++ b/docs/class-LeanCloud.Push.html @@ -0,0 +1,602 @@ + + + + + + Class LeanCloud\Push + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Query.html b/docs/class-LeanCloud.Query.html new file mode 100644 index 0000000..ae42290 --- /dev/null +++ b/docs/class-LeanCloud.Query.html @@ -0,0 +1,2039 @@ + + + + + + Class LeanCloud\Query + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Relation.html b/docs/class-LeanCloud.Relation.html new file mode 100644 index 0000000..c8004d6 --- /dev/null +++ b/docs/class-LeanCloud.Relation.html @@ -0,0 +1,470 @@ + + + + + + Class LeanCloud\Relation + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Role.html b/docs/class-LeanCloud.Role.html new file mode 100644 index 0000000..5b5013a --- /dev/null +++ b/docs/class-LeanCloud.Role.html @@ -0,0 +1,416 @@ + + + + + + Class LeanCloud\Role + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.SMS.html b/docs/class-LeanCloud.SMS.html new file mode 100644 index 0000000..c6dcd98 --- /dev/null +++ b/docs/class-LeanCloud.SMS.html @@ -0,0 +1,264 @@ + + + + + + Class LeanCloud\SMS + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.SaveOption.html b/docs/class-LeanCloud.SaveOption.html new file mode 100644 index 0000000..8ab4108 --- /dev/null +++ b/docs/class-LeanCloud.SaveOption.html @@ -0,0 +1,259 @@ + + + + + + Class LeanCloud\SaveOption + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Storage.CookieStorage.html b/docs/class-LeanCloud.Storage.CookieStorage.html new file mode 100644 index 0000000..c49cfe1 --- /dev/null +++ b/docs/class-LeanCloud.Storage.CookieStorage.html @@ -0,0 +1,386 @@ + + + + + + Class LeanCloud\Storage\CookieStorage + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Storage.IStorage.html b/docs/class-LeanCloud.Storage.IStorage.html new file mode 100644 index 0000000..8fe0383 --- /dev/null +++ b/docs/class-LeanCloud.Storage.IStorage.html @@ -0,0 +1,321 @@ + + + + + + Interface LeanCloud\Storage\IStorage + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Storage.SessionStorage.html b/docs/class-LeanCloud.Storage.SessionStorage.html new file mode 100644 index 0000000..2a8b5c9 --- /dev/null +++ b/docs/class-LeanCloud.Storage.SessionStorage.html @@ -0,0 +1,368 @@ + + + + + + Class LeanCloud\Storage\SessionStorage + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Uploader.QCloudUploader.html b/docs/class-LeanCloud.Uploader.QCloudUploader.html new file mode 100644 index 0000000..8b0371f --- /dev/null +++ b/docs/class-LeanCloud.Uploader.QCloudUploader.html @@ -0,0 +1,260 @@ + + + + + + Class LeanCloud\Uploader\QCloudUploader + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Uploader.QiniuUploader.html b/docs/class-LeanCloud.Uploader.QiniuUploader.html new file mode 100644 index 0000000..0c8ee96 --- /dev/null +++ b/docs/class-LeanCloud.Uploader.QiniuUploader.html @@ -0,0 +1,295 @@ + + + + + + Class LeanCloud\Uploader\QiniuUploader + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Uploader.S3Uploader.html b/docs/class-LeanCloud.Uploader.S3Uploader.html new file mode 100644 index 0000000..630d2a6 --- /dev/null +++ b/docs/class-LeanCloud.Uploader.S3Uploader.html @@ -0,0 +1,225 @@ + + + + + + Class LeanCloud\Uploader\S3Uploader + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.Uploader.SimpleUploader.html b/docs/class-LeanCloud.Uploader.SimpleUploader.html new file mode 100644 index 0000000..7ef8755 --- /dev/null +++ b/docs/class-LeanCloud.Uploader.SimpleUploader.html @@ -0,0 +1,456 @@ + + + + + + Class LeanCloud\Uploader\SimpleUploader + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/class-LeanCloud.User.html b/docs/class-LeanCloud.User.html new file mode 100644 index 0000000..9e13d8f --- /dev/null +++ b/docs/class-LeanCloud.User.html @@ -0,0 +1,1547 @@ + + + + + + Class LeanCloud\User + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/elementlist.js b/docs/elementlist.js new file mode 100644 index 0000000..555d59d --- /dev/null +++ b/docs/elementlist.js @@ -0,0 +1,3 @@ + +var ApiGen = ApiGen || {}; +ApiGen.elements = [["c","LeanCloud\\ACL"],["c","LeanCloud\\BatchRequestError"],["c","LeanCloud\\Bytes"],["c","LeanCloud\\Client"],["c","LeanCloud\\CloudException"],["c","LeanCloud\\Engine\\Cloud"],["c","LeanCloud\\Engine\\FunctionError"],["c","LeanCloud\\Engine\\LaravelEngine"],["c","LeanCloud\\Engine\\LeanEngine"],["c","LeanCloud\\Engine\\SlimEngine"],["c","LeanCloud\\File"],["c","LeanCloud\\GeoPoint"],["c","LeanCloud\\MIMEType"],["c","LeanCloud\\Object"],["c","LeanCloud\\Operation\\ArrayOperation"],["c","LeanCloud\\Operation\\DeleteOperation"],["c","LeanCloud\\Operation\\IncrementOperation"],["c","LeanCloud\\Operation\\IOperation"],["c","LeanCloud\\Operation\\RelationOperation"],["c","LeanCloud\\Operation\\SetOperation"],["c","LeanCloud\\Push"],["c","LeanCloud\\Query"],["c","LeanCloud\\Relation"],["c","LeanCloud\\Role"],["c","LeanCloud\\SaveOption"],["c","LeanCloud\\SMS"],["c","LeanCloud\\Storage\\CookieStorage"],["c","LeanCloud\\Storage\\IStorage"],["c","LeanCloud\\Storage\\SessionStorage"],["c","LeanCloud\\Uploader\\QCloudUploader"],["c","LeanCloud\\Uploader\\QiniuUploader"],["c","LeanCloud\\Uploader\\S3Uploader"],["c","LeanCloud\\Uploader\\SimpleUploader"],["c","LeanCloud\\User"]]; diff --git a/docs/index.html b/docs/index.html new file mode 100644 index 0000000..07dbff3 --- /dev/null +++ b/docs/index.html @@ -0,0 +1,165 @@ + + + + + + Overview + + + + + + + + +
+ + + + + + diff --git a/docs/namespace-LeanCloud.Engine.html b/docs/namespace-LeanCloud.Engine.html new file mode 100644 index 0000000..29bcb24 --- /dev/null +++ b/docs/namespace-LeanCloud.Engine.html @@ -0,0 +1,147 @@ + + + + + + Namespace LeanCloud\Engine + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/namespace-LeanCloud.Operation.html b/docs/namespace-LeanCloud.Operation.html new file mode 100644 index 0000000..122fdf3 --- /dev/null +++ b/docs/namespace-LeanCloud.Operation.html @@ -0,0 +1,152 @@ + + + + + + Namespace LeanCloud\Operation + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/namespace-LeanCloud.Storage.html b/docs/namespace-LeanCloud.Storage.html new file mode 100644 index 0000000..8f83219 --- /dev/null +++ b/docs/namespace-LeanCloud.Storage.html @@ -0,0 +1,137 @@ + + + + + + Namespace LeanCloud\Storage + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/namespace-LeanCloud.Uploader.html b/docs/namespace-LeanCloud.Uploader.html new file mode 100644 index 0000000..ff28ad6 --- /dev/null +++ b/docs/namespace-LeanCloud.Uploader.html @@ -0,0 +1,136 @@ + + + + + + Namespace LeanCloud\Uploader + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/namespace-LeanCloud.html b/docs/namespace-LeanCloud.html new file mode 100644 index 0000000..dcb7ca4 --- /dev/null +++ b/docs/namespace-LeanCloud.html @@ -0,0 +1,217 @@ + + + + + + Namespace LeanCloud + + + + + + +
+ +
+ +
+ + + + + + diff --git a/docs/resources/collapsed.png b/docs/resources/collapsed.png new file mode 100644 index 0000000000000000000000000000000000000000..56e7323931a3ca5774e2e85ba622c6282c122f5f GIT binary patch literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XCV09yhE&{2`t$$4z4PH~`Tr$57mdKI;Vst0QmG<2><{9 literal 0 HcmV?d00001 diff --git a/docs/resources/combined.js b/docs/resources/combined.js new file mode 100644 index 0000000..1790dbc --- /dev/null +++ b/docs/resources/combined.js @@ -0,0 +1,1347 @@ + +var ApiGen = ApiGen || {}; +ApiGen.config = {"options":{"elementDetailsCollapsed":true,"elementsOrder":"natural"},"name":"ApiGen theme","templatesPath":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src","resources":{"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/resources":"resources"},"templates":{"overview":{"filename":"index.html","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/overview.latte"},"combined":{"filename":"resources\/combined.js","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/combined.js.latte"},"elementlist":{"filename":"elementlist.js","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/elementlist.js.latte"},"404":{"filename":"404.html","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/404.latte"},"package":{"filename":"package-%s.html","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/package.latte"},"namespace":{"filename":"namespace-%s.html","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/namespace.latte"},"class":{"filename":"class-%s.html","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/class.latte"},"constant":{"filename":"constant-%s.html","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/constant.latte"},"function":{"filename":"function-%s.html","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/function.latte"},"annotationGroup":{"filename":"annotation-group-%s.html","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/annotation-group.latte"},"source":{"filename":"source-%s.html","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/source.latte"},"tree":{"filename":"tree.html","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/tree.latte"},"sitemap":{"filename":"sitemap.xml","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/sitemap.xml.latte"},"opensearch":{"filename":"opensearch.xml","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/opensearch.xml.latte"},"robots":{"filename":"robots.txt","template":"\/Users\/jv\/dev\/lean\/php-sdk\/vendor\/apigen\/apigen\/bin\/..\/..\/..\/..\/vendor\/apigen\/theme-default\/src\/robots.txt.latte"}}}; + + + /*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license +*/ +(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="
",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="
a",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="
t
",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="
",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t +}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/\s*$/g,At={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X
","
"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?""!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle); +u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("