From: Gaetano Giunta Date: Wed, 14 Jun 2017 08:55:37 +0000 (+0100) Subject: Merge pull request #51 from FinesseRus/patch-1 X-Git-Tag: 4.2.0~2 X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=238968291ce5627e94dbc3928d377d09f6e9eeda;hp=e7b08a72aecd879884bc85988640cf49302ce041 Merge pull request #51 from FinesseRus/patch-1 Less specific date type detection --- diff --git a/src/Encoder.php b/src/Encoder.php index 220ce88..dfec15d 100644 --- a/src/Encoder.php +++ b/src/Encoder.php @@ -63,11 +63,11 @@ class Encoder $out = strtotime($out); } if (is_int($out)) { - $result = new \Datetime(); + $result = new \DateTime(); $result->setTimestamp($out); return $result; - } elseif (is_a($out, 'Datetime')) { + } elseif (is_a($out, 'DateTimeInterface')) { return $out; } } @@ -179,7 +179,7 @@ class Encoder case 'object': if (is_a($phpVal, 'PhpXmlRpc\Value')) { $xmlrpcVal = $phpVal; - } elseif (is_a($phpVal, 'DateTime')) { + } elseif (is_a($phpVal, 'DateTimeInterface')) { $xmlrpcVal = new Value($phpVal->format('Ymd\TH:i:s'), Value::$xmlrpcStruct); } else { $arr = array();