Code smell.

This commit is contained in:
Ivor Barhansky
2022-12-17 01:20:43 +02:00
parent b1f578f4b0
commit 0398425205
45 changed files with 875 additions and 851 deletions
+13 -12
View File
@@ -4,13 +4,14 @@ declare(strict_types=1);
namespace Battles\Database;
use Battles\GameConfigs;
use PDO, PDOException;
use PDO;
use PDOException;
class Db
{
private PDO $pdo;
private static ?self $_instance = null;
private static ?self $instance = null;
private function __construct()
{
@@ -32,10 +33,10 @@ class Db
public static function getInstance(): self
{
if (is_null(self::$_instance)) {
self::$_instance = new self();
if (is_null(self::$instance)) {
self::$instance = new self();
}
return self::$_instance;
return self::$instance;
}
public function execute($query, $values = null)
@@ -74,11 +75,11 @@ class Db
// Allows the user to retrieve results using a
// column from the results as a key for the array
if (!is_null($key) && $results[0][$key]) {
$keyed_results = array();
$keyedResults = [];
foreach ($results as $result) {
$keyed_results[$result[$key]] = $result;
$keyedResults[$result[$key]] = $result;
}
$results = $keyed_results;
$results = $keyedResults;
}
return $results;
}
@@ -107,11 +108,11 @@ class Db
// Allows the user to retrieve results using a
// column from the results as a key for the array
if (!is_null($key) && $results[0][$key]) {
$keyed_results = (object)[];
$keyedResults = (object)[];
foreach ($results as $result) {
$keyed_results->$result[$key] = $result;
$keyedResults->$result[$key] = $result;
}
$results = $keyed_results;
$results = $keyedResults;
}
return $results;
}
@@ -131,4 +132,4 @@ class Db
$stmt = $this->execute($query, $values);
return $stmt->fetchColumn();
}
}
}