From d2bd6c2f588ffd8a41ed082e5725536558ba6c6a Mon Sep 17 00:00:00 2001 From: Dave Mc Nicoll Date: Tue, 31 Oct 2023 16:34:45 +0000 Subject: [PATCH] - minor fixes --- src/Attribute/Property/Field/ForeignKey.php | 2 +- src/EntityTrait.php | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Attribute/Property/Field/ForeignKey.php b/src/Attribute/Property/Field/ForeignKey.php index 11970a9..0c5deeb 100644 --- a/src/Attribute/Property/Field/ForeignKey.php +++ b/src/Attribute/Property/Field/ForeignKey.php @@ -13,7 +13,7 @@ use Ulmus\Attribute\ConstrainActionEnum; class ForeignKey extends PrimaryKey { public function __construct( public ? string $name = null, - public ? string $type = 'bigint', + public ? string $type = null, public null|int|string $length = null, public ? int $precision = null, public array $attributes = [ diff --git a/src/EntityTrait.php b/src/EntityTrait.php index 26a8723..26a2d92 100644 --- a/src/EntityTrait.php +++ b/src/EntityTrait.php @@ -112,7 +112,7 @@ trait EntityTrait { $this->entityLoadedDataset = array_change_key_case($dataset, \CASE_LOWER); } elseif ($overwriteDataset) { - $this->entityLoadedDataset = array_change_key_case($dataset, \CASE_LOWER) + $this->entityLoadedDataset; + $this->entityLoadedDataset = iterator_to_array(array_change_key_case($dataset, \CASE_LOWER)) + $this->entityLoadedDataset; } } @@ -261,10 +261,6 @@ trait EntityTrait { #[Ignore] public function __clone() { - foreach($this as $prop) { - - } - if ( null !== $pkField = $this->resolveEntity()->getPrimaryKeyField($this) ) { $key = key($pkField);