From ebf16a36a15e4af2c8dcde8b47d921513ba74b3e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 26 Feb 2021 19:27:40 +0300
Subject: [PATCH] remove a bunch of return type hints that didn't quite fit
---
classes/userhelper.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/classes/userhelper.php b/classes/userhelper.php
index f366682ef..44406b959 100644
--- a/classes/userhelper.php
+++ b/classes/userhelper.php
@@ -143,7 +143,7 @@ class UserHelper {
}
- static function get_user_ip() : string {
+ static function get_user_ip() {
foreach (["HTTP_X_REAL_IP", "REMOTE_ADDR"] as $hdr) {
if (isset($_SERVER[$hdr]))
return $_SERVER[$hdr];
@@ -152,7 +152,7 @@ class UserHelper {
return null;
}
- static function get_login_by_id(int $id) : string {
+ static function get_login_by_id(int $id) {
$pdo = Db::pdo();
$sth = $pdo->prepare("SELECT login FROM ttrss_users WHERE id = ?");
@@ -165,7 +165,7 @@ class UserHelper {
return null;
}
- static function find_user_by_login(string $login) : int {
+ static function find_user_by_login(string $login) {
$pdo = Db::pdo();
$sth = $pdo->prepare("SELECT id FROM ttrss_users WHERE
@@ -264,7 +264,7 @@ class UserHelper {
return false;
}
- static function get_otp_secret(int $owner_uid, bool $show_if_enabled = false) : string {
+ static function get_otp_secret(int $owner_uid, bool $show_if_enabled = false) {
$sth = Db::pdo()->prepare("SELECT salt, otp_enabled FROM ttrss_users WHERE id = ?");
$sth->execute([$owner_uid]);
--
GitLab