Commit c364e266 by Carsten Brandt

Merge pull request #836 from cebe/component-has-method

Added hasMethod() to Component and Object class
parents f83fcc55 15a3ec27
......@@ -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);
}
}
......@@ -299,6 +299,32 @@ class Component extends Object
}
/**
* Returns a value indicating whether a method is defined.
* A method is defined if:
*
* - the class has a method with the specified name
* - an attached behavior has a method with the given name (when `$checkBehaviors` is true).
*
* @param string $name the property name
* @param boolean $checkBehaviors whether to treat behaviors' methods as methods of this component
* @return boolean whether the property is defined
*/
public function hasMethod($name, $checkBehaviors = true)
{
if (method_exists($this, $name)) {
return true;
} elseif ($checkBehaviors) {
$this->ensureBehaviors();
foreach ($this->_behaviors as $behavior) {
if ($behavior->hasMethod($name)) {
return true;
}
}
}
return false;
}
/**
* Returns a list of behaviors that this component should behave as.
*
* Child classes may override this method to specify the behaviors they want to behave as.
......
......@@ -220,6 +220,19 @@ class Object implements Arrayable
}
/**
* Returns a value indicating whether a method is defined.
*
* The default implementation is a call to php function `method_exists()`.
* You may override this method when you implemented the php magic method `__call()`.
* @param string $name the property name
* @return boolean whether the property is defined
*/
public function hasMethod($name)
{
return method_exists($this, $name);
}
/**
* Converts the object into an array.
* The default implementation will return all public property values as an array.
* @return array the array representation of the object
......
......@@ -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();
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment