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

Merge pull request #696 from creocoder/ar-getnamespacedclass-static

Browse Source 
Make ActiveRecord::getNamespacedClass() static
This commit is contained in:
Alexander Makarov
2013-07-31 13:27:49 -07:00
parent 92d3c98cde 02581c59e7
commit 445854171b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/yii/db/ActiveRecord.php
View File

@@ -440,7 +440,7 @@ class ActiveRecord extends Model
public function hasOne($class, $link) public function hasOne($class, $link)
{ {
return new ActiveRelation(array( return new ActiveRelation(array(
'modelClass' => $this->getNamespacedClass($class), 'modelClass' => static::getNamespacedClass($class),
'primaryModel' => $this, 'primaryModel' => $this,
'link' => $link, 'link' => $link,
'multiple' => false, 'multiple' => false,
@@ -478,7 +478,7 @@ class ActiveRecord extends Model
public function hasMany($class, $link) public function hasMany($class, $link)
{ {
return new ActiveRelation(array( return new ActiveRelation(array(
'modelClass' => $this->getNamespacedClass($class), 'modelClass' => static::getNamespacedClass($class),
'primaryModel' => $this, 'primaryModel' => $this,
'link' => $link, 'link' => $link,
'multiple' => true, 'multiple' => true,
@@ -1400,10 +1400,10 @@ class ActiveRecord extends Model
* @param string $class the class name to be namespaced * @param string $class the class name to be namespaced
* @return string the namespaced class name * @return string the namespaced class name
*/ */
protected function getNamespacedClass($class) protected static function getNamespacedClass($class)
{ {
if (strpos($class, '\\') === false) { if (strpos($class, '\\') === false) {
$reflector = new \ReflectionClass($this); $reflector = new \ReflectionClass(static::className());
return $reflector->getNamespaceName() . '\\' . $class; return $reflector->getNamespaceName() . '\\' . $class;
} else { } else {
return $class; return $class;