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
9434cc8f
Commit
9434cc8f
authored
Oct 19, 2013
by
Alexander Makarov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved Application::$controllerNamespace init into variable declaration,…
Moved Application::$controllerNamespace init into variable declaration, reordered Module::__construct.
parent
61352a44
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
Application.php
framework/yii/base/Application.php
+7
-4
Module.php
framework/yii/base/Module.php
+1
-2
No files found.
framework/yii/base/Application.php
View file @
9434cc8f
...
@@ -54,6 +54,13 @@ abstract class Application extends Module
...
@@ -54,6 +54,13 @@ abstract class Application extends Module
* @event ActionEvent an event raised after executing a controller action.
* @event ActionEvent an event raised after executing a controller action.
*/
*/
const
EVENT_AFTER_ACTION
=
'afterAction'
;
const
EVENT_AFTER_ACTION
=
'afterAction'
;
/**
* @var string the namespace that controller classes are in. If not set,
* it will use the "app\controllers" namespace.
*/
public
$controllerNamespace
=
'app\\controllers'
;
/**
/**
* @var string the application name.
* @var string the application name.
*/
*/
...
@@ -140,10 +147,6 @@ abstract class Application extends Module
...
@@ -140,10 +147,6 @@ abstract class Application extends Module
$this
->
registerCoreComponents
();
$this
->
registerCoreComponents
();
Component
::
__construct
(
$config
);
Component
::
__construct
(
$config
);
if
(
$this
->
controllerNamespace
===
null
)
{
$this
->
controllerNamespace
=
'app\\controllers'
;
}
}
}
/**
/**
...
...
framework/yii/base/Module.php
View file @
9434cc8f
...
@@ -83,7 +83,6 @@ abstract class Module extends Component
...
@@ -83,7 +83,6 @@ abstract class Module extends Component
* it will use the "controllers" sub-namespace under the namespace of this module.
* it will use the "controllers" sub-namespace under the namespace of this module.
* For example, if the namespace of this module is "foo\bar", then the default
* For example, if the namespace of this module is "foo\bar", then the default
* controller namespace would be "foo\bar\controllers".
* controller namespace would be "foo\bar\controllers".
* If the module is an application, it will default to "app\controllers".
*/
*/
public
$controllerNamespace
;
public
$controllerNamespace
;
/**
/**
...
@@ -127,9 +126,9 @@ abstract class Module extends Component
...
@@ -127,9 +126,9 @@ abstract class Module extends Component
*/
*/
public
function
__construct
(
$id
,
$parent
=
null
,
$config
=
[])
public
function
__construct
(
$id
,
$parent
=
null
,
$config
=
[])
{
{
parent
::
__construct
(
$config
);
$this
->
id
=
$id
;
$this
->
id
=
$id
;
$this
->
module
=
$parent
;
$this
->
module
=
$parent
;
parent
::
__construct
(
$config
);
if
(
$this
->
controllerNamespace
===
null
)
{
if
(
$this
->
controllerNamespace
===
null
)
{
$class
=
get_class
(
$this
);
$class
=
get_class
(
$this
);
if
((
$pos
=
strrpos
(
$class
,
'\\'
))
!==
false
)
{
if
((
$pos
=
strrpos
(
$class
,
'\\'
))
!==
false
)
{
...
...
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