summaryrefslogtreecommitdiff
path: root/app/Models/Entry.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/Entry.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/Entry.php')
-rw-r--r--app/Models/Entry.php19
1 files changed, 6 insertions, 13 deletions
diff --git a/app/Models/Entry.php b/app/Models/Entry.php
index f2701fb68..4b331419b 100644
--- a/app/Models/Entry.php
+++ b/app/Models/Entry.php
@@ -32,13 +32,10 @@ class FreshRSS_Entry extends Minz_Model {
private array $tags = [];
/**
- * @param int|string $pubdate
- * @param bool|int|null $is_read
- * @param bool|int|null $is_favorite
* @param string|array<string> $tags
*/
public function __construct(int $feedId = 0, string $guid = '', string $title = '', string $authors = '', string $content = '',
- string $link = '', $pubdate = 0, $is_read = false, $is_favorite = false, $tags = '') {
+ string $link = '', int|string $pubdate = 0, bool|int|null $is_read = false, bool|int|null $is_favorite = false, $tags = '') {
$this->_title($title);
$this->_authors($authors);
$this->_content($content);
@@ -149,7 +146,7 @@ class FreshRSS_Entry extends Minz_Model {
* @phpstan-return ($asString is true ? string : array<string>)
* @return string|array<string>
*/
- public function authors(bool $asString = false) {
+ public function authors(bool $asString = false): string|array {
if ($asString) {
return $this->authors == null ? '' : ';' . implode('; ', $this->authors);
} else {
@@ -384,9 +381,8 @@ HTML;
}
/**
* @phpstan-return ($raw is false ? string : int)
- * @return string|int
*/
- public function date(bool $raw = false) {
+ public function date(bool $raw = false): int|string {
if ($raw) {
return $this->date;
}
@@ -402,9 +398,8 @@ HTML;
/**
* @phpstan-return ($raw is false ? string : ($microsecond is true ? string : int))
- * @return int|string
*/
- public function dateAdded(bool $raw = false, bool $microsecond = false) {
+ public function dateAdded(bool $raw = false, bool $microsecond = false): int|string {
if ($raw) {
if ($microsecond) {
return $this->date_added;
@@ -451,7 +446,7 @@ HTML;
* @phpstan-return ($asString is true ? string : array<string>)
* @return string|array<string>
*/
- public function tags(bool $asString = false) {
+ public function tags(bool $asString = false): array|string {
if ($asString) {
return $this->tags == null ? '' : '#' . implode(' #', $this->tags);
} else {
@@ -719,9 +714,7 @@ HTML;
}
}
FreshRSS_Context::userConf()->applyFilterActions($this);
- if ($feed->category() !== null) {
- $feed->category()->applyFilterActions($this);
- }
+ $feed->category()?->applyFilterActions($this);
$feed->applyFilterActions($this);
}