mcndave
/
ulmus
1
0
Fork 0
Code Issues 16 Pull Requests Projects 1 Releases Wiki Activity

Merge branch 'master' of https://git.mcnd.ca/mcndave/ulmus

This commit is contained in:
Dave M. 2023-10-31 18:05:00 +00:00
parent 667c1fe9ab d2bd6c2f58
commit 3736fbe0f6
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Attribute/Property/Field/ForeignKey.php
View File

@ -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 = [

6
src/EntityTrait.php
View File

@ -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);