diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2022-06-19 20:08:42 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-06-19 20:08:42 +0200 |
| commit | f365a9aeb44c33a1c817ae19a6027aa0fbffd706 (patch) | |
| tree | 6f93f55d5c71eda6672168a7f1250ad1d784c5ef /app/Models/FeedDAO.php | |
| parent | 238e55b2fd7f08b5ce866b712c43c1a8fa03a657 (diff) | |
Update all test dependencies (#4419)
* Update all test dependencies
* Remove old false-positive
* Minor update lock files
* Increase PHPStan memory for Fedora
https://github.com/FreshRSS/FreshRSS/pull/4400#issuecomment-1159514197
* Require PHP8+ for tests
Due to small changes of signature in `ob_implicit_flush` and `simplexml_load_string`, cf. https://github.com/FreshRSS/FreshRSS/pull/4123
* Missing lint in CSS files
Diffstat (limited to 'app/Models/FeedDAO.php')
| -rw-r--r-- | app/Models/FeedDAO.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php index 89e667813..86ba70d5c 100644 --- a/app/Models/FeedDAO.php +++ b/app/Models/FeedDAO.php @@ -363,7 +363,7 @@ SQL; if ($stm !== false) { return self::daoToFeed($stm->fetchAll(PDO::FETCH_ASSOC)); } else { - $info = $stm == null ? $this->pdo->errorInfo() : $stm->errorInfo(); + $info = $this->pdo->errorInfo(); if ($this->autoUpdateDb($info)) { return $this->listFeedsOrderUpdate($defaultCacheDuration); } @@ -600,7 +600,7 @@ SQL; $sql2 = 'ALTER TABLE `_feed` ADD COLUMN ttl INT NOT NULL DEFAULT ' . FreshRSS_Feed::TTL_DEFAULT; //v0.7.3 $stm = $this->pdo->query($sql2); if ($stm === false) { - $info = $stm == null ? $this->pdo->errorInfo() : $stm->errorInfo(); + $info = $this->pdo->errorInfo(); Minz_Log::error('SQL error updateTTL 2: ' . $info[2] . ' ' . $sql2); } } else { |