From a087972704f8f2c76f278be900e5136817d3e41f Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sun, 26 May 2013 01:46:39 +0200
Subject: [PATCH] fixed framework path of req checker + notice on wrong path

git ignore composer.lock
---
 apps/advanced/.gitignore       | 3 ++-
 apps/advanced/install          | 0
 apps/advanced/requirements.php | 9 ++++++++-
 apps/basic/.gitignore          | 1 +
 apps/basic/requirements.php    | 9 ++++++++-
 5 files changed, 19 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 apps/advanced/install
 create mode 100644 apps/basic/.gitignore

diff --git a/apps/advanced/.gitignore b/apps/advanced/.gitignore
index b1cf719..fd6a8d5 100644
--- a/apps/advanced/.gitignore
+++ b/apps/advanced/.gitignore
@@ -1 +1,2 @@
-/yii
\ No newline at end of file
+/yii
+composer.lock
diff --git a/apps/advanced/install b/apps/advanced/install
old mode 100644
new mode 100755
diff --git a/apps/advanced/requirements.php b/apps/advanced/requirements.php
index 5a2d910..c9e6493 100644
--- a/apps/advanced/requirements.php
+++ b/apps/advanced/requirements.php
@@ -11,7 +11,14 @@
  */
 
 // you may need to adjust this path to the correct Yii framework path
-$frameworkPath = dirname(__FILE__) . '/../../yii';
+$frameworkPath = dirname(__FILE__) . '/vendor/yiisoft/yii2/yii';
+
+if (!is_dir($frameworkPath)) {
+	echo '<h1>Error</h1>';
+	echo '<p><strong>The path to yii framework seems to be incorrect.</strong></p>';
+	echo '<p>You need to install Yii framework via composer or adjust the framework path in file <abbr title="' . __FILE__ . '">' . basename(__FILE__) .'</abbr>.</p>';
+	echo '<p>Please refer to the <abbr title="' . dirname(__FILE__) . '/README.md">README</abbr> on how to install Yii.</p>';
+}
 
 require_once($frameworkPath . '/requirements/YiiRequirementChecker.php');
 $requirementsChecker = new YiiRequirementChecker();
diff --git a/apps/basic/.gitignore b/apps/basic/.gitignore
new file mode 100644
index 0000000..2cf7a3f
--- /dev/null
+++ b/apps/basic/.gitignore
@@ -0,0 +1 @@
+composer.lock
\ No newline at end of file
diff --git a/apps/basic/requirements.php b/apps/basic/requirements.php
index 5a2d910..c075760 100644
--- a/apps/basic/requirements.php
+++ b/apps/basic/requirements.php
@@ -11,7 +11,14 @@
  */
 
 // you may need to adjust this path to the correct Yii framework path
-$frameworkPath = dirname(__FILE__) . '/../../yii';
+$frameworkPath = dirname(__FILE__) . '/vendor/yiisoft/yii2/yii.';
+
+if (!is_dir($frameworkPath)) {
+	echo '<h1>Error</h1>';
+	echo '<p><strong>The path to yii framework seems to be incorrect.</strong></p>';
+	echo '<p>You need to install Yii framework via composer or adjust the framework path in file <abbr title="' . __FILE__ . '">' . basename(__FILE__) .'</abbr>.</p>';
+	echo '<p>Please refer to the <abbr title="' . dirname(__FILE__) . '/README.md">README</abbr> on how to install Yii.</p>';
+}
 
 require_once($frameworkPath . '/requirements/YiiRequirementChecker.php');
 $requirementsChecker = new YiiRequirementChecker();