From 918026fca427dbd8f384def45f7bf400ec8d0416 Mon Sep 17 00:00:00 2001 From: Markus Birth Date: Sun, 10 Jul 2016 21:56:19 +0200 Subject: [PATCH] Assign empty value for unset fields. Fix bug in test. --- lib/Frs/FieldDefinition.php | 8 ++++++-- tests/FieldDefinitionTest.php | 3 ++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/Frs/FieldDefinition.php b/lib/Frs/FieldDefinition.php index 9a6a113..9fc9ba1 100644 --- a/lib/Frs/FieldDefinition.php +++ b/lib/Frs/FieldDefinition.php @@ -93,8 +93,12 @@ class FieldDefinition $groupName = $this->fieldData['groups'][$meta['group']]; $meta['group_name'] = $groupName; - if (isset($meta['default']) && (!isset($meta['value']) || empty($meta['value']))) { - $meta['value'] = $meta['default']; + if (!isset($meta['value']) || empty($meta['value'])) { + if (isset($meta['default'])) { + $meta['value'] = $meta['default']; + } else { + $meta['value'] = ''; + } } // Field type marker for Mustache diff --git a/tests/FieldDefinitionTest.php b/tests/FieldDefinitionTest.php index a561fa6..c4da5af 100644 --- a/tests/FieldDefinitionTest.php +++ b/tests/FieldDefinitionTest.php @@ -34,7 +34,8 @@ class FieldDefinitionTest extends \PHPUnit_Framework_TestCase public function testAddFieldValues() { $fdo = new FieldDefinition('hotel'); - $fdo->addFieldValues(array('url'=>'http://example.org/'), array('USER_NAME'=>'John Doe')); + $fdo->addPlaceholder('USER_NAME', 'John Doe'); + $fdo->addFieldValues(array('url'=>'http://example.org/')); $fd = $fdo->getFieldData(); $this->assertArrayHasKey('fields', $fd); $this->assertArrayHasKey('url', $fd['fields']);