kj/duckbrain
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix className not returning the classname in the right format.

Browse Source
This commit is contained in:
KJ 2024-10-25 10:40:57 -04:00
parent c600688725
commit 6aef212350
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Libs/Model.php
View File

@ -250,8 +250,7 @@ class Model {
foreach ($elem as $key => $value) { foreach ($elem as $key => $value) {
$index = array_search($key, $propertyNames); $index = array_search($key, $propertyNames);
if (is_numeric($index) && isset($value) && if (is_numeric($index) && enum_exists($properties[$index]->getType()->getName()))
enum_exists($properties[$index]->getType()->getName()))
$instance->$key = $properties[$index]->getType()->getName()::tryfrom($value); $instance->$key = $properties[$index]->getType()->getName()::tryfrom($value);
else else
$instance->$key = $value; $instance->$key = $value;
@ -305,13 +304,8 @@ class Model {
*/ */
public static function className(): string public static function className(): string
{ {
return strtolower( return substr(
preg_replace(
'/(?<!^)[A-Z]/', '_$0',
substr(
strrchr(get_called_class(), '\\'), 1 strrchr(get_called_class(), '\\'), 1
)
)
); );
} }
@ -326,7 +320,13 @@ class Model {
{ {
if (isset(static::$table)) if (isset(static::$table))
return static::$table; return static::$table;
return static::className().static::$tableSufix;
return strtolower(
preg_replace(
'/(?<!^)[A-Z]/', '_$0',
static::className()
)
).static::$tableSufix;
} }
/** /**
@ -861,7 +861,7 @@ class Model {
* @param bool $resetQuery * @param bool $resetQuery
* (opcional) Indica si el query debe reiniciarse o no (por defecto es true). * (opcional) Indica si el query debe reiniciarse o no (por defecto es true).
* *
* @return array<static> * @return array
* Arreglo con instancias del la clase actual resultantes del query. * Arreglo con instancias del la clase actual resultantes del query.
*/ */
public static function get(bool $resetQuery = true): array public static function get(bool $resetQuery = true): array
@ -897,7 +897,7 @@ class Model {
/** /**
* Obtener todos los elementos del la tabla de la instancia actual. * Obtener todos los elementos del la tabla de la instancia actual.
* *
* @return array<static> * @return array
* Contiene un arreglo de instancias de la clase actual. * Contiene un arreglo de instancias de la clase actual.
*/ */
public static function all(): array public static function all(): array