Skip to content

Commit

Permalink
Add buildValidator event hook to Table.
Browse files Browse the repository at this point in the history
While I don't think this will be frequently used, it does round out the
method listener options at the Table class. I've included some more
tests as well.

Refs #9099
  • Loading branch information
markstory committed Jul 13, 2016
1 parent e6e3ca7 commit c678bff
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/ORM/Table.php
Expand Up @@ -2252,6 +2252,7 @@ public function validateUnique($value, array $options, array $context = null)
* The conventional method map is:
*
* - Model.beforeMarshal => beforeMarshal
* - Model.buildValidator => buildValidator
* - Model.beforeFind => beforeFind
* - Model.beforeSave => beforeSave
* - Model.afterSave => afterSave
Expand All @@ -2268,6 +2269,7 @@ public function implementedEvents()
{
$eventMap = [
'Model.beforeMarshal' => 'beforeMarshal',
'Model.buildValidator' => 'buildValidator',
'Model.beforeFind' => 'beforeFind',
'Model.beforeSave' => 'beforeSave',
'Model.afterSave' => 'afterSave',
Expand Down
14 changes: 13 additions & 1 deletion tests/TestCase/ORM/TableTest.php
Expand Up @@ -1673,15 +1673,27 @@ public function testCallBehaviorAliasedFinder()
public function testImplementedEvents()
{
$table = $this->getMockBuilder('Cake\ORM\Table')
->setMethods(['beforeFind', 'beforeSave', 'afterSave', 'beforeDelete', 'afterDelete'])
->setMethods([
'buildValidator',
'beforeMarshal',
'beforeFind',
'beforeSave',
'afterSave',
'beforeDelete',
'afterDelete',
'afterRules'
])
->getMock();
$result = $table->implementedEvents();
$expected = [
'Model.beforeMarshal' => 'beforeMarshal',
'Model.buildValidator' => 'buildValidator',
'Model.beforeFind' => 'beforeFind',
'Model.beforeSave' => 'beforeSave',
'Model.afterSave' => 'afterSave',
'Model.beforeDelete' => 'beforeDelete',
'Model.afterDelete' => 'afterDelete',
'Model.afterRules' => 'afterRules',
];
$this->assertEquals($expected, $result, 'Events do not match.');
}
Expand Down

0 comments on commit c678bff

Please sign in to comment.