Commit 942370f8 by Qiang Xue

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

parents b6575aa0 954b0b5f
...@@ -12,7 +12,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', false); ...@@ -12,7 +12,7 @@ defined('YII_DEBUG') or define('YII_DEBUG', false);
$composerAutoload = [ $composerAutoload = [
__DIR__ . '/vendor/autoload.php', // standalone with "composer install" run __DIR__ . '/vendor/autoload.php', // standalone with "composer install" run
__DIR__ . '/../autoload.php', // script is installed as a composer binary __DIR__ . '/../../autoload.php', // script is installed as a composer binary
]; ];
foreach($composerAutoload as $autoload) { foreach($composerAutoload as $autoload) {
if (file_exists($autoload)) { if (file_exists($autoload)) {
...@@ -23,7 +23,7 @@ foreach($composerAutoload as $autoload) { ...@@ -23,7 +23,7 @@ foreach($composerAutoload as $autoload) {
$yiiDirs = [ $yiiDirs = [
__DIR__ . '/../../framework', // in yii2-dev repo __DIR__ . '/../../framework', // in yii2-dev repo
__DIR__ . '/vendor/yiisoft/yii2', // standalone with "composer install" run __DIR__ . '/vendor/yiisoft/yii2', // standalone with "composer install" run
__DIR__ . '/../yiisoft/yii2', // script is installed as a composer binary __DIR__ . '/../../yiisoft/yii2', // script is installed as a composer binary
]; ];
foreach($yiiDirs as $dir) { foreach($yiiDirs as $dir) {
if (file_exists($dir . '/Yii.php')) { if (file_exists($dir . '/Yii.php')) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment