tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4845 from tractorcow/pulls/3/extension-hook-byref

Browse Source 
API before/afterExtend now support parameters passed by reference
This commit is contained in:
Daniel Hensby 2016-01-22 16:08:20 +00:00
commit 119bd2f873
2 changed files with 63 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/Object.php
View File

@ -970,7 +970,7 @@ abstract class Object {
if(!empty($this->beforeExtendCallbacks[$method])) { if(!empty($this->beforeExtendCallbacks[$method])) {
foreach(array_reverse($this->beforeExtendCallbacks[$method]) as $callback) { foreach(array_reverse($this->beforeExtendCallbacks[$method]) as $callback) {
$value = call_user_func($callback, $a1, $a2, $a3, $a4, $a5, $a6, $a7); $value = call_user_func_array($callback, array(&$a1, &$a2, &$a3, &$a4, &$a5, &$a6, &$a7));
if($value !== null) $values[] = $value; if($value !== null) $values[] = $value;
} }
$this->beforeExtendCallbacks[$method] = array(); $this->beforeExtendCallbacks[$method] = array();
@ -987,7 +987,7 @@ abstract class Object {
if(!empty($this->afterExtendCallbacks[$method])) { if(!empty($this->afterExtendCallbacks[$method])) {
foreach(array_reverse($this->afterExtendCallbacks[$method]) as $callback) { foreach(array_reverse($this->afterExtendCallbacks[$method]) as $callback) {
$value = call_user_func($callback, $a1, $a2, $a3, $a4, $a5, $a6, $a7); $value = call_user_func_array($callback, array(&$a1, &$a2, &$a3, &$a4, &$a5, &$a6, &$a7));
if($value !== null) $values[] = $value; if($value !== null) $values[] = $value;
} }
$this->afterExtendCallbacks[$method] = array(); $this->afterExtendCallbacks[$method] = array();

61
tests/core/ObjectTest.php
View File

@ -383,6 +383,19 @@ class ObjectTest extends SapphireTest {
$object->invokeWithExtensions('extendableMethod', 'test'), $object->invokeWithExtensions('extendableMethod', 'test'),
array('ExtendTest(test)', 'ExtendTest2(modified)') array('ExtendTest(test)', 'ExtendTest2(modified)')
); );
$object2 = new ObjectTest_Extending();
$first = 1;
$second = 2;
$third = 3;
$result = $object2->getResults($first, $second, $third);
$this->assertEquals(
array(array('before', 'extension', 'after')),
$result
);
$this->assertEquals(31, $first);
$this->assertEquals(32, $second);
$this->assertEquals(33, $third);
} }
public function testParseClassSpec() { public function testParseClassSpec() {
@ -600,4 +613,52 @@ class ObjectTest_ExtendTest4 extends ObjectTest_ExtendTest3 {
public function extendableMethod($argument = null) { return "ExtendTest4($argument)"; } public function extendableMethod($argument = null) { return "ExtendTest4($argument)"; }
} }
class ObjectTest_Extending extends Object implements TestOnly {
private static $extensions = array(
'ObjectTest_Extending_Extension'
);
public function getResults(&$first, &$second, &$third) {
// Before extending should be invoked second
$this->beforeExtending('updateResult', function(&$first, &$second, &$third) {
if($first === 1 && $second === 2 && $third === 3) {
$first = 11;
$second = 12;
$third = 13;
return 'before';
}
return 'before-error';
});
// After extending should be invoked fourth
$this->afterExtending('updateResult', function(&$first, &$second, &$third) {
if($first === 21 && $second === 22 && $third = 23) {
$first = 31;
$second = 32;
$third = 33;
return 'after';
}
return 'after-error';
});
// Function body invoked first
$result = $this->extend('updateResult', $first, $second, $third);
return array($result);
}
}
class ObjectTest_Extending_Extension extends Extension implements TestOnly {
public function updateResult(&$first, &$second, &$third) {
// Extension should be invoked third
if($first === 11 && $second === 12 && $third == 13) {
$first = 21;
$second = 22;
$third = 23;
return 'extension';
}
return 'extension-error';
}
}
/**#@-*/ /**#@-*/