refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dimtrovich merged 3 commits into from
Feb 25, 2026
Merged

refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0485a5b
refactor: remplacement de ConnectionResolver par DatabaseManager et m…
dimtrovich Feb 24, 2026
d473400
fix bugs
dimtrovich Feb 24, 2026
2c4c182
chore: suppression de fichier non utilisés
dimtrovich Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Builder/BaseBuilder.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -794,7 +794,7 @@ public function query(string $sql, array $params = [])
*/
public function result(int|string $type = PDO::FETCH_OBJ): array
{
return $this->execute()->result($type);
return $this->execute()->get($type);
}

/**
Expand Down
101 changes: 64 additions & 37 deletions src/Config/Services.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,87 +12,114 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\ConnectionResolverInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Database;
use Dimtrovich\DbDumper\Exceptions\Exception as DumperException;
use BlitzPHP\Database\DatabaseManager;
use Dimtrovich\DbDumper\Exporter;
use Dimtrovich\DbDumper\Importer;
use InvalidArgumentException;

/**
* Services de base de données
*/
class Services extends BaseServices
{
/**
* Query Builder
* Instance du gestionnaire de base de données
*/
public static function builder(?string $group = null, bool $shared = true): BaseBuilder
protected static ?DatabaseManager $manager = null;

/**
* Récupère le gestionnaire de base de données
*/
protected static function manager(): DatabaseManager
{
if (true === $shared && isset(static::$instances[BaseBuilder::class])) {
return static::$instances[BaseBuilder::class];
if (static::$manager === null) {
static::$manager = new DatabaseManager(static::logger(), static::event());
}

return static::$instances[BaseBuilder::class] = Database::builder(static::database($group));
return static::$manager;
}

/**
* Connexion a la base de données
* Récupère une connexion à la base de données
*/
public static function database(?string $group = null, bool $shared = true): BaseConnection
{
/** @var ConnectionResolverInterface */
$connectionResolver = static::container()->get(ConnectionResolverInterface::class);
[$group] = $connectionResolver->connectionInfo($group);
$connection = static::manager()->connect($group, $shared);

if (true === $shared && isset(static::$instances[Database::class]) && static::$instances[Database::class]->group === $group) {
return static::$instances[Database::class];
if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
}

return static::$instances[Database::class] = $connectionResolver->connect($group);
return $connection;
}

/**
* Systeme d'exportation de la base de donnees
* Récupère un query builder
*/
public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
public static function builder(?string $group = null, bool $shared = true): BaseBuilder
{
if (true === $shared && isset(static::$instances[Exporter::class])) {
return static::$instances[Exporter::class];
$key = 'builder_' . ($group ?? 'default');

if ($shared && isset(static::$instances[$key])) {
return static::$instances[$key];
}

$builder = static::manager()->builder(static::database($group, $shared));

if ($shared) {
static::$instances[$key] = $builder;
}

$db ??= self::database();
$config ??= config('dump', []);
return $builder;
}

if (! $db->conn) {
$db->initialize();
/**
* Récupère un exportateur de base de données
*/
public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
{
if ($shared) {
return static::sharedInstance('dbExporter', $db, $config);
}

if (! $db->isPdo()) {
throw new DumperException('Impossible de sauvegarder la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
$db ??= static::database();
$config = $config ?: (array) config('dump', []);

// Initialiser la connexion si nécessaire
$db->initialize();

$exporter = new Exporter($db->getDatabase(), $db->getConnection(), $config);

if ($shared) {
static::$instances[Exporter::class] = $exporter;
}

return static::$instances[Exporter::class] = new Exporter($db->database, $db->conn, $config);
return $exporter;
}

/**
* Systeme d'importation de la base de donnees
* Récupère un importateur de base de données
*/
public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
{
if (true === $shared && isset(static::$instances[Importer::class])) {
return static::$instances[Importer::class];
if ($shared) {
return static::sharedInstance('dbImporter', $db, $config);
}

$db ??= self::database();
$config ??= config('dump', []);
$db ??= static::database();
$config = $config ?: (array) config('dump', []);

if (! $db->conn) {
$db->initialize();
}
// Initialiser la connexion si nécessaire
$db->initialize();

$importer = new Importer($db->getDatabase(), $db->getConnection(), $config);

if (! $db->isPdo()) {
throw new DumperException('Impossible de restaurer la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
if ($shared) {
static::$instances[Importer::class] = $importer;
}

return static::$instances[Importer::class] = new Importer($db->database, $db->conn, $config);
return $importer;
}
}
4 changes: 2 additions & 2 deletions src/Config/database.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,11 @@
/**
* @var string Pilote de base de données à utiliser
*/
'driver' => env('db.default.driver', 'pdomysql'),
'driver' => env('db.default.driver', 'mysql'),
/** @var int */
'port' => env('db.default.port', 3306),
/** @var string */
'host' => env('db.default.hostname', 'localhost'),
'hostname' => env('db.default.hostname', 'localhost'),
/** @var string */
'username' => env('db.default.username', 'root'),
/** @var string */
Expand Down
22 changes: 21 additions & 1 deletion src/Connection/BaseConnection.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,11 @@ public function escapeIdentifiers(mixed $item): mixed
*/
protected function escapeIdentifier(string $item): string
{
return $this->escapeChar . str_replace($this->escapeChar, $this->escapeChar . $this->escapeChar, $item) . $this->escapeChar;
if ($this->isEscapedIdentifier($item)) {
return $item;
}

return $this->escapeChar . $item . $this->escapeChar;
}

/**
Expand All@@ -606,6 +610,22 @@ protected function isReserved(string $item): bool
return in_array($item, ['*'], true);
}

/**
* Determine si une chaine est échappée comme un identifiant SQL
*/
public function isEscapedIdentifier(string $value): bool
{
if ($value === '') {
return false;
}

$value = trim($value);

return str_starts_with($value, $this->escapeChar)
// && str_contains($value, '.')
&& str_ends_with($value, $this->escapeChar);
}

/**
* Crée le nom de la table avec son alias et le prefix des table de la base de données
*/
Expand Down
177 changes: 0 additions & 177 deletions src/ConnectionResolver.php
View file
Open in desktop

This file was deleted.

Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimtrovich
merged 3 commits into

from

Feb 25, 2026
 Merged


refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0485a5b

refactor: remplacement de ConnectionResolver par DatabaseManager et m…


dimtrovich Feb 24, 2026
d473400

fix bugs


dimtrovich Feb 24, 2026
2c4c182

chore: suppression de fichier non utilisés


dimtrovich Feb 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/Builder/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,7 +794,7 @@ public function query(string $sql, array $params = [])
 */
 public function result(int|string $type = PDO::FETCH_OBJ): array
 {
 return $this->execute()->result($type);
 return $this->execute()->get($type);
 }

 /**
Expand Down

101 changes: 64 additions & 37 deletions
src/Config/Services.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,87 +12,114 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\ConnectionResolverInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Database;
use Dimtrovich\DbDumper\Exceptions\Exception as DumperException;
use BlitzPHP\Database\DatabaseManager;
use Dimtrovich\DbDumper\Exporter;
use Dimtrovich\DbDumper\Importer;
use InvalidArgumentException;

/**
 * Services de base de données
 */
class Services extends BaseServices
{
 /**
 * Query Builder
 * Instance du gestionnaire de base de données
 */
 public static function builder(?string $group = null, bool $shared = true): BaseBuilder
 protected static ?DatabaseManager $manager = null;

 /**
 * Récupère le gestionnaire de base de données
 */
 protected static function manager(): DatabaseManager
 {
 if (true === $shared && isset(static::$instances[BaseBuilder::class])) {
return static::$instances[BaseBuilder::class];
 if (static::$manager === null) {
 static::$manager = new DatabaseManager(static::logger(), static::event());
 }

 return static::$instances[BaseBuilder::class] = Database::builder(static::database($group));
 return static::$manager;
 }

 /**
 * Connexion a la base de données
 * Récupère une connexion à la base de données
 */
 public static function database(?string $group = null, bool $shared = true): BaseConnection
 {
 /** @var ConnectionResolverInterface */
 $connectionResolver = static::container()->get(ConnectionResolverInterface::class);
 [$group] = $connectionResolver->connectionInfo($group);
 $connection = static::manager()->connect($group, $shared);

 if (true === $shared && isset(static::$instances[Database::class]) && static::$instances[Database::class]->group === $group) {
return static::$instances[Database::class];
 if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
 }

 return static::$instances[Database::class] = $connectionResolver->connect($group);
 return $connection;
 }

 /**
 * Systeme d'exportation de la base de donnees
 * Récupère un query builder
 */
 public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
 public static function builder(?string $group = null, bool $shared = true): BaseBuilder
 {
 if (true === $shared && isset(static::$instances[Exporter::class])) {
 return static::$instances[Exporter::class];
 $key = 'builder_' . ($group ?? 'default');

 if ($shared && isset(static::$instances[$key])) {
 return static::$instances[$key];
 }

 $builder = static::manager()->builder(static::database($group, $shared));

 if ($shared) {
 static::$instances[$key] = $builder;
 }

$db ??= self::database();
 $config ??= config('dump', []);
return $builder;
}

 if (! $db->conn) {
 $db->initialize();
 /**
 * Récupère un exportateur de base de données
 */
 public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
 {
 if ($shared) {
 return static::sharedInstance('dbExporter', $db, $config);
 }

 if (! $db->isPdo()) {
 throw new DumperException('Impossible de sauvegarder la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
 $db ??= static::database();
 $config = $config ?: (array) config('dump', []);

 // Initialiser la connexion si nécessaire
 $db->initialize();

 $exporter = new Exporter($db->getDatabase(), $db->getConnection(), $config);

 if ($shared) {
 static::$instances[Exporter::class] = $exporter;
 }

 return static::$instances[Exporter::class] = new Exporter($db->database, $db->conn, $config);
 return $exporter;
 }

 /**
 * Systeme d'importation de la base de donnees
 * Récupère un importateur de base de données
 */
 public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
 {
 if (true === $shared && isset(static::$instances[Importer::class])) {
 return static::$instances[Importer::class];
 if ($shared) {
 return static::sharedInstance('dbImporter', $db, $config);
 }

 $db ??= self::database();
 $config ??= config('dump', []);
 $db ??= static::database();
 $config = $config ?: (array) config('dump', []);

 if (! $db->conn) {
 $db->initialize();
 }
 // Initialiser la connexion si nécessaire
 $db->initialize();

 $importer = new Importer($db->getDatabase(), $db->getConnection(), $config);

 if (! $db->isPdo()) {
throw new DumperException('Impossible de restaurer la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
 if ($shared) {
static::$instances[Importer::class] = $importer;
 }

 return static::$instances[Importer::class] = new Importer($db->database, $db->conn, $config);
 return $importer;
 }
}

4 changes: 2 additions & 2 deletions
src/Config/database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,11 @@
 /**
 * @var string Pilote de base de données à utiliser
 */
 'driver' => env('db.default.driver', 'pdomysql'),
 'driver' => env('db.default.driver', 'mysql'),
 /** @var int */
 'port' => env('db.default.port', 3306),
 /** @var string */
 'host' => env('db.default.hostname', 'localhost'),
 'hostname' => env('db.default.hostname', 'localhost'),
 /** @var string */
 'username' => env('db.default.username', 'root'),
 /** @var string */
Expand Down

22 changes: 21 additions & 1 deletion
src/Connection/BaseConnection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,11 @@ public function escapeIdentifiers(mixed $item): mixed
 */
 protected function escapeIdentifier(string $item): string
 {
 return $this->escapeChar . str_replace($this->escapeChar, $this->escapeChar . $this->escapeChar, $item) . $this->escapeChar;
 if ($this->isEscapedIdentifier($item)) {
 return $item;
 }

 return $this->escapeChar . $item . $this->escapeChar;
 }

 /**
Expand All@@ -606,6 +610,22 @@ protected function isReserved(string $item): bool
 return in_array($item, ['*'], true);
 }

 /**
 * Determine si une chaine est échappée comme un identifiant SQL
 */
 public function isEscapedIdentifier(string $value): bool
 {
 if ($value === '') {
 return false;
 }

 $value = trim($value);

 return str_starts_with($value, $this->escapeChar)
 // && str_contains($value, '.')
 && str_ends_with($value, $this->escapeChar);
 }

 /**
 * Crée le nom de la table avec son alias et le prefix des table de la base de données
 */
Expand Down

177 changes: 0 additions & 177 deletions
src/ConnectionResolver.php

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimtrovich
merged 3 commits into

from

Feb 25, 2026
 Merged


refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0485a5b

refactor: remplacement de ConnectionResolver par DatabaseManager et m…


dimtrovich Feb 24, 2026
d473400

fix bugs


dimtrovich Feb 24, 2026
2c4c182

chore: suppression de fichier non utilisés


dimtrovich Feb 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/Builder/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,7 +794,7 @@ public function query(string $sql, array $params = [])
 */
 public function result(int|string $type = PDO::FETCH_OBJ): array
 {
 return $this->execute()->result($type);
 return $this->execute()->get($type);
 }

 /**
Expand Down

101 changes: 64 additions & 37 deletions
src/Config/Services.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,87 +12,114 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\ConnectionResolverInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Database;
use Dimtrovich\DbDumper\Exceptions\Exception as DumperException;
use BlitzPHP\Database\DatabaseManager;
use Dimtrovich\DbDumper\Exporter;
use Dimtrovich\DbDumper\Importer;
use InvalidArgumentException;

/**
 * Services de base de données
 */
class Services extends BaseServices
{
 /**
 * Query Builder
 * Instance du gestionnaire de base de données
 */
 public static function builder(?string $group = null, bool $shared = true): BaseBuilder
 protected static ?DatabaseManager $manager = null;

 /**
 * Récupère le gestionnaire de base de données
 */
 protected static function manager(): DatabaseManager
 {
 if (true === $shared && isset(static::$instances[BaseBuilder::class])) {
return static::$instances[BaseBuilder::class];
 if (static::$manager === null) {
 static::$manager = new DatabaseManager(static::logger(), static::event());
 }

 return static::$instances[BaseBuilder::class] = Database::builder(static::database($group));
 return static::$manager;
 }

 /**
 * Connexion a la base de données
 * Récupère une connexion à la base de données
 */
 public static function database(?string $group = null, bool $shared = true): BaseConnection
 {
 /** @var ConnectionResolverInterface */
 $connectionResolver = static::container()->get(ConnectionResolverInterface::class);
 [$group] = $connectionResolver->connectionInfo($group);
 $connection = static::manager()->connect($group, $shared);

 if (true === $shared && isset(static::$instances[Database::class]) && static::$instances[Database::class]->group === $group) {
return static::$instances[Database::class];
 if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
 }

 return static::$instances[Database::class] = $connectionResolver->connect($group);
 return $connection;
 }

 /**
 * Systeme d'exportation de la base de donnees
 * Récupère un query builder
 */
 public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
 public static function builder(?string $group = null, bool $shared = true): BaseBuilder
 {
 if (true === $shared && isset(static::$instances[Exporter::class])) {
 return static::$instances[Exporter::class];
 $key = 'builder_' . ($group ?? 'default');

 if ($shared && isset(static::$instances[$key])) {
 return static::$instances[$key];
 }

 $builder = static::manager()->builder(static::database($group, $shared));

 if ($shared) {
 static::$instances[$key] = $builder;
 }

$db ??= self::database();
 $config ??= config('dump', []);
return $builder;
}

 if (! $db->conn) {
 $db->initialize();
 /**
 * Récupère un exportateur de base de données
 */
 public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
 {
 if ($shared) {
 return static::sharedInstance('dbExporter', $db, $config);
 }

 if (! $db->isPdo()) {
 throw new DumperException('Impossible de sauvegarder la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
 $db ??= static::database();
 $config = $config ?: (array) config('dump', []);

 // Initialiser la connexion si nécessaire
 $db->initialize();

 $exporter = new Exporter($db->getDatabase(), $db->getConnection(), $config);

 if ($shared) {
 static::$instances[Exporter::class] = $exporter;
 }

 return static::$instances[Exporter::class] = new Exporter($db->database, $db->conn, $config);
 return $exporter;
 }

 /**
 * Systeme d'importation de la base de donnees
 * Récupère un importateur de base de données
 */
 public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
 {
 if (true === $shared && isset(static::$instances[Importer::class])) {
 return static::$instances[Importer::class];
 if ($shared) {
 return static::sharedInstance('dbImporter', $db, $config);
 }

 $db ??= self::database();
 $config ??= config('dump', []);
 $db ??= static::database();
 $config = $config ?: (array) config('dump', []);

 if (! $db->conn) {
 $db->initialize();
 }
 // Initialiser la connexion si nécessaire
 $db->initialize();

 $importer = new Importer($db->getDatabase(), $db->getConnection(), $config);

 if (! $db->isPdo()) {
throw new DumperException('Impossible de restaurer la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
 if ($shared) {
static::$instances[Importer::class] = $importer;
 }

 return static::$instances[Importer::class] = new Importer($db->database, $db->conn, $config);
 return $importer;
 }
}

4 changes: 2 additions & 2 deletions
src/Config/database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,11 @@
 /**
 * @var string Pilote de base de données à utiliser
 */
 'driver' => env('db.default.driver', 'pdomysql'),
 'driver' => env('db.default.driver', 'mysql'),
 /** @var int */
 'port' => env('db.default.port', 3306),
 /** @var string */
 'host' => env('db.default.hostname', 'localhost'),
 'hostname' => env('db.default.hostname', 'localhost'),
 /** @var string */
 'username' => env('db.default.username', 'root'),
 /** @var string */
Expand Down

22 changes: 21 additions & 1 deletion
src/Connection/BaseConnection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,11 @@ public function escapeIdentifiers(mixed $item): mixed
 */
 protected function escapeIdentifier(string $item): string
 {
 return $this->escapeChar . str_replace($this->escapeChar, $this->escapeChar . $this->escapeChar, $item) . $this->escapeChar;
 if ($this->isEscapedIdentifier($item)) {
 return $item;
 }

 return $this->escapeChar . $item . $this->escapeChar;
 }

 /**
Expand All@@ -606,6 +610,22 @@ protected function isReserved(string $item): bool
 return in_array($item, ['*'], true);
 }

 /**
 * Determine si une chaine est échappée comme un identifiant SQL
 */
 public function isEscapedIdentifier(string $value): bool
 {
 if ($value === '') {
 return false;
 }

 $value = trim($value);

 return str_starts_with($value, $this->escapeChar)
 // && str_contains($value, '.')
 && str_ends_with($value, $this->escapeChar);
 }

 /**
 * Crée le nom de la table avec son alias et le prefix des table de la base de données
 */
Expand Down

177 changes: 0 additions & 177 deletions
src/ConnectionResolver.php

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimtrovich
merged 3 commits into

from

Feb 25, 2026
 Merged


refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0485a5b

refactor: remplacement de ConnectionResolver par DatabaseManager et m…


dimtrovich Feb 24, 2026
d473400

fix bugs


dimtrovich Feb 24, 2026
2c4c182

chore: suppression de fichier non utilisés


dimtrovich Feb 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/Builder/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,7 +794,7 @@ public function query(string $sql, array $params = [])
 */
 public function result(int|string $type = PDO::FETCH_OBJ): array
 {
 return $this->execute()->result($type);
 return $this->execute()->get($type);
 }

 /**
Expand Down

101 changes: 64 additions & 37 deletions
src/Config/Services.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,87 +12,114 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\ConnectionResolverInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Database;
use Dimtrovich\DbDumper\Exceptions\Exception as DumperException;
use BlitzPHP\Database\DatabaseManager;
use Dimtrovich\DbDumper\Exporter;
use Dimtrovich\DbDumper\Importer;
use InvalidArgumentException;

/**
 * Services de base de données
 */
class Services extends BaseServices
{
 /**
 * Query Builder
 * Instance du gestionnaire de base de données
 */
 public static function builder(?string $group = null, bool $shared = true): BaseBuilder
 protected static ?DatabaseManager $manager = null;

 /**
 * Récupère le gestionnaire de base de données
 */
 protected static function manager(): DatabaseManager
 {
 if (true === $shared && isset(static::$instances[BaseBuilder::class])) {
return static::$instances[BaseBuilder::class];
 if (static::$manager === null) {
 static::$manager = new DatabaseManager(static::logger(), static::event());
 }

 return static::$instances[BaseBuilder::class] = Database::builder(static::database($group));
 return static::$manager;
 }

 /**
 * Connexion a la base de données
 * Récupère une connexion à la base de données
 */
 public static function database(?string $group = null, bool $shared = true): BaseConnection
 {
 /** @var ConnectionResolverInterface */
 $connectionResolver = static::container()->get(ConnectionResolverInterface::class);
 [$group] = $connectionResolver->connectionInfo($group);
 $connection = static::manager()->connect($group, $shared);

 if (true === $shared && isset(static::$instances[Database::class]) && static::$instances[Database::class]->group === $group) {
return static::$instances[Database::class];
 if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
 }

 return static::$instances[Database::class] = $connectionResolver->connect($group);
 return $connection;
 }

 /**
 * Systeme d'exportation de la base de donnees
 * Récupère un query builder
 */
 public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
 public static function builder(?string $group = null, bool $shared = true): BaseBuilder
 {
 if (true === $shared && isset(static::$instances[Exporter::class])) {
 return static::$instances[Exporter::class];
 $key = 'builder_' . ($group ?? 'default');

 if ($shared && isset(static::$instances[$key])) {
 return static::$instances[$key];
 }

 $builder = static::manager()->builder(static::database($group, $shared));

 if ($shared) {
 static::$instances[$key] = $builder;
 }

$db ??= self::database();
 $config ??= config('dump', []);
return $builder;
}

 if (! $db->conn) {
 $db->initialize();
 /**
 * Récupère un exportateur de base de données
 */
 public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
 {
 if ($shared) {
 return static::sharedInstance('dbExporter', $db, $config);
 }

 if (! $db->isPdo()) {
 throw new DumperException('Impossible de sauvegarder la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
 $db ??= static::database();
 $config = $config ?: (array) config('dump', []);

 // Initialiser la connexion si nécessaire
 $db->initialize();

 $exporter = new Exporter($db->getDatabase(), $db->getConnection(), $config);

 if ($shared) {
 static::$instances[Exporter::class] = $exporter;
 }

 return static::$instances[Exporter::class] = new Exporter($db->database, $db->conn, $config);
 return $exporter;
 }

 /**
 * Systeme d'importation de la base de donnees
 * Récupère un importateur de base de données
 */
 public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
 {
 if (true === $shared && isset(static::$instances[Importer::class])) {
 return static::$instances[Importer::class];
 if ($shared) {
 return static::sharedInstance('dbImporter', $db, $config);
 }

 $db ??= self::database();
 $config ??= config('dump', []);
 $db ??= static::database();
 $config = $config ?: (array) config('dump', []);

 if (! $db->conn) {
 $db->initialize();
 }
 // Initialiser la connexion si nécessaire
 $db->initialize();

 $importer = new Importer($db->getDatabase(), $db->getConnection(), $config);

 if (! $db->isPdo()) {
throw new DumperException('Impossible de restaurer la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
 if ($shared) {
static::$instances[Importer::class] = $importer;
 }

 return static::$instances[Importer::class] = new Importer($db->database, $db->conn, $config);
 return $importer;
 }
}

4 changes: 2 additions & 2 deletions
src/Config/database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,11 @@
 /**
 * @var string Pilote de base de données à utiliser
 */
 'driver' => env('db.default.driver', 'pdomysql'),
 'driver' => env('db.default.driver', 'mysql'),
 /** @var int */
 'port' => env('db.default.port', 3306),
 /** @var string */
 'host' => env('db.default.hostname', 'localhost'),
 'hostname' => env('db.default.hostname', 'localhost'),
 /** @var string */
 'username' => env('db.default.username', 'root'),
 /** @var string */
Expand Down

22 changes: 21 additions & 1 deletion
src/Connection/BaseConnection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,11 @@ public function escapeIdentifiers(mixed $item): mixed
 */
 protected function escapeIdentifier(string $item): string
 {
 return $this->escapeChar . str_replace($this->escapeChar, $this->escapeChar . $this->escapeChar, $item) . $this->escapeChar;
 if ($this->isEscapedIdentifier($item)) {
 return $item;
 }

 return $this->escapeChar . $item . $this->escapeChar;
 }

 /**
Expand All@@ -606,6 +610,22 @@ protected function isReserved(string $item): bool
 return in_array($item, ['*'], true);
 }

 /**
 * Determine si une chaine est échappée comme un identifiant SQL
 */
 public function isEscapedIdentifier(string $value): bool
 {
 if ($value === '') {
 return false;
 }

 $value = trim($value);

 return str_starts_with($value, $this->escapeChar)
 // && str_contains($value, '.')
 && str_ends_with($value, $this->escapeChar);
 }

 /**
 * Crée le nom de la table avec son alias et le prefix des table de la base de données
 */
Expand Down

177 changes: 0 additions & 177 deletions
src/ConnectionResolver.php

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimtrovich
merged 3 commits into

from

Feb 25, 2026
 Merged


refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0485a5b

refactor: remplacement de ConnectionResolver par DatabaseManager et m…


dimtrovich Feb 24, 2026
d473400

fix bugs


dimtrovich Feb 24, 2026
2c4c182

chore: suppression de fichier non utilisés


dimtrovich Feb 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/Builder/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,7 +794,7 @@ public function query(string $sql, array $params = [])
 */
 public function result(int|string $type = PDO::FETCH_OBJ): array
 {
 return $this->execute()->result($type);
 return $this->execute()->get($type);
 }

 /**
Expand Down

101 changes: 64 additions & 37 deletions
src/Config/Services.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,87 +12,114 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\ConnectionResolverInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Database;
use Dimtrovich\DbDumper\Exceptions\Exception as DumperException;
use BlitzPHP\Database\DatabaseManager;
use Dimtrovich\DbDumper\Exporter;
use Dimtrovich\DbDumper\Importer;
use InvalidArgumentException;

/**
 * Services de base de données
 */
class Services extends BaseServices
{
 /**
 * Query Builder
 * Instance du gestionnaire de base de données
 */
 public static function builder(?string $group = null, bool $shared = true): BaseBuilder
 protected static ?DatabaseManager $manager = null;

 /**
 * Récupère le gestionnaire de base de données
 */
 protected static function manager(): DatabaseManager
 {
 if (true === $shared && isset(static::$instances[BaseBuilder::class])) {
return static::$instances[BaseBuilder::class];
 if (static::$manager === null) {
 static::$manager = new DatabaseManager(static::logger(), static::event());
 }

 return static::$instances[BaseBuilder::class] = Database::builder(static::database($group));
 return static::$manager;
 }

 /**
 * Connexion a la base de données
 * Récupère une connexion à la base de données
 */
 public static function database(?string $group = null, bool $shared = true): BaseConnection
 {
 /** @var ConnectionResolverInterface */
 $connectionResolver = static::container()->get(ConnectionResolverInterface::class);
 [$group] = $connectionResolver->connectionInfo($group);
 $connection = static::manager()->connect($group, $shared);

 if (true === $shared && isset(static::$instances[Database::class]) && static::$instances[Database::class]->group === $group) {
return static::$instances[Database::class];
 if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
 }

 return static::$instances[Database::class] = $connectionResolver->connect($group);
 return $connection;
 }

 /**
 * Systeme d'exportation de la base de donnees
 * Récupère un query builder
 */
 public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
 public static function builder(?string $group = null, bool $shared = true): BaseBuilder
 {
 if (true === $shared && isset(static::$instances[Exporter::class])) {
 return static::$instances[Exporter::class];
 $key = 'builder_' . ($group ?? 'default');

 if ($shared && isset(static::$instances[$key])) {
 return static::$instances[$key];
 }

 $builder = static::manager()->builder(static::database($group, $shared));

 if ($shared) {
 static::$instances[$key] = $builder;
 }

$db ??= self::database();
 $config ??= config('dump', []);
return $builder;
}

 if (! $db->conn) {
 $db->initialize();
 /**
 * Récupère un exportateur de base de données
 */
 public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
 {
 if ($shared) {
 return static::sharedInstance('dbExporter', $db, $config);
 }

 if (! $db->isPdo()) {
 throw new DumperException('Impossible de sauvegarder la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
 $db ??= static::database();
 $config = $config ?: (array) config('dump', []);

 // Initialiser la connexion si nécessaire
 $db->initialize();

 $exporter = new Exporter($db->getDatabase(), $db->getConnection(), $config);

 if ($shared) {
 static::$instances[Exporter::class] = $exporter;
 }

 return static::$instances[Exporter::class] = new Exporter($db->database, $db->conn, $config);
 return $exporter;
 }

 /**
 * Systeme d'importation de la base de donnees
 * Récupère un importateur de base de données
 */
 public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
 {
 if (true === $shared && isset(static::$instances[Importer::class])) {
 return static::$instances[Importer::class];
 if ($shared) {
 return static::sharedInstance('dbImporter', $db, $config);
 }

 $db ??= self::database();
 $config ??= config('dump', []);
 $db ??= static::database();
 $config = $config ?: (array) config('dump', []);

 if (! $db->conn) {
 $db->initialize();
 }
 // Initialiser la connexion si nécessaire
 $db->initialize();

 $importer = new Importer($db->getDatabase(), $db->getConnection(), $config);

 if (! $db->isPdo()) {
throw new DumperException('Impossible de restaurer la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
 if ($shared) {
static::$instances[Importer::class] = $importer;
 }

 return static::$instances[Importer::class] = new Importer($db->database, $db->conn, $config);
 return $importer;
 }
}

4 changes: 2 additions & 2 deletions
src/Config/database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,11 @@
 /**
 * @var string Pilote de base de données à utiliser
 */
 'driver' => env('db.default.driver', 'pdomysql'),
 'driver' => env('db.default.driver', 'mysql'),
 /** @var int */
 'port' => env('db.default.port', 3306),
 /** @var string */
 'host' => env('db.default.hostname', 'localhost'),
 'hostname' => env('db.default.hostname', 'localhost'),
 /** @var string */
 'username' => env('db.default.username', 'root'),
 /** @var string */
Expand Down

22 changes: 21 additions & 1 deletion
src/Connection/BaseConnection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,11 @@ public function escapeIdentifiers(mixed $item): mixed
 */
 protected function escapeIdentifier(string $item): string
 {
 return $this->escapeChar . str_replace($this->escapeChar, $this->escapeChar . $this->escapeChar, $item) . $this->escapeChar;
 if ($this->isEscapedIdentifier($item)) {
 return $item;
 }

 return $this->escapeChar . $item . $this->escapeChar;
 }

 /**
Expand All@@ -606,6 +610,22 @@ protected function isReserved(string $item): bool
 return in_array($item, ['*'], true);
 }

 /**
 * Determine si une chaine est échappée comme un identifiant SQL
 */
 public function isEscapedIdentifier(string $value): bool
 {
 if ($value === '') {
 return false;
 }

 $value = trim($value);

 return str_starts_with($value, $this->escapeChar)
 // && str_contains($value, '.')
 && str_ends_with($value, $this->escapeChar);
 }

 /**
 * Crée le nom de la table avec son alias et le prefix des table de la base de données
 */
Expand Down

177 changes: 0 additions & 177 deletions
src/ConnectionResolver.php

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimtrovich
merged 3 commits into

from

Feb 25, 2026
 Merged


refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0485a5b

refactor: remplacement de ConnectionResolver par DatabaseManager et m…


dimtrovich Feb 24, 2026
d473400

fix bugs


dimtrovich Feb 24, 2026
2c4c182

chore: suppression de fichier non utilisés


dimtrovich Feb 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/Builder/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,7 +794,7 @@ public function query(string $sql, array $params = [])
 */
 public function result(int|string $type = PDO::FETCH_OBJ): array
 {
 return $this->execute()->result($type);
 return $this->execute()->get($type);
 }

 /**
Expand Down

101 changes: 64 additions & 37 deletions
src/Config/Services.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,87 +12,114 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\ConnectionResolverInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Database;
use Dimtrovich\DbDumper\Exceptions\Exception as DumperException;
use BlitzPHP\Database\DatabaseManager;
use Dimtrovich\DbDumper\Exporter;
use Dimtrovich\DbDumper\Importer;
use InvalidArgumentException;

/**
 * Services de base de données
 */
class Services extends BaseServices
{
 /**
 * Query Builder
 * Instance du gestionnaire de base de données
 */
 public static function builder(?string $group = null, bool $shared = true): BaseBuilder
 protected static ?DatabaseManager $manager = null;

 /**
 * Récupère le gestionnaire de base de données
 */
 protected static function manager(): DatabaseManager
 {
 if (true === $shared && isset(static::$instances[BaseBuilder::class])) {
return static::$instances[BaseBuilder::class];
 if (static::$manager === null) {
 static::$manager = new DatabaseManager(static::logger(), static::event());
 }

 return static::$instances[BaseBuilder::class] = Database::builder(static::database($group));
 return static::$manager;
 }

 /**
 * Connexion a la base de données
 * Récupère une connexion à la base de données
 */
 public static function database(?string $group = null, bool $shared = true): BaseConnection
 {
 /** @var ConnectionResolverInterface */
 $connectionResolver = static::container()->get(ConnectionResolverInterface::class);
 [$group] = $connectionResolver->connectionInfo($group);
 $connection = static::manager()->connect($group, $shared);

 if (true === $shared && isset(static::$instances[Database::class]) && static::$instances[Database::class]->group === $group) {
return static::$instances[Database::class];
 if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
 }

 return static::$instances[Database::class] = $connectionResolver->connect($group);
 return $connection;
 }

 /**
 * Systeme d'exportation de la base de donnees
 * Récupère un query builder
 */
 public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
 public static function builder(?string $group = null, bool $shared = true): BaseBuilder
 {
 if (true === $shared && isset(static::$instances[Exporter::class])) {
 return static::$instances[Exporter::class];
 $key = 'builder_' . ($group ?? 'default');

 if ($shared && isset(static::$instances[$key])) {
 return static::$instances[$key];
 }

 $builder = static::manager()->builder(static::database($group, $shared));

 if ($shared) {
 static::$instances[$key] = $builder;
 }

$db ??= self::database();
 $config ??= config('dump', []);
return $builder;
}

 if (! $db->conn) {
 $db->initialize();
 /**
 * Récupère un exportateur de base de données
 */
 public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
 {
 if ($shared) {
 return static::sharedInstance('dbExporter', $db, $config);
 }

 if (! $db->isPdo()) {
 throw new DumperException('Impossible de sauvegarder la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
 $db ??= static::database();
 $config = $config ?: (array) config('dump', []);

 // Initialiser la connexion si nécessaire
 $db->initialize();

 $exporter = new Exporter($db->getDatabase(), $db->getConnection(), $config);

 if ($shared) {
 static::$instances[Exporter::class] = $exporter;
 }

 return static::$instances[Exporter::class] = new Exporter($db->database, $db->conn, $config);
 return $exporter;
 }

 /**
 * Systeme d'importation de la base de donnees
 * Récupère un importateur de base de données
 */
 public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
 {
 if (true === $shared && isset(static::$instances[Importer::class])) {
 return static::$instances[Importer::class];
 if ($shared) {
 return static::sharedInstance('dbImporter', $db, $config);
 }

 $db ??= self::database();
 $config ??= config('dump', []);
 $db ??= static::database();
 $config = $config ?: (array) config('dump', []);

 if (! $db->conn) {
 $db->initialize();
 }
 // Initialiser la connexion si nécessaire
 $db->initialize();

 $importer = new Importer($db->getDatabase(), $db->getConnection(), $config);

 if (! $db->isPdo()) {
throw new DumperException('Impossible de restaurer la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
 if ($shared) {
static::$instances[Importer::class] = $importer;
 }

 return static::$instances[Importer::class] = new Importer($db->database, $db->conn, $config);
 return $importer;
 }
}

4 changes: 2 additions & 2 deletions
src/Config/database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,11 @@
 /**
 * @var string Pilote de base de données à utiliser
 */
 'driver' => env('db.default.driver', 'pdomysql'),
 'driver' => env('db.default.driver', 'mysql'),
 /** @var int */
 'port' => env('db.default.port', 3306),
 /** @var string */
 'host' => env('db.default.hostname', 'localhost'),
 'hostname' => env('db.default.hostname', 'localhost'),
 /** @var string */
 'username' => env('db.default.username', 'root'),
 /** @var string */
Expand Down

22 changes: 21 additions & 1 deletion
src/Connection/BaseConnection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,11 @@ public function escapeIdentifiers(mixed $item): mixed
 */
 protected function escapeIdentifier(string $item): string
 {
 return $this->escapeChar . str_replace($this->escapeChar, $this->escapeChar . $this->escapeChar, $item) . $this->escapeChar;
 if ($this->isEscapedIdentifier($item)) {
 return $item;
 }

 return $this->escapeChar . $item . $this->escapeChar;
 }

 /**
Expand All@@ -606,6 +610,22 @@ protected function isReserved(string $item): bool
 return in_array($item, ['*'], true);
 }

 /**
 * Determine si une chaine est échappée comme un identifiant SQL
 */
 public function isEscapedIdentifier(string $value): bool
 {
 if ($value === '') {
 return false;
 }

 $value = trim($value);

 return str_starts_with($value, $this->escapeChar)
 // && str_contains($value, '.')
 && str_ends_with($value, $this->escapeChar);
 }

 /**
 * Crée le nom de la table avec son alias et le prefix des table de la base de données
 */
Expand Down

177 changes: 0 additions & 177 deletions
src/ConnectionResolver.php

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimtrovich
merged 3 commits into

from

Feb 25, 2026
 Merged


refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0485a5b

refactor: remplacement de ConnectionResolver par DatabaseManager et m…


dimtrovich Feb 24, 2026
d473400

fix bugs


dimtrovich Feb 24, 2026
2c4c182

chore: suppression de fichier non utilisés


dimtrovich Feb 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/Builder/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,7 +794,7 @@ public function query(string $sql, array $params = [])
 */
 public function result(int|string $type = PDO::FETCH_OBJ): array
 {
 return $this->execute()->result($type);
 return $this->execute()->get($type);
 }

 /**
Expand Down

101 changes: 64 additions & 37 deletions
src/Config/Services.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,87 +12,114 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\ConnectionResolverInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Database;
use Dimtrovich\DbDumper\Exceptions\Exception as DumperException;
use BlitzPHP\Database\DatabaseManager;
use Dimtrovich\DbDumper\Exporter;
use Dimtrovich\DbDumper\Importer;
use InvalidArgumentException;

/**
 * Services de base de données
 */
class Services extends BaseServices
{
 /**
 * Query Builder
 * Instance du gestionnaire de base de données
 */
 public static function builder(?string $group = null, bool $shared = true): BaseBuilder
 protected static ?DatabaseManager $manager = null;

 /**
 * Récupère le gestionnaire de base de données
 */
 protected static function manager(): DatabaseManager
 {
 if (true === $shared && isset(static::$instances[BaseBuilder::class])) {
return static::$instances[BaseBuilder::class];
 if (static::$manager === null) {
 static::$manager = new DatabaseManager(static::logger(), static::event());
 }

 return static::$instances[BaseBuilder::class] = Database::builder(static::database($group));
 return static::$manager;
 }

 /**
 * Connexion a la base de données
 * Récupère une connexion à la base de données
 */
 public static function database(?string $group = null, bool $shared = true): BaseConnection
 {
 /** @var ConnectionResolverInterface */
 $connectionResolver = static::container()->get(ConnectionResolverInterface::class);
 [$group] = $connectionResolver->connectionInfo($group);
 $connection = static::manager()->connect($group, $shared);

 if (true === $shared && isset(static::$instances[Database::class]) && static::$instances[Database::class]->group === $group) {
return static::$instances[Database::class];
 if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
 }

 return static::$instances[Database::class] = $connectionResolver->connect($group);
 return $connection;
 }

 /**
 * Systeme d'exportation de la base de donnees
 * Récupère un query builder
 */
 public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
 public static function builder(?string $group = null, bool $shared = true): BaseBuilder
 {
 if (true === $shared && isset(static::$instances[Exporter::class])) {
 return static::$instances[Exporter::class];
 $key = 'builder_' . ($group ?? 'default');

 if ($shared && isset(static::$instances[$key])) {
 return static::$instances[$key];
 }

 $builder = static::manager()->builder(static::database($group, $shared));

 if ($shared) {
 static::$instances[$key] = $builder;
 }

$db ??= self::database();
 $config ??= config('dump', []);
return $builder;
}

 if (! $db->conn) {
 $db->initialize();
 /**
 * Récupère un exportateur de base de données
 */
 public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
 {
 if ($shared) {
 return static::sharedInstance('dbExporter', $db, $config);
 }

 if (! $db->isPdo()) {
 throw new DumperException('Impossible de sauvegarder la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
 $db ??= static::database();
 $config = $config ?: (array) config('dump', []);

 // Initialiser la connexion si nécessaire
 $db->initialize();

 $exporter = new Exporter($db->getDatabase(), $db->getConnection(), $config);

 if ($shared) {
 static::$instances[Exporter::class] = $exporter;
 }

 return static::$instances[Exporter::class] = new Exporter($db->database, $db->conn, $config);
 return $exporter;
 }

 /**
 * Systeme d'importation de la base de donnees
 * Récupère un importateur de base de données
 */
 public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
 {
 if (true === $shared && isset(static::$instances[Importer::class])) {
 return static::$instances[Importer::class];
 if ($shared) {
 return static::sharedInstance('dbImporter', $db, $config);
 }

 $db ??= self::database();
 $config ??= config('dump', []);
 $db ??= static::database();
 $config = $config ?: (array) config('dump', []);

 if (! $db->conn) {
 $db->initialize();
 }
 // Initialiser la connexion si nécessaire
 $db->initialize();

 $importer = new Importer($db->getDatabase(), $db->getConnection(), $config);

 if (! $db->isPdo()) {
throw new DumperException('Impossible de restaurer la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
 if ($shared) {
static::$instances[Importer::class] = $importer;
 }

 return static::$instances[Importer::class] = new Importer($db->database, $db->conn, $config);
 return $importer;
 }
}

4 changes: 2 additions & 2 deletions
src/Config/database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,11 @@
 /**
 * @var string Pilote de base de données à utiliser
 */
 'driver' => env('db.default.driver', 'pdomysql'),
 'driver' => env('db.default.driver', 'mysql'),
 /** @var int */
 'port' => env('db.default.port', 3306),
 /** @var string */
 'host' => env('db.default.hostname', 'localhost'),
 'hostname' => env('db.default.hostname', 'localhost'),
 /** @var string */
 'username' => env('db.default.username', 'root'),
 /** @var string */
Expand Down

22 changes: 21 additions & 1 deletion
src/Connection/BaseConnection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,11 @@ public function escapeIdentifiers(mixed $item): mixed
 */
 protected function escapeIdentifier(string $item): string
 {
 return $this->escapeChar . str_replace($this->escapeChar, $this->escapeChar . $this->escapeChar, $item) . $this->escapeChar;
 if ($this->isEscapedIdentifier($item)) {
 return $item;
 }

 return $this->escapeChar . $item . $this->escapeChar;
 }

 /**
Expand All@@ -606,6 +610,22 @@ protected function isReserved(string $item): bool
 return in_array($item, ['*'], true);
 }

 /**
 * Determine si une chaine est échappée comme un identifiant SQL
 */
 public function isEscapedIdentifier(string $value): bool
 {
 if ($value === '') {
 return false;
 }

 $value = trim($value);

 return str_starts_with($value, $this->escapeChar)
 // && str_contains($value, '.')
 && str_ends_with($value, $this->escapeChar);
 }

 /**
 * Crée le nom de la table avec son alias et le prefix des table de la base de données
 */
Expand Down

177 changes: 0 additions & 177 deletions
src/ConnectionResolver.php

View file


Open in desktop


This file was deleted.

Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion#5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

dimtrovich
merged 3 commits into

from

Feb 25, 2026
 Merged


refactor: remplacement de ConnectionResolver par DatabaseManager et mise à jour des services de connexion
#5
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
0485a5b

refactor: remplacement de ConnectionResolver par DatabaseManager et m…


dimtrovich Feb 24, 2026
d473400

fix bugs


dimtrovich Feb 24, 2026
2c4c182

chore: suppression de fichier non utilisés


dimtrovich Feb 25, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
src/Builder/BaseBuilder.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -794,7 +794,7 @@ public function query(string $sql, array $params = [])
 */
 public function result(int|string $type = PDO::FETCH_OBJ): array
 {
 return $this->execute()->result($type);
 return $this->execute()->get($type);
 }

 /**
Expand Down

101 changes: 64 additions & 37 deletions
src/Config/Services.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,87 +12,114 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\ConnectionResolverInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Database;
use Dimtrovich\DbDumper\Exceptions\Exception as DumperException;
use BlitzPHP\Database\DatabaseManager;
use Dimtrovich\DbDumper\Exporter;
use Dimtrovich\DbDumper\Importer;
use InvalidArgumentException;

/**
 * Services de base de données
 */
class Services extends BaseServices
{
 /**
 * Query Builder
 * Instance du gestionnaire de base de données
 */
 public static function builder(?string $group = null, bool $shared = true): BaseBuilder
 protected static ?DatabaseManager $manager = null;

 /**
 * Récupère le gestionnaire de base de données
 */
 protected static function manager(): DatabaseManager
 {
 if (true === $shared && isset(static::$instances[BaseBuilder::class])) {
return static::$instances[BaseBuilder::class];
 if (static::$manager === null) {
 static::$manager = new DatabaseManager(static::logger(), static::event());
 }

 return static::$instances[BaseBuilder::class] = Database::builder(static::database($group));
 return static::$manager;
 }

 /**
 * Connexion a la base de données
 * Récupère une connexion à la base de données
 */
 public static function database(?string $group = null, bool $shared = true): BaseConnection
 {
 /** @var ConnectionResolverInterface */
 $connectionResolver = static::container()->get(ConnectionResolverInterface::class);
 [$group] = $connectionResolver->connectionInfo($group);
 $connection = static::manager()->connect($group, $shared);

 if (true === $shared && isset(static::$instances[Database::class]) && static::$instances[Database::class]->group === $group) {
return static::$instances[Database::class];
 if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
 }

 return static::$instances[Database::class] = $connectionResolver->connect($group);
 return $connection;
 }

 /**
 * Systeme d'exportation de la base de donnees
 * Récupère un query builder
 */
 public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
 public static function builder(?string $group = null, bool $shared = true): BaseBuilder
 {
 if (true === $shared && isset(static::$instances[Exporter::class])) {
 return static::$instances[Exporter::class];
 $key = 'builder_' . ($group ?? 'default');

 if ($shared && isset(static::$instances[$key])) {
 return static::$instances[$key];
 }

 $builder = static::manager()->builder(static::database($group, $shared));

 if ($shared) {
 static::$instances[$key] = $builder;
 }

$db ??= self::database();
 $config ??= config('dump', []);
return $builder;
}

 if (! $db->conn) {
 $db->initialize();
 /**
 * Récupère un exportateur de base de données
 */
 public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
 {
 if ($shared) {
 return static::sharedInstance('dbExporter', $db, $config);
 }

 if (! $db->isPdo()) {
 throw new DumperException('Impossible de sauvegarder la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
 $db ??= static::database();
 $config = $config ?: (array) config('dump', []);

 // Initialiser la connexion si nécessaire
 $db->initialize();

 $exporter = new Exporter($db->getDatabase(), $db->getConnection(), $config);

 if ($shared) {
 static::$instances[Exporter::class] = $exporter;
 }

 return static::$instances[Exporter::class] = new Exporter($db->database, $db->conn, $config);
 return $exporter;
 }

 /**
 * Systeme d'importation de la base de donnees
 * Récupère un importateur de base de données
 */
 public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
 {
 if (true === $shared && isset(static::$instances[Importer::class])) {
 return static::$instances[Importer::class];
 if ($shared) {
 return static::sharedInstance('dbImporter', $db, $config);
 }

 $db ??= self::database();
 $config ??= config('dump', []);
 $db ??= static::database();
 $config = $config ?: (array) config('dump', []);

 if (! $db->conn) {
 $db->initialize();
 }
 // Initialiser la connexion si nécessaire
 $db->initialize();

 $importer = new Importer($db->getDatabase(), $db->getConnection(), $config);

 if (! $db->isPdo()) {
throw new DumperException('Impossible de restaurer la base de données. Vous devez utiliser un pilote PDO', DumperException::PDO_EXCEPTION);
 if ($shared) {
static::$instances[Importer::class] = $importer;
 }

 return static::$instances[Importer::class] = new Importer($db->database, $db->conn, $config);
 return $importer;
 }
}

4 changes: 2 additions & 2 deletions
src/Config/database.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,11 +29,11 @@
 /**
 * @var string Pilote de base de données à utiliser
 */
 'driver' => env('db.default.driver', 'pdomysql'),
 'driver' => env('db.default.driver', 'mysql'),
 /** @var int */
 'port' => env('db.default.port', 3306),
 /** @var string */
 'host' => env('db.default.hostname', 'localhost'),
 'hostname' => env('db.default.hostname', 'localhost'),
 /** @var string */
 'username' => env('db.default.username', 'root'),
 /** @var string */
Expand Down

22 changes: 21 additions & 1 deletion
src/Connection/BaseConnection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -595,7 +595,11 @@ public function escapeIdentifiers(mixed $item): mixed
 */
 protected function escapeIdentifier(string $item): string
 {
 return $this->escapeChar . str_replace($this->escapeChar, $this->escapeChar . $this->escapeChar, $item) . $this->escapeChar;
 if ($this->isEscapedIdentifier($item)) {
 return $item;
 }

 return $this->escapeChar . $item . $this->escapeChar;
 }

 /**
Expand All@@ -606,6 +610,22 @@ protected function isReserved(string $item): bool
 return in_array($item, ['*'], true);
 }

 /**
 * Determine si une chaine est échappée comme un identifiant SQL
 */
 public function isEscapedIdentifier(string $value): bool
 {
 if ($value === '') {
 return false;
 }

 $value = trim($value);

 return str_starts_with($value, $this->escapeChar)
 // && str_contains($value, '.')
 && str_ends_with($value, $this->escapeChar);
 }

 /**
 * Crée le nom de la table avec son alias et le prefix des table de la base de données
 */
Expand Down

177 changes: 0 additions & 177 deletions
src/ConnectionResolver.php

View file


Open in desktop


This file was deleted.

Loading