From 07ae8faaacf93fdc29ddf5bf98af136837083552 Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Fri, 3 Nov 2023 08:25:35 -0400 Subject: [PATCH 1/2] - Worked on SQLite adapter mostly --- src/Adapter/SQLite.php | 8 ++++++++ src/Adapter/SqlAdapterTrait.php | 2 +- src/EntityCollection.php | 2 +- src/EntityTrait.php | 13 ++++++++----- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/Adapter/SQLite.php b/src/Adapter/SQLite.php index 3cae7fb..66d441e 100644 --- a/src/Adapter/SQLite.php +++ b/src/Adapter/SQLite.php @@ -163,6 +163,14 @@ class SQLite implements AdapterInterface, MigrateInterface, SqlAdapterInterface $pdo->sqliteCreateFunction('length', fn($string) => strlen($string), 1); $pdo->sqliteCreateFunction('lcase', fn($string) => strtolower($string), 1); $pdo->sqliteCreateFunction('ucase', fn($string) => strtoupper($string), 1); + $pdo->sqliteCreateFunction('md5', fn($string) => md5($string), 1); + $pdo->sqliteCreateFunction('sha1', fn($string) => sha1($string), 1); + $pdo->sqliteCreateFunction('sha256', fn($string) => hash('sha256', $string), 1); + $pdo->sqliteCreateFunction('sha512', fn($string) => hash('sha512', $string), 1); + $pdo->sqliteCreateFunction('whirlpool', fn($string) => hash('whirlpool', $string), 1); + $pdo->sqliteCreateFunction('murmur3a', fn($string) => hash('murmur3a', $string), 1); + $pdo->sqliteCreateFunction('murmur3c', fn($string) => hash('murmur3c', $string), 1); + $pdo->sqliteCreateFunction('murmur3f', fn($string) => hash('murmur3f', $string), 1); $pdo->sqliteCreateFunction('left', fn($string, $length) => substr($string, 0, $length), 2); $pdo->sqliteCreateFunction('right', fn($string, $length) => substr($string, -$length), 2); $pdo->sqliteCreateFunction('strcmp', fn($s1, $s2) => strcmp($s1, $s2), 2); diff --git a/src/Adapter/SqlAdapterTrait.php b/src/Adapter/SqlAdapterTrait.php index 6f73d8e..a1860de 100644 --- a/src/Adapter/SqlAdapterTrait.php +++ b/src/Adapter/SqlAdapterTrait.php @@ -134,7 +134,7 @@ trait SqlAdapterTrait case is_object($value): return Ulmus::convertObject($value); - case is_array($value): + case is_array($value): return json_encode($value); case is_bool($value): diff --git a/src/EntityCollection.php b/src/EntityCollection.php index fb412cc..30b1858 100644 --- a/src/EntityCollection.php +++ b/src/EntityCollection.php @@ -360,7 +360,7 @@ class EntityCollection extends \ArrayObject implements \JsonSerializable { public function jsonSerialize(): mixed { - return $this->toArray(); + return $this->toArray(true); } public function append($value) : void diff --git a/src/EntityTrait.php b/src/EntityTrait.php index 26a8723..8dfa1bd 100644 --- a/src/EntityTrait.php +++ b/src/EntityTrait.php @@ -141,7 +141,7 @@ trait EntityTrait { return $this->entityFillFromDataset($dataset); } - public function entityGetDataset(bool $includeRelations = false, bool $returnSource = false) : array + public function entityGetDataset(bool $includeRelations = false, bool $returnSource = false, bool $rewriteValue = true) : array { if ( $returnSource ) { return $this->entityLoadedDataset; @@ -155,7 +155,10 @@ trait EntityTrait { $annotation = $entityResolver->searchFieldAnnotation($key, [ Attribute\Property\Field::class, Field::class ]); if ( isset($this->$key) ) { - $dataset[$annotation->name ?? $key] = static::repository()->adapter->adapter()->writableValue($this->$key); + $dataset[$annotation->name ?? $key] = $rewriteValue? + static::repository()->adapter->adapter()->writableValue($this->$key) + : + $this->$key; } elseif ( $field['nullable'] ) { $dataset[$annotation->name ?? $key] = null; @@ -165,7 +168,7 @@ trait EntityTrait { # @TODO Must fix recursive bug ! if ($includeRelations) { foreach($entityResolver->properties as $name => $field){ - $relation = $entityResolver->searchFieldAnnotation($key, [ Attribute\Property\Relation::class. Relation::class ] ); + $relation = $entityResolver->searchFieldAnnotation($name, [ Attribute\Property\Relation::class, Relation::class ] ); if ( $relation && isset($this->$name) && ($relation->entity ?? $relation->bridge) !== static::class ) { if ( null !== $value = $this->$name ?? null ) { @@ -192,7 +195,7 @@ trait EntityTrait { #[Ignore] public function toArray($includeRelations = false, array $filterFields = null) : array { - $dataset = $this->entityGetDataset($includeRelations); + $dataset = $this->entityGetDataset($includeRelations, false, false); return $filterFields ? array_intersect_key($dataset, array_flip($filterFields)) : $dataset; } @@ -275,7 +278,7 @@ trait EntityTrait { #[Ignore] public function jsonSerialize() : mixed { - return $this->entityGetDataset(); + return $this->entityGetDataset(true, false, false); } #[Ignore] From bfc1e1cf934e57bd02ca9dc95900142e6071e892 Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Fri, 3 Nov 2023 19:45:21 -0400 Subject: [PATCH 2/2] - WIP on removing annotations --- src/Entity/EntityInterface.php | 22 ++++++++++++++++++++++ src/EntityTrait.php | 12 ++++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 src/Entity/EntityInterface.php diff --git a/src/Entity/EntityInterface.php b/src/Entity/EntityInterface.php new file mode 100644 index 0000000..42b9cdb --- /dev/null +++ b/src/Entity/EntityInterface.php @@ -0,0 +1,22 @@ +entityFillFromDataset($dataset); + } + $this->resetVirtualProperties(); } @@ -136,7 +140,7 @@ trait EntityTrait { } #[Ignore] - public function fromArray(iterable $dataset) : self + public function fromArray(iterable $dataset) : static { return $this->entityFillFromDataset($dataset); } @@ -300,7 +304,7 @@ trait EntityTrait { } #[Ignore] - public static function queryBuilder() : QueryBuilder + public static function queryBuilder() : QueryBuilderInterface { return Ulmus::queryBuilder(static::class); }