Code smell.
This commit is contained in:
@@ -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();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user