php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-18 07:20:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed the support for calling anonymous function returned as a property value.

Browse Source
This commit is contained in:
Qiang Xue
2013-09-12 20:10:06 -04:00
parent a2b946e4d3
commit 91b6e2945a
3 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
framework/yii/base/Component.php
View File

@@ -179,9 +179,8 @@ class Component extends Object
/** /**
* Calls the named method which is not a class method. * Calls the named method which is not a class method.
* If the name refers to a component property whose value is *
* an anonymous function, the method will execute the function. * This method will check if any attached behavior has
* Otherwise, it will check if any attached behavior has
* the named method and will execute it if available. * the named method and will execute it if available.
* *
* Do not call this method directly as it is a PHP magic method that * Do not call this method directly as it is a PHP magic method that
@@ -193,13 +192,6 @@ class Component extends Object
*/ */
public function __call($name, $params) public function __call($name, $params)
{ {
if ($this->canGetProperty($name)) {
$func = $this->$name;
if ($func instanceof \Closure) {
return call_user_func_array($func, $params);
}
}
$this->ensureBehaviors(); $this->ensureBehaviors();
foreach ($this->_behaviors as $object) { foreach ($this->_behaviors as $object) {
if ($object->hasMethod($name)) { if ($object->hasMethod($name)) {

8
framework/yii/base/Object.php
View File

@@ -143,8 +143,6 @@ class Object implements Arrayable
/** /**
* Calls the named method which is not a class method. * Calls the named method which is not a class method.
* If the name refers to a component property whose value is
* an anonymous function, the method will execute the function.
* *
* Do not call this method directly as it is a PHP magic method that * Do not call this method directly as it is a PHP magic method that
* will be implicitly called when an unknown method is being invoked. * will be implicitly called when an unknown method is being invoked.
@@ -155,12 +153,6 @@ class Object implements Arrayable
*/ */
public function __call($name, $params) public function __call($name, $params)
{ {
if ($this->canGetProperty($name)) {
$func = $this->$name;
if ($func instanceof \Closure) {
return call_user_func_array($func, $params);
}
}
throw new UnknownMethodException('Unknown method: ' . get_class($this) . "::$name()"); throw new UnknownMethodException('Unknown method: ' . get_class($this) . "::$name()");
} }

5
tests/unit/framework/base/ObjectTest.php
View File

@@ -134,11 +134,6 @@ class ObjectTest extends TestCase
$this->assertEquals('new text', $this->object->object->text); $this->assertEquals('new text', $this->object->object->text);
} }
public function testAnonymousFunctionProperty()
{
$this->assertEquals(2, $this->object->execute(1));
}
public function testConstruct() public function testConstruct()
{ {
$object = new NewObject(array('text' => 'test text')); $object = new NewObject(array('text' => 'test text'));