Code: add types

Author: f3l1x

src/Comgate.php

@@ -5,14 +5,11 @@
 class Comgate
 {
 
-	/** @var string */
-	private $merchant;
+	private string $merchant;
 
-	/** @var string */
-	private $secret;
+	private string $secret;
 
-	/** @var bool */
-	private $test;
+	private bool $test;
 
 	public function __construct(string $merchant, string $secret, bool $test = true)
 	{

src/Entity/AbstractPayment.php

@@ -7,29 +7,22 @@
 class AbstractPayment extends AbstractEntity
 {
 
-	/** @var int */
-	protected $price;
+	protected int $price;
 
 	/** @var string ISO 4217 */
-	protected $curr;
+	protected string $curr;
 
-	/** @var string */
-	protected $label;
+	protected string $label;
 
-	/** @var string */
-	protected $refId;
+	protected string $refId;
 
-	/** @var string */
-	protected $email;
+	protected string $email;
 
-	/** @var string */
-	protected $country = CountryCode::ALL;
+	protected string $country = CountryCode::ALL;
 
-	/** @var string */
-	protected $account;
+	protected string $account;
 
-	/** @var string */
-	protected $name;
+	protected string $name;
 
 	public function getPrice(): int
 	{

src/Entity/Payment.php

@@ -11,29 +11,24 @@
 class Payment extends AbstractPayment
 {
 
-	/** @var string */
-	private $method = PaymentMethodCode::ALL;
+	private string $method = PaymentMethodCode::ALL;
 
 	/** @var string ISO 639-1 */
-	private $lang = LangCode::CS;
+	private string $lang = LangCode::CS;
 
-	/** @var bool */
-	private $prepareOnly = true;
+	private bool $prepareOnly = true;
 
-	/** @var bool */
-	private $preauth = false;
+	private bool $preauth = false;
 
-	/** @var bool */
-	private $initRecurring = false;
+	private bool $initRecurring = false;
 
-	/** @var bool */
-	private $verification = false;
+	private bool $verification = false;
 
-	/** @var bool */
-	private $embedded = false;
+	private bool $embedded = false;
 
 	final private function __construct()
 	{
+		// Noop
 	}
 
 	public static function of(

src/Entity/PaymentStatus.php

@@ -5,11 +5,11 @@
 class PaymentStatus extends AbstractEntity
 {
 
-	/** @var string */
-	private $transId;
+	private string $transId;
 
 	final private function __construct()
 	{
+		// Noop
 	}
 
 	public static function of(string $transId): self

src/Entity/RecurringPayment.php

@@ -9,11 +9,11 @@
 class RecurringPayment extends AbstractPayment
 {
 
-	/** @var string */
-	private $initRecurringId;
+	private string $initRecurringId;
 
 	final private function __construct()
 	{
+		// Noop
 	}
 
 	public static function of(

src/Entity/Refund.php

@@ -8,20 +8,18 @@
 class Refund extends AbstractEntity
 {
 
-	/** @var int */
-	private $amount;
+	private int $amount;
 
 	/** @var string ISO 4217 */
-	private $curr;
+	private string $curr;
 
-	/** @var string */
-	private $transId;
+	private string $transId;
 
-	/** @var string|null */
-	private $refId;
+	private ?string $refId = null;
 
 	final private function __construct()
 	{
+		// Noop
 	}
 
 	public static function of(

src/Entity/Response/AbstractResponseEntity.php

@@ -10,10 +10,7 @@
 abstract class AbstractResponseEntity extends Response
 {
 
-	/**
-	 * @param Response|ResponseInterface $origin
-	 */
-	public function __construct($origin)
+	public function __construct(Response|ResponseInterface $origin)
 	{
 		if ($origin instanceof Response) {
 			$origin = $origin->getOrigin();
@@ -22,12 +19,7 @@ public function __construct($origin)
 		parent::__construct($origin);
 	}
 
-	/**
-	 * @param string $fieldId
-	 * @param int|string|null $default
-	 * @return int|string|null
-	 */
-	public function get(string $fieldId, $default = null)
+	public function get(string $fieldId, int|string|null $default = null): int|string|null
 	{
 		$value = $this->getData()[$fieldId] ?? $default;
 		if ($value !== null && !is_string($value) && !is_int($value)) {
@@ -37,6 +29,21 @@ public function get(string $fieldId, $default = null)
 		return $value;
 	}
 
+	public function getErrorCode(): int
+	{
+		return $this->getRequiredInteger('code');
+	}
+
+	public function getErrorMessage(): ?string
+	{
+		return $this->getString('message');
+	}
+
+	public function isOk(): bool
+	{
+		return $this->getInteger('code', -1) === 0;
+	}
+
 	/**
 	 * @phpstan-return ($default is null ? (string|null) : string)
 	 */
@@ -91,19 +98,4 @@ protected function getRequiredBool(string $fieldId): bool
 		return $value;
 	}
 
-	public function getErrorCode(): int
-	{
-		return $this->getRequiredInteger('code');
-	}
-
-	public function getErrorMessage(): ?string
-	{
-		return $this->getString('message');
-	}
-
-	public function isOk(): bool
-	{
-		return $this->getInteger('code', -1) === 0;
-	}
-
 }

src/Entity/Storno.php

@@ -5,11 +5,11 @@
 class Storno extends AbstractEntity
 {
 
-	/** @var string */
-	private $transId;
+	private string $transId;
 
 	final private function __construct()
 	{
+		// Noop
 	}
 
 	public static function of(
@@ -27,7 +27,6 @@ public function getTransId(): string
 		return $this->transId;
 	}
 
-
 	/**
 	 * @return mixed[]
 	 */

src/Gateway/PaymentService.php

@@ -17,8 +17,7 @@
 class PaymentService
 {
 
-	/** @var HttpClient */
-	protected $client;
+	protected HttpClient $client;
 
 	public function __construct(HttpClient $client)
 	{

src/Http/HttpClient.php

@@ -8,11 +8,9 @@
 class HttpClient
 {
 
-	/** @var ClientInterface */
-	protected $client;
+	protected ClientInterface $client;
 
-	/** @var Comgate */
-	protected $comgate;
+	protected Comgate $comgate;
 
 	public function __construct(ClientInterface $client, Comgate $comgate)
 	{