issue #1575 PHP 8 compatibility, check for object type

* by using $response instanceof PwgError instead of get_class()
This commit is contained in:
Eike Rathke 2022-07-21 17:27:37 +02:00 committed by GitHub
parent 8fbc17c392
commit 8889f7ffef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 6 deletions

View file

@ -586,7 +586,7 @@ Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseF
$result = trigger_change('ws_invoke_allowed', true, $methodName, $params);
$is_error = false;
if (is_object($result) and strtolower( get_class($result) ) == 'pwgerror')
if ($result instanceof PwgError)
{
$is_error = true;
}

View file

@ -10,7 +10,7 @@ class PwgJsonEncoder extends PwgResponseEncoder
{
function encodeResponse($response)
{
if (is_object($response) and strtolower(get_class($response)) == 'pwgerror')
if ($response instanceof PwgError)
{
return json_encode(
array(

View file

@ -10,8 +10,7 @@ class PwgSerialPhpEncoder extends PwgResponseEncoder
{
function encodeResponse($response)
{
$respClass = strtolower( @get_class($response) );
if ($respClass=='pwgerror')
if ($response instanceof PwgError)
{
return serialize(
array(

View file

@ -49,8 +49,7 @@ class PwgXmlRpcEncoder extends PwgResponseEncoder
{
function encodeResponse($response)
{
$respClass = strtolower( @get_class($response) );
if ($respClass=='pwgerror')
if ($response instanceof PwgError)
{
$code = $response->code();
$msg = htmlspecialchars($response->message());