Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
Y
yii2
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
PSDI Army
yii2
Commits
44585417
Commit
44585417
authored
Jul 31, 2013
by
Alexander Makarov
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #696 from creocoder/ar-getnamespacedclass-static
Make ActiveRecord::getNamespacedClass() static
parents
92d3c98c
02581c59
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
ActiveRecord.php
framework/yii/db/ActiveRecord.php
+4
-4
No files found.
framework/yii/db/ActiveRecord.php
View file @
44585417
...
@@ -440,7 +440,7 @@ class ActiveRecord extends Model
...
@@ -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
...
@@ -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
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment