From d29ea5a1103fba1c1dda3dadf0af9e9fa0566671 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Fri, 12 Jul 2013 07:31:54 -0400 Subject: [PATCH 1/2] import namespaces. --- apps/advanced/environments/dev/frontend/www/index.php | 1 + apps/advanced/environments/dev/yii | 1 + apps/advanced/environments/prod/frontend/www/index.php | 1 + apps/advanced/environments/prod/yii | 1 + apps/basic/www/index-test.php | 1 + apps/basic/www/index.php | 1 + apps/basic/yii | 1 + framework/yii/YiiBase.php | 1 - 8 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/advanced/environments/dev/frontend/www/index.php b/apps/advanced/environments/dev/frontend/www/index.php index 9a2ffaa..f7d974c 100644 --- a/apps/advanced/environments/dev/frontend/www/index.php +++ b/apps/advanced/environments/dev/frontend/www/index.php @@ -5,6 +5,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', true); require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php'); require(__DIR__ . '/../../vendor/autoload.php'); +require(__DIR__ . '/../../vendor/composer/autoload_namespaces.php'); $config = yii\helpers\ArrayHelper::merge( require(__DIR__ . '/../config/main.php'), diff --git a/apps/advanced/environments/dev/yii b/apps/advanced/environments/dev/yii index b81fc10..fce2955 100644 --- a/apps/advanced/environments/dev/yii +++ b/apps/advanced/environments/dev/yii @@ -15,6 +15,7 @@ defined('STDIN') or define('STDIN', fopen('php://stdin', 'r')); require(__DIR__ . '/vendor/yiisoft/yii2/yii/Yii.php'); require(__DIR__ . '/vendor/autoload.php'); +require(__DIR__ . '/vendor/composer/autoload_namespaces.php'); $config = yii\helpers\ArrayHelper::merge( require(__DIR__ . '/console/config/main.php'), diff --git a/apps/advanced/environments/prod/frontend/www/index.php b/apps/advanced/environments/prod/frontend/www/index.php index e797bf0..640d581 100644 --- a/apps/advanced/environments/prod/frontend/www/index.php +++ b/apps/advanced/environments/prod/frontend/www/index.php @@ -5,6 +5,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', false); require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php'); require(__DIR__ . '/../../vendor/autoload.php'); +require(__DIR__ . '/../../vendor/composer/autoload_namespaces.php'); $config = yii\helpers\ArrayHelper::merge( require(__DIR__ . '/../config/main.php'), diff --git a/apps/advanced/environments/prod/yii b/apps/advanced/environments/prod/yii index 0d4ebe2..0115b33 100644 --- a/apps/advanced/environments/prod/yii +++ b/apps/advanced/environments/prod/yii @@ -15,6 +15,7 @@ defined('STDIN') or define('STDIN', fopen('php://stdin', 'r')); require(__DIR__ . '/vendor/yiisoft/yii2/yii/Yii.php'); require(__DIR__ . '/vendor/autoload.php'); +require(__DIR__ . '/vendor/composer/autoload_namespaces.php'); $config = yii\helpers\ArrayHelper::merge( require(__DIR__ . '/console/config/main.php'), diff --git a/apps/basic/www/index-test.php b/apps/basic/www/index-test.php index 4a00b37..c744dc7 100644 --- a/apps/basic/www/index-test.php +++ b/apps/basic/www/index-test.php @@ -10,6 +10,7 @@ defined('YII_ENV') or define('YII_ENV', 'test'); require_once(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php'); require_once(__DIR__ . '/../vendor/autoload.php'); +require(__DIR__ . '/../vendor/composer/autoload_namespaces.php'); $config = require(__DIR__ . '/../config/web-test.php'); diff --git a/apps/basic/www/index.php b/apps/basic/www/index.php index 9bc1565..fc78e6b 100644 --- a/apps/basic/www/index.php +++ b/apps/basic/www/index.php @@ -6,6 +6,7 @@ defined('YII_ENV') or define('YII_ENV', 'dev'); require(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php'); require(__DIR__ . '/../vendor/autoload.php'); +require(__DIR__ . '/../vendor/composer/autoload_namespaces.php'); $config = require(__DIR__ . '/../config/web.php'); diff --git a/apps/basic/yii b/apps/basic/yii index c874ce0..5762bb7 100755 --- a/apps/basic/yii +++ b/apps/basic/yii @@ -15,6 +15,7 @@ defined('STDIN') or define('STDIN', fopen('php://stdin', 'r')); require(__DIR__ . '/vendor/yiisoft/yii2/yii/Yii.php'); require(__DIR__ . '/vendor/autoload.php'); +require(__DIR__ . '/vendor/composer/autoload_namespaces.php'); $config = require(__DIR__ . '/config/console.php'); diff --git a/framework/yii/YiiBase.php b/framework/yii/YiiBase.php index 6384023..c43e856 100644 --- a/framework/yii/YiiBase.php +++ b/framework/yii/YiiBase.php @@ -93,7 +93,6 @@ class YiiBase public static $objectConfig = array(); private static $_imported = array(); // alias => class name or directory - private static $_logger; /** * @return string the version of Yii framework From 2d8da01c988fe7817fa20a2ea26b284272317036 Mon Sep 17 00:00:00 2001 From: Qiang Xue Date: Fri, 12 Jul 2013 07:36:00 -0400 Subject: [PATCH 2/2] import namespaces. --- apps/advanced/environments/dev/frontend/www/index.php | 2 +- apps/advanced/environments/dev/yii | 2 +- apps/advanced/environments/prod/frontend/www/index.php | 2 +- apps/advanced/environments/prod/yii | 2 +- apps/basic/www/index-test.php | 2 +- apps/basic/www/index.php | 2 +- apps/basic/yii | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/advanced/environments/dev/frontend/www/index.php b/apps/advanced/environments/dev/frontend/www/index.php index f7d974c..b1fc4c2 100644 --- a/apps/advanced/environments/dev/frontend/www/index.php +++ b/apps/advanced/environments/dev/frontend/www/index.php @@ -5,7 +5,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', true); require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php'); require(__DIR__ . '/../../vendor/autoload.php'); -require(__DIR__ . '/../../vendor/composer/autoload_namespaces.php'); +Yii::importNamespaces(require(__DIR__ . '/../../vendor/composer/autoload_namespaces.php')); $config = yii\helpers\ArrayHelper::merge( require(__DIR__ . '/../config/main.php'), diff --git a/apps/advanced/environments/dev/yii b/apps/advanced/environments/dev/yii index fce2955..b2c9288 100644 --- a/apps/advanced/environments/dev/yii +++ b/apps/advanced/environments/dev/yii @@ -15,7 +15,7 @@ defined('STDIN') or define('STDIN', fopen('php://stdin', 'r')); require(__DIR__ . '/vendor/yiisoft/yii2/yii/Yii.php'); require(__DIR__ . '/vendor/autoload.php'); -require(__DIR__ . '/vendor/composer/autoload_namespaces.php'); +Yii::importNamespaces(require(__DIR__ . '/vendor/composer/autoload_namespaces.php')); $config = yii\helpers\ArrayHelper::merge( require(__DIR__ . '/console/config/main.php'), diff --git a/apps/advanced/environments/prod/frontend/www/index.php b/apps/advanced/environments/prod/frontend/www/index.php index 640d581..b21ce0a 100644 --- a/apps/advanced/environments/prod/frontend/www/index.php +++ b/apps/advanced/environments/prod/frontend/www/index.php @@ -5,7 +5,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', false); require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php'); require(__DIR__ . '/../../vendor/autoload.php'); -require(__DIR__ . '/../../vendor/composer/autoload_namespaces.php'); +Yii::importNamespaces(require(__DIR__ . '/../../vendor/composer/autoload_namespaces.php')); $config = yii\helpers\ArrayHelper::merge( require(__DIR__ . '/../config/main.php'), diff --git a/apps/advanced/environments/prod/yii b/apps/advanced/environments/prod/yii index 0115b33..9ce1630 100644 --- a/apps/advanced/environments/prod/yii +++ b/apps/advanced/environments/prod/yii @@ -15,7 +15,7 @@ defined('STDIN') or define('STDIN', fopen('php://stdin', 'r')); require(__DIR__ . '/vendor/yiisoft/yii2/yii/Yii.php'); require(__DIR__ . '/vendor/autoload.php'); -require(__DIR__ . '/vendor/composer/autoload_namespaces.php'); +Yii::importNamespaces(require(__DIR__ . '/vendor/composer/autoload_namespaces.php')); $config = yii\helpers\ArrayHelper::merge( require(__DIR__ . '/console/config/main.php'), diff --git a/apps/basic/www/index-test.php b/apps/basic/www/index-test.php index c744dc7..80d0953 100644 --- a/apps/basic/www/index-test.php +++ b/apps/basic/www/index-test.php @@ -10,7 +10,7 @@ defined('YII_ENV') or define('YII_ENV', 'test'); require_once(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php'); require_once(__DIR__ . '/../vendor/autoload.php'); -require(__DIR__ . '/../vendor/composer/autoload_namespaces.php'); +Yii::importNamespaces(require(__DIR__ . '/../vendor/composer/autoload_namespaces.php')); $config = require(__DIR__ . '/../config/web-test.php'); diff --git a/apps/basic/www/index.php b/apps/basic/www/index.php index fc78e6b..fb66386 100644 --- a/apps/basic/www/index.php +++ b/apps/basic/www/index.php @@ -6,7 +6,7 @@ defined('YII_ENV') or define('YII_ENV', 'dev'); require(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php'); require(__DIR__ . '/../vendor/autoload.php'); -require(__DIR__ . '/../vendor/composer/autoload_namespaces.php'); +Yii::importNamespaces(require(__DIR__ . '/../vendor/composer/autoload_namespaces.php')); $config = require(__DIR__ . '/../config/web.php'); diff --git a/apps/basic/yii b/apps/basic/yii index 5762bb7..73968c1 100755 --- a/apps/basic/yii +++ b/apps/basic/yii @@ -15,7 +15,7 @@ defined('STDIN') or define('STDIN', fopen('php://stdin', 'r')); require(__DIR__ . '/vendor/yiisoft/yii2/yii/Yii.php'); require(__DIR__ . '/vendor/autoload.php'); -require(__DIR__ . '/vendor/composer/autoload_namespaces.php'); +Yii::importNamespaces(require(__DIR__ . '/vendor/composer/autoload_namespaces.php')); $config = require(__DIR__ . '/config/console.php');