Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions composer.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
"require-dev": {
"blitz-php/coding-standard": "^1.5",
"blitz-php/framework": "^1.0.0-rc",
"fakerphp/faker": "^1.24",
"kahlan/kahlan": "^6.1.0",
"phpstan/phpstan": "^2.1.36"
},
Expand Down
139 changes: 111 additions & 28 deletions src/Commands/Seed.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@

namespace BlitzPHP\Database\Commands;

use BlitzPHP\Container\Services;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Seeder\Seeder;
use InvalidArgumentException;

Expand All@@ -34,55 +34,138 @@ class Seed extends DatabaseCommand
* {@inheritDoc}
*/
protected array $arguments = [
'name' => 'Nom du seedr a executer',
'name' => 'Nom du seeder à exécuter (ex: DatabaseSeeder ou Users\\UserSeeder)',
];

/**
* {@inheritDoc}
*/
protected array $options = [
'--group' => 'Groupe de connexion à utiliser',
'--silent' => 'Mode silencieux (pas de sortie)',
'--locale' => 'Langue à utiliser pour Faker (ex: fr_FR, en_US)',
];

protected ?BaseConnection $db = null;

/**
* {@inheritDoc}
*/
public function handle()
{
if (empty($name = $this->argument('name'))) {
$name = $this->prompt(lang('Migrations.migSeeder'), null, static function ($val) {
$group = $this->option('group');
$silent = $this->option('silent') !== null;
$locale = $this->option('locale', config('app.language', 'fr_FR'));

$this->db = $this->resolver->connect($group);

$name = $this->getSeederName();

$seeder = $this->resolveSeeder($name);

$this->configureSeeder($seeder, $locale, $silent);

$this->runSeeder($seeder);

return EXIT_SUCCESS;
}

/**
* Récupère le nom du seeder
*/
protected function getSeederName(): string
{
if (null !== $name = $this->argument('name')) {
return $name;
}

return $this->prompt(
'Quel seeder souhaitez-vous exécuter ?',
'DatabaseSeeder',
function ($val) {
if (empty($val)) {
throw new InvalidArgumentException('Veuillez entrer le nom du seeder.');
}

return $val;
});
}
}
);
}

$seedClass = APP_NAMESPACE . '\Database\Seeds\\';
$seedClass .= str_replace($seedClass, '', $name);
/**
* Résout la classe du seeder
*/
protected function resolveSeeder(string $name): Seeder
{
// Chemins possibles
$paths = [
APP_NAMESPACE . '\\Database\\Seeds\\',
APP_NAMESPACE . '\\Database\\Seeders\\',
'Database\\Seeds\\',
'Database\\Seeders\\',
];

$className = $name;

/**
* @var Seeder
*/
$seeder = new $seedClass($this->db);
// Si le nom ne contient pas de namespace, on essaie les chemins standards
if (!str_contains($name, '\\')) {
foreach ($paths as $path) {
$fullClass = $path . $name;
if (class_exists($fullClass)) {
$className = $fullClass;
break;
}
}
}

if ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language'));
if (!class_exists($className)) {
throw new InvalidArgumentException(
"Le seeder '{$name}' n'a pas été trouvé.\n" .
"Chemins recherchés :\n" .
implode("\n", array_map(fn($p) => "- {$p}{$name}", $paths))
);
}

$this->task('Demarrage du seed')->eol();
sleep(2);
$this->info('Remplissage en cours de traitement');
return new $className($this->db);
}

if (method_exists($seeder, 'run')) {
Services::container()->call([$seeder, 'run']);
/**
* Configure le seeder
*/
protected function configureSeeder(Seeder $seeder, ?string $locale, bool $silent): void
{
if ($locale !== null) {
$seeder->setLocale($locale);
} elseif ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language', 'fr_FR'));
}

$usedSeed = [
Services::container()->call([$seeder, 'execute']),
...$seeder->getSeeded(),
if ($silent) {
$seeder->setSilent(true);
}
}

/**
* Exécute le seeder
*/
protected function runSeeder(Seeder $seeder): void
{
$this->task('Démarrage du seed')->eol();

$this->info('Remplissage en cours...');

$seeder->setCommand($this)->execute();

$executed = [
$seeder::class,
...$seeder->getCalled(),
];

$this->eol()->success('Opération terminée.');
$this->eol()->success('Opération terminée avec succès !');

foreach ($usedSeed as $seeded) {
$this->eol()->write('- ')->writer->yellow($seeded);
}
$this->eol()->write('Seeders exécutés :');

return EXIT_SUCCESS;
foreach (array_unique($executed) as $seeded) {
$this->eol()->write(' ✔ ')->writer->green($seeded);
}
}
}
22 changes: 15 additions & 7 deletions src/Config/Services.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\BuilderInterface;
use BlitzPHP\Contracts\Database\ConnectionInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\DatabaseManager;
Expand All@@ -32,7 +34,7 @@ class Services extends BaseServices
/**
* Récupère le gestionnaire de base de données
*/
protected static function manager(): DatabaseManager
public static function dbManager(): DatabaseManager
{
if (static::$manager === null) {
static::$manager = new DatabaseManager(static::logger(), static::event());
Expand All@@ -43,10 +45,12 @@ protected static function manager(): DatabaseManager

/**
* Récupère une connexion à la base de données
*
* @return BaseConnection
*/
public static function database(?string $group = null, bool $shared = true): BaseConnection
public static function database(?string $group = null, bool $shared = true): ConnectionInterface
{
$connection = static::manager()->connect($group, $shared);
$connection = static::dbManager()->connect($group, $shared);

if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
Expand All@@ -57,16 +61,20 @@ public static function database(?string $group = null, bool $shared = true): Bas

/**
* Récupère un query builder
*
* @return BaseBuilder
*
* @deprecated 1.0 use static::database()->table($tablename) instead
*/
public static function builder(?string $group = null, bool $shared = true): BaseBuilder
public static function builder(?string $group = null, bool $shared = true): BuilderInterface
{
$key = 'builder_' . ($group ?? 'default');

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

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

if ($shared) {
static::$instances[$key] = $builder;
Expand All@@ -78,7 +86,7 @@ public static function builder(?string $group = null, bool $shared = true): Base
/**
* Récupère un exportateur de base de données
*/
public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
public static function dbExporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Exporter
{
if ($shared) {
return static::sharedInstance('dbExporter', $db, $config);
Expand All@@ -102,7 +110,7 @@ public static function dbExporter(?BaseConnection $db = null, array $config = []
/**
* Récupère un importateur de base de données
*/
public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
public static function dbImporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Importer
{
if ($shared) {
return static::sharedInstance('dbImporter', $db, $config);
Expand Down
5 changes: 5 additions & 0 deletions src/Exceptions/DatabaseException.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,4 +21,9 @@ class DatabaseException extends Error implements ExceptionInterface
* @var int
*/
protected $code = 8;

protected static function t(string $message, array $args = []): string
{
return sprintf($message, $args);
}
}
31 changes: 31 additions & 0 deletions src/Exceptions/SeederException.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<?php

namespace BlitzPHP\Database\Exceptions;

class SeederException extends DatabaseException
{
public static function dataCannotBeEmpty()
{
return new static(static::t('Les données ne peuvent pas être vides.'));
}

public static function unspecifiedFakerMethod()
{
return new static(static::t('Méthode Faker non spécifiée.'));
}

public static function relationTableNotFound(string $table)
{
return new static(static::t("Table de relation '%s' non trouvée.", [$table]));
}

public static function propertyNotFound(string $property)
{
return new static(static::t("Propriété '%s' non trouvée.", [$property]));
}

public static function seederClassDoesNotExist(string $class)
{
return new static(static::t("La classe de seeder '%s' n'existe pas.", [$class]));
}
}
84 changes: 84 additions & 0 deletions src/Seeder/Factory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
<?php

/**
* This file is part of Blitz PHP framework - Database Layer.
*
* (c) 2022 Dimitri Sitchet Tomkeu <devcode.dst@gmail.com>
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/

namespace BlitzPHP\Database\Seeder;

use Faker\Factory as FakerFactory;
use Faker\Generator as FakerGenerator;

/**
* Générateur de configurations pour les seeders
*
* @mixin FakerGenerator
*/
class Factory
{
/**
* Instance Faker
*/
protected FakerGenerator $faker;

/**
* Constructeur
*/
public function __construct(string $locale = 'fr_FR')
{
$this->faker = FakerFactory::create($locale);
}

/**
* Appel Faker (retourne une configuration)
*/
public function __call(string $name, array $arguments): array
{
if ($name === 'unique') {
return ['faker:unique', $arguments[0] ?? null, array_slice($arguments, 1) ?? []];
}

return ['faker', $name, $arguments];
}

/**
* Propriété Faker (retourne une configuration)
*/
public function __get(string $name): array
{
return ['faker', $name, []];
}

/**
* Relation avec une autre table
*/
public function relation(string $table, string $column = 'id'): array
{
return ['relation', $table, $column];
}

/**
* Valeur optionnelle
*/
public function optional(float $weight = 0.5, mixed $default = null, mixed $value = null): array
{
if ($value === null) {
// Si pas de valeur fournie, on utilisera une closure
return ['optional', $weight, $default];
}
return ['optional', $weight, $default, $value];
}

/**
* Valeur fixe (pour compatibilité)
*/
public function raw(mixed $value): mixed
{
return $value;
}
}
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions composer.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
"require-dev": {
"blitz-php/coding-standard": "^1.5",
"blitz-php/framework": "^1.0.0-rc",
"fakerphp/faker": "^1.24",
"kahlan/kahlan": "^6.1.0",
"phpstan/phpstan": "^2.1.36"
},
Expand Down
139 changes: 111 additions & 28 deletions src/Commands/Seed.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@

namespace BlitzPHP\Database\Commands;

use BlitzPHP\Container\Services;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Seeder\Seeder;
use InvalidArgumentException;

Expand All@@ -34,55 +34,138 @@ class Seed extends DatabaseCommand
* {@inheritDoc}
*/
protected array $arguments = [
'name' => 'Nom du seedr a executer',
'name' => 'Nom du seeder à exécuter (ex: DatabaseSeeder ou Users\\UserSeeder)',
];

/**
* {@inheritDoc}
*/
protected array $options = [
'--group' => 'Groupe de connexion à utiliser',
'--silent' => 'Mode silencieux (pas de sortie)',
'--locale' => 'Langue à utiliser pour Faker (ex: fr_FR, en_US)',
];

protected ?BaseConnection $db = null;

/**
* {@inheritDoc}
*/
public function handle()
{
if (empty($name = $this->argument('name'))) {
$name = $this->prompt(lang('Migrations.migSeeder'), null, static function ($val) {
$group = $this->option('group');
$silent = $this->option('silent') !== null;
$locale = $this->option('locale', config('app.language', 'fr_FR'));

$this->db = $this->resolver->connect($group);

$name = $this->getSeederName();

$seeder = $this->resolveSeeder($name);

$this->configureSeeder($seeder, $locale, $silent);

$this->runSeeder($seeder);

return EXIT_SUCCESS;
}

/**
* Récupère le nom du seeder
*/
protected function getSeederName(): string
{
if (null !== $name = $this->argument('name')) {
return $name;
}

return $this->prompt(
'Quel seeder souhaitez-vous exécuter ?',
'DatabaseSeeder',
function ($val) {
if (empty($val)) {
throw new InvalidArgumentException('Veuillez entrer le nom du seeder.');
}

return $val;
});
}
}
);
}

$seedClass = APP_NAMESPACE . '\Database\Seeds\\';
$seedClass .= str_replace($seedClass, '', $name);
/**
* Résout la classe du seeder
*/
protected function resolveSeeder(string $name): Seeder
{
// Chemins possibles
$paths = [
APP_NAMESPACE . '\\Database\\Seeds\\',
APP_NAMESPACE . '\\Database\\Seeders\\',
'Database\\Seeds\\',
'Database\\Seeders\\',
];

$className = $name;

/**
* @var Seeder
*/
$seeder = new $seedClass($this->db);
// Si le nom ne contient pas de namespace, on essaie les chemins standards
if (!str_contains($name, '\\')) {
foreach ($paths as $path) {
$fullClass = $path . $name;
if (class_exists($fullClass)) {
$className = $fullClass;
break;
}
}
}

if ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language'));
if (!class_exists($className)) {
throw new InvalidArgumentException(
"Le seeder '{$name}' n'a pas été trouvé.\n" .
"Chemins recherchés :\n" .
implode("\n", array_map(fn($p) => "- {$p}{$name}", $paths))
);
}

$this->task('Demarrage du seed')->eol();
sleep(2);
$this->info('Remplissage en cours de traitement');
return new $className($this->db);
}

if (method_exists($seeder, 'run')) {
Services::container()->call([$seeder, 'run']);
/**
* Configure le seeder
*/
protected function configureSeeder(Seeder $seeder, ?string $locale, bool $silent): void
{
if ($locale !== null) {
$seeder->setLocale($locale);
} elseif ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language', 'fr_FR'));
}

$usedSeed = [
Services::container()->call([$seeder, 'execute']),
...$seeder->getSeeded(),
if ($silent) {
$seeder->setSilent(true);
}
}

/**
* Exécute le seeder
*/
protected function runSeeder(Seeder $seeder): void
{
$this->task('Démarrage du seed')->eol();

$this->info('Remplissage en cours...');

$seeder->setCommand($this)->execute();

$executed = [
$seeder::class,
...$seeder->getCalled(),
];

$this->eol()->success('Opération terminée.');
$this->eol()->success('Opération terminée avec succès !');

foreach ($usedSeed as $seeded) {
$this->eol()->write('- ')->writer->yellow($seeded);
}
$this->eol()->write('Seeders exécutés :');

return EXIT_SUCCESS;
foreach (array_unique($executed) as $seeded) {
$this->eol()->write(' ✔ ')->writer->green($seeded);
}
}
}
22 changes: 15 additions & 7 deletions src/Config/Services.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\BuilderInterface;
use BlitzPHP\Contracts\Database\ConnectionInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\DatabaseManager;
Expand All@@ -32,7 +34,7 @@ class Services extends BaseServices
/**
* Récupère le gestionnaire de base de données
*/
protected static function manager(): DatabaseManager
public static function dbManager(): DatabaseManager
{
if (static::$manager === null) {
static::$manager = new DatabaseManager(static::logger(), static::event());
Expand All@@ -43,10 +45,12 @@ protected static function manager(): DatabaseManager

/**
* Récupère une connexion à la base de données
*
* @return BaseConnection
*/
public static function database(?string $group = null, bool $shared = true): BaseConnection
public static function database(?string $group = null, bool $shared = true): ConnectionInterface
{
$connection = static::manager()->connect($group, $shared);
$connection = static::dbManager()->connect($group, $shared);

if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
Expand All@@ -57,16 +61,20 @@ public static function database(?string $group = null, bool $shared = true): Bas

/**
* Récupère un query builder
*
* @return BaseBuilder
*
* @deprecated 1.0 use static::database()->table($tablename) instead
*/
public static function builder(?string $group = null, bool $shared = true): BaseBuilder
public static function builder(?string $group = null, bool $shared = true): BuilderInterface
{
$key = 'builder_' . ($group ?? 'default');

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

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

if ($shared) {
static::$instances[$key] = $builder;
Expand All@@ -78,7 +86,7 @@ public static function builder(?string $group = null, bool $shared = true): Base
/**
* Récupère un exportateur de base de données
*/
public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
public static function dbExporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Exporter
{
if ($shared) {
return static::sharedInstance('dbExporter', $db, $config);
Expand All@@ -102,7 +110,7 @@ public static function dbExporter(?BaseConnection $db = null, array $config = []
/**
* Récupère un importateur de base de données
*/
public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
public static function dbImporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Importer
{
if ($shared) {
return static::sharedInstance('dbImporter', $db, $config);
Expand Down
5 changes: 5 additions & 0 deletions src/Exceptions/DatabaseException.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,4 +21,9 @@ class DatabaseException extends Error implements ExceptionInterface
* @var int
*/
protected $code = 8;

protected static function t(string $message, array $args = []): string
{
return sprintf($message, $args);
}
}
31 changes: 31 additions & 0 deletions src/Exceptions/SeederException.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<?php

namespace BlitzPHP\Database\Exceptions;

class SeederException extends DatabaseException
{
public static function dataCannotBeEmpty()
{
return new static(static::t('Les données ne peuvent pas être vides.'));
}

public static function unspecifiedFakerMethod()
{
return new static(static::t('Méthode Faker non spécifiée.'));
}

public static function relationTableNotFound(string $table)
{
return new static(static::t("Table de relation '%s' non trouvée.", [$table]));
}

public static function propertyNotFound(string $property)
{
return new static(static::t("Propriété '%s' non trouvée.", [$property]));
}

public static function seederClassDoesNotExist(string $class)
{
return new static(static::t("La classe de seeder '%s' n'existe pas.", [$class]));
}
}
84 changes: 84 additions & 0 deletions src/Seeder/Factory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
<?php

/**
* This file is part of Blitz PHP framework - Database Layer.
*
* (c) 2022 Dimitri Sitchet Tomkeu <devcode.dst@gmail.com>
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/

namespace BlitzPHP\Database\Seeder;

use Faker\Factory as FakerFactory;
use Faker\Generator as FakerGenerator;

/**
* Générateur de configurations pour les seeders
*
* @mixin FakerGenerator
*/
class Factory
{
/**
* Instance Faker
*/
protected FakerGenerator $faker;

/**
* Constructeur
*/
public function __construct(string $locale = 'fr_FR')
{
$this->faker = FakerFactory::create($locale);
}

/**
* Appel Faker (retourne une configuration)
*/
public function __call(string $name, array $arguments): array
{
if ($name === 'unique') {
return ['faker:unique', $arguments[0] ?? null, array_slice($arguments, 1) ?? []];
}

return ['faker', $name, $arguments];
}

/**
* Propriété Faker (retourne une configuration)
*/
public function __get(string $name): array
{
return ['faker', $name, []];
}

/**
* Relation avec une autre table
*/
public function relation(string $table, string $column = 'id'): array
{
return ['relation', $table, $column];
}

/**
* Valeur optionnelle
*/
public function optional(float $weight = 0.5, mixed $default = null, mixed $value = null): array
{
if ($value === null) {
// Si pas de valeur fournie, on utilisera une closure
return ['optional', $weight, $default];
}
return ['optional', $weight, $default, $value];
}

/**
* Valeur fixe (pour compatibilité)
*/
public function raw(mixed $value): mixed
{
return $value;
}
}
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions composer.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
"require-dev": {
"blitz-php/coding-standard": "^1.5",
"blitz-php/framework": "^1.0.0-rc",
"fakerphp/faker": "^1.24",
"kahlan/kahlan": "^6.1.0",
"phpstan/phpstan": "^2.1.36"
},
Expand Down
139 changes: 111 additions & 28 deletions src/Commands/Seed.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@

namespace BlitzPHP\Database\Commands;

use BlitzPHP\Container\Services;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Seeder\Seeder;
use InvalidArgumentException;

Expand All@@ -34,55 +34,138 @@ class Seed extends DatabaseCommand
* {@inheritDoc}
*/
protected array $arguments = [
'name' => 'Nom du seedr a executer',
'name' => 'Nom du seeder à exécuter (ex: DatabaseSeeder ou Users\\UserSeeder)',
];

/**
* {@inheritDoc}
*/
protected array $options = [
'--group' => 'Groupe de connexion à utiliser',
'--silent' => 'Mode silencieux (pas de sortie)',
'--locale' => 'Langue à utiliser pour Faker (ex: fr_FR, en_US)',
];

protected ?BaseConnection $db = null;

/**
* {@inheritDoc}
*/
public function handle()
{
if (empty($name = $this->argument('name'))) {
$name = $this->prompt(lang('Migrations.migSeeder'), null, static function ($val) {
$group = $this->option('group');
$silent = $this->option('silent') !== null;
$locale = $this->option('locale', config('app.language', 'fr_FR'));

$this->db = $this->resolver->connect($group);

$name = $this->getSeederName();

$seeder = $this->resolveSeeder($name);

$this->configureSeeder($seeder, $locale, $silent);

$this->runSeeder($seeder);

return EXIT_SUCCESS;
}

/**
* Récupère le nom du seeder
*/
protected function getSeederName(): string
{
if (null !== $name = $this->argument('name')) {
return $name;
}

return $this->prompt(
'Quel seeder souhaitez-vous exécuter ?',
'DatabaseSeeder',
function ($val) {
if (empty($val)) {
throw new InvalidArgumentException('Veuillez entrer le nom du seeder.');
}

return $val;
});
}
}
);
}

$seedClass = APP_NAMESPACE . '\Database\Seeds\\';
$seedClass .= str_replace($seedClass, '', $name);
/**
* Résout la classe du seeder
*/
protected function resolveSeeder(string $name): Seeder
{
// Chemins possibles
$paths = [
APP_NAMESPACE . '\\Database\\Seeds\\',
APP_NAMESPACE . '\\Database\\Seeders\\',
'Database\\Seeds\\',
'Database\\Seeders\\',
];

$className = $name;

/**
* @var Seeder
*/
$seeder = new $seedClass($this->db);
// Si le nom ne contient pas de namespace, on essaie les chemins standards
if (!str_contains($name, '\\')) {
foreach ($paths as $path) {
$fullClass = $path . $name;
if (class_exists($fullClass)) {
$className = $fullClass;
break;
}
}
}

if ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language'));
if (!class_exists($className)) {
throw new InvalidArgumentException(
"Le seeder '{$name}' n'a pas été trouvé.\n" .
"Chemins recherchés :\n" .
implode("\n", array_map(fn($p) => "- {$p}{$name}", $paths))
);
}

$this->task('Demarrage du seed')->eol();
sleep(2);
$this->info('Remplissage en cours de traitement');
return new $className($this->db);
}

if (method_exists($seeder, 'run')) {
Services::container()->call([$seeder, 'run']);
/**
* Configure le seeder
*/
protected function configureSeeder(Seeder $seeder, ?string $locale, bool $silent): void
{
if ($locale !== null) {
$seeder->setLocale($locale);
} elseif ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language', 'fr_FR'));
}

$usedSeed = [
Services::container()->call([$seeder, 'execute']),
...$seeder->getSeeded(),
if ($silent) {
$seeder->setSilent(true);
}
}

/**
* Exécute le seeder
*/
protected function runSeeder(Seeder $seeder): void
{
$this->task('Démarrage du seed')->eol();

$this->info('Remplissage en cours...');

$seeder->setCommand($this)->execute();

$executed = [
$seeder::class,
...$seeder->getCalled(),
];

$this->eol()->success('Opération terminée.');
$this->eol()->success('Opération terminée avec succès !');

foreach ($usedSeed as $seeded) {
$this->eol()->write('- ')->writer->yellow($seeded);
}
$this->eol()->write('Seeders exécutés :');

return EXIT_SUCCESS;
foreach (array_unique($executed) as $seeded) {
$this->eol()->write(' ✔ ')->writer->green($seeded);
}
}
}
22 changes: 15 additions & 7 deletions src/Config/Services.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\BuilderInterface;
use BlitzPHP\Contracts\Database\ConnectionInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\DatabaseManager;
Expand All@@ -32,7 +34,7 @@ class Services extends BaseServices
/**
* Récupère le gestionnaire de base de données
*/
protected static function manager(): DatabaseManager
public static function dbManager(): DatabaseManager
{
if (static::$manager === null) {
static::$manager = new DatabaseManager(static::logger(), static::event());
Expand All@@ -43,10 +45,12 @@ protected static function manager(): DatabaseManager

/**
* Récupère une connexion à la base de données
*
* @return BaseConnection
*/
public static function database(?string $group = null, bool $shared = true): BaseConnection
public static function database(?string $group = null, bool $shared = true): ConnectionInterface
{
$connection = static::manager()->connect($group, $shared);
$connection = static::dbManager()->connect($group, $shared);

if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
Expand All@@ -57,16 +61,20 @@ public static function database(?string $group = null, bool $shared = true): Bas

/**
* Récupère un query builder
*
* @return BaseBuilder
*
* @deprecated 1.0 use static::database()->table($tablename) instead
*/
public static function builder(?string $group = null, bool $shared = true): BaseBuilder
public static function builder(?string $group = null, bool $shared = true): BuilderInterface
{
$key = 'builder_' . ($group ?? 'default');

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

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

if ($shared) {
static::$instances[$key] = $builder;
Expand All@@ -78,7 +86,7 @@ public static function builder(?string $group = null, bool $shared = true): Base
/**
* Récupère un exportateur de base de données
*/
public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
public static function dbExporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Exporter
{
if ($shared) {
return static::sharedInstance('dbExporter', $db, $config);
Expand All@@ -102,7 +110,7 @@ public static function dbExporter(?BaseConnection $db = null, array $config = []
/**
* Récupère un importateur de base de données
*/
public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
public static function dbImporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Importer
{
if ($shared) {
return static::sharedInstance('dbImporter', $db, $config);
Expand Down
5 changes: 5 additions & 0 deletions src/Exceptions/DatabaseException.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,4 +21,9 @@ class DatabaseException extends Error implements ExceptionInterface
* @var int
*/
protected $code = 8;

protected static function t(string $message, array $args = []): string
{
return sprintf($message, $args);
}
}
31 changes: 31 additions & 0 deletions src/Exceptions/SeederException.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<?php

namespace BlitzPHP\Database\Exceptions;

class SeederException extends DatabaseException
{
public static function dataCannotBeEmpty()
{
return new static(static::t('Les données ne peuvent pas être vides.'));
}

public static function unspecifiedFakerMethod()
{
return new static(static::t('Méthode Faker non spécifiée.'));
}

public static function relationTableNotFound(string $table)
{
return new static(static::t("Table de relation '%s' non trouvée.", [$table]));
}

public static function propertyNotFound(string $property)
{
return new static(static::t("Propriété '%s' non trouvée.", [$property]));
}

public static function seederClassDoesNotExist(string $class)
{
return new static(static::t("La classe de seeder '%s' n'existe pas.", [$class]));
}
}
84 changes: 84 additions & 0 deletions src/Seeder/Factory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
<?php

/**
* This file is part of Blitz PHP framework - Database Layer.
*
* (c) 2022 Dimitri Sitchet Tomkeu <devcode.dst@gmail.com>
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/

namespace BlitzPHP\Database\Seeder;

use Faker\Factory as FakerFactory;
use Faker\Generator as FakerGenerator;

/**
* Générateur de configurations pour les seeders
*
* @mixin FakerGenerator
*/
class Factory
{
/**
* Instance Faker
*/
protected FakerGenerator $faker;

/**
* Constructeur
*/
public function __construct(string $locale = 'fr_FR')
{
$this->faker = FakerFactory::create($locale);
}

/**
* Appel Faker (retourne une configuration)
*/
public function __call(string $name, array $arguments): array
{
if ($name === 'unique') {
return ['faker:unique', $arguments[0] ?? null, array_slice($arguments, 1) ?? []];
}

return ['faker', $name, $arguments];
}

/**
* Propriété Faker (retourne une configuration)
*/
public function __get(string $name): array
{
return ['faker', $name, []];
}

/**
* Relation avec une autre table
*/
public function relation(string $table, string $column = 'id'): array
{
return ['relation', $table, $column];
}

/**
* Valeur optionnelle
*/
public function optional(float $weight = 0.5, mixed $default = null, mixed $value = null): array
{
if ($value === null) {
// Si pas de valeur fournie, on utilisera une closure
return ['optional', $weight, $default];
}
return ['optional', $weight, $default, $value];
}

/**
* Valeur fixe (pour compatibilité)
*/
public function raw(mixed $value): mixed
{
return $value;
}
}
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions composer.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
"require-dev": {
"blitz-php/coding-standard": "^1.5",
"blitz-php/framework": "^1.0.0-rc",
"fakerphp/faker": "^1.24",
"kahlan/kahlan": "^6.1.0",
"phpstan/phpstan": "^2.1.36"
},
Expand Down
139 changes: 111 additions & 28 deletions src/Commands/Seed.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@

namespace BlitzPHP\Database\Commands;

use BlitzPHP\Container\Services;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Seeder\Seeder;
use InvalidArgumentException;

Expand All@@ -34,55 +34,138 @@ class Seed extends DatabaseCommand
* {@inheritDoc}
*/
protected array $arguments = [
'name' => 'Nom du seedr a executer',
'name' => 'Nom du seeder à exécuter (ex: DatabaseSeeder ou Users\\UserSeeder)',
];

/**
* {@inheritDoc}
*/
protected array $options = [
'--group' => 'Groupe de connexion à utiliser',
'--silent' => 'Mode silencieux (pas de sortie)',
'--locale' => 'Langue à utiliser pour Faker (ex: fr_FR, en_US)',
];

protected ?BaseConnection $db = null;

/**
* {@inheritDoc}
*/
public function handle()
{
if (empty($name = $this->argument('name'))) {
$name = $this->prompt(lang('Migrations.migSeeder'), null, static function ($val) {
$group = $this->option('group');
$silent = $this->option('silent') !== null;
$locale = $this->option('locale', config('app.language', 'fr_FR'));

$this->db = $this->resolver->connect($group);

$name = $this->getSeederName();

$seeder = $this->resolveSeeder($name);

$this->configureSeeder($seeder, $locale, $silent);

$this->runSeeder($seeder);

return EXIT_SUCCESS;
}

/**
* Récupère le nom du seeder
*/
protected function getSeederName(): string
{
if (null !== $name = $this->argument('name')) {
return $name;
}

return $this->prompt(
'Quel seeder souhaitez-vous exécuter ?',
'DatabaseSeeder',
function ($val) {
if (empty($val)) {
throw new InvalidArgumentException('Veuillez entrer le nom du seeder.');
}

return $val;
});
}
}
);
}

$seedClass = APP_NAMESPACE . '\Database\Seeds\\';
$seedClass .= str_replace($seedClass, '', $name);
/**
* Résout la classe du seeder
*/
protected function resolveSeeder(string $name): Seeder
{
// Chemins possibles
$paths = [
APP_NAMESPACE . '\\Database\\Seeds\\',
APP_NAMESPACE . '\\Database\\Seeders\\',
'Database\\Seeds\\',
'Database\\Seeders\\',
];

$className = $name;

/**
* @var Seeder
*/
$seeder = new $seedClass($this->db);
// Si le nom ne contient pas de namespace, on essaie les chemins standards
if (!str_contains($name, '\\')) {
foreach ($paths as $path) {
$fullClass = $path . $name;
if (class_exists($fullClass)) {
$className = $fullClass;
break;
}
}
}

if ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language'));
if (!class_exists($className)) {
throw new InvalidArgumentException(
"Le seeder '{$name}' n'a pas été trouvé.\n" .
"Chemins recherchés :\n" .
implode("\n", array_map(fn($p) => "- {$p}{$name}", $paths))
);
}

$this->task('Demarrage du seed')->eol();
sleep(2);
$this->info('Remplissage en cours de traitement');
return new $className($this->db);
}

if (method_exists($seeder, 'run')) {
Services::container()->call([$seeder, 'run']);
/**
* Configure le seeder
*/
protected function configureSeeder(Seeder $seeder, ?string $locale, bool $silent): void
{
if ($locale !== null) {
$seeder->setLocale($locale);
} elseif ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language', 'fr_FR'));
}

$usedSeed = [
Services::container()->call([$seeder, 'execute']),
...$seeder->getSeeded(),
if ($silent) {
$seeder->setSilent(true);
}
}

/**
* Exécute le seeder
*/
protected function runSeeder(Seeder $seeder): void
{
$this->task('Démarrage du seed')->eol();

$this->info('Remplissage en cours...');

$seeder->setCommand($this)->execute();

$executed = [
$seeder::class,
...$seeder->getCalled(),
];

$this->eol()->success('Opération terminée.');
$this->eol()->success('Opération terminée avec succès !');

foreach ($usedSeed as $seeded) {
$this->eol()->write('- ')->writer->yellow($seeded);
}
$this->eol()->write('Seeders exécutés :');

return EXIT_SUCCESS;
foreach (array_unique($executed) as $seeded) {
$this->eol()->write(' ✔ ')->writer->green($seeded);
}
}
}
22 changes: 15 additions & 7 deletions src/Config/Services.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\BuilderInterface;
use BlitzPHP\Contracts\Database\ConnectionInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\DatabaseManager;
Expand All@@ -32,7 +34,7 @@ class Services extends BaseServices
/**
* Récupère le gestionnaire de base de données
*/
protected static function manager(): DatabaseManager
public static function dbManager(): DatabaseManager
{
if (static::$manager === null) {
static::$manager = new DatabaseManager(static::logger(), static::event());
Expand All@@ -43,10 +45,12 @@ protected static function manager(): DatabaseManager

/**
* Récupère une connexion à la base de données
*
* @return BaseConnection
*/
public static function database(?string $group = null, bool $shared = true): BaseConnection
public static function database(?string $group = null, bool $shared = true): ConnectionInterface
{
$connection = static::manager()->connect($group, $shared);
$connection = static::dbManager()->connect($group, $shared);

if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
Expand All@@ -57,16 +61,20 @@ public static function database(?string $group = null, bool $shared = true): Bas

/**
* Récupère un query builder
*
* @return BaseBuilder
*
* @deprecated 1.0 use static::database()->table($tablename) instead
*/
public static function builder(?string $group = null, bool $shared = true): BaseBuilder
public static function builder(?string $group = null, bool $shared = true): BuilderInterface
{
$key = 'builder_' . ($group ?? 'default');

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

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

if ($shared) {
static::$instances[$key] = $builder;
Expand All@@ -78,7 +86,7 @@ public static function builder(?string $group = null, bool $shared = true): Base
/**
* Récupère un exportateur de base de données
*/
public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
public static function dbExporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Exporter
{
if ($shared) {
return static::sharedInstance('dbExporter', $db, $config);
Expand All@@ -102,7 +110,7 @@ public static function dbExporter(?BaseConnection $db = null, array $config = []
/**
* Récupère un importateur de base de données
*/
public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
public static function dbImporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Importer
{
if ($shared) {
return static::sharedInstance('dbImporter', $db, $config);
Expand Down
5 changes: 5 additions & 0 deletions src/Exceptions/DatabaseException.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,4 +21,9 @@ class DatabaseException extends Error implements ExceptionInterface
* @var int
*/
protected $code = 8;

protected static function t(string $message, array $args = []): string
{
return sprintf($message, $args);
}
}
31 changes: 31 additions & 0 deletions src/Exceptions/SeederException.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<?php

namespace BlitzPHP\Database\Exceptions;

class SeederException extends DatabaseException
{
public static function dataCannotBeEmpty()
{
return new static(static::t('Les données ne peuvent pas être vides.'));
}

public static function unspecifiedFakerMethod()
{
return new static(static::t('Méthode Faker non spécifiée.'));
}

public static function relationTableNotFound(string $table)
{
return new static(static::t("Table de relation '%s' non trouvée.", [$table]));
}

public static function propertyNotFound(string $property)
{
return new static(static::t("Propriété '%s' non trouvée.", [$property]));
}

public static function seederClassDoesNotExist(string $class)
{
return new static(static::t("La classe de seeder '%s' n'existe pas.", [$class]));
}
}
84 changes: 84 additions & 0 deletions src/Seeder/Factory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
<?php

/**
* This file is part of Blitz PHP framework - Database Layer.
*
* (c) 2022 Dimitri Sitchet Tomkeu <devcode.dst@gmail.com>
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/

namespace BlitzPHP\Database\Seeder;

use Faker\Factory as FakerFactory;
use Faker\Generator as FakerGenerator;

/**
* Générateur de configurations pour les seeders
*
* @mixin FakerGenerator
*/
class Factory
{
/**
* Instance Faker
*/
protected FakerGenerator $faker;

/**
* Constructeur
*/
public function __construct(string $locale = 'fr_FR')
{
$this->faker = FakerFactory::create($locale);
}

/**
* Appel Faker (retourne une configuration)
*/
public function __call(string $name, array $arguments): array
{
if ($name === 'unique') {
return ['faker:unique', $arguments[0] ?? null, array_slice($arguments, 1) ?? []];
}

return ['faker', $name, $arguments];
}

/**
* Propriété Faker (retourne une configuration)
*/
public function __get(string $name): array
{
return ['faker', $name, []];
}

/**
* Relation avec une autre table
*/
public function relation(string $table, string $column = 'id'): array
{
return ['relation', $table, $column];
}

/**
* Valeur optionnelle
*/
public function optional(float $weight = 0.5, mixed $default = null, mixed $value = null): array
{
if ($value === null) {
// Si pas de valeur fournie, on utilisera une closure
return ['optional', $weight, $default];
}
return ['optional', $weight, $default, $value];
}

/**
* Valeur fixe (pour compatibilité)
*/
public function raw(mixed $value): mixed
{
return $value;
}
}
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions composer.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
"require-dev": {
"blitz-php/coding-standard": "^1.5",
"blitz-php/framework": "^1.0.0-rc",
"fakerphp/faker": "^1.24",
"kahlan/kahlan": "^6.1.0",
"phpstan/phpstan": "^2.1.36"
},
Expand Down
139 changes: 111 additions & 28 deletions src/Commands/Seed.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@

namespace BlitzPHP\Database\Commands;

use BlitzPHP\Container\Services;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Seeder\Seeder;
use InvalidArgumentException;

Expand All@@ -34,55 +34,138 @@ class Seed extends DatabaseCommand
* {@inheritDoc}
*/
protected array $arguments = [
'name' => 'Nom du seedr a executer',
'name' => 'Nom du seeder à exécuter (ex: DatabaseSeeder ou Users\\UserSeeder)',
];

/**
* {@inheritDoc}
*/
protected array $options = [
'--group' => 'Groupe de connexion à utiliser',
'--silent' => 'Mode silencieux (pas de sortie)',
'--locale' => 'Langue à utiliser pour Faker (ex: fr_FR, en_US)',
];

protected ?BaseConnection $db = null;

/**
* {@inheritDoc}
*/
public function handle()
{
if (empty($name = $this->argument('name'))) {
$name = $this->prompt(lang('Migrations.migSeeder'), null, static function ($val) {
$group = $this->option('group');
$silent = $this->option('silent') !== null;
$locale = $this->option('locale', config('app.language', 'fr_FR'));

$this->db = $this->resolver->connect($group);

$name = $this->getSeederName();

$seeder = $this->resolveSeeder($name);

$this->configureSeeder($seeder, $locale, $silent);

$this->runSeeder($seeder);

return EXIT_SUCCESS;
}

/**
* Récupère le nom du seeder
*/
protected function getSeederName(): string
{
if (null !== $name = $this->argument('name')) {
return $name;
}

return $this->prompt(
'Quel seeder souhaitez-vous exécuter ?',
'DatabaseSeeder',
function ($val) {
if (empty($val)) {
throw new InvalidArgumentException('Veuillez entrer le nom du seeder.');
}

return $val;
});
}
}
);
}

$seedClass = APP_NAMESPACE . '\Database\Seeds\\';
$seedClass .= str_replace($seedClass, '', $name);
/**
* Résout la classe du seeder
*/
protected function resolveSeeder(string $name): Seeder
{
// Chemins possibles
$paths = [
APP_NAMESPACE . '\\Database\\Seeds\\',
APP_NAMESPACE . '\\Database\\Seeders\\',
'Database\\Seeds\\',
'Database\\Seeders\\',
];

$className = $name;

/**
* @var Seeder
*/
$seeder = new $seedClass($this->db);
// Si le nom ne contient pas de namespace, on essaie les chemins standards
if (!str_contains($name, '\\')) {
foreach ($paths as $path) {
$fullClass = $path . $name;
if (class_exists($fullClass)) {
$className = $fullClass;
break;
}
}
}

if ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language'));
if (!class_exists($className)) {
throw new InvalidArgumentException(
"Le seeder '{$name}' n'a pas été trouvé.\n" .
"Chemins recherchés :\n" .
implode("\n", array_map(fn($p) => "- {$p}{$name}", $paths))
);
}

$this->task('Demarrage du seed')->eol();
sleep(2);
$this->info('Remplissage en cours de traitement');
return new $className($this->db);
}

if (method_exists($seeder, 'run')) {
Services::container()->call([$seeder, 'run']);
/**
* Configure le seeder
*/
protected function configureSeeder(Seeder $seeder, ?string $locale, bool $silent): void
{
if ($locale !== null) {
$seeder->setLocale($locale);
} elseif ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language', 'fr_FR'));
}

$usedSeed = [
Services::container()->call([$seeder, 'execute']),
...$seeder->getSeeded(),
if ($silent) {
$seeder->setSilent(true);
}
}

/**
* Exécute le seeder
*/
protected function runSeeder(Seeder $seeder): void
{
$this->task('Démarrage du seed')->eol();

$this->info('Remplissage en cours...');

$seeder->setCommand($this)->execute();

$executed = [
$seeder::class,
...$seeder->getCalled(),
];

$this->eol()->success('Opération terminée.');
$this->eol()->success('Opération terminée avec succès !');

foreach ($usedSeed as $seeded) {
$this->eol()->write('- ')->writer->yellow($seeded);
}
$this->eol()->write('Seeders exécutés :');

return EXIT_SUCCESS;
foreach (array_unique($executed) as $seeded) {
$this->eol()->write(' ✔ ')->writer->green($seeded);
}
}
}
22 changes: 15 additions & 7 deletions src/Config/Services.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\BuilderInterface;
use BlitzPHP\Contracts\Database\ConnectionInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\DatabaseManager;
Expand All@@ -32,7 +34,7 @@ class Services extends BaseServices
/**
* Récupère le gestionnaire de base de données
*/
protected static function manager(): DatabaseManager
public static function dbManager(): DatabaseManager
{
if (static::$manager === null) {
static::$manager = new DatabaseManager(static::logger(), static::event());
Expand All@@ -43,10 +45,12 @@ protected static function manager(): DatabaseManager

/**
* Récupère une connexion à la base de données
*
* @return BaseConnection
*/
public static function database(?string $group = null, bool $shared = true): BaseConnection
public static function database(?string $group = null, bool $shared = true): ConnectionInterface
{
$connection = static::manager()->connect($group, $shared);
$connection = static::dbManager()->connect($group, $shared);

if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
Expand All@@ -57,16 +61,20 @@ public static function database(?string $group = null, bool $shared = true): Bas

/**
* Récupère un query builder
*
* @return BaseBuilder
*
* @deprecated 1.0 use static::database()->table($tablename) instead
*/
public static function builder(?string $group = null, bool $shared = true): BaseBuilder
public static function builder(?string $group = null, bool $shared = true): BuilderInterface
{
$key = 'builder_' . ($group ?? 'default');

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

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

if ($shared) {
static::$instances[$key] = $builder;
Expand All@@ -78,7 +86,7 @@ public static function builder(?string $group = null, bool $shared = true): Base
/**
* Récupère un exportateur de base de données
*/
public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
public static function dbExporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Exporter
{
if ($shared) {
return static::sharedInstance('dbExporter', $db, $config);
Expand All@@ -102,7 +110,7 @@ public static function dbExporter(?BaseConnection $db = null, array $config = []
/**
* Récupère un importateur de base de données
*/
public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
public static function dbImporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Importer
{
if ($shared) {
return static::sharedInstance('dbImporter', $db, $config);
Expand Down
5 changes: 5 additions & 0 deletions src/Exceptions/DatabaseException.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,4 +21,9 @@ class DatabaseException extends Error implements ExceptionInterface
* @var int
*/
protected $code = 8;

protected static function t(string $message, array $args = []): string
{
return sprintf($message, $args);
}
}
31 changes: 31 additions & 0 deletions src/Exceptions/SeederException.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<?php

namespace BlitzPHP\Database\Exceptions;

class SeederException extends DatabaseException
{
public static function dataCannotBeEmpty()
{
return new static(static::t('Les données ne peuvent pas être vides.'));
}

public static function unspecifiedFakerMethod()
{
return new static(static::t('Méthode Faker non spécifiée.'));
}

public static function relationTableNotFound(string $table)
{
return new static(static::t("Table de relation '%s' non trouvée.", [$table]));
}

public static function propertyNotFound(string $property)
{
return new static(static::t("Propriété '%s' non trouvée.", [$property]));
}

public static function seederClassDoesNotExist(string $class)
{
return new static(static::t("La classe de seeder '%s' n'existe pas.", [$class]));
}
}
84 changes: 84 additions & 0 deletions src/Seeder/Factory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
<?php

/**
* This file is part of Blitz PHP framework - Database Layer.
*
* (c) 2022 Dimitri Sitchet Tomkeu <devcode.dst@gmail.com>
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/

namespace BlitzPHP\Database\Seeder;

use Faker\Factory as FakerFactory;
use Faker\Generator as FakerGenerator;

/**
* Générateur de configurations pour les seeders
*
* @mixin FakerGenerator
*/
class Factory
{
/**
* Instance Faker
*/
protected FakerGenerator $faker;

/**
* Constructeur
*/
public function __construct(string $locale = 'fr_FR')
{
$this->faker = FakerFactory::create($locale);
}

/**
* Appel Faker (retourne une configuration)
*/
public function __call(string $name, array $arguments): array
{
if ($name === 'unique') {
return ['faker:unique', $arguments[0] ?? null, array_slice($arguments, 1) ?? []];
}

return ['faker', $name, $arguments];
}

/**
* Propriété Faker (retourne une configuration)
*/
public function __get(string $name): array
{
return ['faker', $name, []];
}

/**
* Relation avec une autre table
*/
public function relation(string $table, string $column = 'id'): array
{
return ['relation', $table, $column];
}

/**
* Valeur optionnelle
*/
public function optional(float $weight = 0.5, mixed $default = null, mixed $value = null): array
{
if ($value === null) {
// Si pas de valeur fournie, on utilisera une closure
return ['optional', $weight, $default];
}
return ['optional', $weight, $default, $value];
}

/**
* Valeur fixe (pour compatibilité)
*/
public function raw(mixed $value): mixed
{
return $value;
}
}
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions composer.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
"require-dev": {
"blitz-php/coding-standard": "^1.5",
"blitz-php/framework": "^1.0.0-rc",
"fakerphp/faker": "^1.24",
"kahlan/kahlan": "^6.1.0",
"phpstan/phpstan": "^2.1.36"
},
Expand Down
139 changes: 111 additions & 28 deletions src/Commands/Seed.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@

namespace BlitzPHP\Database\Commands;

use BlitzPHP\Container\Services;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Seeder\Seeder;
use InvalidArgumentException;

Expand All@@ -34,55 +34,138 @@ class Seed extends DatabaseCommand
* {@inheritDoc}
*/
protected array $arguments = [
'name' => 'Nom du seedr a executer',
'name' => 'Nom du seeder à exécuter (ex: DatabaseSeeder ou Users\\UserSeeder)',
];

/**
* {@inheritDoc}
*/
protected array $options = [
'--group' => 'Groupe de connexion à utiliser',
'--silent' => 'Mode silencieux (pas de sortie)',
'--locale' => 'Langue à utiliser pour Faker (ex: fr_FR, en_US)',
];

protected ?BaseConnection $db = null;

/**
* {@inheritDoc}
*/
public function handle()
{
if (empty($name = $this->argument('name'))) {
$name = $this->prompt(lang('Migrations.migSeeder'), null, static function ($val) {
$group = $this->option('group');
$silent = $this->option('silent') !== null;
$locale = $this->option('locale', config('app.language', 'fr_FR'));

$this->db = $this->resolver->connect($group);

$name = $this->getSeederName();

$seeder = $this->resolveSeeder($name);

$this->configureSeeder($seeder, $locale, $silent);

$this->runSeeder($seeder);

return EXIT_SUCCESS;
}

/**
* Récupère le nom du seeder
*/
protected function getSeederName(): string
{
if (null !== $name = $this->argument('name')) {
return $name;
}

return $this->prompt(
'Quel seeder souhaitez-vous exécuter ?',
'DatabaseSeeder',
function ($val) {
if (empty($val)) {
throw new InvalidArgumentException('Veuillez entrer le nom du seeder.');
}

return $val;
});
}
}
);
}

$seedClass = APP_NAMESPACE . '\Database\Seeds\\';
$seedClass .= str_replace($seedClass, '', $name);
/**
* Résout la classe du seeder
*/
protected function resolveSeeder(string $name): Seeder
{
// Chemins possibles
$paths = [
APP_NAMESPACE . '\\Database\\Seeds\\',
APP_NAMESPACE . '\\Database\\Seeders\\',
'Database\\Seeds\\',
'Database\\Seeders\\',
];

$className = $name;

/**
* @var Seeder
*/
$seeder = new $seedClass($this->db);
// Si le nom ne contient pas de namespace, on essaie les chemins standards
if (!str_contains($name, '\\')) {
foreach ($paths as $path) {
$fullClass = $path . $name;
if (class_exists($fullClass)) {
$className = $fullClass;
break;
}
}
}

if ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language'));
if (!class_exists($className)) {
throw new InvalidArgumentException(
"Le seeder '{$name}' n'a pas été trouvé.\n" .
"Chemins recherchés :\n" .
implode("\n", array_map(fn($p) => "- {$p}{$name}", $paths))
);
}

$this->task('Demarrage du seed')->eol();
sleep(2);
$this->info('Remplissage en cours de traitement');
return new $className($this->db);
}

if (method_exists($seeder, 'run')) {
Services::container()->call([$seeder, 'run']);
/**
* Configure le seeder
*/
protected function configureSeeder(Seeder $seeder, ?string $locale, bool $silent): void
{
if ($locale !== null) {
$seeder->setLocale($locale);
} elseif ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language', 'fr_FR'));
}

$usedSeed = [
Services::container()->call([$seeder, 'execute']),
...$seeder->getSeeded(),
if ($silent) {
$seeder->setSilent(true);
}
}

/**
* Exécute le seeder
*/
protected function runSeeder(Seeder $seeder): void
{
$this->task('Démarrage du seed')->eol();

$this->info('Remplissage en cours...');

$seeder->setCommand($this)->execute();

$executed = [
$seeder::class,
...$seeder->getCalled(),
];

$this->eol()->success('Opération terminée.');
$this->eol()->success('Opération terminée avec succès !');

foreach ($usedSeed as $seeded) {
$this->eol()->write('- ')->writer->yellow($seeded);
}
$this->eol()->write('Seeders exécutés :');

return EXIT_SUCCESS;
foreach (array_unique($executed) as $seeded) {
$this->eol()->write(' ✔ ')->writer->green($seeded);
}
}
}
22 changes: 15 additions & 7 deletions src/Config/Services.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\BuilderInterface;
use BlitzPHP\Contracts\Database\ConnectionInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\DatabaseManager;
Expand All@@ -32,7 +34,7 @@ class Services extends BaseServices
/**
* Récupère le gestionnaire de base de données
*/
protected static function manager(): DatabaseManager
public static function dbManager(): DatabaseManager
{
if (static::$manager === null) {
static::$manager = new DatabaseManager(static::logger(), static::event());
Expand All@@ -43,10 +45,12 @@ protected static function manager(): DatabaseManager

/**
* Récupère une connexion à la base de données
*
* @return BaseConnection
*/
public static function database(?string $group = null, bool $shared = true): BaseConnection
public static function database(?string $group = null, bool $shared = true): ConnectionInterface
{
$connection = static::manager()->connect($group, $shared);
$connection = static::dbManager()->connect($group, $shared);

if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
Expand All@@ -57,16 +61,20 @@ public static function database(?string $group = null, bool $shared = true): Bas

/**
* Récupère un query builder
*
* @return BaseBuilder
*
* @deprecated 1.0 use static::database()->table($tablename) instead
*/
public static function builder(?string $group = null, bool $shared = true): BaseBuilder
public static function builder(?string $group = null, bool $shared = true): BuilderInterface
{
$key = 'builder_' . ($group ?? 'default');

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

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

if ($shared) {
static::$instances[$key] = $builder;
Expand All@@ -78,7 +86,7 @@ public static function builder(?string $group = null, bool $shared = true): Base
/**
* Récupère un exportateur de base de données
*/
public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
public static function dbExporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Exporter
{
if ($shared) {
return static::sharedInstance('dbExporter', $db, $config);
Expand All@@ -102,7 +110,7 @@ public static function dbExporter(?BaseConnection $db = null, array $config = []
/**
* Récupère un importateur de base de données
*/
public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
public static function dbImporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Importer
{
if ($shared) {
return static::sharedInstance('dbImporter', $db, $config);
Expand Down
5 changes: 5 additions & 0 deletions src/Exceptions/DatabaseException.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,4 +21,9 @@ class DatabaseException extends Error implements ExceptionInterface
* @var int
*/
protected $code = 8;

protected static function t(string $message, array $args = []): string
{
return sprintf($message, $args);
}
}
31 changes: 31 additions & 0 deletions src/Exceptions/SeederException.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<?php

namespace BlitzPHP\Database\Exceptions;

class SeederException extends DatabaseException
{
public static function dataCannotBeEmpty()
{
return new static(static::t('Les données ne peuvent pas être vides.'));
}

public static function unspecifiedFakerMethod()
{
return new static(static::t('Méthode Faker non spécifiée.'));
}

public static function relationTableNotFound(string $table)
{
return new static(static::t("Table de relation '%s' non trouvée.", [$table]));
}

public static function propertyNotFound(string $property)
{
return new static(static::t("Propriété '%s' non trouvée.", [$property]));
}

public static function seederClassDoesNotExist(string $class)
{
return new static(static::t("La classe de seeder '%s' n'existe pas.", [$class]));
}
}
84 changes: 84 additions & 0 deletions src/Seeder/Factory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
<?php

/**
* This file is part of Blitz PHP framework - Database Layer.
*
* (c) 2022 Dimitri Sitchet Tomkeu <devcode.dst@gmail.com>
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/

namespace BlitzPHP\Database\Seeder;

use Faker\Factory as FakerFactory;
use Faker\Generator as FakerGenerator;

/**
* Générateur de configurations pour les seeders
*
* @mixin FakerGenerator
*/
class Factory
{
/**
* Instance Faker
*/
protected FakerGenerator $faker;

/**
* Constructeur
*/
public function __construct(string $locale = 'fr_FR')
{
$this->faker = FakerFactory::create($locale);
}

/**
* Appel Faker (retourne une configuration)
*/
public function __call(string $name, array $arguments): array
{
if ($name === 'unique') {
return ['faker:unique', $arguments[0] ?? null, array_slice($arguments, 1) ?? []];
}

return ['faker', $name, $arguments];
}

/**
* Propriété Faker (retourne une configuration)
*/
public function __get(string $name): array
{
return ['faker', $name, []];
}

/**
* Relation avec une autre table
*/
public function relation(string $table, string $column = 'id'): array
{
return ['relation', $table, $column];
}

/**
* Valeur optionnelle
*/
public function optional(float $weight = 0.5, mixed $default = null, mixed $value = null): array
{
if ($value === null) {
// Si pas de valeur fournie, on utilisera une closure
return ['optional', $weight, $default];
}
return ['optional', $weight, $default, $value];
}

/**
* Valeur fixe (pour compatibilité)
*/
public function raw(mixed $value): mixed
{
return $value;
}
}
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions composer.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
"require-dev": {
"blitz-php/coding-standard": "^1.5",
"blitz-php/framework": "^1.0.0-rc",
"fakerphp/faker": "^1.24",
"kahlan/kahlan": "^6.1.0",
"phpstan/phpstan": "^2.1.36"
},
Expand Down
139 changes: 111 additions & 28 deletions src/Commands/Seed.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@

namespace BlitzPHP\Database\Commands;

use BlitzPHP\Container\Services;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Seeder\Seeder;
use InvalidArgumentException;

Expand All@@ -34,55 +34,138 @@ class Seed extends DatabaseCommand
* {@inheritDoc}
*/
protected array $arguments = [
'name' => 'Nom du seedr a executer',
'name' => 'Nom du seeder à exécuter (ex: DatabaseSeeder ou Users\\UserSeeder)',
];

/**
* {@inheritDoc}
*/
protected array $options = [
'--group' => 'Groupe de connexion à utiliser',
'--silent' => 'Mode silencieux (pas de sortie)',
'--locale' => 'Langue à utiliser pour Faker (ex: fr_FR, en_US)',
];

protected ?BaseConnection $db = null;

/**
* {@inheritDoc}
*/
public function handle()
{
if (empty($name = $this->argument('name'))) {
$name = $this->prompt(lang('Migrations.migSeeder'), null, static function ($val) {
$group = $this->option('group');
$silent = $this->option('silent') !== null;
$locale = $this->option('locale', config('app.language', 'fr_FR'));

$this->db = $this->resolver->connect($group);

$name = $this->getSeederName();

$seeder = $this->resolveSeeder($name);

$this->configureSeeder($seeder, $locale, $silent);

$this->runSeeder($seeder);

return EXIT_SUCCESS;
}

/**
* Récupère le nom du seeder
*/
protected function getSeederName(): string
{
if (null !== $name = $this->argument('name')) {
return $name;
}

return $this->prompt(
'Quel seeder souhaitez-vous exécuter ?',
'DatabaseSeeder',
function ($val) {
if (empty($val)) {
throw new InvalidArgumentException('Veuillez entrer le nom du seeder.');
}

return $val;
});
}
}
);
}

$seedClass = APP_NAMESPACE . '\Database\Seeds\\';
$seedClass .= str_replace($seedClass, '', $name);
/**
* Résout la classe du seeder
*/
protected function resolveSeeder(string $name): Seeder
{
// Chemins possibles
$paths = [
APP_NAMESPACE . '\\Database\\Seeds\\',
APP_NAMESPACE . '\\Database\\Seeders\\',
'Database\\Seeds\\',
'Database\\Seeders\\',
];

$className = $name;

/**
* @var Seeder
*/
$seeder = new $seedClass($this->db);
// Si le nom ne contient pas de namespace, on essaie les chemins standards
if (!str_contains($name, '\\')) {
foreach ($paths as $path) {
$fullClass = $path . $name;
if (class_exists($fullClass)) {
$className = $fullClass;
break;
}
}
}

if ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language'));
if (!class_exists($className)) {
throw new InvalidArgumentException(
"Le seeder '{$name}' n'a pas été trouvé.\n" .
"Chemins recherchés :\n" .
implode("\n", array_map(fn($p) => "- {$p}{$name}", $paths))
);
}

$this->task('Demarrage du seed')->eol();
sleep(2);
$this->info('Remplissage en cours de traitement');
return new $className($this->db);
}

if (method_exists($seeder, 'run')) {
Services::container()->call([$seeder, 'run']);
/**
* Configure le seeder
*/
protected function configureSeeder(Seeder $seeder, ?string $locale, bool $silent): void
{
if ($locale !== null) {
$seeder->setLocale($locale);
} elseif ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language', 'fr_FR'));
}

$usedSeed = [
Services::container()->call([$seeder, 'execute']),
...$seeder->getSeeded(),
if ($silent) {
$seeder->setSilent(true);
}
}

/**
* Exécute le seeder
*/
protected function runSeeder(Seeder $seeder): void
{
$this->task('Démarrage du seed')->eol();

$this->info('Remplissage en cours...');

$seeder->setCommand($this)->execute();

$executed = [
$seeder::class,
...$seeder->getCalled(),
];

$this->eol()->success('Opération terminée.');
$this->eol()->success('Opération terminée avec succès !');

foreach ($usedSeed as $seeded) {
$this->eol()->write('- ')->writer->yellow($seeded);
}
$this->eol()->write('Seeders exécutés :');

return EXIT_SUCCESS;
foreach (array_unique($executed) as $seeded) {
$this->eol()->write(' ✔ ')->writer->green($seeded);
}
}
}
22 changes: 15 additions & 7 deletions src/Config/Services.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\BuilderInterface;
use BlitzPHP\Contracts\Database\ConnectionInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\DatabaseManager;
Expand All@@ -32,7 +34,7 @@ class Services extends BaseServices
/**
* Récupère le gestionnaire de base de données
*/
protected static function manager(): DatabaseManager
public static function dbManager(): DatabaseManager
{
if (static::$manager === null) {
static::$manager = new DatabaseManager(static::logger(), static::event());
Expand All@@ -43,10 +45,12 @@ protected static function manager(): DatabaseManager

/**
* Récupère une connexion à la base de données
*
* @return BaseConnection
*/
public static function database(?string $group = null, bool $shared = true): BaseConnection
public static function database(?string $group = null, bool $shared = true): ConnectionInterface
{
$connection = static::manager()->connect($group, $shared);
$connection = static::dbManager()->connect($group, $shared);

if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
Expand All@@ -57,16 +61,20 @@ public static function database(?string $group = null, bool $shared = true): Bas

/**
* Récupère un query builder
*
* @return BaseBuilder
*
* @deprecated 1.0 use static::database()->table($tablename) instead
*/
public static function builder(?string $group = null, bool $shared = true): BaseBuilder
public static function builder(?string $group = null, bool $shared = true): BuilderInterface
{
$key = 'builder_' . ($group ?? 'default');

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

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

if ($shared) {
static::$instances[$key] = $builder;
Expand All@@ -78,7 +86,7 @@ public static function builder(?string $group = null, bool $shared = true): Base
/**
* Récupère un exportateur de base de données
*/
public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
public static function dbExporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Exporter
{
if ($shared) {
return static::sharedInstance('dbExporter', $db, $config);
Expand All@@ -102,7 +110,7 @@ public static function dbExporter(?BaseConnection $db = null, array $config = []
/**
* Récupère un importateur de base de données
*/
public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
public static function dbImporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Importer
{
if ($shared) {
return static::sharedInstance('dbImporter', $db, $config);
Expand Down
5 changes: 5 additions & 0 deletions src/Exceptions/DatabaseException.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,4 +21,9 @@ class DatabaseException extends Error implements ExceptionInterface
* @var int
*/
protected $code = 8;

protected static function t(string $message, array $args = []): string
{
return sprintf($message, $args);
}
}
31 changes: 31 additions & 0 deletions src/Exceptions/SeederException.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<?php

namespace BlitzPHP\Database\Exceptions;

class SeederException extends DatabaseException
{
public static function dataCannotBeEmpty()
{
return new static(static::t('Les données ne peuvent pas être vides.'));
}

public static function unspecifiedFakerMethod()
{
return new static(static::t('Méthode Faker non spécifiée.'));
}

public static function relationTableNotFound(string $table)
{
return new static(static::t("Table de relation '%s' non trouvée.", [$table]));
}

public static function propertyNotFound(string $property)
{
return new static(static::t("Propriété '%s' non trouvée.", [$property]));
}

public static function seederClassDoesNotExist(string $class)
{
return new static(static::t("La classe de seeder '%s' n'existe pas.", [$class]));
}
}
84 changes: 84 additions & 0 deletions src/Seeder/Factory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
<?php

/**
* This file is part of Blitz PHP framework - Database Layer.
*
* (c) 2022 Dimitri Sitchet Tomkeu <devcode.dst@gmail.com>
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/

namespace BlitzPHP\Database\Seeder;

use Faker\Factory as FakerFactory;
use Faker\Generator as FakerGenerator;

/**
* Générateur de configurations pour les seeders
*
* @mixin FakerGenerator
*/
class Factory
{
/**
* Instance Faker
*/
protected FakerGenerator $faker;

/**
* Constructeur
*/
public function __construct(string $locale = 'fr_FR')
{
$this->faker = FakerFactory::create($locale);
}

/**
* Appel Faker (retourne une configuration)
*/
public function __call(string $name, array $arguments): array
{
if ($name === 'unique') {
return ['faker:unique', $arguments[0] ?? null, array_slice($arguments, 1) ?? []];
}

return ['faker', $name, $arguments];
}

/**
* Propriété Faker (retourne une configuration)
*/
public function __get(string $name): array
{
return ['faker', $name, []];
}

/**
* Relation avec une autre table
*/
public function relation(string $table, string $column = 'id'): array
{
return ['relation', $table, $column];
}

/**
* Valeur optionnelle
*/
public function optional(float $weight = 0.5, mixed $default = null, mixed $value = null): array
{
if ($value === null) {
// Si pas de valeur fournie, on utilisera une closure
return ['optional', $weight, $default];
}
return ['optional', $weight, $default, $value];
}

/**
* Valeur fixe (pour compatibilité)
*/
public function raw(mixed $value): mixed
{
return $value;
}
}
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions composer.json
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,6 +23,7 @@
"require-dev": {
"blitz-php/coding-standard": "^1.5",
"blitz-php/framework": "^1.0.0-rc",
"fakerphp/faker": "^1.24",
"kahlan/kahlan": "^6.1.0",
"phpstan/phpstan": "^2.1.36"
},
Expand Down
139 changes: 111 additions & 28 deletions src/Commands/Seed.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,7 +11,7 @@

namespace BlitzPHP\Database\Commands;

use BlitzPHP\Container\Services;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\Seeder\Seeder;
use InvalidArgumentException;

Expand All@@ -34,55 +34,138 @@ class Seed extends DatabaseCommand
* {@inheritDoc}
*/
protected array $arguments = [
'name' => 'Nom du seedr a executer',
'name' => 'Nom du seeder à exécuter (ex: DatabaseSeeder ou Users\\UserSeeder)',
];

/**
* {@inheritDoc}
*/
protected array $options = [
'--group' => 'Groupe de connexion à utiliser',
'--silent' => 'Mode silencieux (pas de sortie)',
'--locale' => 'Langue à utiliser pour Faker (ex: fr_FR, en_US)',
];

protected ?BaseConnection $db = null;

/**
* {@inheritDoc}
*/
public function handle()
{
if (empty($name = $this->argument('name'))) {
$name = $this->prompt(lang('Migrations.migSeeder'), null, static function ($val) {
$group = $this->option('group');
$silent = $this->option('silent') !== null;
$locale = $this->option('locale', config('app.language', 'fr_FR'));

$this->db = $this->resolver->connect($group);

$name = $this->getSeederName();

$seeder = $this->resolveSeeder($name);

$this->configureSeeder($seeder, $locale, $silent);

$this->runSeeder($seeder);

return EXIT_SUCCESS;
}

/**
* Récupère le nom du seeder
*/
protected function getSeederName(): string
{
if (null !== $name = $this->argument('name')) {
return $name;
}

return $this->prompt(
'Quel seeder souhaitez-vous exécuter ?',
'DatabaseSeeder',
function ($val) {
if (empty($val)) {
throw new InvalidArgumentException('Veuillez entrer le nom du seeder.');
}

return $val;
});
}
}
);
}

$seedClass = APP_NAMESPACE . '\Database\Seeds\\';
$seedClass .= str_replace($seedClass, '', $name);
/**
* Résout la classe du seeder
*/
protected function resolveSeeder(string $name): Seeder
{
// Chemins possibles
$paths = [
APP_NAMESPACE . '\\Database\\Seeds\\',
APP_NAMESPACE . '\\Database\\Seeders\\',
'Database\\Seeds\\',
'Database\\Seeders\\',
];

$className = $name;

/**
* @var Seeder
*/
$seeder = new $seedClass($this->db);
// Si le nom ne contient pas de namespace, on essaie les chemins standards
if (!str_contains($name, '\\')) {
foreach ($paths as $path) {
$fullClass = $path . $name;
if (class_exists($fullClass)) {
$className = $fullClass;
break;
}
}
}

if ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language'));
if (!class_exists($className)) {
throw new InvalidArgumentException(
"Le seeder '{$name}' n'a pas été trouvé.\n" .
"Chemins recherchés :\n" .
implode("\n", array_map(fn($p) => "- {$p}{$name}", $paths))
);
}

$this->task('Demarrage du seed')->eol();
sleep(2);
$this->info('Remplissage en cours de traitement');
return new $className($this->db);
}

if (method_exists($seeder, 'run')) {
Services::container()->call([$seeder, 'run']);
/**
* Configure le seeder
*/
protected function configureSeeder(Seeder $seeder, ?string $locale, bool $silent): void
{
if ($locale !== null) {
$seeder->setLocale($locale);
} elseif ($seeder->getLocale() === '') {
$seeder->setLocale(config('app.language', 'fr_FR'));
}

$usedSeed = [
Services::container()->call([$seeder, 'execute']),
...$seeder->getSeeded(),
if ($silent) {
$seeder->setSilent(true);
}
}

/**
* Exécute le seeder
*/
protected function runSeeder(Seeder $seeder): void
{
$this->task('Démarrage du seed')->eol();

$this->info('Remplissage en cours...');

$seeder->setCommand($this)->execute();

$executed = [
$seeder::class,
...$seeder->getCalled(),
];

$this->eol()->success('Opération terminée.');
$this->eol()->success('Opération terminée avec succès !');

foreach ($usedSeed as $seeded) {
$this->eol()->write('- ')->writer->yellow($seeded);
}
$this->eol()->write('Seeders exécutés :');

return EXIT_SUCCESS;
foreach (array_unique($executed) as $seeded) {
$this->eol()->write(' ✔ ')->writer->green($seeded);
}
}
}
22 changes: 15 additions & 7 deletions src/Config/Services.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,8 @@
namespace BlitzPHP\Database\Config;

use BlitzPHP\Container\Services as BaseServices;
use BlitzPHP\Contracts\Database\BuilderInterface;
use BlitzPHP\Contracts\Database\ConnectionInterface;
use BlitzPHP\Database\Builder\BaseBuilder;
use BlitzPHP\Database\Connection\BaseConnection;
use BlitzPHP\Database\DatabaseManager;
Expand All@@ -32,7 +34,7 @@ class Services extends BaseServices
/**
* Récupère le gestionnaire de base de données
*/
protected static function manager(): DatabaseManager
public static function dbManager(): DatabaseManager
{
if (static::$manager === null) {
static::$manager = new DatabaseManager(static::logger(), static::event());
Expand All@@ -43,10 +45,12 @@ protected static function manager(): DatabaseManager

/**
* Récupère une connexion à la base de données
*
* @return BaseConnection
*/
public static function database(?string $group = null, bool $shared = true): BaseConnection
public static function database(?string $group = null, bool $shared = true): ConnectionInterface
{
$connection = static::manager()->connect($group, $shared);
$connection = static::dbManager()->connect($group, $shared);

if (!$connection instanceof BaseConnection) {
throw new InvalidArgumentException('La connexion retournée n\'est pas une instance de BaseConnection');
Expand All@@ -57,16 +61,20 @@ public static function database(?string $group = null, bool $shared = true): Bas

/**
* Récupère un query builder
*
* @return BaseBuilder
*
* @deprecated 1.0 use static::database()->table($tablename) instead
*/
public static function builder(?string $group = null, bool $shared = true): BaseBuilder
public static function builder(?string $group = null, bool $shared = true): BuilderInterface
{
$key = 'builder_' . ($group ?? 'default');

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

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

if ($shared) {
static::$instances[$key] = $builder;
Expand All@@ -78,7 +86,7 @@ public static function builder(?string $group = null, bool $shared = true): Base
/**
* Récupère un exportateur de base de données
*/
public static function dbExporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Exporter
public static function dbExporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Exporter
{
if ($shared) {
return static::sharedInstance('dbExporter', $db, $config);
Expand All@@ -102,7 +110,7 @@ public static function dbExporter(?BaseConnection $db = null, array $config = []
/**
* Récupère un importateur de base de données
*/
public static function dbImporter(?BaseConnection $db = null, array $config = [], bool $shared = true): Importer
public static function dbImporter(?ConnectionInterface $db = null, array $config = [], bool $shared = true): Importer
{
if ($shared) {
return static::sharedInstance('dbImporter', $db, $config);
Expand Down
5 changes: 5 additions & 0 deletions src/Exceptions/DatabaseException.php
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,4 +21,9 @@ class DatabaseException extends Error implements ExceptionInterface
* @var int
*/
protected $code = 8;

protected static function t(string $message, array $args = []): string
{
return sprintf($message, $args);
}
}
31 changes: 31 additions & 0 deletions src/Exceptions/SeederException.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
<?php

namespace BlitzPHP\Database\Exceptions;

class SeederException extends DatabaseException
{
public static function dataCannotBeEmpty()
{
return new static(static::t('Les données ne peuvent pas être vides.'));
}

public static function unspecifiedFakerMethod()
{
return new static(static::t('Méthode Faker non spécifiée.'));
}

public static function relationTableNotFound(string $table)
{
return new static(static::t("Table de relation '%s' non trouvée.", [$table]));
}

public static function propertyNotFound(string $property)
{
return new static(static::t("Propriété '%s' non trouvée.", [$property]));
}

public static function seederClassDoesNotExist(string $class)
{
return new static(static::t("La classe de seeder '%s' n'existe pas.", [$class]));
}
}
84 changes: 84 additions & 0 deletions src/Seeder/Factory.php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
<?php

/**
* This file is part of Blitz PHP framework - Database Layer.
*
* (c) 2022 Dimitri Sitchet Tomkeu <devcode.dst@gmail.com>
*
* For the full copyright and license information, please view
* the LICENSE file that was distributed with this source code.
*/

namespace BlitzPHP\Database\Seeder;

use Faker\Factory as FakerFactory;
use Faker\Generator as FakerGenerator;

/**
* Générateur de configurations pour les seeders
*
* @mixin FakerGenerator
*/
class Factory
{
/**
* Instance Faker
*/
protected FakerGenerator $faker;

/**
* Constructeur
*/
public function __construct(string $locale = 'fr_FR')
{
$this->faker = FakerFactory::create($locale);
}

/**
* Appel Faker (retourne une configuration)
*/
public function __call(string $name, array $arguments): array
{
if ($name === 'unique') {
return ['faker:unique', $arguments[0] ?? null, array_slice($arguments, 1) ?? []];
}

return ['faker', $name, $arguments];
}

/**
* Propriété Faker (retourne une configuration)
*/
public function __get(string $name): array
{
return ['faker', $name, []];
}

/**
* Relation avec une autre table
*/
public function relation(string $table, string $column = 'id'): array
{
return ['relation', $table, $column];
}

/**
* Valeur optionnelle
*/
public function optional(float $weight = 0.5, mixed $default = null, mixed $value = null): array
{
if ($value === null) {
// Si pas de valeur fournie, on utilisera une closure
return ['optional', $weight, $default];
}
return ['optional', $weight, $default, $value];
}

/**
* Valeur fixe (pour compatibilité)
*/
public function raw(mixed $value): mixed
{
return $value;
}
}
Loading