6543/CommunityID
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

import v1.1.0_beta1 | 2009-08-21

Browse Source
This commit is contained in:
6543
2019-07-17 22:16:19 +02:00
parent 2c1152f0d3
commit 8dee6b1a10
2306 changed files with 251360 additions and 23428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
libs/Zend/Rest/Server.php
View File

@ -29,11 +29,6 @@ require_once 'Zend/Server/Interface.php';
*/
require_once 'Zend/Server/Reflection.php';
/**
* Zend_Rest_Server_Exception
*/
require_once 'Zend/Rest/Server/Exception.php';
/**
* Zend_Server_Abstract
*/
@ -114,8 +109,8 @@ class Zend_Rest_Server implements Zend_Server_Interface
/**
* Set XML encoding
*
* @param string $encoding
*
* @param string $encoding
* @return Zend_Rest_Server
*/
public function setEncoding($encoding)
@ -126,7 +121,7 @@ class Zend_Rest_Server implements Zend_Server_Interface
/**
* Get XML encoding
*
*
* @return string
*/
public function getEncoding()
@ -214,6 +209,7 @@ class Zend_Rest_Server implements Zend_Server_Interface
$result = false;
if (count($calling_args) < count($func_args)) {
require_once 'Zend/Rest/Server/Exception.php';
$result = $this->fault(new Zend_Rest_Server_Exception('Invalid Method Call to ' . $this->_method . '. Requires ' . count($func_args) . ', ' . count($calling_args) . ' given.'), 400);
}
@ -480,7 +476,7 @@ class Zend_Rest_Server implements Zend_Server_Interface
$element->appendChild($dom->createTextNode($exception->getMessage()));
$xmlResponse->appendChild($element);
$code = $exception->getCode();
} elseif (!is_null($exception) || 'rest' == $function) {
} elseif (($exception !== null) || 'rest' == $function) {
$xmlResponse->appendChild($dom->createElement('message', 'An unknown error occured. Please try again.'));
} else {
$xmlResponse->appendChild($dom->createElement('message', 'Call to ' . $method . ' failed.'));
@ -490,8 +486,7 @@ class Zend_Rest_Server implements Zend_Server_Interface
$xmlMethod->appendChild($dom->createElement('status', 'failed'));
// Headers to send
if (is_null($code) || (404 != $code))
{
if ($code === null || (404 != $code)) {
$this->_headers[] = 'HTTP/1.0 400 Bad Request';
} else {
$this->_headers[] = 'HTTP/1.0 404 File Not Found';
@ -526,6 +521,7 @@ class Zend_Rest_Server implements Zend_Server_Interface
if (is_callable($func) && !in_array($func, self::$magicMethods)) {
$this->_functions[$func] = $this->_reflection->reflectFunction($func);
} else {
require_once 'Zend/Rest/Server/Exception.php';
throw new Zend_Rest_Server_Exception("Invalid Method Added to Service.");
}
}
@ -563,9 +559,9 @@ class Zend_Rest_Server implements Zend_Server_Interface
/**
* Call a static class method and return the result
*
* @param string $class
* @param array $args
*
* @param string $class
* @param array $args
* @return mixed
*/
protected function _callStaticMethod($class, array $args)
@ -580,7 +576,7 @@ class Zend_Rest_Server implements Zend_Server_Interface
/**
* Call an instance method of an object
*
*
* @param string $class
* @param array $args
* @return mixed
@ -596,6 +592,7 @@ class Zend_Rest_Server implements Zend_Server_Interface
}
} catch (Exception $e) {
echo $e->getMessage();
require_once 'Zend/Rest/Server/Exception.php';
throw new Zend_Rest_Server_Exception('Error instantiating class ' . $class . ' to invoke method ' . $this->_functions[$this->_method]->getName(), 500);
}