From 8f0a121e6a85a18464196b40969c9151e2b0bf0e Mon Sep 17 00:00:00 2001
From: Luc SANCHEZ <4697568+ColonelMoutarde@users.noreply.github.com>
Date: Tue, 30 May 2023 21:34:42 +0200
Subject: phpstan-8 typehinting (#5429)

Co-authored-by: Luc <sanchezluc+freshrss@gmail.com>
---
 lib/Minz/ModelPdo.php  | 34 ++++++++++++----------------------
 tests/phpstan-next.txt |  1 -
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 49556450e..a1b768bd9 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -37,12 +37,11 @@ class Minz_ModelPdo {
 	protected $current_user;
 
 	/**
-	 * @return void
 	 * @throws Minz_ConfigurationNamespaceException
 	 * @throws Minz_PDOConnectionException
 	 * @throws PDOException
 	 */
-	private function dbConnect() {
+	private function dbConnect(): void {
 		$db = Minz_Configuration::get('system')->db;
 		$driver_options = isset($db['pdo_options']) && is_array($db['pdo_options']) ? $db['pdo_options'] : [];
 		$driver_options[PDO::ATTR_ERRMODE] = PDO::ERRMODE_SILENT;
@@ -147,10 +146,7 @@ class Minz_ModelPdo {
 			);
 	}
 
-	/**
-	 * @return void
-	 */
-	public function beginTransaction() {
+	public function beginTransaction(): void {
 		$this->pdo->beginTransaction();
 	}
 
@@ -158,24 +154,15 @@ class Minz_ModelPdo {
 		return $this->pdo->inTransaction();
 	}
 
-	/**
-	 * @return void
-	 */
-	public function commit() {
+	public function commit(): void {
 		$this->pdo->commit();
 	}
 
-	/**
-	 * @return void
-	 */
-	public function rollBack() {
+	public function rollBack(): void {
 		$this->pdo->rollBack();
 	}
 
-	/**
-	 * @return void
-	 */
-	public static function clean() {
+	public static function clean(): void {
 		self::$sharedPdo = null;
 		self::$sharedCurrentUser = '';
 	}
@@ -190,10 +177,13 @@ class Minz_ModelPdo {
 		$ok = $stm !== false;
 		if ($ok && !empty($values)) {
 			foreach ($values as $name => $value) {
-				if (is_int($value)) $type = PDO::PARAM_INT;
-				elseif (is_string($value)) $type = PDO::PARAM_STR;
-				elseif (is_null($value)) $type = PDO::PARAM_NULL;
-				else {
+				if (is_int($value)) {
+					$type = PDO::PARAM_INT;
+				} elseif (is_string($value)) {
+					$type = PDO::PARAM_STR;
+				} elseif (is_null($value)) {
+					$type = PDO::PARAM_NULL;
+				} else {
 					$ok = false;
 					break;
 				}
diff --git a/tests/phpstan-next.txt b/tests/phpstan-next.txt
index 83945f2f1..52990dca0 100644
--- a/tests/phpstan-next.txt
+++ b/tests/phpstan-next.txt
@@ -74,4 +74,3 @@
 ./cli/user-info.php
 ./lib/lib_install.php
 ./lib/Minz/ModelPdo.php
-./lib/Minz/Translate.php
-- 
cgit v1.2.3