Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions plugins/baser-core/src/Model/Table/UsersTable.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ public function beforeMarshal(Event $event, ArrayObject $data, ArrayObject $opti
(isset($data['password_2']) && $data['password_2'] !== '')) {
$data['password'] = $data['password_1'];
}
foreach(['real_name_1', 'real_name_2'] as $field) {
if (isset($data[$field]) && is_string($data[$field])) {
$data[$field] = preg_replace('/^[  ]+|[  ]+$/u', '', $data[$field]);
}
Comment on lines +82 to +85
}
}

/**
Expand Down
31 changes: 31 additions & 0 deletions plugins/baser-core/tests/TestCase/Model/Table/UsersTableTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,37 @@ public function testBeforeMarshal()
$this->assertNotEmpty($user->password);
}

/**
* Test beforeMarshal
*
* real_name_1/real_name_2 は前後の半角・全角スペースのみ除去し、間のスペースは保持すること
*/
public function testBeforeMarshalTrimsRealName()
{
$user = $this->Users->newEntity([
'real_name_1' => "  山田 太郎  ",
'real_name_2' => "  鈴木 一郎  ",
], ['validate' => false]);
$this->assertEquals('山田 太郎', $user->real_name_1);
$this->assertEquals('鈴木 一郎', $user->real_name_2);
}

/**
* Test beforeMarshal
*
* real_name_1/real_name_2 がスペースのみの場合、トリムされて空文字になり、
* real_name_1 は必須バリデーションでエラーになり、real_name_2 は空文字を許容してエラーにならないこと
*/
public function testBeforeMarshalRealNameOnlySpace()
{
$user = $this->Users->newEntity([
'real_name_1' => ' ',
'real_name_2' => '   ',
]);
$this->assertNotEmpty($user->getError('real_name_1'));
$this->assertEmpty($user->getError('real_name_2'));
}

/**
* Test afterMarshal
*/
Expand Down
Loading