diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2023-11-07 13:15:48 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-11-07 13:15:48 +0100 |
| commit | 85345559c7c66787ad9474da8a63de24e6484843 (patch) | |
| tree | 3a19f00d18fc8f12ce3551413af62ec0ec98834d /app/Models/EntryDAO.php | |
| parent | 711e2153d11f3df181be2f6248368d75a36b5725 (diff) | |
Compatibility PHP 8.2 for running automated tests (#5826)
https://php.net/pdo.errorinfo has slightly changed signature
Diffstat (limited to 'app/Models/EntryDAO.php')
| -rw-r--r-- | app/Models/EntryDAO.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index 82fb27903..017754e04 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -65,11 +65,11 @@ SQL; } //TODO: Move the database auto-updates to DatabaseDAO - /** @param array<string> $errorInfo */ + /** @param array<string|int> $errorInfo */ protected function autoUpdateDb(array $errorInfo): bool { if (isset($errorInfo[0])) { if ($errorInfo[0] === FreshRSS_DatabaseDAO::ER_BAD_FIELD_ERROR || $errorInfo[0] === FreshRSS_DatabaseDAOPGSQL::UNDEFINED_COLUMN) { - $errorLines = explode("\n", $errorInfo[2], 2); // The relevant column name is on the first line, other lines are noise + $errorLines = explode("\n", (string)$errorInfo[2], 2); // The relevant column name is on the first line, other lines are noise foreach (['attributes'] as $column) { if (stripos($errorLines[0], $column) !== false) { return $this->addColumn($column); @@ -78,8 +78,9 @@ SQL; } } if (isset($errorInfo[1])) { + // May be a string or an int if ($errorInfo[1] == FreshRSS_DatabaseDAO::ER_DATA_TOO_LONG) { - if (stripos($errorInfo[2], 'content_bin') !== false) { + if (stripos((string)$errorInfo[2], 'content_bin') !== false) { return $this->updateToMediumBlob(); //v1.15.0 } } |