From adfded51888236d0c56576abab6e0c912f9dc82e Mon Sep 17 00:00:00 2001
From: James Silver <jamsilver@gmail.com>
Date: Thu, 19 Jul 2012 11:47:29 +0100
Subject: [PATCH] Issue #1692884 by jamsilver: Change private server methods to protected.

---
 servers/rest_server/includes/RESTServer.inc |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/servers/rest_server/includes/RESTServer.inc b/servers/rest_server/includes/RESTServer.inc
index a456b76..3edcfc2 100755
--- a/servers/rest_server/includes/RESTServer.inc
+++ b/servers/rest_server/includes/RESTServer.inc
@@ -6,7 +6,7 @@
  */
 
 class RESTServer {
-  private $endpoint;
+  protected $endpoint;
 
   /**
    * Handles the call to the REST server
@@ -185,7 +185,7 @@ class RESTServer {
    *  The method used to make the request
    * @return void
    */
-  private function getControllerArguments($controller, $path, $method) {
+  protected function getControllerArguments($controller, $path, $method) {
     $data = $this->parseRequest($method, $controller);
     drupal_alter('rest_server_request_parsed', $data, $controller);
 
@@ -235,7 +235,7 @@ class RESTServer {
     return $arguments;
   }
 
-  private function parseRequestHeaders() {
+  protected function parseRequestHeaders() {
     $headers = array();
     if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
       $headers['IF_MODIFIED_SINCE'] = strtotime(preg_replace('/;.*$/', '', $_SERVER['HTTP_IF_MODIFIED_SINCE']));
@@ -243,7 +243,7 @@ class RESTServer {
     return $headers;
   }
 
-  private function parseRequest($method, $controller) {
+  protected function parseRequest($method, $controller) {
     switch ($method) {
       case 'POST':
       case 'PUT':
@@ -382,7 +382,7 @@ class RESTServer {
     }
   }
 
-  private function renderFormatterView($controller, $formatter, $result) {
+  protected function renderFormatterView($controller, $formatter, $result) {
     // Wrap the results in a model class if required by the formatter
     if (isset($formatter['model'])) {
       $cm = $controller['models'][$formatter['model']];
@@ -401,7 +401,7 @@ class RESTServer {
   /**
    * Get best match parser for $controller based on $mime type.
    */
-  private function requestParser($mime, $controller = NULL) {
+  protected function requestParser($mime, $controller = NULL) {
     // Check if the controller has declared support for parsing the mime type.
     if ($controller && !empty($controller['rest request parsers'])) {
       $parser = $this->matchParser($mime, $controller['rest request parsers']);
@@ -427,7 +427,7 @@ class RESTServer {
    *
    * @return Mimeparse
    */
-  private function mimeParse() {
+  protected function mimeParse() {
     static $mimeparse;
     if (!$mimeparse) {
       module_load_include('php', 'rest_server', 'lib/mimeparse');
@@ -446,7 +446,7 @@ class RESTServer {
    * @return mixed
    *  Returns a parser callback or FALSE if no match was found.
    */
-  private function matchParser($mime, $parsers) {
+  protected function matchParser($mime, $parsers) {
     $mimeparse = $this->mimeParse();
     $mime_type = $mimeparse->best_match(array_keys($parsers), $mime);
 
@@ -479,7 +479,7 @@ class RESTServer {
     return Spyc::YAMLLoadString(self::contentFromStream($handle));
   }
 
-  private function responseFormatters($format = NULL) {
+  protected function responseFormatters($format = NULL) {
     $formatters = rest_server_response_formatters();
 
     // Remove formatters that have been disabled for this endpoint.
@@ -496,7 +496,7 @@ class RESTServer {
     return $formatters;
   }
 
-  private function supportedControllerModel($controller, $format) {
+  protected function supportedControllerModel($controller, $format) {
     if (
       // The format uses models
       isset($format['model']) &&
@@ -508,7 +508,7 @@ class RESTServer {
     }
   }
 
-  private function resolveController($resource, $method, $path, $endpoint, $resource_name) {
+  protected function resolveController($resource, $method, $path, $endpoint, $resource_name) {
     $pc = count($path);
     $class = NULL;
     $operation = NULL;
-- 
1.7.1