From a30ecee03f85a3c483a37b16bff9e1ebc0540ac3 Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Thu, 24 Apr 2014 16:05:42 -0400 Subject: [PATCH] some changes to implement latest version of restler 3.0.0 --- composer.json | 4 ++-- .../src/ProcessMaker/Services/Api/Project.php | 14 +++++++++++--- .../src/ProcessMaker/Services/OAuth2/Server.php | 5 +++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 7b7c9ca89..31373274b 100644 --- a/composer.json +++ b/composer.json @@ -38,11 +38,11 @@ } ], - "minimum-stability": "beta", + "minimum-stability": "stable", "prefer-stable": true, "require": { - "luracast/restler" : "3.0.0-RC4", + "luracast/restler" : "3.0.0", "bshaffer/oauth2-server-php": "v1.0", "jquery/jquery": "1.10.2", "underscore/underscore": "1.5.2", diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Project.php b/workflow/engine/src/ProcessMaker/Services/Api/Project.php index 8e596a7f1..4ae9f55c8 100644 --- a/workflow/engine/src/ProcessMaker/Services/Api/Project.php +++ b/workflow/engine/src/ProcessMaker/Services/Api/Project.php @@ -16,7 +16,10 @@ use \ProcessMaker\Util; */ class Project extends Api { - public function index() + /** + * @url GET + */ + public function doGetProjects() { try { $start = null; @@ -31,10 +34,15 @@ class Project extends Api } } - public function get($prjUid) + /** + * @url GET /:prj_uid + * + * @param string $prj_uid {@min 32}{@max 32} + */ + public function doGetProject($prj_uid) { try { - return Adapter\BpmnWorkflow::getStruct($prjUid); + return Adapter\BpmnWorkflow::getStruct($prj_uid); } catch (\Exception $e) { throw new RestException(Api::STAT_APP_EXCEPTION, $e->getMessage()); } diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php index 127201760..efe509912 100644 --- a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php +++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php @@ -235,5 +235,10 @@ class Server implements iAuthenticate { return array_keys($this->scope); } + + public function __getWWWAuthenticateString() + { + return ""; + } }