Make http\RestController's Do methods public

diff --git a/data/controller.php b/data/controller.php
index 47e5990810ccfa38f7608aa4475208f82e769dbc..d1926f50f0616d78ced1a297553f9a9a55cb1b6a 100644 (file)
--- a/data/controller.php
+++ b/data/controller.php
@@ -42,7 +42,7 @@ class Controller extends http\RestAction
   }
 
   /*! Gets the data from the model. */
-  protected function _DoGet(http\Request $request, http\Response $response)
+  public function DoGet(http\Request $request, http\Response $response)
   {
     $this->model->SetFrom($request->data);
     try {
@@ -54,7 +54,7 @@ class Controller extends http\RestAction
   }
 
   /*! Updates an object in the store. */
-  protected function _DoPost(http\Request $request, http\Response $response)
+  public function DoPost(http\Request $request, http\Response $response)
   {
     $this->model->SetFrom($request->data);
     try {
@@ -67,7 +67,7 @@ class Controller extends http\RestAction
   }
 
   /*! Deletes the object from the store. */
-  protected function _DoDelete(http\Request $request, http\Response $response)
+  public function DoDelete(http\Request $request, http\Response $response)
   {
     $this->model->SetFrom($request->data);
     try {
@@ -79,7 +79,7 @@ class Controller extends http\RestAction
   }
 
   /*! Updates an object in the store. */
-  protected function _DoPut(http\Request $request, http\Response $response)
+  public function DoPut(http\Request $request, http\Response $response)
   {
     $this->model->SetFrom($request->data);
     try {

diff --git a/http/rest_action.php b/http/rest_action.php
index 91170be1e9c32fb81373374ab106316044dde377..35c5191848baf6060f196270954fc9af482df5f0 100644 (file)
--- a/http/rest_action.php
+++ b/http/rest_action.php
@@ -38,13 +38,13 @@ class RestAction extends Action
       return;
     }
 
-    $invoke = '_Do' . ucwords($method);
+    $invoke = 'Do' . ucwords($method);
     $this->$invoke($request, $response);
   }
 
   /*! Methods for each of the different HTTP methods. */
-  protected function _DoGet(Request $request, Response $response) {}
-  protected function _DoPost(Request $request, Response $response) {}
-  protected function _DoDelete(Request $request, Response $response) {}
-  protected function _DoPut(Request $request, Response $response) {}
+  public function DoGet(Request $request, Response $response) {}
+  public function DoPost(Request $request, Response $response) {}
+  public function DoDelete(Request $request, Response $response) {}
+  public function DoPut(Request $request, Response $response) {}
 }

diff --git a/testing/tests/http/rest_action_test.php b/testing/tests/http/rest_action_test.php
index 217fddfc563edc0676a44d65cc5e3d99f90204a1..635709356101345537cc125dbe3459b48a34b96e 100644 (file)
--- a/testing/tests/http/rest_action_test.php
+++ b/testing/tests/http/rest_action_test.php
@@ -27,22 +27,22 @@ class TestRestAction extends http\RestAction
   public $did_delete = FALSE;
   public $did_put = FALSE;
 
-  protected function _DoGet(http\Request $request, http\Response $response)
+  public function DoGet(http\Request $request, http\Response $response)
   {
     parent::_DoGet($request, $response);
     $this->did_get = TRUE;
   }
-  protected function _DoPost(http\Request $request, http\Response $response)
+  public function DoPost(http\Request $request, http\Response $response)
   {
     parent::_DoPost($request, $response);
     $this->did_post = TRUE;
   }
-  protected function _DoDelete(http\Request $request, http\Response $response)
+  public function DoDelete(http\Request $request, http\Response $response)
   {
     parent::_DoDelete($request, $response);
     $this->did_delete = TRUE;
   }
-  protected function _DoPut(http\Request $request, http\Response $response)
+  public function DoPut(http\Request $request, http\Response $response)
   {
     parent::_DoPut($request, $response);
     $this->did_put = TRUE;