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
b9b4555d
Commit
b9b4555d
authored
Mar 27, 2014
by
Qiang Xue
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move assetManager to base application.
parent
d44e42ab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
Application.php
framework/base/Application.php
+11
-1
Application.php
framework/web/Application.php
+0
-10
No files found.
framework/base/Application.php
View file @
b9b4555d
...
@@ -506,6 +506,15 @@ abstract class Application extends Module
...
@@ -506,6 +506,15 @@ abstract class Application extends Module
}
}
/**
/**
* Returns the asset manager.
* @return \yii\web\AssetManager the asset manager component
*/
public
function
getAssetManager
()
{
return
$this
->
get
(
'assetManager'
);
}
/**
* Returns the core application components.
* Returns the core application components.
* @see set
* @see set
*/
*/
...
@@ -514,11 +523,12 @@ abstract class Application extends Module
...
@@ -514,11 +523,12 @@ abstract class Application extends Module
return
[
return
[
'log'
=>
[
'class'
=>
'yii\log\Dispatcher'
],
'log'
=>
[
'class'
=>
'yii\log\Dispatcher'
],
'errorHandler'
=>
[
'class'
=>
'yii\base\ErrorHandler'
],
'errorHandler'
=>
[
'class'
=>
'yii\base\ErrorHandler'
],
'view'
=>
[
'class'
=>
'yii\web\View'
],
'formatter'
=>
[
'class'
=>
'yii\base\Formatter'
],
'formatter'
=>
[
'class'
=>
'yii\base\Formatter'
],
'i18n'
=>
[
'class'
=>
'yii\i18n\I18N'
],
'i18n'
=>
[
'class'
=>
'yii\i18n\I18N'
],
'mail'
=>
[
'class'
=>
'yii\swiftmailer\Mailer'
],
'mail'
=>
[
'class'
=>
'yii\swiftmailer\Mailer'
],
'urlManager'
=>
[
'class'
=>
'yii\web\UrlManager'
],
'urlManager'
=>
[
'class'
=>
'yii\web\UrlManager'
],
'
view'
=>
[
'class'
=>
'yii\web\View
'
],
'
assetManager'
=>
[
'class'
=>
'yii\web\AssetManager
'
],
];
];
}
}
...
...
framework/web/Application.php
View file @
b9b4555d
...
@@ -160,15 +160,6 @@ class Application extends \yii\base\Application
...
@@ -160,15 +160,6 @@ class Application extends \yii\base\Application
}
}
/**
/**
* Returns the asset manager.
* @return AssetManager the asset manager component
*/
public
function
getAssetManager
()
{
return
$this
->
get
(
'assetManager'
);
}
/**
* @inheritdoc
* @inheritdoc
*/
*/
public
function
coreComponents
()
public
function
coreComponents
()
...
@@ -178,7 +169,6 @@ class Application extends \yii\base\Application
...
@@ -178,7 +169,6 @@ class Application extends \yii\base\Application
'response'
=>
[
'class'
=>
'yii\web\Response'
],
'response'
=>
[
'class'
=>
'yii\web\Response'
],
'session'
=>
[
'class'
=>
'yii\web\Session'
],
'session'
=>
[
'class'
=>
'yii\web\Session'
],
'user'
=>
[
'class'
=>
'yii\web\User'
],
'user'
=>
[
'class'
=>
'yii\web\User'
],
'assetManager'
=>
[
'class'
=>
'yii\web\AssetManager'
],
],
parent
::
coreComponents
());
],
parent
::
coreComponents
());
}
}
}
}
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