|
|
@@ -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
|
|
|
}
|
|
|
}
|