Moved Composer vendor dir into framework

.gitignore

@@ -13,4 +13,4 @@ nbproject
 Thumbs.db
 
 # composer vendor dir
-vendor
\ No newline at end of file
+/framework/vendor
\ No newline at end of file

composer.json

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

composer.lock

@@ -3,7 +3,7 @@
         "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"
     ],
-    "hash": "8036953eff9eafbdbd4c431929a1d223",
+    "hash": "7d46ce9c4d8d5f4ecae1611ea8f0b49c",
     "packages": [
         {
             "name": "ezyang/htmlpurifier",

framework/helpers/base/Markdown.php

@@ -7,7 +7,7 @@
 
 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;
 
 /**

framework/helpers/base/Purifier.php

@@ -7,7 +7,7 @@
 namespace yii\helpers\base;
 
 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'));
 }
 
 /**