From e2f551ec128d4ca85856cadf4c088a8d96eb9213 Mon Sep 17 00:00:00 2001 From: "steven.lewis" Date: Tue, 15 Oct 2024 13:28:37 +0100 Subject: [PATCH] Changes for PHP 8.4 --- src/AbstractExtendedPdo.php | 34 +++++++++++++++++----------------- src/DecoratedPdo.php | 2 +- src/ExtendedPdo.php | 6 +++--- src/ExtendedPdoInterface.php | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/AbstractExtendedPdo.php b/src/AbstractExtendedPdo.php index f241969..3e237fe 100644 --- a/src/AbstractExtendedPdo.php +++ b/src/AbstractExtendedPdo.php @@ -105,7 +105,7 @@ abstract class AbstractExtendedPdo extends PDO implements ExtendedPdoInterface */ public function __call(string $name, array $arguments) { - $this->autoConnect(); + $this->establishConnection(); if (! method_exists($this->pdo, $name)) { $class = get_class($this); @@ -127,7 +127,7 @@ public function __call(string $name, array $arguments) */ public function beginTransaction(): bool { - $this->autoConnect(); + $this->establishConnection(); $this->profiler->start(__FUNCTION__); $result = $this->pdo->beginTransaction(); $this->profiler->finish(); @@ -145,7 +145,7 @@ public function beginTransaction(): bool */ public function commit(): bool { - $this->autoConnect(); + $this->establishConnection(); $this->profiler->start(__FUNCTION__); $result = $this->pdo->commit(); $this->profiler->finish(); @@ -158,7 +158,7 @@ public function commit(): bool * * @return void */ - abstract public function autoConnect(): void; + abstract public function establishConnection(): void; /** * @@ -177,7 +177,7 @@ abstract public function disconnect(): void; */ public function errorCode(): ?string { - $this->autoConnect(); + $this->establishConnection(); return $this->pdo->errorCode(); } @@ -190,7 +190,7 @@ public function errorCode(): ?string */ public function errorInfo(): array { - $this->autoConnect(); + $this->establishConnection(); return $this->pdo->errorInfo(); } @@ -207,7 +207,7 @@ public function errorInfo(): array */ public function exec(string $statement): int|false { - $this->autoConnect(); + $this->establishConnection(); $this->profiler->start(__FUNCTION__); $affectedRows = $this->pdo->exec($statement); $this->profiler->finish($statement); @@ -493,7 +493,7 @@ public function getProfiler(): ProfilerInterface */ public function inTransaction(): bool { - $this->autoConnect(); + $this->establishConnection(); $this->profiler->start(__FUNCTION__); $result = $this->pdo->inTransaction(); $this->profiler->finish(); @@ -525,7 +525,7 @@ public function isConnected(): bool */ public function lastInsertId(?string $name = null): string|false { - $this->autoConnect(); + $this->establishConnection(); $this->profiler->start(__FUNCTION__); $result = $this->pdo->lastInsertId($name); $this->profiler->finish(); @@ -550,7 +550,7 @@ public function lastInsertId(?string $name = null): string|false */ public function perform(string $statement, array $values = []): PDOStatement { - $this->autoConnect(); + $this->establishConnection(); $sth = $this->prepareWithValues($statement, $values); $this->profiler->start(__FUNCTION__); $sth->execute(); @@ -574,7 +574,7 @@ public function perform(string $statement, array $values = []): PDOStatement */ public function prepare(string $query, array $options = []): PDOStatement|false { - $this->autoConnect(); + $this->establishConnection(); $sth = $this->pdo->prepare($query, $options); return $sth; } @@ -610,7 +610,7 @@ public function prepareWithValues(string $statement, array $values = []): PDOSta return $this->prepare($statement); } - $this->autoConnect(); + $this->establishConnection(); // rebuild the statement and values $parser = clone $this->parser; @@ -645,7 +645,7 @@ public function prepareWithValues(string $statement, array $values = []): PDOSta */ public function query(string $query, ?int $fetchMode = null, mixed ...$fetch_mode_args): PDOStatement|false { - $this->autoConnect(); + $this->establishConnection(); $this->profiler->start(__FUNCTION__); $sth = $this->pdo->query($query, $fetchMode, ...$fetch_mode_args); $this->profiler->finish($sth->queryString); @@ -670,7 +670,7 @@ public function query(string $query, ?int $fetchMode = null, mixed ...$fetch_mod */ public function quote(string|int|array|float|null $value, int $type = self::PARAM_STR): string|false { - $this->autoConnect(); + $this->establishConnection(); $value = $value ?? ''; @@ -742,7 +742,7 @@ public function quoteSingleName(string $name): string */ public function rollBack(): bool { - $this->autoConnect(); + $this->establishConnection(); $this->profiler->start(__FUNCTION__); $result = $this->pdo->rollBack(); $this->profiler->finish(); @@ -992,7 +992,7 @@ protected function setQuoteName(string $driver): void */ public function getAttribute(int $attribute): bool|int|string|array|null { - $this->autoConnect(); + $this->establishConnection(); return $this->pdo->getAttribute($attribute); } @@ -1006,7 +1006,7 @@ public function getAttribute(int $attribute): bool|int|string|array|null */ public function setAttribute(int $attribute, mixed $value): bool { - $this->autoConnect(); + $this->establishConnection(); return $this->pdo->setAttribute($attribute, $value); } } diff --git a/src/DecoratedPdo.php b/src/DecoratedPdo.php index b379879..0eb683f 100644 --- a/src/DecoratedPdo.php +++ b/src/DecoratedPdo.php @@ -51,7 +51,7 @@ public function __construct(PDO $pdo, ?ProfilerInterface $profiler = null) * @return void * */ - public function autoConnect(): void + public function establishConnection(): void { // already connected } diff --git a/src/ExtendedPdo.php b/src/ExtendedPdo.php index 62d2744..0a00335 100644 --- a/src/ExtendedPdo.php +++ b/src/ExtendedPdo.php @@ -94,7 +94,7 @@ public static function connect( ?ProfilerInterface $profiler = null ): static { $pdo = new static($dsn, $username, $password, $options ?? [], $queries, $profiler); - $pdo->autoConnect(); + $pdo->establishConnection(); return $pdo; } @@ -104,7 +104,7 @@ public static function connect( * * @return void */ - public function autoConnect(): void + public function establishConnection(): void { if ($this->pdo) { return; @@ -169,7 +169,7 @@ public function __debugInfo(): array */ public function getPdo(): PDO { - $this->autoConnect(); + $this->establishConnection(); return $this->pdo; } } diff --git a/src/ExtendedPdoInterface.php b/src/ExtendedPdoInterface.php index 369fc28..4313185 100644 --- a/src/ExtendedPdoInterface.php +++ b/src/ExtendedPdoInterface.php @@ -28,7 +28,7 @@ interface ExtendedPdoInterface extends PdoInterface * Connects to the database. * */ - public function autoConnect(): void; + public function establishConnection(): void; /** *