From 23c3420af062830fbf2ed6b9e5b6d704c5b37077 Mon Sep 17 00:00:00 2001
From: Tobias Munk <schmunk@usrbin.de>
Date: Thu, 27 Feb 2014 17:37:08 +0100
Subject: [PATCH 1/4] replaced keyword "yii" with "yii2" in composer.json files
 (fixes #2557)

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 9990ef7..726a7ea 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
 	"name": "yiisoft/yii2-app-basic",
 	"description": "Yii 2 Basic Application Template",
-	"keywords": ["yii", "framework", "basic", "application template"],
+	"keywords": ["yii2", "framework", "basic", "application template"],
 	"homepage": "http://www.yiiframework.com/",
 	"type": "project",
 	"license": "BSD-3-Clause",

From 3ffc02730248d6e12e9d9fdd11b4b4d19a403c90 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 4 Mar 2014 22:17:11 +0400
Subject: [PATCH 2/4] Used ternary operator instead of "or" for constant
 definition

---
 tests/_bootstrap.php         | 8 ++++----
 tests/_console_bootstrap.php | 8 ++++----
 web/index-test.php           | 4 ++--
 web/index.php                | 4 ++--
 yii                          | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index 4890b3e..7db3cfd 100644
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -2,14 +2,14 @@
 
 // the entry script URL (without host info) for functional and acceptance tests
 // PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
-defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/basic/web/index-test.php');
+defined('TEST_ENTRY_URL') ?: define('TEST_ENTRY_URL', '/basic/web/index-test.php');
 
 // the entry script file path for functional and acceptance tests
-defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php');
+defined('TEST_ENTRY_FILE') ?: define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php');
 
-defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_DEBUG') ?: define('YII_DEBUG', true);
 
-defined('YII_ENV') or define('YII_ENV', 'test');
+defined('YII_ENV') ?: define('YII_ENV', 'test');
 
 require_once(__DIR__ . '/../vendor/autoload.php');
 
diff --git a/tests/_console_bootstrap.php b/tests/_console_bootstrap.php
index 81287f3..1eb0644 100644
--- a/tests/_console_bootstrap.php
+++ b/tests/_console_bootstrap.php
@@ -1,12 +1,12 @@
 <?php
 
-defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_DEBUG') ?: define('YII_DEBUG', true);
 
-defined('YII_ENV') or define('YII_ENV', 'test');
+defined('YII_ENV') ?: define('YII_ENV', 'test');
 
 // fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
+defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r'));
+defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w'));
 
 require(__DIR__ . '/../vendor/autoload.php');
 require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
diff --git a/web/index-test.php b/web/index-test.php
index b5ed695..5709d21 100644
--- a/web/index-test.php
+++ b/web/index-test.php
@@ -5,8 +5,8 @@ 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');
+defined('YII_DEBUG') ?: define('YII_DEBUG', true);
+defined('YII_ENV') ?: define('YII_ENV', 'test');
 
 require(__DIR__ . '/../vendor/autoload.php');
 require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
diff --git a/web/index.php b/web/index.php
index d1e070a..6e4b4d8 100644
--- a/web/index.php
+++ b/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') ?: define('YII_DEBUG', true);
+defined('YII_ENV') ?: define('YII_ENV', 'dev');
 
 require(__DIR__ . '/../vendor/autoload.php');
 require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
diff --git a/yii b/yii
index b032ebd..ad914bd 100755
--- a/yii
+++ b/yii
@@ -8,11 +8,11 @@
  * @license http://www.yiiframework.com/license/
  */
 
-defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_DEBUG') ?: define('YII_DEBUG', true);
 
 // fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
+defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r'));
+defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w'));
 
 require(__DIR__ . '/vendor/autoload.php');
 require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');

From 13bef84dfb3bb0b7b4239b9fae4cb1242d95f2c2 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 4 Mar 2014 22:40:04 +0400
Subject: [PATCH 3/4] Removed unused "use" statements

---
 mail/layouts/html.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/mail/layouts/html.php b/mail/layouts/html.php
index 2e6b615..8e2707d 100644
--- a/mail/layouts/html.php
+++ b/mail/layouts/html.php
@@ -1,10 +1,9 @@
 <?php
 use yii\helpers\Html;
-use yii\mail\BaseMessage;
 
 /**
  * @var \yii\web\View $this
- * @var BaseMessage $content
+ * @var \yii\mail\BaseMessage $content
  */
 ?>
 <?php $this->beginPage() ?>

From d8763496cc9ae67e8a4e74393f539d65bba3a9d0 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 6 Mar 2014 01:56:51 +0400
Subject: [PATCH 4/4] Revert "Used ternary operator instead of "or" for
 constant definition"

This reverts commit 2bb6f13505e212d68841a7e6609806fb30d04002.
---
 tests/_bootstrap.php         | 8 ++++----
 tests/_console_bootstrap.php | 8 ++++----
 web/index-test.php           | 4 ++--
 web/index.php                | 4 ++--
 yii                          | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index 7db3cfd..4890b3e 100644
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -2,14 +2,14 @@
 
 // the entry script URL (without host info) for functional and acceptance tests
 // PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
-defined('TEST_ENTRY_URL') ?: define('TEST_ENTRY_URL', '/basic/web/index-test.php');
+defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', '/basic/web/index-test.php');
 
 // the entry script file path for functional and acceptance tests
-defined('TEST_ENTRY_FILE') ?: define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php');
+defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(__DIR__) . '/web/index-test.php');
 
-defined('YII_DEBUG') ?: define('YII_DEBUG', true);
+defined('YII_DEBUG') or define('YII_DEBUG', true);
 
-defined('YII_ENV') ?: define('YII_ENV', 'test');
+defined('YII_ENV') or define('YII_ENV', 'test');
 
 require_once(__DIR__ . '/../vendor/autoload.php');
 
diff --git a/tests/_console_bootstrap.php b/tests/_console_bootstrap.php
index 1eb0644..81287f3 100644
--- a/tests/_console_bootstrap.php
+++ b/tests/_console_bootstrap.php
@@ -1,12 +1,12 @@
 <?php
 
-defined('YII_DEBUG') ?: define('YII_DEBUG', true);
+defined('YII_DEBUG') or define('YII_DEBUG', true);
 
-defined('YII_ENV') ?: define('YII_ENV', 'test');
+defined('YII_ENV') or define('YII_ENV', 'test');
 
 // fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w'));
+defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
+defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
 
 require(__DIR__ . '/../vendor/autoload.php');
 require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
diff --git a/web/index-test.php b/web/index-test.php
index 5709d21..b5ed695 100644
--- a/web/index-test.php
+++ b/web/index-test.php
@@ -5,8 +5,8 @@ if (!in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'])) {
 	die('You are not allowed to access this file.');
 }
 
-defined('YII_DEBUG') ?: define('YII_DEBUG', true);
-defined('YII_ENV') ?: define('YII_ENV', 'test');
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_ENV') or define('YII_ENV', 'test');
 
 require(__DIR__ . '/../vendor/autoload.php');
 require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
diff --git a/web/index.php b/web/index.php
index 6e4b4d8..d1e070a 100644
--- a/web/index.php
+++ b/web/index.php
@@ -1,8 +1,8 @@
 <?php
 
 // comment out the following two lines when deployed to production
-defined('YII_DEBUG') ?: define('YII_DEBUG', true);
-defined('YII_ENV') ?: define('YII_ENV', 'dev');
+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.php');
diff --git a/yii b/yii
index ad914bd..b032ebd 100755
--- a/yii
+++ b/yii
@@ -8,11 +8,11 @@
  * @license http://www.yiiframework.com/license/
  */
 
-defined('YII_DEBUG') ?: define('YII_DEBUG', true);
+defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 // fcgi doesn't have STDIN and STDOUT defined by default
-defined('STDIN') ?: define('STDIN', fopen('php://stdin', 'r'));
-defined('STDOUT') ?: define('STDOUT', fopen('php://stdout', 'w'));
+defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
+defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
 
 require(__DIR__ . '/vendor/autoload.php');
 require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');