php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-04 14:46:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Moved Composer vendor dir into framework

Browse Source
This commit is contained in:
Alexander Makarov
2013-05-08 01:30:08 +04:00
parent f2258e760f
commit 92ec41cc7b
5 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -13,4 +13,4 @@ nbproject
Thumbs.db Thumbs.db
# composer vendor dir # composer vendor dir
vendor /framework/vendor

3
composer.json
View File

@ -63,6 +63,9 @@
"irc": "irc://irc.freenode.net/yii", "irc": "irc://irc.freenode.net/yii",
"source": "https://github.com/yiisoft/yii2" "source": "https://github.com/yiisoft/yii2"
}, },
"config": {
"vendor-dir": "framework/vendor"
},
"bin": [ "bin": [
"framework/yiic" "framework/yiic"
], ],

2
composer.lock generated
View File

@ -3,7 +3,7 @@
"This file locks the dependencies of your project to a known state", "This file locks the dependencies of your project to a known state",
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file" "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file"
], ],
"hash": "8036953eff9eafbdbd4c431929a1d223", "hash": "7d46ce9c4d8d5f4ecae1611ea8f0b49c",
"packages": [ "packages": [
{ {
"name": "ezyang/htmlpurifier", "name": "ezyang/htmlpurifier",

2
framework/helpers/base/Markdown.php
View File

@ -7,7 +7,7 @@
namespace yii\helpers\base; namespace yii\helpers\base;
\Yii::setAlias('@Michelf', \Yii::getAlias('@yii').'/../vendor/michelf/php-markdown/Michelf'); \Yii::setAlias('@Michelf', \Yii::getAlias('@yii/vendor/michelf/php-markdown/Michelf'));
use Michelf\MarkdownExtra; use Michelf\MarkdownExtra;
/** /**

2
framework/helpers/base/Purifier.php
View File

@ -7,7 +7,7 @@
namespace yii\helpers\base; namespace yii\helpers\base;
if (!class_exists('HTMLPurifier_Bootstrap', false)) { if (!class_exists('HTMLPurifier_Bootstrap', false)) {
require_once(\Yii::getAlias('@yii').'/../vendor/ezyang/htmlpurifier/library'.DIRECTORY_SEPARATOR.'HTMLPurifier.auto.php'); require_once(\Yii::getAlias('@yii/vendor/ezyang/htmlpurifier/library/HTMLPurifier.auto.php'));
} }
/** /**