From fd0e6b470e820e25fab8db3528446b5b031f9304 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Thu, 25 Apr 2024 16:34:21 +0000 Subject: [PATCH] test fixes --- Models/AttributeType.php | 12 ++++++++++-- tests/Models/AttributeTypeTest.php | 2 +- tests/Models/AttributeValueTest.php | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Models/AttributeType.php b/Models/AttributeType.php index f864efa..d5c68f2 100755 --- a/Models/AttributeType.php +++ b/Models/AttributeType.php @@ -135,8 +135,16 @@ class AttributeType implements \JsonSerializable $mValue = (float) $value; } elseif ($this->datatype === AttributeValueType::_DATETIME) { $mValue = $value instanceof \DateTime - ? $value - : new \DateTime((string) $value); + ? $value->format('Y-m-d H:i:s') + : $value; + + foreach ($this->defaults as $default) { + if ($default->valueDat->format('Y-m-d H:i:s') === $mValue) { + return $default; + } + } + + return new NullAttributeValue(); } foreach ($this->defaults as $default) { diff --git a/tests/Models/AttributeTypeTest.php b/tests/Models/AttributeTypeTest.php index aa57ef8..78a30f6 100644 --- a/tests/Models/AttributeTypeTest.php +++ b/tests/Models/AttributeTypeTest.php @@ -63,7 +63,7 @@ final class AttributeTypeTest extends \PHPUnit\Framework\TestCase $type->defaults[] = new AttributeValue(); $type->defaults[0]->setValue(false, AttributeValueType::_BOOL); - self::assertFalse($type->getDefaultByValue(false)->getValue()); + self::assertFalse((bool) $type->getDefaultByValue(false)->getValue()); } public function testGetDefaultFloat() : void diff --git a/tests/Models/AttributeValueTest.php b/tests/Models/AttributeValueTest.php index 3c36ec8..0cf96d1 100644 --- a/tests/Models/AttributeValueTest.php +++ b/tests/Models/AttributeValueTest.php @@ -52,7 +52,7 @@ final class AttributeValueTest extends \PHPUnit\Framework\TestCase $value = new AttributeValue(); $value->setValue(false, AttributeValueType::_BOOL); - self::assertFalse($value->getValue()); + self::assertFalse((bool) $value->getValue()); } public function testGetDefaultFloat() : void