diff --git a/lib/php/lib/Exception/TApplicationException.php b/lib/php/lib/Exception/TApplicationException.php index b88fb64424..b489c36a81 100644 --- a/lib/php/lib/Exception/TApplicationException.php +++ b/lib/php/lib/Exception/TApplicationException.php @@ -25,6 +25,7 @@ namespace Thrift\Exception; +use Thrift\Protocol\TProtocol; use Thrift\Type\TType; class TApplicationException extends TException @@ -53,17 +54,17 @@ class TApplicationException extends TException public const INVALID_PROTOCOL = 9; public const UNSUPPORTED_CLIENT_TYPE = 10; - public function __construct($message = null, $code = 0) + public function __construct(?string $message = null, int $code = 0) { parent::__construct($message, $code); } - public function read($output) + public function read(TProtocol $input): int { - return $this->readStruct('TApplicationException', self::$tspec, $output); + return $this->readStruct('TApplicationException', self::$tspec, $input); } - public function write($output) + public function write(TProtocol $output): int { $xfer = 0; $xfer += $output->writeStructBegin('TApplicationException'); diff --git a/lib/php/lib/Exception/TException.php b/lib/php/lib/Exception/TException.php index 31d14625c0..98f0ec76a5 100644 --- a/lib/php/lib/Exception/TException.php +++ b/lib/php/lib/Exception/TException.php @@ -38,13 +38,13 @@ * Can be called with standard Exception constructor (message, code) or with * Thrift Base object constructor (spec, vals). * - * @param mixed $p1 Message (string) or type-spec (array) - * @param mixed $p2 Code (integer) or values (array) + * @param string|array|null $p1 Message (string) or type-spec (array) + * @param int|array $p2 Code (integer) or values (array) */ #[\AllowDynamicProperties] class TException extends \Exception { - public function __construct($p1 = null, $p2 = 0) + public function __construct(string|array|null $p1 = null, int|array $p2 = 0) { if (is_array($p1) && is_array($p2)) { $spec = $p1; @@ -56,7 +56,7 @@ public function __construct($p1 = null, $p2 = 0) } } } else { - parent::__construct((string)$p1, $p2); + parent::__construct($p1 ?? '', $p2); } } diff --git a/lib/php/lib/Exception/TProtocolException.php b/lib/php/lib/Exception/TProtocolException.php index b16baebfe3..becafdac45 100644 --- a/lib/php/lib/Exception/TProtocolException.php +++ b/lib/php/lib/Exception/TProtocolException.php @@ -46,7 +46,7 @@ class TProtocolException extends TException public const NOT_IMPLEMENTED = 5; public const DEPTH_LIMIT = 6; - public function __construct($message = null, $code = 0) + public function __construct(?string $message = null, int $code = 0) { parent::__construct($message, $code); } diff --git a/lib/php/lib/Exception/TTransportException.php b/lib/php/lib/Exception/TTransportException.php index fa3dec1e02..cdb52dda50 100644 --- a/lib/php/lib/Exception/TTransportException.php +++ b/lib/php/lib/Exception/TTransportException.php @@ -36,7 +36,7 @@ class TTransportException extends TException public const TIMED_OUT = 3; public const END_OF_FILE = 4; - public function __construct($message = null, $code = 0) + public function __construct(?string $message = null, int $code = 0) { parent::__construct($message, $code); }