aboutsummaryrefslogtreecommitdiff
path: root/app/Models/CategoryDAO.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2024-09-06 09:06:46 +0200
committerGravatar GitHub <noreply@github.com> 2024-09-06 09:06:46 +0200
commita81656c3ed5b8fe0f31794a4fbe0d1a907fca8e8 (patch)
tree8bf49bd876aaebc985a9fb1214863190a799cbee /app/Models/CategoryDAO.php
parent8f7c3473a76809efc88814253722c76f0cc8eb04 (diff)
Upgrade to PHP 8.1 (#6711)
* Upgrade to PHP 8.1 As discussed in https://github.com/FreshRSS/FreshRSS/discussions/5474 https://www.php.net/releases/8.0/en.php https://www.php.net/releases/8.1/en.php Upgrade to available native type declarations https://php.net/language.types.declarations Upgrade to https://phpunit.de/announcements/phpunit-10.html which requires PHP 8.1+ (good timing, as version 9 was not maintained anymore) Upgrade `:oldest` Docker dev image to oldest Alpine version supporting PHP 8.1: Alpine 3.16, which includes PHP 8.1.22. * Include 6736 https://github.com/FreshRSS/FreshRSS/pull/6736
Diffstat (limited to 'app/Models/CategoryDAO.php')
-rw-r--r--app/Models/CategoryDAO.php18
1 files changed, 6 insertions, 12 deletions
diff --git a/app/Models/CategoryDAO.php b/app/Models/CategoryDAO.php
index da770ade7..b101f0b3f 100644
--- a/app/Models/CategoryDAO.php
+++ b/app/Models/CategoryDAO.php
@@ -100,9 +100,8 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
/**
* @param array{'name':string,'id'?:int,'kind'?:int,'lastUpdate'?:int,'error'?:int|bool,'attributes'?:string|array<string,mixed>} $valuesTmp
- * @return int|false
*/
- public function addCategory(array $valuesTmp) {
+ public function addCategory(array $valuesTmp): int|false {
// TRIM() to provide a type hint as text
// No tag of the same name
$sql = <<<'SQL'
@@ -136,8 +135,7 @@ SQL;
}
}
- /** @return int|false */
- public function addCategoryObject(FreshRSS_Category $category) {
+ public function addCategoryObject(FreshRSS_Category $category): int|false {
$cat = $this->searchByName($category->name());
if (!$cat) {
$values = [
@@ -153,9 +151,8 @@ SQL;
/**
* @param array{'name':string,'kind':int,'attributes'?:array<string,mixed>|mixed|null} $valuesTmp
- * @return int|false
*/
- public function updateCategory(int $id, array $valuesTmp) {
+ public function updateCategory(int $id, array $valuesTmp): int|false {
// No tag of the same name
$sql = <<<'SQL'
UPDATE `_category` SET name=?, kind=?, attributes=? WHERE id=?
@@ -187,8 +184,7 @@ SQL;
}
}
- /** @return int|false */
- public function updateLastUpdate(int $id, bool $inError = false, int $mtime = 0) {
+ public function updateLastUpdate(int $id, bool $inError = false, int $mtime = 0): int|false {
$sql = 'UPDATE `_category` SET `lastUpdate`=?, error=? WHERE id=?';
$values = [
$mtime <= 0 ? time() : $mtime,
@@ -206,8 +202,7 @@ SQL;
}
}
- /** @return int|false */
- public function deleteCategory(int $id) {
+ public function deleteCategory(int $id): int|false {
if ($id <= self::DEFAULTCATEGORYID) {
return false;
}
@@ -345,8 +340,7 @@ SQL;
}
}
- /** @return int|bool */
- public function checkDefault() {
+ public function checkDefault(): int|bool {
$def_cat = $this->searchById(self::DEFAULTCATEGORYID);
if ($def_cat == null) {