Merge branch 'master' of github.com:yiisoft/yii2

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');
+Yii::importNamespaces(require(__DIR__ . '/../../vendor/composer/autoload_namespaces.php'));
 
 $config = yii\helpers\ArrayHelper::merge(
 	require(__DIR__ . '/../config/main.php'),

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');
+Yii::importNamespaces(require(__DIR__ . '/vendor/composer/autoload_namespaces.php'));
 
 $config = yii\helpers\ArrayHelper::merge(
 	require(__DIR__ . '/console/config/main.php'),

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');
+Yii::importNamespaces(require(__DIR__ . '/../../vendor/composer/autoload_namespaces.php'));
 
 $config = yii\helpers\ArrayHelper::merge(
 	require(__DIR__ . '/../config/main.php'),

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');
+Yii::importNamespaces(require(__DIR__ . '/vendor/composer/autoload_namespaces.php'));
 
 $config = yii\helpers\ArrayHelper::merge(
 	require(__DIR__ . '/console/config/main.php'),

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');
+Yii::importNamespaces(require(__DIR__ . '/../vendor/composer/autoload_namespaces.php'));
 
 $config = require(__DIR__ . '/../config/web-test.php');
 

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');
+Yii::importNamespaces(require(__DIR__ . '/../vendor/composer/autoload_namespaces.php'));
 
 $config = require(__DIR__ . '/../config/web.php');
 

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');
+Yii::importNamespaces(require(__DIR__ . '/vendor/composer/autoload_namespaces.php'));
 
 $config = require(__DIR__ . '/config/console.php');
 

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