From 5c86563a08726f406417fef799d25c4854d02ea2 Mon Sep 17 00:00:00 2001
From: Mark <mark.github@yandex.ru>
Date: Mon, 2 Dec 2013 15:23:58 +0400
Subject: [PATCH] new entry points for application

---
 apps/basic/web/index-debug.php       | 13 +++++++++++++
 apps/basic/web/index-test-accept.php | 16 ++++++++++++++++
 apps/basic/web/index-test-func.php   | 16 ++++++++++++++++
 apps/basic/web/index-test.php        | 24 ------------------------
 apps/basic/web/index.php             |  4 ++--
 5 files changed, 47 insertions(+), 26 deletions(-)
 create mode 100644 apps/basic/web/index-debug.php
 create mode 100644 apps/basic/web/index-test-accept.php
 create mode 100644 apps/basic/web/index-test-func.php
 delete mode 100644 apps/basic/web/index-test.php

diff --git a/apps/basic/web/index-debug.php b/apps/basic/web/index-debug.php
new file mode 100644
index 0000000..e9eeb33
--- /dev/null
+++ b/apps/basic/web/index-debug.php
@@ -0,0 +1,13 @@
+<?php
+
+// comment out the following two lines when deployed to production
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_ENV') or define('YII_ENV', 'dev');
+
+require(__DIR__ . '/../vendor/autoload.php');
+require(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
+
+$config = require(__DIR__ . '/../config/web.php');
+
+$application = new yii\web\Application($config);
+$application->run();
diff --git a/apps/basic/web/index-test-accept.php b/apps/basic/web/index-test-accept.php
new file mode 100644
index 0000000..4343726
--- /dev/null
+++ b/apps/basic/web/index-test-accept.php
@@ -0,0 +1,16 @@
+<?php
+
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+
+defined('YII_ENV') or define('YII_ENV', 'test');
+
+require_once(__DIR__ . '/../vendor/autoload.php');
+require_once(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
+
+$config = yii\helpers\ArrayHelper::merge(
+	require(__DIR__ . '/../config/web-test.php'),
+	require(__DIR__ . '/../config/codeception/acceptance.php')
+);
+
+$application = new yii\web\Application($config);
+$application->run();
diff --git a/apps/basic/web/index-test-func.php b/apps/basic/web/index-test-func.php
new file mode 100644
index 0000000..ebce924
--- /dev/null
+++ b/apps/basic/web/index-test-func.php
@@ -0,0 +1,16 @@
+<?php
+
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+
+defined('YII_ENV') or define('YII_ENV', 'test');
+
+require_once(__DIR__ . '/../vendor/autoload.php');
+require_once(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
+
+$config = yii\helpers\ArrayHelper::merge(
+	require(__DIR__ . '/../config/web-test.php'),
+	require(__DIR__ . '/../config/codeception/functional.php')
+);
+
+$config['class'] = 'yii\web\Application';
+return $config;
diff --git a/apps/basic/web/index-test.php b/apps/basic/web/index-test.php
deleted file mode 100644
index bd61e0b..0000000
--- a/apps/basic/web/index-test.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-if (!in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'])) {
-	die('You are not allowed to access this file.');
-}
-
-defined('YII_DEBUG') or define('YII_DEBUG', true);
-
-defined('YII_ENV') or define('YII_ENV', 'test');
-
-require_once(__DIR__ . '/../vendor/autoload.php');
-require_once(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');
-
-$config = require(__DIR__ . '/../config/web-test.php');
-
-if (isset($this)) {
-	// run in functional tests
-	$config['class'] = 'yii\web\Application';
-	return $config;
-} else {
-	// run in acceptance tests
-	$application = new yii\web\Application($config);
-	$application->run();
-}
diff --git a/apps/basic/web/index.php b/apps/basic/web/index.php
index e9eeb33..c644d40 100644
--- a/apps/basic/web/index.php
+++ b/apps/basic/web/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // comment out the following two lines when deployed to production
-defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_ENV') or define('YII_ENV', 'dev');
+defined('YII_DEBUG') or define('YII_DEBUG', false);
+defined('YII_ENV') or define('YII_ENV', 'prod');
 
 require(__DIR__ . '/../vendor/autoload.php');
 require(__DIR__ . '/../vendor/yiisoft/yii2/yii/Yii.php');