From 130449e2befff3f6d388fa99b798a8483de5505d Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 22 Oct 2013 21:18:41 -0400
Subject: [PATCH] adjusted basic app to use the new yii extension installer.

---
 config/console.php | 3 +--
 config/web.php     | 1 +
 web/index-test.php | 1 -
 web/index.php      | 1 -
 yii                | 1 -
 5 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/config/console.php b/config/console.php
index cc1cdb8..598316f 100644
--- a/config/console.php
+++ b/config/console.php
@@ -6,8 +6,7 @@ return [
 	'preload' => ['log'],
 	'controllerPath' => dirname(__DIR__) . '/commands',
 	'controllerNamespace' => 'app\commands',
-	'modules' => [
-	],
+	'extensions' => require(__DIR__ . '/../vendor/yii-extensions.php'),
 	'components' => [
 		'cache' => [
 			'class' => 'yii\caching\FileCache',
diff --git a/config/web.php b/config/web.php
index 6e4d2a1..e27754f 100644
--- a/config/web.php
+++ b/config/web.php
@@ -3,6 +3,7 @@ $params = require(__DIR__ . '/params.php');
 $config = [
 	'id' => 'bootstrap',
 	'basePath' => dirname(__DIR__),
+	'extensions' => require(__DIR__ . '/../vendor/yii-extensions.php'),
 	'components' => [
 		'request' => [
 			'enableCsrfValidation' => true,
diff --git a/web/index-test.php b/web/index-test.php
index c9bd338..1593164 100644
--- a/web/index-test.php
+++ b/web/index-test.php
@@ -10,7 +10,6 @@ defined('YII_ENV') or define('YII_ENV', 'test');
 
 require_once(__DIR__ . '/../vendor/autoload.php');
 require_once(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
-Yii::importNamespaces(require(__DIR__ . '/../vendor/composer/autoload_namespaces.php'));
 
 $config = require(__DIR__ . '/../config/web-test.php');
 
diff --git a/web/index.php b/web/index.php
index 51673d3..e9eeb33 100644
--- a/web/index.php
+++ b/web/index.php
@@ -6,7 +6,6 @@ defined('YII_ENV') or define('YII_ENV', 'dev');
 
 require(__DIR__ . '/../vendor/autoload.php');
 require(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
-Yii::importNamespaces(require(__DIR__ . '/../vendor/composer/autoload_namespaces.php'));
 
 $config = require(__DIR__ . '/../config/web.php');
 
diff --git a/yii b/yii
index cd979ca..9188f85 100755
--- a/yii
+++ b/yii
@@ -15,7 +15,6 @@ defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
 
 require(__DIR__ . '/vendor/autoload.php');
 require(__DIR__ . '/vendor/yiisoft/yii2/yii/Yii.php');
-Yii::importNamespaces(require(__DIR__ . '/vendor/composer/autoload_namespaces.php'));
 
 $config = require(__DIR__ . '/config/console.php');