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

Merge pull request #3575 from yiisoft/extensions-autoloading

Browse Source 
Fixes #3542: Removed requirement to specify `extensions` in application config
This commit is contained in:
Alexander Makarov
2014-05-25 20:52:58 +02:00
parent ee2b968b7f d9a3f39941
commit e3ee1b0700
5 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/advanced/common/config/main.php
View File

@@ -1,7 +1,6 @@
<?php <?php
return [ return [
'vendorPath' => dirname(dirname(__DIR__)) . '/vendor', 'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
'extensions' => require(__DIR__ . '/../../vendor/yiisoft/extensions.php'),
'components' => [ 'components' => [
'cache' => [ 'cache' => [
'class' => 'yii\caching\FileCache', 'class' => 'yii\caching\FileCache',

1
apps/basic/config/console.php
View File

@@ -10,7 +10,6 @@ return [
'basePath' => dirname(__DIR__), 'basePath' => dirname(__DIR__),
'bootstrap' => ['log'], 'bootstrap' => ['log'],
'controllerNamespace' => 'app\commands', 'controllerNamespace' => 'app\commands',
'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
'components' => [ 'components' => [
'cache' => [ 'cache' => [
'class' => 'yii\caching\FileCache', 'class' => 'yii\caching\FileCache',

1
apps/basic/config/web.php
View File

@@ -6,7 +6,6 @@ $config = [
'id' => 'basic', 'id' => 'basic',
'basePath' => dirname(__DIR__), 'basePath' => dirname(__DIR__),
'bootstrap' => ['log'], 'bootstrap' => ['log'],
'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
'components' => [ 'components' => [
'cache' => [ 'cache' => [
'class' => 'yii\caching\FileCache', 'class' => 'yii\caching\FileCache',

1
framework/CHANGELOG.md
View File

@@ -56,6 +56,7 @@ Yii Framework 2 Change Log
- Enh #3472: Added configurable option to encode spaces in dropDownLists and listBoxes (kartik-v) - Enh #3472: Added configurable option to encode spaces in dropDownLists and listBoxes (kartik-v)
- Enh #3518: `yii\helpers\Html::encode()` now replaces invalid code sequences with "?" (DaSourcerer) - Enh #3518: `yii\helpers\Html::encode()` now replaces invalid code sequences with "?" (DaSourcerer)
- Enh #3521: Added `yii\filters\HttpCache::sessionCacheLimiter` (qiangxue) - Enh #3521: Added `yii\filters\HttpCache::sessionCacheLimiter` (qiangxue)
- Enh #3542: Removed requirement to specify `extensions` in application config (samdark)
- Enh #3574: Add integrity check support for SQLite (zeeke) - Enh #3574: Add integrity check support for SQLite (zeeke)
- Enh: Added support for using sub-queries when building a DB query with `IN` condition (qiangxue) - Enh: Added support for using sub-queries when building a DB query with `IN` condition (qiangxue)
- Enh: Supported adding a new response formatter without the need to reconfigure existing formatters (qiangxue) - Enh: Supported adding a new response formatter without the need to reconfigure existing formatters (qiangxue)

9
framework/base/Application.php
View File

@@ -151,8 +151,11 @@ abstract class Application extends Module
* The "bootstrap" class listed above will be instantiated during the application * The "bootstrap" class listed above will be instantiated during the application
* [[bootstrap()|bootstrapping process]]. If the class implements [[BootstrapInterface]], * [[bootstrap()|bootstrapping process]]. If the class implements [[BootstrapInterface]],
* its [[BootstrapInterface::bootstrap()|bootstrap()]] method will be also be called. * its [[BootstrapInterface::bootstrap()|bootstrap()]] method will be also be called.
*
* If not set explicitily in the application config, this property will be populated with the contents of
* `@vendor/yiisoft/extensions.php`.
*/ */
public $extensions = []; public $extensions;
/** /**
* @var array list of components that should be run during the application [[bootstrap()|bootstrapping process]]. * @var array list of components that should be run during the application [[bootstrap()|bootstrapping process]].
* *
@@ -262,6 +265,10 @@ abstract class Application extends Module
*/ */
protected function bootstrap() protected function bootstrap()
{ {
if ($this->extensions === null) {
$file = Yii::getAlias('@vendor/yiisoft/extensions.php');
$this->extensions = is_file($file) ? include($file) : [];
}
foreach ($this->extensions as $extension) { foreach ($this->extensions as $extension) {
if (!empty($extension['alias'])) { if (!empty($extension['alias'])) {
foreach ($extension['alias'] as $name => $path) { foreach ($extension['alias'] as $name => $path) {