diff options
| author | 2024-09-06 09:06:46 +0200 | |
|---|---|---|
| committer | 2024-09-06 09:06:46 +0200 | |
| commit | a81656c3ed5b8fe0f31794a4fbe0d1a907fca8e8 (patch) | |
| tree | 8bf49bd876aaebc985a9fb1214863190a799cbee /lib/Minz/Pdo.php | |
| parent | 8f7c3473a76809efc88814253722c76f0cc8eb04 (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 'lib/Minz/Pdo.php')
| -rw-r--r-- | lib/Minz/Pdo.php | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/lib/Minz/Pdo.php b/lib/Minz/Pdo.php index 33d84eb45..705c2d58c 100644 --- a/lib/Minz/Pdo.php +++ b/lib/Minz/Pdo.php @@ -37,58 +37,44 @@ abstract class Minz_Pdo extends PDO { return $this->autoPrefix($statement); } - // PHP8+: PDO::lastInsertId(?string $name = null): string|false /** - * @param string|null $name - * @return string|false * @throws PDOException if the attribute `PDO::ATTR_ERRMODE` is set to `PDO::ERRMODE_EXCEPTION` */ #[\Override] - #[\ReturnTypeWillChange] - public function lastInsertId($name = null) { + public function lastInsertId(?string $name = null): string|false { if ($name != null) { $name = $this->preSql($name); } return parent::lastInsertId($name); } - // PHP8+: PDO::prepare(string $query, array $options = []): PDOStatement|false /** - * @param string $query * @param array<int,string> $options - * @return PDOStatement|false * @throws PDOException if the attribute `PDO::ATTR_ERRMODE` is set to `PDO::ERRMODE_EXCEPTION` * @phpstan-ignore method.childParameterType, throws.unusedType */ #[\Override] - #[\ReturnTypeWillChange] - public function prepare($query, $options = []) { + public function prepare(string $query, array $options = []): PDOStatement|false { $query = $this->preSql($query); return parent::prepare($query, $options); } - // PHP8+: PDO::exec(string $statement): int|false /** - * @param string $statement - * @return int|false * @throws PDOException if the attribute `PDO::ATTR_ERRMODE` is set to `PDO::ERRMODE_EXCEPTION` * @phpstan-ignore throws.unusedType */ #[\Override] - #[\ReturnTypeWillChange] - public function exec($statement) { + public function exec(string $statement): int|false { $statement = $this->preSql($statement); return parent::exec($statement); } /** - * @return PDOStatement|false * @throws PDOException if the attribute `PDO::ATTR_ERRMODE` is set to `PDO::ERRMODE_EXCEPTION` * @phpstan-ignore throws.unusedType */ #[\Override] - #[\ReturnTypeWillChange] - public function query(string $query, ?int $fetch_mode = null, ...$fetch_mode_args) { + public function query(string $query, ?int $fetch_mode = null, ...$fetch_mode_args): PDOStatement|false { $query = $this->preSql($query); return $fetch_mode === null ? parent::query($query) : parent::query($query, $fetch_mode, ...$fetch_mode_args); } |
