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
6 changes: 6 additions & 0 deletions src/Builder/BaseBuilder.php
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,12 @@ public function __construct(protected ConnectionInterface $db)
$this->compiler = $this->createCompiler();
}


public function __clone(): void
{
$this->bindings = clone $this->bindings;
}

/**
* Methode magique pour recupere une valeur interne du Builder
*
Expand Down
2 changes: 1 addition & 1 deletion src/Listeners/DatabaseListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private function addInfoToAboutCommand()
return $group;
}

$output = str_ireplace('pdo', '', $config['driver']) . '/' . $config['host'];
$output = str_ireplace('pdo', '', $config['driver']) . '/' . ($config['hostname'] ?? $config['host']);

if (! empty($config['port'])) {
$output .= ':' . $config['port'];
Expand Down
25 changes: 20 additions & 5 deletions src/Model.php
Original file line number Diff line number Diff line change
Expand Up @@ -764,12 +764,26 @@ protected function addTimestamps(array $data, string $action): array
*/
protected function freshTimestamp(): int|string
{
$now = Date::now();
return $this->timeToDate(Date::now());
}

/**
* Convertit la valeur Date en chaîne en utilisant $this->dateFormat.
*
* Les formats disponibles sont :
* - 'int' - Stocke la date sous la forme d'un horodatage entier
* - 'datetime' - Stocke les données au format datetime SQL
* - 'date' - Stocke la date (uniquement) au format de date SQL.
*
* @return int|string
*/
protected function timeToDate(Date $date): int|string
{
return match ($this->dateFormat) {
'int' => $now->getTimestamp(),
'date' => $now->format('Y-m-d'),
default => $now->format('Y-m-d H:i:s'),
'int' => $date->getTimestamp(),
'date' => $date->format('Y-m-d'),
'datetime' => $date->format('Y-m-d H:i:s'),
default => (string) $date,
};
}

Expand Down Expand Up @@ -851,7 +865,8 @@ protected function objectToArray(object $object): array
$properties = [];

foreach ($props as $prop) {
$properties[$prop->getName()] = $prop->getValue($object);
$value = $prop->getValue($object);
$properties[$prop->getName()] = $value instanceof Date ? $this->timeToDate($value) : $value;
}
}

Expand Down