- Changed returned object from PdoObject runQuery method correcting 'Creation of dynamic property PDOStatement:: is deprecated'

src/Common/PdoObject.php

@@ -11,14 +11,18 @@ class PdoObject extends PDO {
 
     public bool $executionStatus;
 
-    public function select(string $sql, array $parameters = []): PDOStatement 
+    public int $rowCount = 0;
+
+    public mixed $lastInsertId = null;
+
+    public function select(string $sql, array $parameters = []): PDOStatement
     {
         static::$dump && call_user_func_array(static::$dump, [ $sql, $parameters ]);
 
         try {
             if (false !== ( $statement = $this->prepare($sql) )) {
-                $statement = $this->execute($statement, $parameters, false);
                 $statement->setFetchMode(\PDO::FETCH_ASSOC);
+                $this->execute($statement, $parameters, false);
 
                 return $statement;
             }
@@ -28,10 +32,7 @@ class PdoObject extends PDO {
         }
     }
 
-    /**
-     * @deprecated
-     */
-    public function runQuery(string $sql, array $parameters = []): ? PDOStatement 
+    public function runQuery(string $sql, array $parameters = []): ? static
     {
         static::$dump && call_user_func_array(static::$dump, [ $sql, $parameters ]);
 
@@ -47,24 +48,25 @@ class PdoObject extends PDO {
         return null;
     }
 
-    public function runInsertQuery(string $sql, array $parameters = [])
+    public function runInsertQuery(string $sql, array $parameters = []) : ? static
     {
         return $this->runQuery($sql, $parameters);
     }
 
-    public function runUpdateQuery(string $sql, array $parameters = [])
+    public function runUpdateQuery(string $sql, array $parameters = []) : ? static
     {
         return $this->runQuery($sql, $parameters);
     }
 
-    public function runDeleteQuery(string $sql, array $parameters = []): ? PDOStatement
+    public function runDeleteQuery(string $sql, array $parameters = []) : ? static
     {
         return $this->runQuery($sql, $parameters);
     }
 
-    public function execute(PDOStatement $statement, array $parameters = [], bool $commit = true): ? PDOStatement
+    public function execute(PDOStatement $statement, array $parameters = [], bool $commit = true) : ? static
     {
         $this->executionStatus = false;
+        $this->lastInsertId = null;
 
         try {
             if ( ! $this->inTransaction() ) {
@@ -74,13 +76,14 @@ class PdoObject extends PDO {
             $this->executionStatus = empty($parameters) ? $statement->execute() : $statement->execute($parameters);
 
             if ( $this->executionStatus  ) {
-                $statement->lastInsertId = $this->lastInsertId();
+                $this->lastInsertId = $this->lastInsertId();
+                $this->rowCount = $statement->rowCount();
 
                 if ( $commit ) {
                     $this->commit();
                 }
 
-                return $statement;
+                return $this;
             }
             else {
                 throw new \PDOException($statement->errorCode() . " - " . json_encode($statement->errorInfo()));