rename stan type logEntryType; added php 8.0 in the run; removed version from composer changed min to 8.0

Author: niden

.github/workflows/ci.yml

@@ -36,6 +36,7 @@ jobs:
       fail-fast: true
       matrix:
         php:
+          - '8.0'
           - '8.1'
           - '8.2'
           - '8.3'
@@ -72,6 +73,7 @@ jobs:
     strategy:
       matrix:
         php:
+          - '8.0'
           - '8.1'
           - '8.2'
           - '8.3'

composer.json

@@ -1,7 +1,6 @@
 {
     "name": "atlas/pdo",
     "type": "library",
-    "version": "2.0.0",
     "description": "Provides a PDO instance decorator with convenience methods, and a connection manager.",
     "keywords": [
         "pdo",
@@ -18,7 +17,7 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.0",
         "ext-pdo": "*"
     },
     "autoload": {

src/Connection.php

@@ -32,7 +32,7 @@
  *      options?: array<int, mixed>
  *  }
  *
- * @phpstan-type logEntry array{
+ * @phpstan-type logEntryType array{
  *      start: float,
  *      finish: ?float,
  *      duration: ?float,
@@ -71,7 +71,7 @@ static public function factory(mixed ...$args) : callable
     /**
      * @var callable|null
      */
-    protected mixed /* callable */ $queryLogger = null;
+    protected mixed $queryLogger = null;
 
     public function __construct(protected PDO $pdo)
     {
@@ -153,7 +153,7 @@ public function prepare(
             $sth = PersistentLoggedStatement::new(
                 $sth,
                 function (array $entry) : void {
-                    /** @var logEntry $entry */
+                    /** @var logEntryType $entry */
                     $this->addLogEntry($entry);
                 },
                 $this->newLogEntry()
@@ -310,7 +310,7 @@ public function fetchOne(
         array $values = []
     ) : array|false
     {
-        $sth    = $this->perform($statement, $values);
+        $sth = $this->perform($statement, $values);
         /** @var array<array-key, mixed> $result */
         $result = $sth->fetch(PDO::FETCH_ASSOC);
 
@@ -437,7 +437,7 @@ public function logQueries(bool $logQueries = true) : void
             LoggedStatement::CLASS,
             [
                 function (array $entry) : void {
-                    /** @var logEntry $entry */
+                    /** @var logEntryType $entry */
                     $this->addLogEntry($entry);
                 },
                 $this->newLogEntry()
@@ -458,23 +458,23 @@ public function setQueryLogger(callable $queryLogger) : void
     /**
      * @param string|null $statement
      *
-     * @return logEntry
+     * @return logEntryType
      */
     protected function newLogEntry(?string $statement = null) : array
     {
         return [
-            'start'     => microtime(true),
-            'finish'    => null,
-            'duration'  => null,
+            'start' => microtime(true),
+            'finish' => null,
+            'duration' => null,
             'performed' => null,
             'statement' => $statement,
-            'values'    => [],
-            'trace'     => null,
+            'values' => [],
+            'trace' => null,
         ];
     }
 
     /**
-     * @param logEntry $entry
+     * @param logEntryType $entry
      *
      * @return void
      */

src/ConnectionLocator.php

@@ -16,7 +16,7 @@
  *      READ: array<string, ?Connection>,
  *      WRITE: array<string, ?Connection>
  * }
- * @phpstan-import-type logEntry from Connection
+ * @phpstan-import-type logEntryType from Connection
  */
 class ConnectionLocator
 {
@@ -53,8 +53,8 @@ static public function new(mixed $arg, mixed ...$args) : static
      */
     protected array $instances = [
         self::DEFAULT => null,
-        self::READ    => [],
-        self::WRITE   => [],
+        self::READ => [],
+        self::WRITE => [],
     ];
 
     protected ?Connection $read = null;
@@ -66,7 +66,7 @@ static public function new(mixed $arg, mixed ...$args) : static
     protected bool $logQueries = false;
 
     /**
-     * @var logEntry[]
+     * @var logEntryType[]
      */
     protected array $queries = [];
 
@@ -205,7 +205,7 @@ protected function newConnection(
         $connection = $factory();
 
         $queryLogger = function (array $entry) use ($label) : void {
-            /** @var logEntry $entry */
+            /** @var logEntryType $entry */
             $entry = ['connection' => $label] + $entry;
             $this->addLogEntry($entry);
         };
@@ -258,7 +258,7 @@ public function logQueries(bool $logQueries = true) : void
     }
 
     /**
-     * @return logEntry[]
+     * @return logEntryType[]
      */
     public function getQueries() : array
     {
@@ -271,7 +271,7 @@ public function setQueryLogger(callable $queryLogger) : void
     }
 
     /**
-     * @param logEntry $entry
+     * @param logEntryType $entry
      *
      * @return void
      */

src/LoggedStatement.php

@@ -14,16 +14,16 @@
 use PDOStatement;
 
 /**
- * @phpstan-import-type  logEntry from Connection
+ * @phpstan-import-type  logEntryType from Connection
  */
 class LoggedStatement extends PDOStatement
 {
     /**
-     * @param callable $queryLogger
-     * @param logEntry $logEntry
+     * @param callable     $queryLogger
+     * @param logEntryType $logEntry
      */
     protected function __construct(
-        protected mixed /* callable */ $queryLogger,
+        protected mixed $queryLogger,
         protected array $logEntry
     ) {
         $this->logEntry['statement'] = $this->queryString;
@@ -45,7 +45,7 @@ public function bindValue(
         /** @var int|string $parameter */
         $result = parent::bindValue($parameter, $value, $dataType);
 
-        if ($result && !empty($this->logEntry)) {
+        if ($result && $this->logEntry !== null) {
             $this->logEntry['values'][$parameter] = $value;
         }
 

src/PersistentLoggedStatement.php

@@ -15,14 +15,14 @@
 use PDOStatement;
 
 /**
- * @phpstan-import-type logEntry from Connection
+ * @phpstan-import-type logEntryType from Connection
  */
 class PersistentLoggedStatement extends PDOStatement
 {
     /**
      * @param PDOStatement $parent
      * @param callable     $queryLogger
-     * @param logEntry     $logEntry
+     * @param logEntryType $logEntry
      *
      * @return static
      */
@@ -45,7 +45,7 @@ static public function new(
     private mixed /* callable */ $queryLogger;
 
     /**
-     * @var logEntry
+     * @var logEntryType
      */
     private array $logEntry;