From a6c251d2ab6d222b5318cc7fa21eb3791a296c62 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Mon, 27 May 2013 00:21:18 +0200
Subject: [PATCH] Adjusted vendor dirs of example applications

- update composer json to chosse right path
- set vendorPath in application config if not default
---
 apps/advanced/backstage/config/main.php | 1 +
 apps/advanced/console/config/main.php   | 1 +
 apps/advanced/frontend/config/main.php  | 1 +
 apps/benchmark/.gitignore               | 1 +
 apps/benchmark/composer.json            | 3 +++
 framework/yii/base/Application.php      | 3 ++-
 6 files changed, 9 insertions(+), 1 deletion(-)
 create mode 100644 apps/benchmark/.gitignore

diff --git a/apps/advanced/backstage/config/main.php b/apps/advanced/backstage/config/main.php
index d3288bd..4898bfd 100644
--- a/apps/advanced/backstage/config/main.php
+++ b/apps/advanced/backstage/config/main.php
@@ -11,6 +11,7 @@ $params = array_merge(
 return array(
 	'id' => 'change-me',
 	'basePath' => dirname(__DIR__),
+	'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
 	'preload' => array('log'),
 	'controllerNamespace' => 'backstage\controllers',
 	'modules' => array(
diff --git a/apps/advanced/console/config/main.php b/apps/advanced/console/config/main.php
index 83cb2e3..cceb311 100644
--- a/apps/advanced/console/config/main.php
+++ b/apps/advanced/console/config/main.php
@@ -11,6 +11,7 @@ $params = array_merge(
 return array(
 	'id' => 'change-me',
 	'basePath' => dirname(__DIR__),
+	'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
 	'preload' => array('log'),
 	'controllerNamespace' => 'console\controllers',
 	'modules' => array(
diff --git a/apps/advanced/frontend/config/main.php b/apps/advanced/frontend/config/main.php
index 607c9a9..02a66c9 100644
--- a/apps/advanced/frontend/config/main.php
+++ b/apps/advanced/frontend/config/main.php
@@ -11,6 +11,7 @@ $params = array_merge(
 return array(
 	'id' => 'change-me',
 	'basePath' => dirname(__DIR__),
+	'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
 	'preload' => array('log'),
 	'controllerNamespace' => 'frontend\controllers',
 	'modules' => array(
diff --git a/apps/benchmark/.gitignore b/apps/benchmark/.gitignore
new file mode 100644
index 0000000..2cf7a3f
--- /dev/null
+++ b/apps/benchmark/.gitignore
@@ -0,0 +1 @@
+composer.lock
\ No newline at end of file
diff --git a/apps/benchmark/composer.json b/apps/benchmark/composer.json
index 4805f4f..e92f1d6 100644
--- a/apps/benchmark/composer.json
+++ b/apps/benchmark/composer.json
@@ -12,6 +12,9 @@
 		"irc": "irc://irc.freenode.net/yii",
 		"source": "https://github.com/yiisoft/yii2"
 	},
+    "config": {
+      "vendor-dir": "protected/vendor"
+    },
 	"minimum-stability": "dev",
 	"require": {
 		"php": ">=5.3.0",
diff --git a/framework/yii/base/Application.php b/framework/yii/base/Application.php
index fb9a6c1..eb0a0d3 100644
--- a/framework/yii/base/Application.php
+++ b/framework/yii/base/Application.php
@@ -207,7 +207,8 @@ class Application extends Module
 
 	/**
 	 * Returns the directory that stores vendor files.
-	 * @return string the directory that stores vendor files. Defaults to 'protected/vendor'.
+	 * @return string the directory that stores vendor files.
+	 * Defaults to 'vendor' directory under applications [[basePath]].
 	 */
 	public function getVendorPath()
 	{