Fixed yii autoload precedence.

apps/advanced/environments/dev/backend/web/index.php

@@ -2,8 +2,8 @@
 // comment out the following line to disable debug mode
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
-require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php');
 require(__DIR__ . '/../../vendor/autoload.php');
+require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php');
 
 $config = yii\helpers\ArrayHelper::merge(
 	require(__DIR__ . '/../config/main.php'),

apps/advanced/environments/dev/frontend/web/index.php

@@ -3,8 +3,8 @@
 // comment out the following line to disable debug mode
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
-require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php');
 require(__DIR__ . '/../../vendor/autoload.php');
+require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php');
 Yii::importNamespaces(require(__DIR__ . '/../../vendor/composer/autoload_namespaces.php'));
 
 $config = yii\helpers\ArrayHelper::merge(

apps/advanced/environments/dev/yii

@@ -13,8 +13,8 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
 // fcgi doesn't have STDIN defined by default
 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/yiisoft/yii2/yii/Yii.php');
 Yii::importNamespaces(require(__DIR__ . '/vendor/composer/autoload_namespaces.php'));
 
 $config = yii\helpers\ArrayHelper::merge(

apps/advanced/environments/prod/backend/web/index.php

@@ -2,8 +2,8 @@
 // comment out the following line to disable debug mode
 defined('YII_DEBUG') or define('YII_DEBUG', false);
 
-require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php');
 require(__DIR__ . '/../../vendor/autoload.php');
+require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php');
 
 $config = yii\helpers\ArrayHelper::merge(
 	require(__DIR__ . '/../config/main.php'),

apps/advanced/environments/prod/frontend/web/index.php

@@ -3,8 +3,8 @@
 // comment out the following line to disable debug mode
 defined('YII_DEBUG') or define('YII_DEBUG', false);
 
-require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php');
 require(__DIR__ . '/../../vendor/autoload.php');
+require(__DIR__ . '/../../vendor/yiisoft/yii2/yii/Yii.php');
 Yii::importNamespaces(require(__DIR__ . '/../../vendor/composer/autoload_namespaces.php'));
 
 $config = yii\helpers\ArrayHelper::merge(

apps/advanced/environments/prod/yii

@@ -13,8 +13,8 @@ defined('YII_DEBUG') or define('YII_DEBUG', false);
 // fcgi doesn't have STDIN defined by default
 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/yiisoft/yii2/yii/Yii.php');
 Yii::importNamespaces(require(__DIR__ . '/vendor/composer/autoload_namespaces.php'));
 
 $config = yii\helpers\ArrayHelper::merge(

apps/basic/web/index-test.php

@@ -8,8 +8,8 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 defined('YII_ENV') or define('YII_ENV', 'test');
 
-require_once(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
 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');

apps/basic/web/index.php

@@ -4,8 +4,8 @@
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or define('YII_ENV', 'dev');
 
-require(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
 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');

apps/basic/yii

@@ -13,8 +13,8 @@ defined('YII_DEBUG') or define('YII_DEBUG', true);
 // fcgi doesn't have STDIN defined by default
 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/yiisoft/yii2/yii/Yii.php');
 Yii::importNamespaces(require(__DIR__ . '/vendor/composer/autoload_namespaces.php'));
 
 $config = require(__DIR__ . '/config/console.php');

framework/yii/Yii.php

@@ -22,5 +22,5 @@ class Yii extends \yii\YiiBase
 {
 }
 
-spl_autoload_register(array('Yii', 'autoload'));
+spl_autoload_register(array('Yii', 'autoload'), true, true);
 Yii::$classMap = include(__DIR__ . '/classes.php');