From 623d2823ff2e0686ccd69bf3de538efce7456acf Mon Sep 17 00:00:00 2001 From: jf-cbd Date: Tue, 4 Feb 2025 11:29:19 +0100 Subject: [PATCH] Fix merge conflict --- .../unitary-tests/core/AttributeDefinitionTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/php-unit-tests/unitary-tests/core/AttributeDefinitionTest.php b/tests/php-unit-tests/unitary-tests/core/AttributeDefinitionTest.php index 8f56c3eef..047f39462 100644 --- a/tests/php-unit-tests/unitary-tests/core/AttributeDefinitionTest.php +++ b/tests/php-unit-tests/unitary-tests/core/AttributeDefinitionTest.php @@ -273,7 +273,7 @@ PHP { $oDateAttribute = $this->GivenAttribute(\WorkOrder::class, 'start_date', AttributeDate::class, 'zabugomeuh', false); - $defaultValue = $oDateAttribute->GetDefaultValue() + $defaultValue = $oDateAttribute->GetDefaultValue(); $this->AssertLastErrorLogEntryContains("Invalid default value 'zabugomeuh' for field 'start_date' on class 'WorkOrder', defaulting to null", "Last error log entry should contain a meaningful message"); self::assertNull($defaultValue, 'Invalid default value for Date attribute should give null default value');