Browse Source

added unit tests and call to $behavior->hasMethod in Component

tags/2.0.0-beta
Carsten Brandt 11 years ago
parent
commit
15a3ec2764
  1. 2
      framework/yii/base/Component.php
  2. 41
      tests/unit/framework/base/BehaviorTest.php

2
framework/yii/base/Component.php

@ -199,7 +199,7 @@ class Component extends Object
$this->ensureBehaviors();
foreach ($this->_behaviors as $object) {
if (method_exists($object, $name)) {
if (method_exists($object, $name) || $object->hasMethod($name)) {
return call_user_func_array(array($object, $name), $params);
}
}

41
tests/unit/framework/base/BehaviorTest.php

@ -28,6 +28,22 @@ class BarBehavior extends Behavior
{
return 'behavior method';
}
public function __call($name, $params)
{
if ($name == 'magicBehaviorMethod') {
return 'Magic Behavior Method Result!';
}
return parent::__call($name, $params);
}
public function hasMethod($name)
{
if ($name == 'magicBehaviorMethod') {
return true;
}
return parent::hasMethod($name);
}
}
class BehaviorTest extends TestCase
@ -59,4 +75,29 @@ class BehaviorTest extends TestCase
$this->assertEquals('behavior property', $foo->behaviorProperty);
$this->assertEquals('behavior method', $foo->behaviorMethod());
}
public function testMagicMethods()
{
$bar = new BarClass();
$behavior = new BarBehavior();
$this->assertFalse($bar->hasMethod('magicBehaviorMethod'));
$bar->attachBehavior('bar', $behavior);
$this->assertFalse($bar->hasMethod('magicBehaviorMethod', false));
$this->assertTrue($bar->hasMethod('magicBehaviorMethod'));
$this->assertEquals('Magic Behavior Method Result!', $bar->magicBehaviorMethod());
}
public function testCallUnknownMethod()
{
$bar = new BarClass();
$behavior = new BarBehavior();
$this->setExpectedException('yii\base\UnknownMethodException');
$this->assertFalse($bar->hasMethod('nomagicBehaviorMethod'));
$bar->attachBehavior('bar', $behavior);
$bar->nomagicBehaviorMethod();
}
}

Loading…
Cancel
Save