php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-14 22:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improved behavior support, fixes #2550

Browse Source 
call hasMethod() instead of using method_exists
This commit is contained in:
Carsten Brandt
2014-02-26 14:18:24 +01:00
parent 6f9e9cd5b0
commit 33d6acba25
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/base/Formatter.php
View File

@ -121,7 +121,7 @@ class Formatter extends Component
$params = [$value]; $params = [$value];
} }
$method = 'as' . $format; $method = 'as' . $format;
if (method_exists($this, $method)) { if ($this->hasMethod($method)) {
return call_user_func_array([$this, $method], $params); return call_user_func_array([$this, $method], $params);
} else { } else {
throw new InvalidParamException("Unknown type: $format"); throw new InvalidParamException("Unknown type: $format");

4
framework/db/ActiveRelationTrait.php
View File

@ -136,13 +136,13 @@ trait ActiveRelationTrait
* Finds the related records for the specified primary record. * Finds the related records for the specified primary record.
* This method is invoked when a relation of an ActiveRecord is being accessed in a lazy fashion. * This method is invoked when a relation of an ActiveRecord is being accessed in a lazy fashion.
* @param string $name the relation name * @param string $name the relation name
* @param ActiveRecordInterface $model the primary model * @param ActiveRecordInterface|BaseActiveRecord $model the primary model
* @return mixed the related record(s) * @return mixed the related record(s)
* @throws InvalidParamException if the relation is invalid * @throws InvalidParamException if the relation is invalid
*/ */
public function findFor($name, $model) public function findFor($name, $model)
{ {
if (method_exists($model, 'get' . $name)) { if ($model->hasMethod('get' . $name)) {
$method = new \ReflectionMethod($model, 'get' . $name); $method = new \ReflectionMethod($model, 'get' . $name);
$realName = lcfirst(substr($method->getName(), 3)); $realName = lcfirst(substr($method->getName(), 3));
if ($realName !== $name) { if ($realName !== $name) {

2
framework/validators/Validator.php
View File

@ -136,7 +136,7 @@ class Validator extends Component
{ {
$params['attributes'] = $attributes; $params['attributes'] = $attributes;
if ($type instanceof \Closure || method_exists($object, $type)) { if ($type instanceof \Closure || $object->hasMethod($type)) {
// method-based validator // method-based validator
$params['class'] = __NAMESPACE__ . '\InlineValidator'; $params['class'] = __NAMESPACE__ . '\InlineValidator';
$params['method'] = $type; $params['method'] = $type;