mbirth/php-frs
Archived
1
0
Fork 0
Code Pull Requests Actions Activity

Assign empty value for unset fields. Fix bug in test.

Browse Source
This commit is contained in:
Markus Birth 2016-07-10 21:56:19 +02:00
parent ebc0c89fcc
commit 918026fca4
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Frs/FieldDefinition.php
View File

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

3
tests/FieldDefinitionTest.php
View File

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