From e9148837ee0676a8daeec77690db153b6569f914 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 1 Mar 2014 23:14:16 -0500
Subject: [PATCH 001/390] rest api WIP

---
 models/User.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/models/User.php b/models/User.php
index b890e6934..8d008a88f 100644
--- a/models/User.php
+++ b/models/User.php
@@ -8,6 +8,7 @@ class User extends \yii\base\Object implements \yii\web\IdentityInterface
 	public $username;
 	public $password;
 	public $authKey;
+	public $apiKey;
 
 	private static $users = [
 		'100' => [
@@ -15,12 +16,14 @@ class User extends \yii\base\Object implements \yii\web\IdentityInterface
 			'username' => 'admin',
 			'password' => 'admin',
 			'authKey' => 'test100key',
+			'apiKey' => '100-apikey',
 		],
 		'101' => [
 			'id' => '101',
 			'username' => 'demo',
 			'password' => 'demo',
 			'authKey' => 'test101key',
+			'apiKey' => '101-apikey',
 		],
 	];
 
@@ -32,6 +35,19 @@ public static function findIdentity($id)
 		return isset(self::$users[$id]) ? new static(self::$users[$id]) : null;
 	}
 
+	/**
+	 * @inheritdoc
+	 */
+	public static function findIdentityByToken($token)
+	{
+		foreach (self::$users as $user) {
+			if ($user['apiKey'] === $token) {
+				return new static($user);
+			}
+		}
+		return null;
+	}
+
 	/**
 	 * Finds user by username
 	 *

From b61e6d214a6699f6ab982cb56967a884e2cd0422 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Mon, 3 Mar 2014 10:18:39 -0500
Subject: [PATCH 002/390] Support for other auth types.

---
 models/User.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/models/User.php b/models/User.php
index 8d008a88f..7a6fcc004 100644
--- a/models/User.php
+++ b/models/User.php
@@ -8,7 +8,7 @@ class User extends \yii\base\Object implements \yii\web\IdentityInterface
 	public $username;
 	public $password;
 	public $authKey;
-	public $apiKey;
+	public $accessToken;
 
 	private static $users = [
 		'100' => [
@@ -16,14 +16,14 @@ class User extends \yii\base\Object implements \yii\web\IdentityInterface
 			'username' => 'admin',
 			'password' => 'admin',
 			'authKey' => 'test100key',
-			'apiKey' => '100-apikey',
+			'accessToken' => '100-token',
 		],
 		'101' => [
 			'id' => '101',
 			'username' => 'demo',
 			'password' => 'demo',
 			'authKey' => 'test101key',
-			'apiKey' => '101-apikey',
+			'accessToken' => '101-token',
 		],
 	];
 
@@ -38,10 +38,10 @@ public static function findIdentity($id)
 	/**
 	 * @inheritdoc
 	 */
-	public static function findIdentityByToken($token)
+	public static function findIdentityByAccessToken($token)
 	{
 		foreach (self::$users as $user) {
-			if ($user['apiKey'] === $token) {
+			if ($user['accessToken'] === $token) {
 				return new static($user);
 			}
 		}

From d78c7a7d21e159e2c251ebea1a63c0566328215b Mon Sep 17 00:00:00 2001
From: Alexander Mohorev <dev.mohorev@gmail.com>
Date: Mon, 3 Mar 2014 20:50:44 +0300
Subject: [PATCH 003/390] @param, @var, @property and @return must declare
 types as boolean, integer, string, array or null

---
 models/User.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/User.php b/models/User.php
index b890e6934..1ecbc6814 100644
--- a/models/User.php
+++ b/models/User.php
@@ -76,7 +76,7 @@ public function validateAuthKey($authKey)
 	 * Validates password
 	 *
 	 * @param string $password password to validate
-	 * @return bool if password provided is valid for current user
+	 * @return boolean if password provided is valid for current user
 	 */
 	public function validatePassword($password)
 	{

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 004/390] 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 4890b3ed7..7db3cfdb9 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 81287f3d8..1eb06446b 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 b5ed6956f..5709d2134 100644
--- a/web/index-test.php
+++ b/web/index-test.php
@@ -5,8 +5,8 @@
 	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 d1e070a39..6e4b4d879 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 b032ebdbc..ad914bdd4 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 005/390] 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 2e6b615f5..8e2707dc5 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 006/390] 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 7db3cfdb9..4890b3ed7 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 1eb06446b..81287f3d8 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 5709d2134..b5ed6956f 100644
--- a/web/index-test.php
+++ b/web/index-test.php
@@ -5,8 +5,8 @@
 	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 6e4b4d879..d1e070a39 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 ad914bdd4..b032ebdbc 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');

From 4742d4e0b327b5beb3245b5d5fc9af3b5103ef55 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Fri, 7 Mar 2014 10:35:15 -0500
Subject: [PATCH 007/390] Fixes #2629: `Module::controllerPath` is now read
 only, and all controller classes must be namespaced under
 `Module::controllerNamespace`

---
 config/console.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/config/console.php b/config/console.php
index 3dd5d42fc..1f58e421e 100644
--- a/config/console.php
+++ b/config/console.php
@@ -9,7 +9,6 @@
 	'id' => 'basic-console',
 	'basePath' => dirname(__DIR__),
 	'preload' => ['log'],
-	'controllerPath' => dirname(__DIR__) . '/commands',
 	'controllerNamespace' => 'app\commands',
 	'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
 	'components' => [

From a85ef65abaafb8ffa3d0942228e0396681ebeb25 Mon Sep 17 00:00:00 2001
From: Luciano Baraglia <luciano.baraglia@gmail.com>
Date: Sat, 8 Mar 2014 20:47:04 -0300
Subject: [PATCH 008/390] Code style fixes

---
 views/site/contact.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/site/contact.php b/views/site/contact.php
index c375161fe..bcaf542a7 100644
--- a/views/site/contact.php
+++ b/views/site/contact.php
@@ -25,7 +25,7 @@
 		to view the mail message on the mail panel of the debugger.
 		<?php if (Yii::$app->mail->useFileTransport): ?>
 		Because the application is in development mode, the email is not sent but saved as
-		a file under <code><?= Yii::getAlias(Yii::$app->mail->fileTransportPath); ?></code>.
+		a file under <code><?= Yii::getAlias(Yii::$app->mail->fileTransportPath) ?></code>.
 		Please configure the <code>useFileTransport</code> property of the <code>mail</code>
 		application component to be false to enable email sending.
 		<?php endif; ?>

From 93cc82c4bf42cea403e1acaab201338bea304b6e Mon Sep 17 00:00:00 2001
From: SonicGD <sonicgd@gmail.com>
Date: Sun, 16 Mar 2014 10:46:16 +0600
Subject: [PATCH 009/390] Reformat code te be PSR-2 compatible

---
 assets/AppAsset.php                   |  22 ++--
 commands/HelloController.php          |  16 +--
 config/console.php                    |  40 +++---
 config/db.php                         |  10 +-
 config/params.php                     |   2 +-
 config/web.php                        |  68 +++++-----
 controllers/SiteController.php        | 148 +++++++++++-----------
 mail/layouts/html.php                 |  14 +--
 models/ContactForm.php                |  95 +++++++-------
 models/LoginForm.php                  | 111 ++++++++--------
 models/User.php                       | 174 +++++++++++++-------------
 requirements.php                      | 166 ++++++++++++------------
 tests/_config.php                     |  16 +--
 tests/_helpers/CodeHelper.php         |   2 +-
 tests/_helpers/TestHelper.php         |   2 +-
 tests/_helpers/WebHelper.php          |   2 +-
 tests/_pages/AboutPage.php            |   2 +-
 tests/_pages/ContactPage.php          |  24 ++--
 tests/_pages/LoginPage.php            |  22 ++--
 tests/acceptance.suite.yml            |   2 +-
 tests/acceptance/ContactCept.php      |  22 ++--
 tests/acceptance/LoginCept.php        |   2 +-
 tests/acceptance/_config.php          |  18 +--
 tests/acceptance/_console.php         |  18 +--
 tests/functional/ContactCept.php      |  20 +--
 tests/functional/_config.php          |  18 +--
 tests/functional/_console.php         |  18 +--
 tests/unit/_config.php                |  18 +--
 tests/unit/_console.php               |  18 +--
 tests/unit/models/ContactFormTest.php |  96 +++++++-------
 tests/unit/models/LoginFormTest.php   |  89 ++++++-------
 tests/unit/models/UserTest.php        |  14 +--
 views/layouts/main.php                |  82 ++++++------
 views/site/about.php                  |  10 +-
 views/site/contact.php                |  86 ++++++-------
 views/site/error.php                  |  20 +--
 views/site/index.php                  |  66 +++++-----
 views/site/login.php                  |  50 ++++----
 web/index-test.php                    |   2 +-
 39 files changed, 806 insertions(+), 799 deletions(-)

diff --git a/assets/AppAsset.php b/assets/AppAsset.php
index c964d36a6..0e495a8f8 100644
--- a/assets/AppAsset.php
+++ b/assets/AppAsset.php
@@ -15,15 +15,15 @@
  */
 class AppAsset extends AssetBundle
 {
-	public $basePath = '@webroot';
-	public $baseUrl = '@web';
-	public $css = [
-		'css/site.css',
-	];
-	public $js = [
-	];
-	public $depends = [
-		'yii\web\YiiAsset',
-		'yii\bootstrap\BootstrapAsset',
-	];
+    public $basePath = '@webroot';
+    public $baseUrl = '@web';
+    public $css = [
+        'css/site.css',
+    ];
+    public $js = [
+    ];
+    public $depends = [
+        'yii\web\YiiAsset',
+        'yii\bootstrap\BootstrapAsset',
+    ];
 }
diff --git a/commands/HelloController.php b/commands/HelloController.php
index ce567ddaf..86ab8b853 100644
--- a/commands/HelloController.php
+++ b/commands/HelloController.php
@@ -19,12 +19,12 @@
  */
 class HelloController extends Controller
 {
-	/**
-	 * This command echoes what you have entered as the message.
-	 * @param string $message the message to be echoed.
-	 */
-	public function actionIndex($message = 'hello world')
-	{
-		echo $message . "\n";
-	}
+    /**
+     * This command echoes what you have entered as the message.
+     * @param string $message the message to be echoed.
+     */
+    public function actionIndex($message = 'hello world')
+    {
+        echo $message . "\n";
+    }
 }
diff --git a/config/console.php b/config/console.php
index 1f58e421e..f25485856 100644
--- a/config/console.php
+++ b/config/console.php
@@ -6,24 +6,24 @@
 $db = require(__DIR__ . '/db.php');
 
 return [
-	'id' => 'basic-console',
-	'basePath' => dirname(__DIR__),
-	'preload' => ['log'],
-	'controllerNamespace' => 'app\commands',
-	'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
-	'components' => [
-		'cache' => [
-			'class' => 'yii\caching\FileCache',
-		],
-		'log' => [
-			'targets' => [
-				[
-					'class' => 'yii\log\FileTarget',
-					'levels' => ['error', 'warning'],
-				],
-			],
-		],
-		'db' => $db,
-	],
-	'params' => $params,
+    'id' => 'basic-console',
+    'basePath' => dirname(__DIR__),
+    'preload' => ['log'],
+    'controllerNamespace' => 'app\commands',
+    'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
+    'components' => [
+        'cache' => [
+            'class' => 'yii\caching\FileCache',
+        ],
+        'log' => [
+            'targets' => [
+                [
+                    'class' => 'yii\log\FileTarget',
+                    'levels' => ['error', 'warning'],
+                ],
+            ],
+        ],
+        'db' => $db,
+    ],
+    'params' => $params,
 ];
diff --git a/config/db.php b/config/db.php
index b14e77ea3..c4c12529c 100644
--- a/config/db.php
+++ b/config/db.php
@@ -1,9 +1,9 @@
 <?php
 
 return [
-	'class' => 'yii\db\Connection',
-	'dsn' => 'mysql:host=localhost;dbname=yii2basic',
-	'username' => 'root',
-	'password' => '',
-	'charset' => 'utf8',
+    'class' => 'yii\db\Connection',
+    'dsn' => 'mysql:host=localhost;dbname=yii2basic',
+    'username' => 'root',
+    'password' => '',
+    'charset' => 'utf8',
 ];
diff --git a/config/params.php b/config/params.php
index 93cb368d9..6ebf2792b 100644
--- a/config/params.php
+++ b/config/params.php
@@ -1,5 +1,5 @@
 <?php
 
 return [
-	'adminEmail' => 'admin@example.com',
+    'adminEmail' => 'admin@example.com',
 ];
diff --git a/config/web.php b/config/web.php
index 6f02f52c7..462c135a8 100644
--- a/config/web.php
+++ b/config/web.php
@@ -4,43 +4,43 @@
 $db = require(__DIR__ . '/db.php');
 
 $config = [
-	'id' => 'basic',
-	'basePath' => dirname(__DIR__),
-	'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
-	'components' => [
-		'cache' => [
-			'class' => 'yii\caching\FileCache',
-		],
-		'user' => [
-			'identityClass' => 'app\models\User',
-			'enableAutoLogin' => true,
-		],
-		'errorHandler' => [
-			'errorAction' => 'site/error',
-		],
-		'mail' => [
-			'class' => 'yii\swiftmailer\Mailer',
-			'useFileTransport' => true,
-		],
-		'log' => [
-			'traceLevel' => YII_DEBUG ? 3 : 0,
-			'targets' => [
-				[
-					'class' => 'yii\log\FileTarget',
-					'levels' => ['error', 'warning'],
-				],
-			],
-		],
-		'db' => $db,
-	],
-	'params' => $params,
+    'id' => 'basic',
+    'basePath' => dirname(__DIR__),
+    'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
+    'components' => [
+        'cache' => [
+            'class' => 'yii\caching\FileCache',
+        ],
+        'user' => [
+            'identityClass' => 'app\models\User',
+            'enableAutoLogin' => true,
+        ],
+        'errorHandler' => [
+            'errorAction' => 'site/error',
+        ],
+        'mail' => [
+            'class' => 'yii\swiftmailer\Mailer',
+            'useFileTransport' => true,
+        ],
+        'log' => [
+            'traceLevel' => YII_DEBUG ? 3 : 0,
+            'targets' => [
+                [
+                    'class' => 'yii\log\FileTarget',
+                    'levels' => ['error', 'warning'],
+                ],
+            ],
+        ],
+        'db' => $db,
+    ],
+    'params' => $params,
 ];
 
 if (YII_ENV_DEV) {
-	// configuration adjustments for 'dev' environment
-	$config['preload'][] = 'debug';
-	$config['modules']['debug'] = 'yii\debug\Module';
-	$config['modules']['gii'] = 'yii\gii\Module';
+    // configuration adjustments for 'dev' environment
+    $config['preload'][] = 'debug';
+    $config['modules']['debug'] = 'yii\debug\Module';
+    $config['modules']['gii'] = 'yii\gii\Module';
 }
 
 return $config;
diff --git a/controllers/SiteController.php b/controllers/SiteController.php
index 0d4d2f985..ebecd28e6 100644
--- a/controllers/SiteController.php
+++ b/controllers/SiteController.php
@@ -11,84 +11,86 @@
 
 class SiteController extends Controller
 {
-	public function behaviors()
-	{
-		return [
-			'access' => [
-				'class' => AccessControl::className(),
-				'only' => ['logout'],
-				'rules' => [
-					[
-						'actions' => ['logout'],
-						'allow' => true,
-						'roles' => ['@'],
-					],
-				],
-			],
-			'verbs' => [
-				'class' => VerbFilter::className(),
-				'actions' => [
-					'logout' => ['post'],
-				],
-			],
-		];
-	}
+    public function behaviors()
+    {
+        return [
+            'access' => [
+                'class' => AccessControl::className(),
+                'only' => ['logout'],
+                'rules' => [
+                    [
+                        'actions' => ['logout'],
+                        'allow' => true,
+                        'roles' => ['@'],
+                    ],
+                ],
+            ],
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'logout' => ['post'],
+                ],
+            ],
+        ];
+    }
 
-	public function actions()
-	{
-		return [
-			'error' => [
-				'class' => 'yii\web\ErrorAction',
-			],
-			'captcha' => [
-				'class' => 'yii\captcha\CaptchaAction',
-				'fixedVerifyCode' => YII_ENV_TEST ? 'testme' : null,
-			],
-		];
-	}
+    public function actions()
+    {
+        return [
+            'error' => [
+                'class' => 'yii\web\ErrorAction',
+            ],
+            'captcha' => [
+                'class' => 'yii\captcha\CaptchaAction',
+                'fixedVerifyCode' => YII_ENV_TEST ? 'testme' : null,
+            ],
+        ];
+    }
 
-	public function actionIndex()
-	{
-		return $this->render('index');
-	}
+    public function actionIndex()
+    {
+        return $this->render('index');
+    }
 
-	public function actionLogin()
-	{
-		if (!\Yii::$app->user->isGuest) {
-			return $this->goHome();
-		}
+    public function actionLogin()
+    {
+        if (!\Yii::$app->user->isGuest) {
+            return $this->goHome();
+        }
 
-		$model = new LoginForm();
-		if ($model->load(Yii::$app->request->post()) && $model->login()) {
-			return $this->goBack();
-		} else {
-			return $this->render('login', [
-				'model' => $model,
-			]);
-		}
-	}
+        $model = new LoginForm();
+        if ($model->load(Yii::$app->request->post()) && $model->login()) {
+            return $this->goBack();
+        } else {
+            return $this->render('login', [
+                'model' => $model,
+            ]);
+        }
+    }
 
-	public function actionLogout()
-	{
-		Yii::$app->user->logout();
-		return $this->goHome();
-	}
+    public function actionLogout()
+    {
+        Yii::$app->user->logout();
 
-	public function actionContact()
-	{
-		$model = new ContactForm();
-		if ($model->load(Yii::$app->request->post()) && $model->contact(Yii::$app->params['adminEmail'])) {
-			Yii::$app->session->setFlash('contactFormSubmitted');
-			return $this->refresh();
-		} else {
-			return $this->render('contact', [
-				'model' => $model,
-			]);
-		}
-	}
+        return $this->goHome();
+    }
 
-	public function actionAbout()
-	{
-		return $this->render('about');
-	}
+    public function actionContact()
+    {
+        $model = new ContactForm();
+        if ($model->load(Yii::$app->request->post()) && $model->contact(Yii::$app->params['adminEmail'])) {
+            Yii::$app->session->setFlash('contactFormSubmitted');
+
+            return $this->refresh();
+        } else {
+            return $this->render('contact', [
+                'model' => $model,
+            ]);
+        }
+    }
+
+    public function actionAbout()
+    {
+        return $this->render('about');
+    }
 }
diff --git a/mail/layouts/html.php b/mail/layouts/html.php
index 8e2707dc5..a9689cc2e 100644
--- a/mail/layouts/html.php
+++ b/mail/layouts/html.php
@@ -10,14 +10,14 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<meta http-equiv="Content-Type" content="text/html; charset=<?= Yii::$app->charset ?>" />
-	<title><?= Html::encode($this->title) ?></title>
-	<?php $this->head() ?>
+    <meta http-equiv="Content-Type" content="text/html; charset=<?= Yii::$app->charset ?>" />
+    <title><?= Html::encode($this->title) ?></title>
+    <?php $this->head() ?>
 </head>
 <body>
-	<?php $this->beginBody() ?>
-	<?= $content ?>
-	<?php $this->endBody() ?>
+    <?php $this->beginBody() ?>
+    <?= $content ?>
+    <?php $this->endBody() ?>
 </body>
 </html>
-<?php $this->endPage() ?>
\ No newline at end of file
+<?php $this->endPage() ?>
diff --git a/models/ContactForm.php b/models/ContactForm.php
index 13445627e..29a5dd996 100644
--- a/models/ContactForm.php
+++ b/models/ContactForm.php
@@ -10,54 +10,55 @@
  */
 class ContactForm extends Model
 {
-	public $name;
-	public $email;
-	public $subject;
-	public $body;
-	public $verifyCode;
+    public $name;
+    public $email;
+    public $subject;
+    public $body;
+    public $verifyCode;
 
-	/**
-	 * @return array the validation rules.
-	 */
-	public function rules()
-	{
-		return [
-			// name, email, subject and body are required
-			[['name', 'email', 'subject', 'body'], 'required'],
-			// email has to be a valid email address
-			['email', 'email'],
-			// verifyCode needs to be entered correctly
-			['verifyCode', 'captcha'],
-		];
-	}
+    /**
+     * @return array the validation rules.
+     */
+    public function rules()
+    {
+        return [
+            // name, email, subject and body are required
+            [['name', 'email', 'subject', 'body'], 'required'],
+            // email has to be a valid email address
+            ['email', 'email'],
+            // verifyCode needs to be entered correctly
+            ['verifyCode', 'captcha'],
+        ];
+    }
 
-	/**
-	 * @return array customized attribute labels
-	 */
-	public function attributeLabels()
-	{
-		return [
-			'verifyCode' => 'Verification Code',
-		];
-	}
+    /**
+     * @return array customized attribute labels
+     */
+    public function attributeLabels()
+    {
+        return [
+            'verifyCode' => 'Verification Code',
+        ];
+    }
 
-	/**
-	 * Sends an email to the specified email address using the information collected by this model.
-	 * @param string $email the target email address
-	 * @return boolean whether the model passes validation
-	 */
-	public function contact($email)
-	{
-		if ($this->validate()) {
-			Yii::$app->mail->compose()
-				->setTo($email)
-				->setFrom([$this->email => $this->name])
-				->setSubject($this->subject)
-				->setTextBody($this->body)
-				->send();
-			return true;
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Sends an email to the specified email address using the information collected by this model.
+     * @param  string  $email the target email address
+     * @return boolean whether the model passes validation
+     */
+    public function contact($email)
+    {
+        if ($this->validate()) {
+            Yii::$app->mail->compose()
+                ->setTo($email)
+                ->setFrom([$this->email => $this->name])
+                ->setSubject($this->subject)
+                ->setTextBody($this->body)
+                ->send();
+
+            return true;
+        } else {
+            return false;
+        }
+    }
 }
diff --git a/models/LoginForm.php b/models/LoginForm.php
index 76cf1de52..31b814e24 100644
--- a/models/LoginForm.php
+++ b/models/LoginForm.php
@@ -10,65 +10,66 @@
  */
 class LoginForm extends Model
 {
-	public $username;
-	public $password;
-	public $rememberMe = true;
+    public $username;
+    public $password;
+    public $rememberMe = true;
 
-	private $_user = false;
+    private $_user = false;
 
-	/**
-	 * @return array the validation rules.
-	 */
-	public function rules()
-	{
-		return [
-			// username and password are both required
-			[['username', 'password'], 'required'],
-			// rememberMe must be a boolean value
-			['rememberMe', 'boolean'],
-			// password is validated by validatePassword()
-			['password', 'validatePassword'],
-		];
-	}
+    /**
+     * @return array the validation rules.
+     */
+    public function rules()
+    {
+        return [
+            // username and password are both required
+            [['username', 'password'], 'required'],
+            // rememberMe must be a boolean value
+            ['rememberMe', 'boolean'],
+            // password is validated by validatePassword()
+            ['password', 'validatePassword'],
+        ];
+    }
 
-	/**
-	 * Validates the password.
-	 * This method serves as the inline validation for password.
-	 */
-	public function validatePassword()
-	{
-		if (!$this->hasErrors()) {
-			$user = $this->getUser();
+    /**
+     * Validates the password.
+     * This method serves as the inline validation for password.
+     */
+    public function validatePassword()
+    {
+        if (!$this->hasErrors()) {
+            $user = $this->getUser();
 
-			if (!$user || !$user->validatePassword($this->password)) {
-				$this->addError('password', 'Incorrect username or password.');
-			}
-		}
-	}
+            if (!$user || !$user->validatePassword($this->password)) {
+                $this->addError('password', 'Incorrect username or password.');
+            }
+        }
+    }
 
-	/**
-	 * Logs in a user using the provided username and password.
-	 * @return boolean whether the user is logged in successfully
-	 */
-	public function login()
-	{
-		if ($this->validate()) {
-			return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600*24*30 : 0);
-		} else {
-			return false;
-		}
-	}
+    /**
+     * Logs in a user using the provided username and password.
+     * @return boolean whether the user is logged in successfully
+     */
+    public function login()
+    {
+        if ($this->validate()) {
+            return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600*24*30 : 0);
+        } else {
+            return false;
+        }
+    }
 
-	/**
-	 * Finds user by [[username]]
-	 *
-	 * @return User|null
-	 */
-	public function getUser()
-	{
-		if ($this->_user === false) {
-			$this->_user = User::findByUsername($this->username);
-		}
-		return $this->_user;
-	}
+    /**
+     * Finds user by [[username]]
+     *
+     * @return User|null
+     */
+    public function getUser()
+    {
+        if ($this->_user === false) {
+            $this->_user = User::findByUsername($this->username);
+        }
+
+        return $this->_user;
+    }
 }
diff --git a/models/User.php b/models/User.php
index fd0d0d434..5de7e20c2 100644
--- a/models/User.php
+++ b/models/User.php
@@ -4,98 +4,100 @@
 
 class User extends \yii\base\Object implements \yii\web\IdentityInterface
 {
-	public $id;
-	public $username;
-	public $password;
-	public $authKey;
-	public $accessToken;
+    public $id;
+    public $username;
+    public $password;
+    public $authKey;
+    public $accessToken;
 
-	private static $users = [
-		'100' => [
-			'id' => '100',
-			'username' => 'admin',
-			'password' => 'admin',
-			'authKey' => 'test100key',
-			'accessToken' => '100-token',
-		],
-		'101' => [
-			'id' => '101',
-			'username' => 'demo',
-			'password' => 'demo',
-			'authKey' => 'test101key',
-			'accessToken' => '101-token',
-		],
-	];
+    private static $users = [
+        '100' => [
+            'id' => '100',
+            'username' => 'admin',
+            'password' => 'admin',
+            'authKey' => 'test100key',
+            'accessToken' => '100-token',
+        ],
+        '101' => [
+            'id' => '101',
+            'username' => 'demo',
+            'password' => 'demo',
+            'authKey' => 'test101key',
+            'accessToken' => '101-token',
+        ],
+    ];
 
-	/**
-	 * @inheritdoc
-	 */
-	public static function findIdentity($id)
-	{
-		return isset(self::$users[$id]) ? new static(self::$users[$id]) : null;
-	}
+    /**
+     * @inheritdoc
+     */
+    public static function findIdentity($id)
+    {
+        return isset(self::$users[$id]) ? new static(self::$users[$id]) : null;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public static function findIdentityByAccessToken($token)
-	{
-		foreach (self::$users as $user) {
-			if ($user['accessToken'] === $token) {
-				return new static($user);
-			}
-		}
-		return null;
-	}
+    /**
+     * @inheritdoc
+     */
+    public static function findIdentityByAccessToken($token)
+    {
+        foreach (self::$users as $user) {
+            if ($user['accessToken'] === $token) {
+                return new static($user);
+            }
+        }
 
-	/**
-	 * Finds user by username
-	 *
-	 * @param string $username
-	 * @return static|null
-	 */
-	public static function findByUsername($username)
-	{
-		foreach (self::$users as $user) {
-			if (strcasecmp($user['username'], $username) === 0) {
-				return new static($user);
-			}
-		}
-		return null;
-	}
+        return null;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getId()
-	{
-		return $this->id;
-	}
+    /**
+     * Finds user by username
+     *
+     * @param  string      $username
+     * @return static|null
+     */
+    public static function findByUsername($username)
+    {
+        foreach (self::$users as $user) {
+            if (strcasecmp($user['username'], $username) === 0) {
+                return new static($user);
+            }
+        }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getAuthKey()
-	{
-		return $this->authKey;
-	}
+        return null;
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function validateAuthKey($authKey)
-	{
-		return $this->authKey === $authKey;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
 
-	/**
-	 * Validates password
-	 *
-	 * @param string $password password to validate
-	 * @return boolean if password provided is valid for current user
-	 */
-	public function validatePassword($password)
-	{
-		return $this->password === $password;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getAuthKey()
+    {
+        return $this->authKey;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function validateAuthKey($authKey)
+    {
+        return $this->authKey === $authKey;
+    }
+
+    /**
+     * Validates password
+     *
+     * @param  string  $password password to validate
+     * @return boolean if password provided is valid for current user
+     */
+    public function validatePassword($password)
+    {
+        return $this->password === $password;
+    }
 }
diff --git a/requirements.php b/requirements.php
index d470f99d7..b96e4d69d 100644
--- a/requirements.php
+++ b/requirements.php
@@ -14,10 +14,10 @@
 $frameworkPath = dirname(__FILE__) . '/vendor/yiisoft/yii2';
 
 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>';
+    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');
@@ -27,84 +27,84 @@
  * Adjust requirements according to your application specifics.
  */
 $requirements = array(
-	// Database :
-	array(
-		'name' => 'PDO extension',
-		'mandatory' => true,
-		'condition' => extension_loaded('pdo'),
-		'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
-	),
-	array(
-		'name' => 'PDO SQLite extension',
-		'mandatory' => false,
-		'condition' => extension_loaded('pdo_sqlite'),
-		'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
-		'memo' => 'Required for SQLite database.',
-	),
-	array(
-		'name' => 'PDO MySQL extension',
-		'mandatory' => false,
-		'condition' => extension_loaded('pdo_mysql'),
-		'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
-		'memo' => 'Required for MySQL database.',
-	),
-	array(
-		'name' => 'PDO PostgreSQL extension',
-		'mandatory' => false,
-		'condition' => extension_loaded('pdo_pgsql'),
-		'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
-		'memo' => 'Required for PostgreSQL database.',
-	),
-	// Cache :
-	array(
-		'name' => 'Memcache extension',
-		'mandatory' => false,
-		'condition' => extension_loaded('memcache') || extension_loaded('memcached'),
-		'by' => '<a href="http://www.yiiframework.com/doc/api/CMemCache">CMemCache</a>',
-		'memo' => extension_loaded('memcached') ? 'To use memcached set <a href="http://www.yiiframework.com/doc/api/CMemCache#useMemcached-detail">CMemCache::useMemcached</a> to <code>true</code>.' : ''
-	),
-	array(
-		'name' => 'APC extension',
-		'mandatory' => false,
-		'condition' => extension_loaded('apc'),
-		'by' => '<a href="http://www.yiiframework.com/doc/api/CApcCache">CApcCache</a>',
-	),
-	// Additional PHP extensions :
-	array(
-		'name' => 'Mcrypt extension',
-		'mandatory' => false,
-		'condition' => extension_loaded('mcrypt'),
-		'by' => '<a href="http://www.yiiframework.com/doc/api/CSecurityManager">CSecurityManager</a>',
-		'memo' => 'Required by encrypt and decrypt methods.'
-	),
-	// PHP ini :
-	'phpSafeMode' => array(
-		'name' => 'PHP safe mode',
-		'mandatory' => false,
-		'condition' => $requirementsChecker->checkPhpIniOff("safe_mode"),
-		'by' => 'File uploading and console command execution',
-		'memo' => '"safe_mode" should be disabled at php.ini',
-	),
-	'phpExposePhp' => array(
-		'name' => 'Expose PHP',
-		'mandatory' => false,
-		'condition' => $requirementsChecker->checkPhpIniOff("expose_php"),
-		'by' => 'Security reasons',
-		'memo' => '"expose_php" should be disabled at php.ini',
-	),
-	'phpAllowUrlInclude' => array(
-		'name' => 'PHP allow url include',
-		'mandatory' => false,
-		'condition' => $requirementsChecker->checkPhpIniOff("allow_url_include"),
-		'by' => 'Security reasons',
-		'memo' => '"allow_url_include" should be disabled at php.ini',
-	),
-	'phpSmtp' => array(
-		'name' => 'PHP mail SMTP',
-		'mandatory' => false,
-		'condition' => strlen(ini_get('SMTP'))>0,
-		'by' => 'Email sending',
-		'memo' => 'PHP mail SMTP server required',
-	),
+    // Database :
+    array(
+        'name' => 'PDO extension',
+        'mandatory' => true,
+        'condition' => extension_loaded('pdo'),
+        'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
+    ),
+    array(
+        'name' => 'PDO SQLite extension',
+        'mandatory' => false,
+        'condition' => extension_loaded('pdo_sqlite'),
+        'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
+        'memo' => 'Required for SQLite database.',
+    ),
+    array(
+        'name' => 'PDO MySQL extension',
+        'mandatory' => false,
+        'condition' => extension_loaded('pdo_mysql'),
+        'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
+        'memo' => 'Required for MySQL database.',
+    ),
+    array(
+        'name' => 'PDO PostgreSQL extension',
+        'mandatory' => false,
+        'condition' => extension_loaded('pdo_pgsql'),
+        'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
+        'memo' => 'Required for PostgreSQL database.',
+    ),
+    // Cache :
+    array(
+        'name' => 'Memcache extension',
+        'mandatory' => false,
+        'condition' => extension_loaded('memcache') || extension_loaded('memcached'),
+        'by' => '<a href="http://www.yiiframework.com/doc/api/CMemCache">CMemCache</a>',
+        'memo' => extension_loaded('memcached') ? 'To use memcached set <a href="http://www.yiiframework.com/doc/api/CMemCache#useMemcached-detail">CMemCache::useMemcached</a> to <code>true</code>.' : ''
+    ),
+    array(
+        'name' => 'APC extension',
+        'mandatory' => false,
+        'condition' => extension_loaded('apc'),
+        'by' => '<a href="http://www.yiiframework.com/doc/api/CApcCache">CApcCache</a>',
+    ),
+    // Additional PHP extensions :
+    array(
+        'name' => 'Mcrypt extension',
+        'mandatory' => false,
+        'condition' => extension_loaded('mcrypt'),
+        'by' => '<a href="http://www.yiiframework.com/doc/api/CSecurityManager">CSecurityManager</a>',
+        'memo' => 'Required by encrypt and decrypt methods.'
+    ),
+    // PHP ini :
+    'phpSafeMode' => array(
+        'name' => 'PHP safe mode',
+        'mandatory' => false,
+        'condition' => $requirementsChecker->checkPhpIniOff("safe_mode"),
+        'by' => 'File uploading and console command execution',
+        'memo' => '"safe_mode" should be disabled at php.ini',
+    ),
+    'phpExposePhp' => array(
+        'name' => 'Expose PHP',
+        'mandatory' => false,
+        'condition' => $requirementsChecker->checkPhpIniOff("expose_php"),
+        'by' => 'Security reasons',
+        'memo' => '"expose_php" should be disabled at php.ini',
+    ),
+    'phpAllowUrlInclude' => array(
+        'name' => 'PHP allow url include',
+        'mandatory' => false,
+        'condition' => $requirementsChecker->checkPhpIniOff("allow_url_include"),
+        'by' => 'Security reasons',
+        'memo' => '"allow_url_include" should be disabled at php.ini',
+    ),
+    'phpSmtp' => array(
+        'name' => 'PHP mail SMTP',
+        'mandatory' => false,
+        'condition' => strlen(ini_get('SMTP'))>0,
+        'by' => 'Email sending',
+        'memo' => 'PHP mail SMTP server required',
+    ),
 );
 $requirementsChecker->checkYii()->check($requirements)->render();
diff --git a/tests/_config.php b/tests/_config.php
index d9cc356dd..24ec1b56a 100644
--- a/tests/_config.php
+++ b/tests/_config.php
@@ -3,12 +3,12 @@
  * application configurations shared by all test types
  */
 return [
-	'components' => [
-		'mail' => [
-			'useFileTransport' => true,
-		],
-		'urlManager' => [
-			'showScriptName' => true,
-		],
-	],
+    'components' => [
+        'mail' => [
+            'useFileTransport' => true,
+        ],
+        'urlManager' => [
+            'showScriptName' => true,
+        ],
+    ],
 ];
diff --git a/tests/_helpers/CodeHelper.php b/tests/_helpers/CodeHelper.php
index 64484868d..201503ddf 100644
--- a/tests/_helpers/CodeHelper.php
+++ b/tests/_helpers/CodeHelper.php
@@ -3,5 +3,5 @@
 
 class CodeHelper extends \Codeception\Module
 {
-	// here you can define custom methods for CodeGuy
+    // here you can define custom methods for CodeGuy
 }
diff --git a/tests/_helpers/TestHelper.php b/tests/_helpers/TestHelper.php
index 9558ff151..ae9418775 100644
--- a/tests/_helpers/TestHelper.php
+++ b/tests/_helpers/TestHelper.php
@@ -3,5 +3,5 @@
 
 class TestHelper extends \Codeception\Module
 {
-	// here you can define custom methods for TestGuy
+    // here you can define custom methods for TestGuy
 }
diff --git a/tests/_helpers/WebHelper.php b/tests/_helpers/WebHelper.php
index b2953af3a..a8c72502a 100644
--- a/tests/_helpers/WebHelper.php
+++ b/tests/_helpers/WebHelper.php
@@ -3,5 +3,5 @@
 
 class WebHelper extends \Codeception\Module
 {
-	// here you can define custom methods for WebGuy
+    // here you can define custom methods for WebGuy
 }
diff --git a/tests/_pages/AboutPage.php b/tests/_pages/AboutPage.php
index 5f9021f4e..77acdb815 100644
--- a/tests/_pages/AboutPage.php
+++ b/tests/_pages/AboutPage.php
@@ -6,5 +6,5 @@
 
 class AboutPage extends BasePage
 {
-	public $route = 'site/about';
+    public $route = 'site/about';
 }
diff --git a/tests/_pages/ContactPage.php b/tests/_pages/ContactPage.php
index 18015b57c..24c8dfa56 100644
--- a/tests/_pages/ContactPage.php
+++ b/tests/_pages/ContactPage.php
@@ -6,17 +6,17 @@
 
 class ContactPage extends BasePage
 {
-	public $route = 'site/contact';
+    public $route = 'site/contact';
 
-	/**
-	 * @param array $contactData
-	 */
-	public function submit(array $contactData)
-	{
-		foreach ($contactData as $field => $value) {
-			$inputType = $field === 'body' ? 'textarea' : 'input';
-			$this->guy->fillField($inputType . '[name="ContactForm[' . $field . ']"]', $value);
-		}
-		$this->guy->click('contact-button');
-	}
+    /**
+     * @param array $contactData
+     */
+    public function submit(array $contactData)
+    {
+        foreach ($contactData as $field => $value) {
+            $inputType = $field === 'body' ? 'textarea' : 'input';
+            $this->guy->fillField($inputType . '[name="ContactForm[' . $field . ']"]', $value);
+        }
+        $this->guy->click('contact-button');
+    }
 }
diff --git a/tests/_pages/LoginPage.php b/tests/_pages/LoginPage.php
index 503a4205f..c73d729af 100644
--- a/tests/_pages/LoginPage.php
+++ b/tests/_pages/LoginPage.php
@@ -6,16 +6,16 @@
 
 class LoginPage extends BasePage
 {
-	public $route = 'site/login';
+    public $route = 'site/login';
 
-	/**
-	 * @param string $username
-	 * @param string $password
-	 */
-	public function login($username, $password)
-	{
-		$this->guy->fillField('input[name="LoginForm[username]"]', $username);
-		$this->guy->fillField('input[name="LoginForm[password]"]', $password);
-		$this->guy->click('login-button');
-	}
+    /**
+     * @param string $username
+     * @param string $password
+     */
+    public function login($username, $password)
+    {
+        $this->guy->fillField('input[name="LoginForm[username]"]', $username);
+        $this->guy->fillField('input[name="LoginForm[password]"]', $password);
+        $this->guy->click('login-button');
+    }
 }
diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml
index b3852841d..2e35aa558 100644
--- a/tests/acceptance.suite.yml
+++ b/tests/acceptance.suite.yml
@@ -15,7 +15,7 @@ modules:
         - PhpBrowser
 # you can use WebDriver instead of PhpBrowser to test javascript and ajax.
 # This will require you to install selenium. See http://codeception.com/docs/04-AcceptanceTests#Selenium
-# "restart" option is used by the WebDriver to start each time per test-file new session and cookies, 
+# "restart" option is used by the WebDriver to start each time per test-file new session and cookies,
 # it is useful if you want to login in your app in each test.
 #        - WebDriver
     config:
diff --git a/tests/acceptance/ContactCept.php b/tests/acceptance/ContactCept.php
index 25f5735e4..e76ac9beb 100644
--- a/tests/acceptance/ContactCept.php
+++ b/tests/acceptance/ContactCept.php
@@ -21,11 +21,11 @@
 
 $I->amGoingTo('submit contact form with not correct email');
 $contactPage->submit([
-	'name'			=>	'tester',
-	'email'			=>	'tester.email',
-	'subject'		=>	'test subject',
-	'body'			=>	'test content',
-	'verifyCode'	=>	'testme',
+    'name'			=>	'tester',
+    'email'			=>	'tester.email',
+    'subject'		=>	'test subject',
+    'body'			=>	'test content',
+    'verifyCode'	=>	'testme',
 ]);
 $I->expectTo('see that email adress is wrong');
 $I->dontSee('Name cannot be blank', '.help-inline');
@@ -36,14 +36,14 @@
 
 $I->amGoingTo('submit contact form with correct data');
 $contactPage->submit([
-	'name'			=>	'tester',
-	'email'			=>	'tester@example.com',
-	'subject'		=>	'test subject',
-	'body'			=>	'test content',
-	'verifyCode'	=>	'testme',
+    'name'			=>	'tester',
+    'email'			=>	'tester@example.com',
+    'subject'		=>	'test subject',
+    'body'			=>	'test content',
+    'verifyCode'	=>	'testme',
 ]);
 if (method_exists($I, 'wait')) {
-	$I->wait(3); // only for selenium
+    $I->wait(3); // only for selenium
 }
 $I->dontSeeElement('#contact-form');
 $I->see('Thank you for contacting us. We will respond to you as soon as possible.');
diff --git a/tests/acceptance/LoginCept.php b/tests/acceptance/LoginCept.php
index 5d6a3878e..07d1c452e 100644
--- a/tests/acceptance/LoginCept.php
+++ b/tests/acceptance/LoginCept.php
@@ -23,7 +23,7 @@
 $I->amGoingTo('try to login with correct credentials');
 $loginPage->login('admin', 'admin');
 if (method_exists($I, 'wait')) {
-	$I->wait(3); // only for selenium
+    $I->wait(3); // only for selenium
 }
 $I->expectTo('see user info');
 $I->see('Logout (admin)');
diff --git a/tests/acceptance/_config.php b/tests/acceptance/_config.php
index 4c306b3bb..857a804f4 100644
--- a/tests/acceptance/_config.php
+++ b/tests/acceptance/_config.php
@@ -1,13 +1,13 @@
 <?php
 
 return yii\helpers\ArrayHelper::merge(
-	require(__DIR__ . '/../../config/web.php'),
-	require(__DIR__ . '/../_config.php'),
-	[
-		'components' => [
-			'db' => [
-				'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance',
-			],
-		],
-	]
+    require(__DIR__ . '/../../config/web.php'),
+    require(__DIR__ . '/../_config.php'),
+    [
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance',
+            ],
+        ],
+    ]
 );
diff --git a/tests/acceptance/_console.php b/tests/acceptance/_console.php
index f89eecfc2..03cdd1ff6 100644
--- a/tests/acceptance/_console.php
+++ b/tests/acceptance/_console.php
@@ -1,13 +1,13 @@
 <?php
 
 return yii\helpers\ArrayHelper::merge(
-	require(__DIR__ . '/../../config/console.php'),
-	require(__DIR__ . '/../_config.php'),
-	[
-		'components' => [
-			'db' => [
-				'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance',
-			],
-		],
-	]
+    require(__DIR__ . '/../../config/console.php'),
+    require(__DIR__ . '/../_config.php'),
+    [
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance',
+            ],
+        ],
+    ]
 );
diff --git a/tests/functional/ContactCept.php b/tests/functional/ContactCept.php
index 14e61973e..49d7735fd 100644
--- a/tests/functional/ContactCept.php
+++ b/tests/functional/ContactCept.php
@@ -21,11 +21,11 @@
 
 $I->amGoingTo('submit contact form with not correct email');
 $contactPage->submit([
-	'name'			=>	'tester',
-	'email'			=>	'tester.email',
-	'subject'		=>	'test subject',
-	'body'			=>	'test content',
-	'verifyCode'	=>	'testme',
+    'name'			=>	'tester',
+    'email'			=>	'tester.email',
+    'subject'		=>	'test subject',
+    'body'			=>	'test content',
+    'verifyCode'	=>	'testme',
 ]);
 $I->expectTo('see that email adress is wrong');
 $I->dontSee('Name cannot be blank', '.help-inline');
@@ -36,11 +36,11 @@
 
 $I->amGoingTo('submit contact form with correct data');
 $contactPage->submit([
-	'name'			=>	'tester',
-	'email'			=>	'tester@example.com',
-	'subject'		=>	'test subject',
-	'body'			=>	'test content',
-	'verifyCode'	=>	'testme',
+    'name'			=>	'tester',
+    'email'			=>	'tester@example.com',
+    'subject'		=>	'test subject',
+    'body'			=>	'test content',
+    'verifyCode'	=>	'testme',
 ]);
 $I->dontSeeElement('#contact-form');
 $I->see('Thank you for contacting us. We will respond to you as soon as possible.');
diff --git a/tests/functional/_config.php b/tests/functional/_config.php
index c2ecae0ea..512e802bb 100644
--- a/tests/functional/_config.php
+++ b/tests/functional/_config.php
@@ -5,13 +5,13 @@
 $_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
 
 return yii\helpers\ArrayHelper::merge(
-	require(__DIR__ . '/../../config/web.php'),
-	require(__DIR__ . '/../_config.php'),
-	[
-		'components' => [
-			'db' => [
-				'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional',
-			],
-		],
-	]
+    require(__DIR__ . '/../../config/web.php'),
+    require(__DIR__ . '/../_config.php'),
+    [
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional',
+            ],
+        ],
+    ]
 );
diff --git a/tests/functional/_console.php b/tests/functional/_console.php
index 2e674c4f9..abeee696c 100644
--- a/tests/functional/_console.php
+++ b/tests/functional/_console.php
@@ -1,13 +1,13 @@
 <?php
 
 return yii\helpers\ArrayHelper::merge(
-	require(__DIR__ . '/../../config/console.php'),
-	require(__DIR__ . '/../_config.php'),
-	[
-		'components' => [
-			'db' => [
-				'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional',
-			],
-		],
-	]
+    require(__DIR__ . '/../../config/console.php'),
+    require(__DIR__ . '/../_config.php'),
+    [
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional',
+            ],
+        ],
+    ]
 );
diff --git a/tests/unit/_config.php b/tests/unit/_config.php
index 45f1ef42f..2559ef31e 100644
--- a/tests/unit/_config.php
+++ b/tests/unit/_config.php
@@ -1,13 +1,13 @@
 <?php
 
 return yii\helpers\ArrayHelper::merge(
-	require(__DIR__ . '/../../config/web.php'),
-	require(__DIR__ . '/../_config.php'),
-	[
-		'components' => [
-			'db' => [
-				'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit',
-			],
-		],
-	]
+    require(__DIR__ . '/../../config/web.php'),
+    require(__DIR__ . '/../_config.php'),
+    [
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit',
+            ],
+        ],
+    ]
 );
diff --git a/tests/unit/_console.php b/tests/unit/_console.php
index d2a233ab3..04272a321 100644
--- a/tests/unit/_console.php
+++ b/tests/unit/_console.php
@@ -1,13 +1,13 @@
 <?php
 
 return yii\helpers\ArrayHelper::merge(
-	require(__DIR__ . '/../../config/console.php'),
-	require(__DIR__ . '/../_config.php'),
-	[
-		'components' => [
-			'db' => [
-				'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit',
-			],
-		],
-	]
+    require(__DIR__ . '/../../config/console.php'),
+    require(__DIR__ . '/../_config.php'),
+    [
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit',
+            ],
+        ],
+    ]
 );
diff --git a/tests/unit/models/ContactFormTest.php b/tests/unit/models/ContactFormTest.php
index c6797178e..d8a55ee83 100644
--- a/tests/unit/models/ContactFormTest.php
+++ b/tests/unit/models/ContactFormTest.php
@@ -7,52 +7,52 @@
 
 class ContactFormTest extends TestCase
 {
-	use \Codeception\Specify;
-
-	protected function setUp()
-	{
-		parent::setUp();
-		Yii::$app->mail->fileTransportCallback = function ($mailer, $message) {
-			return 'testing_message.eml';
-		};
-	}
-
-	protected function tearDown()
-	{
-		unlink($this->getMessageFile());
-		parent::tearDown();
-	}
-
-	public function testContact()
-	{
-		$model = $this->getMock('app\models\ContactForm', ['validate']);
-		$model->expects($this->once())->method('validate')->will($this->returnValue(true));
-
-		$model->attributes = [
-			'name' => 'Tester',
-			'email' => 'tester@example.com',
-			'subject' => 'very important letter subject',
-			'body' => 'body of current message',
-		];
-
-		$model->contact('admin@example.com');
-
-		$this->specify('email should be send', function () {
-			expect('email file should exist', file_exists($this->getMessageFile()))->true();
-		});
-
-		$this->specify('message should contain correct data', function () use ($model) {
-			$emailMessage = file_get_contents($this->getMessageFile());
-
-			expect('email should contain user name', $emailMessage)->contains($model->name);
-			expect('email should contain sender email', $emailMessage)->contains($model->email);
-			expect('email should contain subject', $emailMessage)->contains($model->subject);
-			expect('email should contain body', $emailMessage)->contains($model->body);
-		});
-	}
-
-	private function getMessageFile()
-	{
-		return Yii::getAlias(Yii::$app->mail->fileTransportPath) . '/testing_message.eml';
-	}
+    use \Codeception\Specify;
+
+    protected function setUp()
+    {
+        parent::setUp();
+        Yii::$app->mail->fileTransportCallback = function ($mailer, $message) {
+            return 'testing_message.eml';
+        };
+    }
+
+    protected function tearDown()
+    {
+        unlink($this->getMessageFile());
+        parent::tearDown();
+    }
+
+    public function testContact()
+    {
+        $model = $this->getMock('app\models\ContactForm', ['validate']);
+        $model->expects($this->once())->method('validate')->will($this->returnValue(true));
+
+        $model->attributes = [
+            'name' => 'Tester',
+            'email' => 'tester@example.com',
+            'subject' => 'very important letter subject',
+            'body' => 'body of current message',
+        ];
+
+        $model->contact('admin@example.com');
+
+        $this->specify('email should be send', function () {
+            expect('email file should exist', file_exists($this->getMessageFile()))->true();
+        });
+
+        $this->specify('message should contain correct data', function () use ($model) {
+            $emailMessage = file_get_contents($this->getMessageFile());
+
+            expect('email should contain user name', $emailMessage)->contains($model->name);
+            expect('email should contain sender email', $emailMessage)->contains($model->email);
+            expect('email should contain subject', $emailMessage)->contains($model->subject);
+            expect('email should contain body', $emailMessage)->contains($model->body);
+        });
+    }
+
+    private function getMessageFile()
+    {
+        return Yii::getAlias(Yii::$app->mail->fileTransportPath) . '/testing_message.eml';
+    }
 }
diff --git a/tests/unit/models/LoginFormTest.php b/tests/unit/models/LoginFormTest.php
index d1f6043fa..c2c28cc51 100644
--- a/tests/unit/models/LoginFormTest.php
+++ b/tests/unit/models/LoginFormTest.php
@@ -8,59 +8,60 @@
 
 class LoginFormTest extends TestCase
 {
-	use \Codeception\Specify;
+    use \Codeception\Specify;
 
-	protected function tearDown()
-	{
-		Yii::$app->user->logout();
-		parent::tearDown();
-	}
+    protected function tearDown()
+    {
+        Yii::$app->user->logout();
+        parent::tearDown();
+    }
 
-	public function testLoginNoUser()
-	{
-		$model = $this->mockUser(null);
+    public function testLoginNoUser()
+    {
+        $model = $this->mockUser(null);
 
-		$model->username = 'some_username';
-		$model->password = 'some_password';
+        $model->username = 'some_username';
+        $model->password = 'some_password';
 
-		$this->specify('user should not be able to login, when there is no identity', function () use ($model) {
-			expect('model should not login user', $model->login())->false();
-			expect('user should not be logged in', Yii::$app->user->isGuest)->true();
-		});
-	}
+        $this->specify('user should not be able to login, when there is no identity', function () use ($model) {
+            expect('model should not login user', $model->login())->false();
+            expect('user should not be logged in', Yii::$app->user->isGuest)->true();
+        });
+    }
 
-	public function testLoginWrongPassword()
-	{
-		$model = $this->mockUser(new User);
+    public function testLoginWrongPassword()
+    {
+        $model = $this->mockUser(new User);
 
-		$model->username = 'demo';
-		$model->password = 'wrong-password';
+        $model->username = 'demo';
+        $model->password = 'wrong-password';
 
-		$this->specify('user should not be able to login with wrong password', function () use ($model) {
-			expect('model should not login user', $model->login())->false();
-			expect('error message should be set', $model->errors)->hasKey('password');
-			expect('user should not be logged in', Yii::$app->user->isGuest)->true();
-		});
-	}
+        $this->specify('user should not be able to login with wrong password', function () use ($model) {
+            expect('model should not login user', $model->login())->false();
+            expect('error message should be set', $model->errors)->hasKey('password');
+            expect('user should not be logged in', Yii::$app->user->isGuest)->true();
+        });
+    }
 
-	public function testLoginCorrect()
-	{
-		$model = $this->mockUser(new User(['password' => 'demo']));
+    public function testLoginCorrect()
+    {
+        $model = $this->mockUser(new User(['password' => 'demo']));
 
-		$model->username = 'demo';
-		$model->password = 'demo';
+        $model->username = 'demo';
+        $model->password = 'demo';
 
-		$this->specify('user should be able to login with correct credentials', function () use ($model) {
-			expect('model should login user', $model->login())->true();
-			expect('error message should not be set', $model->errors)->hasntKey('password');
-			expect('user should be logged in', Yii::$app->user->isGuest)->false();
-		});
-	}
+        $this->specify('user should be able to login with correct credentials', function () use ($model) {
+            expect('model should login user', $model->login())->true();
+            expect('error message should not be set', $model->errors)->hasntKey('password');
+            expect('user should be logged in', Yii::$app->user->isGuest)->false();
+        });
+    }
 
-	private function mockUser($user)
-	{
-		$loginForm = $this->getMock('app\models\LoginForm', ['getUser']);
-		$loginForm->expects($this->any())->method('getUser')->will($this->returnValue($user));
-		return $loginForm;
-	}
+    private function mockUser($user)
+    {
+        $loginForm = $this->getMock('app\models\LoginForm', ['getUser']);
+        $loginForm->expects($this->any())->method('getUser')->will($this->returnValue($user));
+
+        return $loginForm;
+    }
 }
diff --git a/tests/unit/models/UserTest.php b/tests/unit/models/UserTest.php
index 109da730d..8cd921533 100644
--- a/tests/unit/models/UserTest.php
+++ b/tests/unit/models/UserTest.php
@@ -6,12 +6,12 @@
 
 class UserTest extends TestCase
 {
-	protected function setUp()
-	{
-		parent::setUp();
-		// uncomment the following to load fixtures for table tbl_user
-		//$this->loadFixtures(['tbl_user']);
-	}
+    protected function setUp()
+    {
+        parent::setUp();
+        // uncomment the following to load fixtures for table tbl_user
+        //$this->loadFixtures(['tbl_user']);
+    }
 
-	// TODO add test methods here
+    // TODO add test methods here
 }
diff --git a/views/layouts/main.php b/views/layouts/main.php
index f32b53fe8..6af9564ab 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -15,53 +15,53 @@
 <!DOCTYPE html>
 <html lang="<?= Yii::$app->language ?>">
 <head>
-	<meta charset="<?= Yii::$app->charset ?>"/>
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title><?= Html::encode($this->title) ?></title>
-	<?php $this->head() ?>
+    <meta charset="<?= Yii::$app->charset ?>"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title><?= Html::encode($this->title) ?></title>
+    <?php $this->head() ?>
 </head>
 <body>
 
 <?php $this->beginBody() ?>
-	<div class="wrap">
-		<?php
-			NavBar::begin([
-				'brandLabel' => 'My Company',
-				'brandUrl' => Yii::$app->homeUrl,
-				'options' => [
-					'class' => 'navbar-inverse navbar-fixed-top',
-				],
-			]);
-			echo Nav::widget([
-				'options' => ['class' => 'navbar-nav navbar-right'],
-				'items' => [
-					['label' => 'Home', 'url' => ['/site/index']],
-					['label' => 'About', 'url' => ['/site/about']],
-					['label' => 'Contact', 'url' => ['/site/contact']],
-					Yii::$app->user->isGuest ?
-						['label' => 'Login', 'url' => ['/site/login']] :
-						['label' => 'Logout (' . Yii::$app->user->identity->username . ')',
-							'url' => ['/site/logout'],
-							'linkOptions' => ['data-method' => 'post']],
-				],
-			]);
-			NavBar::end();
-		?>
+    <div class="wrap">
+        <?php
+            NavBar::begin([
+                'brandLabel' => 'My Company',
+                'brandUrl' => Yii::$app->homeUrl,
+                'options' => [
+                    'class' => 'navbar-inverse navbar-fixed-top',
+                ],
+            ]);
+            echo Nav::widget([
+                'options' => ['class' => 'navbar-nav navbar-right'],
+                'items' => [
+                    ['label' => 'Home', 'url' => ['/site/index']],
+                    ['label' => 'About', 'url' => ['/site/about']],
+                    ['label' => 'Contact', 'url' => ['/site/contact']],
+                    Yii::$app->user->isGuest ?
+                        ['label' => 'Login', 'url' => ['/site/login']] :
+                        ['label' => 'Logout (' . Yii::$app->user->identity->username . ')',
+                            'url' => ['/site/logout'],
+                            'linkOptions' => ['data-method' => 'post']],
+                ],
+            ]);
+            NavBar::end();
+        ?>
 
-		<div class="container">
-			<?= Breadcrumbs::widget([
-				'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
-			]) ?>
-			<?= $content ?>
-		</div>
-	</div>
+        <div class="container">
+            <?= Breadcrumbs::widget([
+                'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
+            ]) ?>
+            <?= $content ?>
+        </div>
+    </div>
 
-	<footer class="footer">
-		<div class="container">
-			<p class="pull-left">&copy; My Company <?= date('Y') ?></p>
-			<p class="pull-right"><?= Yii::powered() ?></p>
-		</div>
-	</footer>
+    <footer class="footer">
+        <div class="container">
+            <p class="pull-left">&copy; My Company <?= date('Y') ?></p>
+            <p class="pull-right"><?= Yii::powered() ?></p>
+        </div>
+    </footer>
 
 <?php $this->endBody() ?>
 </body>
diff --git a/views/site/about.php b/views/site/about.php
index 0608dd2ec..58969ab7a 100644
--- a/views/site/about.php
+++ b/views/site/about.php
@@ -8,11 +8,11 @@
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="site-about">
-	<h1><?= Html::encode($this->title) ?></h1>
+    <h1><?= Html::encode($this->title) ?></h1>
 
-	<p>
-		This is the About page. You may modify the following file to customize its content:
-	</p>
+    <p>
+        This is the About page. You may modify the following file to customize its content:
+    </p>
 
-	<code><?= __FILE__ ?></code>
+    <code><?= __FILE__ ?></code>
 </div>
diff --git a/views/site/contact.php b/views/site/contact.php
index bcaf542a7..6d70462eb 100644
--- a/views/site/contact.php
+++ b/views/site/contact.php
@@ -12,47 +12,47 @@
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="site-contact">
-	<h1><?= Html::encode($this->title) ?></h1>
-
-	<?php if (Yii::$app->session->hasFlash('contactFormSubmitted')): ?>
-
-	<div class="alert alert-success">
-		Thank you for contacting us. We will respond to you as soon as possible.
-	</div>
-
-	<p>
-		Note that if you turn on the Yii debugger, you should be able
-		to view the mail message on the mail panel of the debugger.
-		<?php if (Yii::$app->mail->useFileTransport): ?>
-		Because the application is in development mode, the email is not sent but saved as
-		a file under <code><?= Yii::getAlias(Yii::$app->mail->fileTransportPath) ?></code>.
-		Please configure the <code>useFileTransport</code> property of the <code>mail</code>
-		application component to be false to enable email sending.
-		<?php endif; ?>
-	</p>
-
-	<?php else: ?>
-
-	<p>
-		If you have business inquiries or other questions, please fill out the following form to contact us. Thank you.
-	</p>
-
-	<div class="row">
-		<div class="col-lg-5">
-			<?php $form = ActiveForm::begin(['id' => 'contact-form']); ?>
-				<?= $form->field($model, 'name') ?>
-				<?= $form->field($model, 'email') ?>
-				<?= $form->field($model, 'subject') ?>
-				<?= $form->field($model, 'body')->textArea(['rows' => 6]) ?>
-				<?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [
-					'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
-				]) ?>
-				<div class="form-group">
-					<?= Html::submitButton('Submit', ['class' => 'btn btn-primary', 'name' => 'contact-button']) ?>
-				</div>
-			<?php ActiveForm::end(); ?>
-		</div>
-	</div>
-
-	<?php endif; ?>
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?php if (Yii::$app->session->hasFlash('contactFormSubmitted')): ?>
+
+    <div class="alert alert-success">
+        Thank you for contacting us. We will respond to you as soon as possible.
+    </div>
+
+    <p>
+        Note that if you turn on the Yii debugger, you should be able
+        to view the mail message on the mail panel of the debugger.
+        <?php if (Yii::$app->mail->useFileTransport): ?>
+        Because the application is in development mode, the email is not sent but saved as
+        a file under <code><?= Yii::getAlias(Yii::$app->mail->fileTransportPath) ?></code>.
+        Please configure the <code>useFileTransport</code> property of the <code>mail</code>
+        application component to be false to enable email sending.
+        <?php endif; ?>
+    </p>
+
+    <?php else: ?>
+
+    <p>
+        If you have business inquiries or other questions, please fill out the following form to contact us. Thank you.
+    </p>
+
+    <div class="row">
+        <div class="col-lg-5">
+            <?php $form = ActiveForm::begin(['id' => 'contact-form']); ?>
+                <?= $form->field($model, 'name') ?>
+                <?= $form->field($model, 'email') ?>
+                <?= $form->field($model, 'subject') ?>
+                <?= $form->field($model, 'body')->textArea(['rows' => 6]) ?>
+                <?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [
+                    'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
+                ]) ?>
+                <div class="form-group">
+                    <?= Html::submitButton('Submit', ['class' => 'btn btn-primary', 'name' => 'contact-button']) ?>
+                </div>
+            <?php ActiveForm::end(); ?>
+        </div>
+    </div>
+
+    <?php endif; ?>
 </div>
diff --git a/views/site/error.php b/views/site/error.php
index 1b7ce0422..c172fd621 100644
--- a/views/site/error.php
+++ b/views/site/error.php
@@ -13,17 +13,17 @@
 ?>
 <div class="site-error">
 
-	<h1><?= Html::encode($this->title) ?></h1>
+    <h1><?= Html::encode($this->title) ?></h1>
 
-	<div class="alert alert-danger">
-		<?= nl2br(Html::encode($message)) ?>
-	</div>
+    <div class="alert alert-danger">
+        <?= nl2br(Html::encode($message)) ?>
+    </div>
 
-	<p>
-		The above error occurred while the Web server was processing your request.
-	</p>
-	<p>
-		Please contact us if you think this is a server error. Thank you.
-	</p>
+    <p>
+        The above error occurred while the Web server was processing your request.
+    </p>
+    <p>
+        Please contact us if you think this is a server error. Thank you.
+    </p>
 
 </div>
diff --git a/views/site/index.php b/views/site/index.php
index bcb22781a..6b6394e56 100644
--- a/views/site/index.php
+++ b/views/site/index.php
@@ -6,48 +6,48 @@
 ?>
 <div class="site-index">
 
-	<div class="jumbotron">
-		<h1>Congratulations!</h1>
+    <div class="jumbotron">
+        <h1>Congratulations!</h1>
 
-		<p class="lead">You have successfully created your Yii-powered application.</p>
+        <p class="lead">You have successfully created your Yii-powered application.</p>
 
-		<p><a class="btn btn-lg btn-success" href="http://www.yiiframework.com/">Get started with Yii</a></p>
-	</div>
+        <p><a class="btn btn-lg btn-success" href="http://www.yiiframework.com/">Get started with Yii</a></p>
+    </div>
 
-	<div class="body-content">
+    <div class="body-content">
 
-		<div class="row">
-			<div class="col-lg-4">
-				<h2>Heading</h2>
+        <div class="row">
+            <div class="col-lg-4">
+                <h2>Heading</h2>
 
-				<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
-					dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
-					ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
-					fugiat nulla pariatur.</p>
+                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
+                    dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
+                    ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
+                    fugiat nulla pariatur.</p>
 
-				<p><a class="btn btn-default" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
-			</div>
-			<div class="col-lg-4">
-				<h2>Heading</h2>
+                <p><a class="btn btn-default" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
+            </div>
+            <div class="col-lg-4">
+                <h2>Heading</h2>
 
-				<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
-					dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
-					ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
-					fugiat nulla pariatur.</p>
+                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
+                    dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
+                    ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
+                    fugiat nulla pariatur.</p>
 
-				<p><a class="btn btn-default" href="http://www.yiiframework.com/forum/">Yii Forum &raquo;</a></p>
-			</div>
-			<div class="col-lg-4">
-				<h2>Heading</h2>
+                <p><a class="btn btn-default" href="http://www.yiiframework.com/forum/">Yii Forum &raquo;</a></p>
+            </div>
+            <div class="col-lg-4">
+                <h2>Heading</h2>
 
-				<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
-					dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
-					ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
-					fugiat nulla pariatur.</p>
+                <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
+                    dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
+                    ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
+                    fugiat nulla pariatur.</p>
 
-				<p><a class="btn btn-default" href="http://www.yiiframework.com/extensions/">Yii Extensions &raquo;</a></p>
-			</div>
-		</div>
+                <p><a class="btn btn-default" href="http://www.yiiframework.com/extensions/">Yii Extensions &raquo;</a></p>
+            </div>
+        </div>
 
-	</div>
+    </div>
 </div>
diff --git a/views/site/login.php b/views/site/login.php
index 7d14c54dd..80cc5485e 100644
--- a/views/site/login.php
+++ b/views/site/login.php
@@ -11,37 +11,37 @@
 $this->params['breadcrumbs'][] = $this->title;
 ?>
 <div class="site-login">
-	<h1><?= Html::encode($this->title) ?></h1>
+    <h1><?= Html::encode($this->title) ?></h1>
 
-	<p>Please fill out the following fields to login:</p>
+    <p>Please fill out the following fields to login:</p>
 
-	<?php $form = ActiveForm::begin([
-		'id' => 'login-form',
-		'options' => ['class' => 'form-horizontal'],
-		'fieldConfig' => [
-			'template' => "{label}\n<div class=\"col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
-			'labelOptions' => ['class' => 'col-lg-1 control-label'],
-		],
-	]); ?>
+    <?php $form = ActiveForm::begin([
+        'id' => 'login-form',
+        'options' => ['class' => 'form-horizontal'],
+        'fieldConfig' => [
+            'template' => "{label}\n<div class=\"col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
+            'labelOptions' => ['class' => 'col-lg-1 control-label'],
+        ],
+    ]); ?>
 
-	<?= $form->field($model, 'username') ?>
+    <?= $form->field($model, 'username') ?>
 
-	<?= $form->field($model, 'password')->passwordInput() ?>
+    <?= $form->field($model, 'password')->passwordInput() ?>
 
-	<?= $form->field($model, 'rememberMe', [
-		'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
-	])->checkbox() ?>
+    <?= $form->field($model, 'rememberMe', [
+        'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
+    ])->checkbox() ?>
 
-	<div class="form-group">
-		<div class="col-lg-offset-1 col-lg-11">
-			<?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
-		</div>
-	</div>
+    <div class="form-group">
+        <div class="col-lg-offset-1 col-lg-11">
+            <?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
+        </div>
+    </div>
 
-	<?php ActiveForm::end(); ?>
+    <?php ActiveForm::end(); ?>
 
-	<div class="col-lg-offset-1" style="color:#999;">
-		You may login with <strong>admin/admin</strong> or <strong>demo/demo</strong>.<br>
-		To modify the username/password, please check out the code <code>app\models\User::$users</code>.
-	</div>
+    <div class="col-lg-offset-1" style="color:#999;">
+        You may login with <strong>admin/admin</strong> or <strong>demo/demo</strong>.<br>
+        To modify the username/password, please check out the code <code>app\models\User::$users</code>.
+    </div>
 </div>
diff --git a/web/index-test.php b/web/index-test.php
index b5ed6956f..326608d21 100644
--- a/web/index-test.php
+++ b/web/index-test.php
@@ -2,7 +2,7 @@
 
 // NOTE: Make sure this file is not accessible when deployed to production
 if (!in_array(@$_SERVER['REMOTE_ADDR'], ['127.0.0.1', '::1'])) {
-	die('You are not allowed to access this file.');
+    die('You are not allowed to access this file.');
 }
 
 defined('YII_DEBUG') or define('YII_DEBUG', true);

From d4b6fc017135819e14607d0ed896a51d941c1613 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 25 Mar 2014 08:37:48 -0400
Subject: [PATCH 010/390] more gitignores.

---
 .gitignore | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..45bf7bf41
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,27 @@
+# phpstorm project files
+.idea
+
+# netbeans project files
+nbproject
+
+# zend studio for eclipse project files
+.buildpath
+.project
+.settings
+
+# windows thumbnail cache
+Thumbs.db
+
+# composer vendor dir
+/vendor
+
+# composer itself is not needed
+composer.phar
+
+# Mac DS_Store Files
+.DS_Store
+
+# phpunit itself is not needed
+phpunit.phar
+# local phpunit config
+/phpunit.xml

From 1b8ef667f7260c6eefac2c5849554b4ab9a06ed9 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sun, 30 Mar 2014 19:33:46 +0400
Subject: [PATCH 011/390] Fixes #2911: Removed `tbl_` default for table prefix

---
 tests/unit/models/UserTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/models/UserTest.php b/tests/unit/models/UserTest.php
index 8cd921533..19ab30da0 100644
--- a/tests/unit/models/UserTest.php
+++ b/tests/unit/models/UserTest.php
@@ -9,8 +9,8 @@ class UserTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        // uncomment the following to load fixtures for table tbl_user
-        //$this->loadFixtures(['tbl_user']);
+        // uncomment the following to load fixtures for user table
+        //$this->loadFixtures(['user']);
     }
 
     // TODO add test methods here

From 923744d33358f5e125a1c21eb111093b97218496 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 2 Apr 2014 00:43:23 +0400
Subject: [PATCH 012/390] #2936: New favicon for applications

---
 web/favicon.ico | Bin 1150 -> 318 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/web/favicon.ico b/web/favicon.ico
index 49e61e33ca94362545346cb218c62dc7807e9c66..580ed732e86556ec57f3f3395a210246d679c076 100644
GIT binary patch
literal 318
zcmZQzU<5(|0RbS%!l1#(z#zuJz@P!d0zj+)#2|4HXaJKC0wf0lAEr2iX{M9K3=BR0
y!E90pK{x=K$Oz&POT#sS8N$ZKhC)h8ip0_|-T#43{vnSYgXBQCu@O54$pHYIza?e>

literal 1150
zcma)6XH1hp7(Rmu{|G<SANoU$#2BMSB_x<AOGOa{1Pnt#Kx9b}41&181qwtFAqWP-
z5=20h)ylA?C}0ah=|EcwEtFAOhS19T&ev;%q+%F%d2YPV`#hK2dpU&Gk#1;+$hZv!
ztVd`QLTDEO36aR(IGGS4+|mXBXes3UMoU`!x!U%M<Vf}S$cCl-YWsd}txewLEs#%8
z9JY5<&aH7+O{2?C42g}178eEYfcFvmfqw7EoT{hwxNgo$YfMq-W1KCo@|FqI#acmQ
zk{xj0go-dVueXv;my>tU+!^sFa8rsCv}Jk%uOI+4N{Oj%&Pr>HDfEM$SlXWB1Hz(U
z=q`_hetCNkh4Fv)y`0bdjM_j#e<+ev-v&l=4iw2c-<A%FW7q02OJV&cSx<ZxyB1!x
zvor;RlB_^M1Ewi@t}S=wsD|3e?45Q`;cD`(u+>UG{xrn23ZP6ZdY2&U;sgmB!MCG&
zPViG<zUV<w7_o$!)4}=5FQ+mT_-vsHTq?)GgE<L491VoA`!GkT@(TIhLIv<Yf%mrx
z2<KJ_=14uX+O+b~yN4pA*y52KPNoclUA7XOO2)vIHUS=tNqELn)zL?!*Zq0*aH*pj
zJUJ!c+LVjgDyeM?Pi?l(ON>pf_QK&ieQ-2k5Nuv5z%G|~6pzA1+W5r4)V$G60fX<=
z_5nON#o*SQ2hNQdkSS&*ggllP?sgTy0Y3?thD*ULrXP+a5|6ZDaLgIev<}Qz&tpo@
zi(NG3){+k{P1)eYN(Vc}b4V4|ys-2Xb?vn8f;|^RU>vyM5#0~onF@Z_(5$icj<of9
zz^kfqY)AtKW(u6Ce+o7=aZo91^-aoBL^+4{e75rMme}8rc1C3?Ue|S~ooDCpKW|m8
z9y2=6N*&PZtm*f`x%SDx<gCVEu?B0I6~87nCvwZu{aDFgg=2jOwHgcvQPBkE1X~gM
iy#UZhNDE32A?bF6m;^Bv<o95b|D*w-I2qxm5c&gUx$l7h


From bcf51a1156cb04b7c74756754addf360b8f24be8 Mon Sep 17 00:00:00 2001
From: Paul van Schayck <polleke@gmail.com>
Date: Fri, 4 Apr 2014 12:16:17 +0200
Subject: [PATCH 013/390] Add wait() to login test with wrong credentials to
 fix WebDriver test

---
 tests/acceptance/LoginCept.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/acceptance/LoginCept.php b/tests/acceptance/LoginCept.php
index 07d1c452e..c7c9ae306 100644
--- a/tests/acceptance/LoginCept.php
+++ b/tests/acceptance/LoginCept.php
@@ -17,6 +17,9 @@
 
 $I->amGoingTo('try to login with wrong credentials');
 $loginPage->login('admin', 'wrong');
+if (method_exists($I, 'wait')) {
+    $I->wait(3); // only for selenium
+}
 $I->expectTo('see validations errors');
 $I->see('Incorrect username or password.');
 

From 4f00e23565f3b5b33afa84ebb890cd5f615df81b Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 5 Apr 2014 01:00:14 -0400
Subject: [PATCH 014/390] Moved all filter classes to namespace `yii\filters`

---
 controllers/SiteController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/controllers/SiteController.php b/controllers/SiteController.php
index ebecd28e6..f95994160 100644
--- a/controllers/SiteController.php
+++ b/controllers/SiteController.php
@@ -3,9 +3,9 @@
 namespace app\controllers;
 
 use Yii;
-use yii\web\AccessControl;
+use yii\filters\AccessControl;
 use yii\web\Controller;
-use yii\web\VerbFilter;
+use yii\filters\VerbFilter;
 use app\models\LoginForm;
 use app\models\ContactForm;
 

From 52eea89f09e2a7d770c32588d8ee13620af04b5e Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Wed, 9 Apr 2014 10:47:10 -0400
Subject: [PATCH 015/390] Removed `Application::preload` in favor of
 `Application::bootstrap`

---
 config/console.php | 1 -
 config/web.php     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/console.php b/config/console.php
index f25485856..88c43c526 100644
--- a/config/console.php
+++ b/config/console.php
@@ -8,7 +8,6 @@
 return [
     'id' => 'basic-console',
     'basePath' => dirname(__DIR__),
-    'preload' => ['log'],
     'controllerNamespace' => 'app\commands',
     'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
     'components' => [
diff --git a/config/web.php b/config/web.php
index 462c135a8..845a521c4 100644
--- a/config/web.php
+++ b/config/web.php
@@ -38,7 +38,7 @@
 
 if (YII_ENV_DEV) {
     // configuration adjustments for 'dev' environment
-    $config['preload'][] = 'debug';
+    $config['bootstrap'][] = 'debug';
     $config['modules']['debug'] = 'yii\debug\Module';
     $config['modules']['gii'] = 'yii\gii\Module';
 }

From 7c55b9a8cca1b685338c5bafc840b0630a5001cb Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Thu, 10 Apr 2014 00:05:05 -0400
Subject: [PATCH 016/390] updated error handler and requirement checker links.

---
 requirements.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/requirements.php b/requirements.php
index b96e4d69d..db53ef4e4 100644
--- a/requirements.php
+++ b/requirements.php
@@ -32,27 +32,27 @@
         'name' => 'PDO extension',
         'mandatory' => true,
         'condition' => extension_loaded('pdo'),
-        'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
+        'by' => 'All DB-related classes',
     ),
     array(
         'name' => 'PDO SQLite extension',
         'mandatory' => false,
         'condition' => extension_loaded('pdo_sqlite'),
-        'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
+        'by' => 'All DB-related classes',
         'memo' => 'Required for SQLite database.',
     ),
     array(
         'name' => 'PDO MySQL extension',
         'mandatory' => false,
         'condition' => extension_loaded('pdo_mysql'),
-        'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
+        'by' => 'All DB-related classes',
         'memo' => 'Required for MySQL database.',
     ),
     array(
         'name' => 'PDO PostgreSQL extension',
         'mandatory' => false,
         'condition' => extension_loaded('pdo_pgsql'),
-        'by' => 'All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>',
+        'by' => 'All DB-related classes',
         'memo' => 'Required for PostgreSQL database.',
     ),
     // Cache :
@@ -60,21 +60,21 @@
         'name' => 'Memcache extension',
         'mandatory' => false,
         'condition' => extension_loaded('memcache') || extension_loaded('memcached'),
-        'by' => '<a href="http://www.yiiframework.com/doc/api/CMemCache">CMemCache</a>',
-        'memo' => extension_loaded('memcached') ? 'To use memcached set <a href="http://www.yiiframework.com/doc/api/CMemCache#useMemcached-detail">CMemCache::useMemcached</a> to <code>true</code>.' : ''
+        'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-caching-memcache.html">MemCache</a>',
+        'memo' => extension_loaded('memcached') ? 'To use memcached set <a href="http://www.yiiframework.com/doc-2.0/yii-caching-memcache.html#$useMemcached-detail">MemCache::useMemcached</a> to <code>true</code>.' : ''
     ),
     array(
         'name' => 'APC extension',
         'mandatory' => false,
         'condition' => extension_loaded('apc'),
-        'by' => '<a href="http://www.yiiframework.com/doc/api/CApcCache">CApcCache</a>',
+        'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-caching-apccache.html">ApcCache</a>',
     ),
     // Additional PHP extensions :
     array(
         'name' => 'Mcrypt extension',
         'mandatory' => false,
         'condition' => extension_loaded('mcrypt'),
-        'by' => '<a href="http://www.yiiframework.com/doc/api/CSecurityManager">CSecurityManager</a>',
+        'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-helpers-security.html">Security Helper</a>',
         'memo' => 'Required by encrypt and decrypt methods.'
     ),
     // PHP ini :

From abcc78cd8f8b4f8fd5b84c1a78b94242c57be415 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Thu, 10 Apr 2014 15:05:01 -0400
Subject: [PATCH 017/390] Refactored app bootstrap logic.

---
 config/console.php | 1 +
 config/web.php     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/config/console.php b/config/console.php
index 88c43c526..462f35bd6 100644
--- a/config/console.php
+++ b/config/console.php
@@ -8,6 +8,7 @@
 return [
     'id' => 'basic-console',
     'basePath' => dirname(__DIR__),
+    'bootstrap' => ['log'],
     'controllerNamespace' => 'app\commands',
     'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
     'components' => [
diff --git a/config/web.php b/config/web.php
index 845a521c4..fb9c6791c 100644
--- a/config/web.php
+++ b/config/web.php
@@ -6,6 +6,7 @@
 $config = [
     'id' => 'basic',
     'basePath' => dirname(__DIR__),
+    'bootstrap' => ['log'],
     'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
     'components' => [
         'cache' => [

From c1472697e2422e8d123d3831e4a2fa8dafe370e9 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 13 Apr 2014 17:58:59 -0400
Subject: [PATCH 018/390] prepare for 2.0.0-beta release.

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

diff --git a/composer.json b/composer.json
index 726a7ea93..e879e6b3e 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
 		"irc": "irc://irc.freenode.net/yii",
 		"source": "https://github.com/yiisoft/yii2"
 	},
-	"minimum-stability": "dev",
+	"minimum-stability": "beta",
 	"require": {
 		"php": ">=5.4.0",
 		"yiisoft/yii2": "*",

From fedb41fcc340dacbbd98a6c7976f1c08293cf0cf Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 13 Apr 2014 21:22:29 -0400
Subject: [PATCH 019/390] prepare for next release.

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

diff --git a/composer.json b/composer.json
index e879e6b3e..726a7ea93 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
 		"irc": "irc://irc.freenode.net/yii",
 		"source": "https://github.com/yiisoft/yii2"
 	},
-	"minimum-stability": "beta",
+	"minimum-stability": "dev",
 	"require": {
 		"php": ">=5.4.0",
 		"yiisoft/yii2": "*",

From cbedf7ad960a9a17c40219f821ec857231692f46 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Thu, 17 Apr 2014 20:42:50 -0400
Subject: [PATCH 020/390] Fixes #3088: The debug and gii modules will manage
 their own URL rules now

---
 config/web.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/web.php b/config/web.php
index fb9c6791c..524fd31b9 100644
--- a/config/web.php
+++ b/config/web.php
@@ -41,6 +41,8 @@
     // configuration adjustments for 'dev' environment
     $config['bootstrap'][] = 'debug';
     $config['modules']['debug'] = 'yii\debug\Module';
+
+    $config['bootstrap'][] = 'gii';
     $config['modules']['gii'] = 'yii\gii\Module';
 }
 

From c964a753d8aee813d617ec06f1990dd55e20cfd3 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 6 May 2014 18:45:18 -0400
Subject: [PATCH 021/390] Fixes #3383: Added `$type` parameter to
 `IdentityInterface::findIdentityByAccessToken()`

---
 models/User.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/User.php b/models/User.php
index 5de7e20c2..cbfb9fefc 100644
--- a/models/User.php
+++ b/models/User.php
@@ -38,7 +38,7 @@ public static function findIdentity($id)
     /**
      * @inheritdoc
      */
-    public static function findIdentityByAccessToken($token)
+    public static function findIdentityByAccessToken($token, $type = null)
     {
         foreach (self::$users as $user) {
             if ($user['accessToken'] === $token) {

From 914a6f76fea9233f25c1951b350fe844cd1bd177 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 10 May 2014 14:07:34 -0400
Subject: [PATCH 022/390] finished quick start about database [skip ci]

---
 config/web.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/web.php b/config/web.php
index 524fd31b9..fbb7934e8 100644
--- a/config/web.php
+++ b/config/web.php
@@ -1,7 +1,6 @@
 <?php
 
 $params = require(__DIR__ . '/params.php');
-$db = require(__DIR__ . '/db.php');
 
 $config = [
     'id' => 'basic',
@@ -32,7 +31,7 @@
                 ],
             ],
         ],
-        'db' => $db,
+        'db' => require(__DIR__ . '/db.php'),
     ],
     'params' => $params,
 ];

From fff7565b0569301fd37418e649c8cb8a877677b5 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Fri, 23 May 2014 16:51:38 +0200
Subject: [PATCH 023/390] Tabs to spaces to be consistent

```
vendor/bin/indent --spaces -r framework/
vendor/bin/indent --tabs -r . --pattern=*.json
vendor/bin/indent --spaces -r . --pattern=*.md
vendor/bin/indent --spaces -r . --pattern=yii.*.js
vendor/bin/indent --spaces -r . --pattern=*.css
```
---
 README.md        | 10 +++----
 web/css/site.css | 74 ++++++++++++++++++++++++------------------------
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/README.md b/README.md
index d025b5e07..452d030c2 100644
--- a/README.md
+++ b/README.md
@@ -75,11 +75,11 @@ Edit the file `config/db.php` with real data, for example:
 
 ```php
 return [
-	'class' => 'yii\db\Connection',
-	'dsn' => 'mysql:host=localhost;dbname=yii2basic',
-	'username' => 'root',
-	'password' => '1234',
-	'charset' => 'utf8',
+    'class' => 'yii\db\Connection',
+    'dsn' => 'mysql:host=localhost;dbname=yii2basic',
+    'username' => 'root',
+    'password' => '1234',
+    'charset' => 'utf8',
 ];
 ```
 
diff --git a/web/css/site.css b/web/css/site.css
index 068d5fd40..698be709c 100644
--- a/web/css/site.css
+++ b/web/css/site.css
@@ -1,13 +1,13 @@
 html,
 body {
-	height: 100%;
+    height: 100%;
 }
 
 .wrap {
-	min-height: 100%;
-	height: auto;
-	margin: 0 auto -60px;
-	padding: 0 0 60px;
+    min-height: 100%;
+    height: auto;
+    margin: 0 auto -60px;
+    padding: 0 0 60px;
 }
 
 .wrap > .container {
@@ -15,61 +15,61 @@ body {
 }
 
 .footer {
-	height: 60px;
-	background-color: #f5f5f5;
-	border-top: 1px solid #ddd;
-	padding-top: 20px;
+    height: 60px;
+    background-color: #f5f5f5;
+    border-top: 1px solid #ddd;
+    padding-top: 20px;
 }
 
 .jumbotron {
-	text-align: center;
-	background-color: transparent;
+    text-align: center;
+    background-color: transparent;
 }
 
 .jumbotron .btn {
-	font-size: 21px;
-	padding: 14px 24px;
+    font-size: 21px;
+    padding: 14px 24px;
 }
 
 .not-set {
-	color: #c55;
-	font-style: italic;
+    color: #c55;
+    font-style: italic;
 }
 
 /* add sorting icons to gridview sort links */
 a.asc:after, a.desc:after {
-	position: relative;
-	top: 1px;
-	display: inline-block;
-	font-family: 'Glyphicons Halflings';
-	font-style: normal;
-	font-weight: normal;
-	line-height: 1;
-	padding-left: 5px;
+    position: relative;
+    top: 1px;
+    display: inline-block;
+    font-family: 'Glyphicons Halflings';
+    font-style: normal;
+    font-weight: normal;
+    line-height: 1;
+    padding-left: 5px;
 }
 
 a.asc:after {
-	content: /*"\e113"*/ "\e151";
+    content: /*"\e113"*/ "\e151";
 }
 
 a.desc:after {
-	content: /*"\e114"*/ "\e152";
+    content: /*"\e114"*/ "\e152";
 }
 
 .sort-numerical a.asc:after {
-	content: "\e153";
+    content: "\e153";
 }
 
 .sort-numerical a.desc:after {
-	content: "\e154";
+    content: "\e154";
 }
 
 .sort-ordinal a.asc:after {
-	content: "\e155";
+    content: "\e155";
 }
 
 .sort-ordinal a.desc:after {
-	content: "\e156";
+    content: "\e156";
 }
 
 .grid-view th {
@@ -77,15 +77,15 @@ a.desc:after {
 }
 
 .hint-block {
-	display: block;
-	margin-top: 5px;
-	color: #999;
+    display: block;
+    margin-top: 5px;
+    color: #999;
 }
 
 .error-summary {
-	color: #a94442;
-	background: #fdf7f7;
-	border-left: 3px solid #eed3d7;
-	padding: 10px 20px;
-	margin: 0 0 15px 0;
+    color: #a94442;
+    background: #fdf7f7;
+    border-left: 3px solid #eed3d7;
+    padding: 10px 20px;
+    margin: 0 0 15px 0;
 }

From b946b9906dc0bb56c8939bcc1ebe651cfbdae00c Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 24 May 2014 18:11:59 +0400
Subject: [PATCH 024/390] Fixes #3542: Removed requirement to specify
 `extensions` in application config

---
 config/console.php | 1 -
 config/web.php     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/config/console.php b/config/console.php
index 462f35bd6..85297b3cb 100644
--- a/config/console.php
+++ b/config/console.php
@@ -10,7 +10,6 @@
     'basePath' => dirname(__DIR__),
     'bootstrap' => ['log'],
     'controllerNamespace' => 'app\commands',
-    'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
     'components' => [
         'cache' => [
             'class' => 'yii\caching\FileCache',
diff --git a/config/web.php b/config/web.php
index fbb7934e8..f9013d8fb 100644
--- a/config/web.php
+++ b/config/web.php
@@ -6,7 +6,6 @@
     'id' => 'basic',
     'basePath' => dirname(__DIR__),
     'bootstrap' => ['log'],
-    'extensions' => require(__DIR__ . '/../vendor/yiisoft/extensions.php'),
     'components' => [
         'cache' => [
             'class' => 'yii\caching\FileCache',

From e6888d16d0513e5ef8ebb6ed1b55234a4b699fcd Mon Sep 17 00:00:00 2001
From: Klimov Paul <klimov.paul@gmail.com>
Date: Thu, 29 May 2014 17:11:45 +0300
Subject: [PATCH 025/390] Mail layout charset specification fixed

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

diff --git a/mail/layouts/html.php b/mail/layouts/html.php
index a9689cc2e..b7235d1e8 100644
--- a/mail/layouts/html.php
+++ b/mail/layouts/html.php
@@ -3,14 +3,15 @@
 
 /**
  * @var \yii\web\View $this
- * @var \yii\mail\BaseMessage $content
+ * @var \yii\mail\MessageInterface $message
+ * @var string $content
  */
 ?>
 <?php $this->beginPage() ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=<?= Yii::$app->charset ?>" />
+    <meta http-equiv="Content-Type" content="text/html; charset=<?= $message->getCharset() ?>" />
     <title><?= Html::encode($this->title) ?></title>
     <?php $this->head() ?>
 </head>

From 91454779c27b969c6bea48abc9f2abd4e57682ea Mon Sep 17 00:00:00 2001
From: Klimov Paul <klimov.paul@gmail.com>
Date: Thu, 29 May 2014 17:41:10 +0300
Subject: [PATCH 026/390] Missing $message var reference removed from mail
 layouts

---
 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 b7235d1e8..8c217132d 100644
--- a/mail/layouts/html.php
+++ b/mail/layouts/html.php
@@ -3,7 +3,6 @@
 
 /**
  * @var \yii\web\View $this
- * @var \yii\mail\MessageInterface $message
  * @var string $content
  */
 ?>
@@ -11,7 +10,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=<?= $message->getCharset() ?>" />
+    <meta http-equiv="Content-Type" content="text/html; charset=<?= Yii::$app->charset ?>" />
     <title><?= Html::encode($this->title) ?></title>
     <?php $this->head() ?>
 </head>

From 2dedb6aa2c913dfb4f1b9aacf9600699c1b087ad Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 4 Jun 2014 17:43:09 +0200
Subject: [PATCH 027/390] added explicit comment about file transport to mail
 config

fixes #3694
---
 config/web.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/web.php b/config/web.php
index f9013d8fb..7fee63a65 100644
--- a/config/web.php
+++ b/config/web.php
@@ -19,6 +19,9 @@
         ],
         'mail' => [
             'class' => 'yii\swiftmailer\Mailer',
+            // send all mails to a file by default. You have to set
+            // 'useFileTransport' to false and configure a transport
+            // for the mailer to send real emails.
             'useFileTransport' => true,
         ],
         'log' => [

From 7a467ed501812dd6a07d6af3b8279809dd94d8d6 Mon Sep 17 00:00:00 2001
From: Mark <mark.github@yandex.ru>
Date: Mon, 9 Jun 2014 16:10:16 +0400
Subject: [PATCH 028/390] basic application template tests adjusted

---
 tests/unit/models/ContactFormTest.php |  4 ++-
 tests/unit/models/LoginFormTest.php   | 36 +++++++++++----------------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/tests/unit/models/ContactFormTest.php b/tests/unit/models/ContactFormTest.php
index d8a55ee83..fe214fab4 100644
--- a/tests/unit/models/ContactFormTest.php
+++ b/tests/unit/models/ContactFormTest.php
@@ -4,10 +4,11 @@
 
 use Yii;
 use yii\codeception\TestCase;
+use Codeception\Specify;
 
 class ContactFormTest extends TestCase
 {
-    use \Codeception\Specify;
+    use Specify;
 
     protected function setUp()
     {
@@ -55,4 +56,5 @@ private function getMessageFile()
     {
         return Yii::getAlias(Yii::$app->mail->fileTransportPath) . '/testing_message.eml';
     }
+
 }
diff --git a/tests/unit/models/LoginFormTest.php b/tests/unit/models/LoginFormTest.php
index c2c28cc51..f2c60f584 100644
--- a/tests/unit/models/LoginFormTest.php
+++ b/tests/unit/models/LoginFormTest.php
@@ -4,11 +4,12 @@
 
 use Yii;
 use yii\codeception\TestCase;
-use app\models\User;
+use app\models\LoginForm;
+use Codeception\Specify;
 
 class LoginFormTest extends TestCase
 {
-    use \Codeception\Specify;
+    use Specify;
 
     protected function tearDown()
     {
@@ -18,10 +19,10 @@ protected function tearDown()
 
     public function testLoginNoUser()
     {
-        $model = $this->mockUser(null);
-
-        $model->username = 'some_username';
-        $model->password = 'some_password';
+        $model = new LoginForm([
+            'username' => 'not_existing_username',
+            'password' => 'not_existing_password',
+        ]);
 
         $this->specify('user should not be able to login, when there is no identity', function () use ($model) {
             expect('model should not login user', $model->login())->false();
@@ -31,10 +32,10 @@ public function testLoginNoUser()
 
     public function testLoginWrongPassword()
     {
-        $model = $this->mockUser(new User);
-
-        $model->username = 'demo';
-        $model->password = 'wrong-password';
+        $model = new LoginForm([
+            'username' => 'demo',
+            'password' => 'wrong_password',
+        ]);
 
         $this->specify('user should not be able to login with wrong password', function () use ($model) {
             expect('model should not login user', $model->login())->false();
@@ -45,10 +46,10 @@ public function testLoginWrongPassword()
 
     public function testLoginCorrect()
     {
-        $model = $this->mockUser(new User(['password' => 'demo']));
-
-        $model->username = 'demo';
-        $model->password = 'demo';
+        $model = new LoginForm([
+            'username' => 'demo',
+            'password' => 'demo',
+        ]);
 
         $this->specify('user should be able to login with correct credentials', function () use ($model) {
             expect('model should login user', $model->login())->true();
@@ -57,11 +58,4 @@ public function testLoginCorrect()
         });
     }
 
-    private function mockUser($user)
-    {
-        $loginForm = $this->getMock('app\models\LoginForm', ['getUser']);
-        $loginForm->expects($this->any())->method('getUser')->will($this->returnValue($user));
-
-        return $loginForm;
-    }
 }

From 66a9e874ca55a2a503ba19a29583820392d948c4 Mon Sep 17 00:00:00 2001
From: Mark <mark.github@yandex.ru>
Date: Mon, 9 Jun 2014 16:33:36 +0400
Subject: [PATCH 029/390] basic application template fixtures added

---
 tests/unit/fixtures/data/.gitkeep | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tests/unit/fixtures/data/.gitkeep

diff --git a/tests/unit/fixtures/data/.gitkeep b/tests/unit/fixtures/data/.gitkeep
new file mode 100644
index 000000000..e69de29bb

From 27998d9e1b9119ba04bf2a932626f8e9ce4957da Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Tue, 10 Jun 2014 02:19:11 +0400
Subject: [PATCH 030/390] Fix .gitignore for `basic` and `advanced` application
 templates

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 45bf7bf41..9b1fe01ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,9 +12,6 @@ nbproject
 # windows thumbnail cache
 Thumbs.db
 
-# composer vendor dir
-/vendor
-
 # composer itself is not needed
 composer.phar
 

From 01429aba178b2d9c8c4f59a2869a67da631ba452 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Fri, 13 Jun 2014 10:04:48 -0400
Subject: [PATCH 031/390] Fixes #3358: Removed automatic CSRF meta tag
 generation by `View`. Added `Html::csrfMetaTags()` and its call to main
 layout files

---
 views/layouts/main.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/layouts/main.php b/views/layouts/main.php
index 6af9564ab..53a9354ff 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -17,6 +17,7 @@
 <head>
     <meta charset="<?= Yii::$app->charset ?>"/>
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <?= Html::csrfMetaTags() ?>
     <title><?= Html::encode($this->title) ?></title>
     <?php $this->head() ?>
 </head>

From be792fd146b7c4440aeb176a1c921e67205f0b1f Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Mon, 16 Jun 2014 18:57:09 +0400
Subject: [PATCH 032/390] Application templates refactoring

---
 .gitignore        | 3 +++
 vendor/.gitignore | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)
 delete mode 100644 vendor/.gitignore

diff --git a/.gitignore b/.gitignore
index 9b1fe01ac..45bf7bf41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,9 @@ nbproject
 # windows thumbnail cache
 Thumbs.db
 
+# composer vendor dir
+/vendor
+
 # composer itself is not needed
 composer.phar
 
diff --git a/vendor/.gitignore b/vendor/.gitignore
deleted file mode 100644
index c96a04f00..000000000
--- a/vendor/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file

From 2193366f3f21ed7f1af115ba08e4cc574863638c Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 20 Jun 2014 16:11:45 +0400
Subject: [PATCH 033/390] Fixes #3793: Changed inline autocomplete hints style
 to get more IDEs support

---
 mail/layouts/html.php  |  7 +++----
 views/layouts/main.php |  7 +++----
 views/site/about.php   |  4 +---
 views/site/contact.php |  9 ++++-----
 views/site/error.php   | 10 ++++------
 views/site/index.php   |  4 +---
 views/site/login.php   |  9 ++++-----
 7 files changed, 20 insertions(+), 30 deletions(-)

diff --git a/mail/layouts/html.php b/mail/layouts/html.php
index 8c217132d..6c083957d 100644
--- a/mail/layouts/html.php
+++ b/mail/layouts/html.php
@@ -1,10 +1,9 @@
 <?php
 use yii\helpers\Html;
 
-/**
- * @var \yii\web\View $this
- * @var string $content
- */
+/* @var $this \yii\web\View */
+/* @var $content string */
+
 ?>
 <?php $this->beginPage() ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
diff --git a/views/layouts/main.php b/views/layouts/main.php
index 53a9354ff..b9dcfb97a 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -5,10 +5,9 @@
 use yii\widgets\Breadcrumbs;
 use app\assets\AppAsset;
 
-/**
- * @var \yii\web\View $this
- * @var string $content
- */
+/* @var $this \yii\web\View */
+/* @var $content string */
+
 AppAsset::register($this);
 ?>
 <?php $this->beginPage() ?>
diff --git a/views/site/about.php b/views/site/about.php
index 58969ab7a..13d85a618 100644
--- a/views/site/about.php
+++ b/views/site/about.php
@@ -1,9 +1,7 @@
 <?php
 use yii\helpers\Html;
 
-/**
- * @var yii\web\View $this
- */
+/* @var $this yii\web\View */
 $this->title = 'About';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
diff --git a/views/site/contact.php b/views/site/contact.php
index 6d70462eb..eeb6f5138 100644
--- a/views/site/contact.php
+++ b/views/site/contact.php
@@ -3,11 +3,10 @@
 use yii\widgets\ActiveForm;
 use yii\captcha\Captcha;
 
-/**
- * @var yii\web\View $this
- * @var yii\widgets\ActiveForm $form
- * @var app\models\ContactForm $model
- */
+/* @var $this yii\web\View */
+/* @var $form yii\widgets\ActiveForm */
+/* @var $model app\models\ContactForm */
+
 $this->title = 'Contact';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
diff --git a/views/site/error.php b/views/site/error.php
index c172fd621..b9812c488 100644
--- a/views/site/error.php
+++ b/views/site/error.php
@@ -2,12 +2,10 @@
 
 use yii\helpers\Html;
 
-/**
- * @var yii\web\View $this
- * @var string $name
- * @var string $message
- * @var Exception $exception
- */
+/* @var $this yii\web\View */
+/* @var $name string */
+/* @var $message string */
+/* @var $exception Exception */
 
 $this->title = $name;
 ?>
diff --git a/views/site/index.php b/views/site/index.php
index 6b6394e56..a00ee4da6 100644
--- a/views/site/index.php
+++ b/views/site/index.php
@@ -1,7 +1,5 @@
 <?php
-/**
- * @var yii\web\View $this
- */
+/* @var $this yii\web\View */
 $this->title = 'My Yii Application';
 ?>
 <div class="site-index">
diff --git a/views/site/login.php b/views/site/login.php
index 80cc5485e..df0c812aa 100644
--- a/views/site/login.php
+++ b/views/site/login.php
@@ -2,11 +2,10 @@
 use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 
-/**
- * @var yii\web\View $this
- * @var yii\widgets\ActiveForm $form
- * @var app\models\LoginForm $model
- */
+/* @var $this yii\web\View */
+/* @var $form yii\widgets\ActiveForm */
+/* @var $model app\models\LoginForm */
+
 $this->title = 'Login';
 $this->params['breadcrumbs'][] = $this->title;
 ?>

From 91f05a2891982b82ef10859b667232cb1fd34b4d Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 26 Jun 2014 18:28:28 +0400
Subject: [PATCH 034/390] Fixes #4071: `mail` component renamed to `mailer`,
 `yii\log\EmailTarget::$mail` renamed to `yii\log\EmailTarget::$mailer`

---
 config/web.php                        | 2 +-
 models/ContactForm.php                | 2 +-
 tests/unit/models/ContactFormTest.php | 4 ++--
 views/site/contact.php                | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/web.php b/config/web.php
index 7fee63a65..7939bb322 100644
--- a/config/web.php
+++ b/config/web.php
@@ -17,7 +17,7 @@
         'errorHandler' => [
             'errorAction' => 'site/error',
         ],
-        'mail' => [
+        'mailer' => [
             'class' => 'yii\swiftmailer\Mailer',
             // send all mails to a file by default. You have to set
             // 'useFileTransport' to false and configure a transport
diff --git a/models/ContactForm.php b/models/ContactForm.php
index 29a5dd996..d4052ee93 100644
--- a/models/ContactForm.php
+++ b/models/ContactForm.php
@@ -49,7 +49,7 @@ public function attributeLabels()
     public function contact($email)
     {
         if ($this->validate()) {
-            Yii::$app->mail->compose()
+            Yii::$app->mailer->compose()
                 ->setTo($email)
                 ->setFrom([$this->email => $this->name])
                 ->setSubject($this->subject)
diff --git a/tests/unit/models/ContactFormTest.php b/tests/unit/models/ContactFormTest.php
index fe214fab4..6e69cecd3 100644
--- a/tests/unit/models/ContactFormTest.php
+++ b/tests/unit/models/ContactFormTest.php
@@ -13,7 +13,7 @@ class ContactFormTest extends TestCase
     protected function setUp()
     {
         parent::setUp();
-        Yii::$app->mail->fileTransportCallback = function ($mailer, $message) {
+        Yii::$app->mailer->fileTransportCallback = function ($mailer, $message) {
             return 'testing_message.eml';
         };
     }
@@ -54,7 +54,7 @@ public function testContact()
 
     private function getMessageFile()
     {
-        return Yii::getAlias(Yii::$app->mail->fileTransportPath) . '/testing_message.eml';
+        return Yii::getAlias(Yii::$app->mailer->fileTransportPath) . '/testing_message.eml';
     }
 
 }
diff --git a/views/site/contact.php b/views/site/contact.php
index eeb6f5138..fad2d7ced 100644
--- a/views/site/contact.php
+++ b/views/site/contact.php
@@ -22,9 +22,9 @@
     <p>
         Note that if you turn on the Yii debugger, you should be able
         to view the mail message on the mail panel of the debugger.
-        <?php if (Yii::$app->mail->useFileTransport): ?>
+        <?php if (Yii::$app->mailer->useFileTransport): ?>
         Because the application is in development mode, the email is not sent but saved as
-        a file under <code><?= Yii::getAlias(Yii::$app->mail->fileTransportPath) ?></code>.
+        a file under <code><?= Yii::getAlias(Yii::$app->mailer->fileTransportPath) ?></code>.
         Please configure the <code>useFileTransport</code> property of the <code>mail</code>
         application component to be false to enable email sending.
         <?php endif; ?>

From aa6c41046e8f71a7551bed0b64f657561819080b Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 26 Jun 2014 18:28:57 +0400
Subject: [PATCH 035/390] Missing files for #4071

---
 tests/_config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/_config.php b/tests/_config.php
index 24ec1b56a..8629dd0d9 100644
--- a/tests/_config.php
+++ b/tests/_config.php
@@ -4,7 +4,7 @@
  */
 return [
     'components' => [
-        'mail' => [
+        'mailer' => [
             'useFileTransport' => true,
         ],
         'urlManager' => [

From 1c14872c4a123ccb9dc376e6feb03cee7b5215ef Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sun, 29 Jun 2014 15:26:09 +0200
Subject: [PATCH 036/390] made mcrypt a framework requirement

---
 requirements.php | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/requirements.php b/requirements.php
index db53ef4e4..a38b9363f 100644
--- a/requirements.php
+++ b/requirements.php
@@ -69,14 +69,6 @@
         'condition' => extension_loaded('apc'),
         'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-caching-apccache.html">ApcCache</a>',
     ),
-    // Additional PHP extensions :
-    array(
-        'name' => 'Mcrypt extension',
-        'mandatory' => false,
-        'condition' => extension_loaded('mcrypt'),
-        'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-helpers-security.html">Security Helper</a>',
-        'memo' => 'Required by encrypt and decrypt methods.'
-    ),
     // PHP ini :
     'phpSafeMode' => array(
         'name' => 'PHP safe mode',

From d9385653f5214b3d010160a4cf02d61c60ef34cb Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 1 Jul 2014 14:45:44 -0400
Subject: [PATCH 037/390] Fixes #3992 Fixes #4147

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

diff --git a/mail/layouts/html.php b/mail/layouts/html.php
index 6c083957d..c2fb7a640 100644
--- a/mail/layouts/html.php
+++ b/mail/layouts/html.php
@@ -1,9 +1,9 @@
 <?php
 use yii\helpers\Html;
 
-/* @var $this \yii\web\View */
-/* @var $content string */
-
+/* @var $this \yii\web\View view component instance */
+/* @var $message \yii\mail\MessageInterface the message bing composed */
+/* @var $content string main view render result */
 ?>
 <?php $this->beginPage() ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

From 0c8c520cbb19b2e97537705bed8aab64533497e2 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 2 Jul 2014 14:44:31 +0300
Subject: [PATCH 038/390] Switched to Codeception 2.0.* for application
 template tests

---
 composer.json   | 2 +-
 tests/README.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 726a7ea93..d9d0b11d3 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
 		"yiisoft/yii2-gii": "*"
 	},
 	"suggest": {
-		"codeception/codeception": "Codeception, 1.8.*@dev is currently works well with Yii.",
+		"codeception/codeception": "Codeception, 2.0.* is currently works well with Yii.",
 		"codeception/specify": "BDD style code blocks for PHPUnit and Codeception",
 		"codeception/verify": "BDD Assertions for PHPUnit and Codeception"
 	},
diff --git a/tests/README.md b/tests/README.md
index a745bf6bc..e1aed9a6e 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -6,7 +6,7 @@ After creating the basic application, follow these steps to prepare for the test
 1. Install additional composer packages:
 
    ```
-   php composer.phar require --dev "codeception/codeception: 1.8.*@dev" "codeception/specify: *" "codeception/verify: *"
+   php composer.phar require --dev "codeception/codeception: 2.0.*" "codeception/specify: *" "codeception/verify: *"
    ```
 2. In the file `_bootstrap.php`, modify the definition of the constant `TEST_ENTRY_URL` so
    that it points to the correct entry script URL.

From d24f93b717ca0a977904e8d270b713e62758d5fd Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 2 Jul 2014 17:08:18 +0200
Subject: [PATCH 039/390] typo

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

diff --git a/mail/layouts/html.php b/mail/layouts/html.php
index c2fb7a640..bddbc6129 100644
--- a/mail/layouts/html.php
+++ b/mail/layouts/html.php
@@ -2,7 +2,7 @@
 use yii\helpers\Html;
 
 /* @var $this \yii\web\View view component instance */
-/* @var $message \yii\mail\MessageInterface the message bing composed */
+/* @var $message \yii\mail\MessageInterface the message being composed */
 /* @var $content string main view render result */
 ?>
 <?php $this->beginPage() ?>

From 8e1d70c4d4a9f93d214ceb3411615f267765661e Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 11 Jul 2014 01:11:50 +0400
Subject: [PATCH 040/390] Fixes #4252, Fixes #3171 Fixed Codeception

---
 tests/_helpers/CodeHelper.php | 5 ++++-
 tests/_helpers/TestHelper.php | 5 ++++-
 tests/_helpers/WebHelper.php  | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/_helpers/CodeHelper.php b/tests/_helpers/CodeHelper.php
index 201503ddf..8ed57692d 100644
--- a/tests/_helpers/CodeHelper.php
+++ b/tests/_helpers/CodeHelper.php
@@ -3,5 +3,8 @@
 
 class CodeHelper extends \Codeception\Module
 {
-    // here you can define custom methods for CodeGuy
+    public function _beforeSuite($settings = [])
+    {
+        include __DIR__.'/../unit/_bootstrap.php';
+    }
 }
diff --git a/tests/_helpers/TestHelper.php b/tests/_helpers/TestHelper.php
index ae9418775..65f807666 100644
--- a/tests/_helpers/TestHelper.php
+++ b/tests/_helpers/TestHelper.php
@@ -3,5 +3,8 @@
 
 class TestHelper extends \Codeception\Module
 {
-    // here you can define custom methods for TestGuy
+    public function _beforeSuite($settings = [])
+    {
+        include __DIR__.'/../functional/_bootstrap.php';
+    }
 }
diff --git a/tests/_helpers/WebHelper.php b/tests/_helpers/WebHelper.php
index a8c72502a..c332c4ac4 100644
--- a/tests/_helpers/WebHelper.php
+++ b/tests/_helpers/WebHelper.php
@@ -3,5 +3,8 @@
 
 class WebHelper extends \Codeception\Module
 {
-    // here you can define custom methods for WebGuy
+    public function _beforeSuite($settings = [])
+    {
+        include __DIR__.'/../acceptance/_bootstrap.php';
+    }
 }

From 539a6f0c5965bc92bcf8af23c33d0e86e85f4857 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 11 Jul 2014 19:24:33 +0400
Subject: [PATCH 041/390] Codeceoption adjustments

- Removed hacks since these are no longer required: https://github.com/Codeception/Codeception/commit/71db233985531f298264dc4ca0160d2aa1c83b7f
- Removed unused helper classes
- Added 2.0 style "actor" to config

Thanks to @Ragazzo and @DavertMik for helping with it.
---
 codeception.yml               |  1 +
 tests/_helpers/CodeHelper.php | 10 ----------
 tests/_helpers/TestHelper.php | 10 ----------
 tests/_helpers/WebHelper.php  | 10 ----------
 tests/acceptance.suite.yml    |  1 -
 tests/functional.suite.yml    |  1 -
 tests/unit.suite.yml          |  3 ---
 7 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 tests/_helpers/CodeHelper.php
 delete mode 100644 tests/_helpers/TestHelper.php
 delete mode 100644 tests/_helpers/WebHelper.php

diff --git a/codeception.yml b/codeception.yml
index 864fba0bf..496ebd9c3 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -1,3 +1,4 @@
+actor: Tester
 paths:
     tests: tests
     log: tests/_log
diff --git a/tests/_helpers/CodeHelper.php b/tests/_helpers/CodeHelper.php
deleted file mode 100644
index 8ed57692d..000000000
--- a/tests/_helpers/CodeHelper.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-class CodeHelper extends \Codeception\Module
-{
-    public function _beforeSuite($settings = [])
-    {
-        include __DIR__.'/../unit/_bootstrap.php';
-    }
-}
diff --git a/tests/_helpers/TestHelper.php b/tests/_helpers/TestHelper.php
deleted file mode 100644
index 65f807666..000000000
--- a/tests/_helpers/TestHelper.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-class TestHelper extends \Codeception\Module
-{
-    public function _beforeSuite($settings = [])
-    {
-        include __DIR__.'/../functional/_bootstrap.php';
-    }
-}
diff --git a/tests/_helpers/WebHelper.php b/tests/_helpers/WebHelper.php
deleted file mode 100644
index c332c4ac4..000000000
--- a/tests/_helpers/WebHelper.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-namespace Codeception\Module;
-
-class WebHelper extends \Codeception\Module
-{
-    public function _beforeSuite($settings = [])
-    {
-        include __DIR__.'/../acceptance/_bootstrap.php';
-    }
-}
diff --git a/tests/acceptance.suite.yml b/tests/acceptance.suite.yml
index 2e35aa558..bd10f82a1 100644
--- a/tests/acceptance.suite.yml
+++ b/tests/acceptance.suite.yml
@@ -11,7 +11,6 @@
 class_name: WebGuy
 modules:
     enabled:
-        - WebHelper
         - PhpBrowser
 # you can use WebDriver instead of PhpBrowser to test javascript and ajax.
 # This will require you to install selenium. See http://codeception.com/docs/04-AcceptanceTests#Selenium
diff --git a/tests/functional.suite.yml b/tests/functional.suite.yml
index 0d400afcb..916ef1aaa 100644
--- a/tests/functional.suite.yml
+++ b/tests/functional.suite.yml
@@ -10,7 +10,6 @@ class_name: TestGuy
 modules:
     enabled:
       - Filesystem
-      - TestHelper
       - Yii2
     config:
         Yii2:
diff --git a/tests/unit.suite.yml b/tests/unit.suite.yml
index be2874d74..f0573a843 100644
--- a/tests/unit.suite.yml
+++ b/tests/unit.suite.yml
@@ -4,6 +4,3 @@
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
 class_name: CodeGuy
-modules:
-    enabled:
-        - CodeHelper

From fb1d9fa32a2fb2e2554f47b3ac710fa96a9ca00b Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 19 Jul 2014 14:56:31 -0400
Subject: [PATCH 042/390] `yii\web\Request::cookieValidationKey` is now
 automatically generated by the installation script for the basic and advanced
 application templates

---
 composer.json  | 98 ++++++++++++++++++++++++++------------------------
 config/web.php |  4 +++
 2 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/composer.json b/composer.json
index d9d0b11d3..a21128bf3 100644
--- a/composer.json
+++ b/composer.json
@@ -1,49 +1,53 @@
 {
-	"name": "yiisoft/yii2-app-basic",
-	"description": "Yii 2 Basic Application Template",
-	"keywords": ["yii2", "framework", "basic", "application template"],
-	"homepage": "http://www.yiiframework.com/",
-	"type": "project",
-	"license": "BSD-3-Clause",
-	"support": {
-		"issues": "https://github.com/yiisoft/yii2/issues?state=open",
-		"forum": "http://www.yiiframework.com/forum/",
-		"wiki": "http://www.yiiframework.com/wiki/",
-		"irc": "irc://irc.freenode.net/yii",
-		"source": "https://github.com/yiisoft/yii2"
-	},
-	"minimum-stability": "dev",
-	"require": {
-		"php": ">=5.4.0",
-		"yiisoft/yii2": "*",
-		"yiisoft/yii2-bootstrap": "*",
-		"yiisoft/yii2-swiftmailer": "*"
-	},
-	"require-dev": {
-		"yiisoft/yii2-codeception": "*",
-		"yiisoft/yii2-debug": "*",
-		"yiisoft/yii2-gii": "*"
-	},
-	"suggest": {
-		"codeception/codeception": "Codeception, 2.0.* is currently works well with Yii.",
-		"codeception/specify": "BDD style code blocks for PHPUnit and Codeception",
-		"codeception/verify": "BDD Assertions for PHPUnit and Codeception"
-	},
-	"scripts": {
-		"post-create-project-cmd": [
-			"yii\\composer\\Installer::setPermission"
-		]
-	},
-	"config": {
-		"process-timeout": 1800
-	},
-	"extra": {
-		"writable": [
-			"runtime",
-			"web/assets"
-		],
-		"executable": [
-			"yii"
-		]
-	}
+    "name": "yiisoft/yii2-app-basic",
+    "description": "Yii 2 Basic Application Template",
+    "keywords": ["yii2", "framework", "basic", "application template"],
+    "homepage": "http://www.yiiframework.com/",
+    "type": "project",
+    "license": "BSD-3-Clause",
+    "support": {
+        "issues": "https://github.com/yiisoft/yii2/issues?state=open",
+        "forum": "http://www.yiiframework.com/forum/",
+        "wiki": "http://www.yiiframework.com/wiki/",
+        "irc": "irc://irc.freenode.net/yii",
+        "source": "https://github.com/yiisoft/yii2"
+    },
+    "minimum-stability": "dev",
+    "require": {
+        "php": ">=5.4.0",
+        "yiisoft/yii2": "*",
+        "yiisoft/yii2-bootstrap": "*",
+        "yiisoft/yii2-swiftmailer": "*"
+    },
+    "require-dev": {
+        "yiisoft/yii2-codeception": "*",
+        "yiisoft/yii2-debug": "*",
+        "yiisoft/yii2-gii": "*"
+    },
+    "suggest": {
+        "codeception/codeception": "Codeception, 2.0.* is currently works well with Yii.",
+        "codeception/specify": "BDD style code blocks for PHPUnit and Codeception",
+        "codeception/verify": "BDD Assertions for PHPUnit and Codeception"
+    },
+    "scripts": {
+        "post-create-project-cmd": [
+            "yii\\composer\\Installer::setPermission",
+            "yii\\composer\\Installer::generateCookieValidationKey"
+        ]
+    },
+    "config": {
+        "process-timeout": 1800
+    },
+    "extra": {
+        "writable": [
+            "runtime",
+            "web/assets"
+        ],
+        "executable": [
+            "yii"
+        ],
+        "config": [
+            "config/web.php"
+        ]
+    }
 }
diff --git a/config/web.php b/config/web.php
index 7939bb322..793943716 100644
--- a/config/web.php
+++ b/config/web.php
@@ -7,6 +7,10 @@
     'basePath' => dirname(__DIR__),
     'bootstrap' => ['log'],
     'components' => [
+        'request' => [
+            // a secret key used to validate cookies. You may modify this key with your own one.
+            'cookieValidationKey' => '',
+        ],
         'cache' => [
             'class' => 'yii\caching\FileCache',
         ],

From 48d2ced997f25aa7e3e9654c41c3bd4b53c81991 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 19 Jul 2014 15:39:03 -0400
Subject: [PATCH 043/390] Request::cookieValidationKey must be explicitly
 specified now.

---
 config/web.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/web.php b/config/web.php
index 793943716..1632a5aab 100644
--- a/config/web.php
+++ b/config/web.php
@@ -8,7 +8,7 @@
     'bootstrap' => ['log'],
     'components' => [
         'request' => [
-            // a secret key used to validate cookies. You may modify this key with your own one.
+            // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
             'cookieValidationKey' => '',
         ],
         'cache' => [

From f77cd8b411257fedbe590bbdcb7f9e06b1a7bbb6 Mon Sep 17 00:00:00 2001
From: mickgeek <olgblst@gmail.com>
Date: Thu, 31 Jul 2014 10:11:55 +0400
Subject: [PATCH 044/390] Fix signature validation

---
 models/LoginForm.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/models/LoginForm.php b/models/LoginForm.php
index 31b814e24..687d29ded 100644
--- a/models/LoginForm.php
+++ b/models/LoginForm.php
@@ -34,14 +34,17 @@ public function rules()
     /**
      * Validates the password.
      * This method serves as the inline validation for password.
+     *
+     * @param string $attribute the attribute currently being validated
+     * @param array $params the additional name-value pairs given in the rule
      */
-    public function validatePassword()
+    public function validatePassword($attribute, $params)
     {
         if (!$this->hasErrors()) {
             $user = $this->getUser();
 
             if (!$user || !$user->validatePassword($this->password)) {
-                $this->addError('password', 'Incorrect username or password.');
+                $this->addError($attribute, 'Incorrect username or password.');
             }
         }
     }

From c55a791237b5e90dce917851f60777380a925de4 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 15 Aug 2014 03:30:47 +0400
Subject: [PATCH 045/390] Codeception test adjustments for basic and advanced
 applications

- Moved everything test-related into `tests` directory. Codeception tests are in `codeception`.
- Removed database module since we're using fixtures and migrations.
- Moved console entry points and bootstrap into `tests/codeception/bin`.
- Adjusted travis build scripts.
- Adjusted documentation to be consistent and reflect changes made.
---
 composer.json                                 |  5 --
 tests/README.md                               | 52 +++++++++++++------
 tests/acceptance/_console.php                 | 13 -----
 tests/acceptance/yii                          | 17 ------
 codeception.yml => tests/codeception.yml      | 10 ++--
 tests/{ => codeception}/.gitignore            |  0
 tests/{ => codeception}/_bootstrap.php        | 10 ++--
 tests/{ => codeception}/_config.php           |  0
 tests/{ => codeception}/_data/dump.sql        |  0
 tests/{ => codeception}/_log/.gitignore       |  0
 tests/{ => codeception}/_pages/AboutPage.php  |  2 +-
 .../{ => codeception}/_pages/ContactPage.php  |  2 +-
 tests/{ => codeception}/_pages/LoginPage.php  |  2 +-
 tests/{ => codeception}/acceptance.suite.yml  |  0
 .../acceptance/AboutCept.php                  |  2 +-
 .../acceptance/ContactCept.php                |  2 +-
 .../{ => codeception}/acceptance/HomeCept.php |  0
 .../acceptance/LoginCept.php                  |  2 +-
 .../acceptance/_bootstrap.php                 |  0
 .../{ => codeception}/acceptance/_config.php  |  2 +-
 .../bin}/_console_bootstrap.php               |  6 ++-
 tests/codeception/bin/yii_acceptance          | 27 ++++++++++
 .../bin/yii_acceptance.bat}                   |  2 +-
 tests/codeception/bin/yii_functional          | 27 ++++++++++
 .../bin/yii_functional.bat}                   |  2 +-
 tests/codeception/bin/yii_unit                | 27 ++++++++++
 .../yii.bat => codeception/bin/yii_unit.bat}  |  2 +-
 tests/{ => codeception}/functional.suite.yml  |  2 +-
 .../functional/AboutCept.php                  |  2 +-
 .../functional/ContactCept.php                |  2 +-
 .../{ => codeception}/functional/HomeCept.php |  0
 .../functional/LoginCept.php                  |  2 +-
 .../functional/_bootstrap.php                 |  0
 .../{ => codeception}/functional/_config.php  |  2 +-
 tests/{ => codeception}/unit.suite.yml        |  0
 tests/{ => codeception}/unit/_bootstrap.php   |  0
 tests/{ => codeception}/unit/_config.php      |  2 +-
 .../{ => codeception}/unit/fixtures/.gitkeep  |  0
 .../unit/fixtures/data/.gitkeep               |  0
 .../unit/models/ContactFormTest.php           |  2 +-
 .../unit/models/LoginFormTest.php             |  2 +-
 .../unit/models/UserTest.php                  |  2 +-
 .../unit/templates/fixtures/.gitkeep          |  0
 tests/functional/_console.php                 | 13 -----
 tests/functional/yii                          | 17 ------
 tests/unit/_console.php                       | 13 -----
 tests/unit/yii                                | 17 ------
 web/index-test.php                            |  2 +-
 48 files changed, 150 insertions(+), 144 deletions(-)
 delete mode 100644 tests/acceptance/_console.php
 delete mode 100644 tests/acceptance/yii
 rename codeception.yml => tests/codeception.yml (62%)
 rename tests/{ => codeception}/.gitignore (100%)
 rename tests/{ => codeception}/_bootstrap.php (65%)
 rename tests/{ => codeception}/_config.php (100%)
 rename tests/{ => codeception}/_data/dump.sql (100%)
 rename tests/{ => codeception}/_log/.gitignore (100%)
 rename tests/{ => codeception}/_pages/AboutPage.php (78%)
 rename tests/{ => codeception}/_pages/ContactPage.php (94%)
 rename tests/{ => codeception}/_pages/LoginPage.php (93%)
 rename tests/{ => codeception}/acceptance.suite.yml (100%)
 rename tests/{ => codeception}/acceptance/AboutCept.php (78%)
 rename tests/{ => codeception}/acceptance/ContactCept.php (97%)
 rename tests/{ => codeception}/acceptance/HomeCept.php (100%)
 rename tests/{ => codeception}/acceptance/LoginCept.php (95%)
 rename tests/{ => codeception}/acceptance/_bootstrap.php (100%)
 rename tests/{ => codeception}/acceptance/_config.php (83%)
 rename tests/{ => codeception/bin}/_console_bootstrap.php (62%)
 create mode 100644 tests/codeception/bin/yii_acceptance
 rename tests/{unit/yii.bat => codeception/bin/yii_acceptance.bat} (91%)
 create mode 100644 tests/codeception/bin/yii_functional
 rename tests/{acceptance/yii.bat => codeception/bin/yii_functional.bat} (91%)
 create mode 100644 tests/codeception/bin/yii_unit
 rename tests/{functional/yii.bat => codeception/bin/yii_unit.bat} (92%)
 rename tests/{ => codeception}/functional.suite.yml (85%)
 rename tests/{ => codeception}/functional/AboutCept.php (78%)
 rename tests/{ => codeception}/functional/ContactCept.php (97%)
 rename tests/{ => codeception}/functional/HomeCept.php (100%)
 rename tests/{ => codeception}/functional/LoginCept.php (95%)
 rename tests/{ => codeception}/functional/_bootstrap.php (100%)
 rename tests/{ => codeception}/functional/_config.php (87%)
 rename tests/{ => codeception}/unit.suite.yml (100%)
 rename tests/{ => codeception}/unit/_bootstrap.php (100%)
 rename tests/{ => codeception}/unit/_config.php (83%)
 rename tests/{ => codeception}/unit/fixtures/.gitkeep (100%)
 rename tests/{ => codeception}/unit/fixtures/data/.gitkeep (100%)
 rename tests/{ => codeception}/unit/models/ContactFormTest.php (98%)
 rename tests/{ => codeception}/unit/models/LoginFormTest.php (98%)
 rename tests/{ => codeception}/unit/models/UserTest.php (89%)
 rename tests/{ => codeception}/unit/templates/fixtures/.gitkeep (100%)
 delete mode 100644 tests/functional/_console.php
 delete mode 100644 tests/functional/yii
 delete mode 100644 tests/unit/_console.php
 delete mode 100644 tests/unit/yii

diff --git a/composer.json b/composer.json
index a21128bf3..607accb1b 100644
--- a/composer.json
+++ b/composer.json
@@ -24,11 +24,6 @@
         "yiisoft/yii2-debug": "*",
         "yiisoft/yii2-gii": "*"
     },
-    "suggest": {
-        "codeception/codeception": "Codeception, 2.0.* is currently works well with Yii.",
-        "codeception/specify": "BDD style code blocks for PHPUnit and Codeception",
-        "codeception/verify": "BDD Assertions for PHPUnit and Codeception"
-    },
     "scripts": {
         "post-create-project-cmd": [
             "yii\\composer\\Installer::setPermission",
diff --git a/tests/README.md b/tests/README.md
index e1aed9a6e..1c4b50bca 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,32 +1,50 @@
-This folder contains various tests for the basic application.
-These tests are developed with [Codeception PHP Testing Framework](http://codeception.com/).
+This directory contains various tests for the basic application.
+
+Tests in `codeception` directory are developed with [Codeception PHP Testing Framework](http://codeception.com/).
 
 After creating the basic application, follow these steps to prepare for the tests:
 
-1. Install additional composer packages:
+1. Install Codeception if it's not yet installed:
+
+```
+composer global require "codeception/codeception=2.0.*"
+composer global require "codeception/specify=*"
+composer global require "codeception/verify=*"
+```
+
+If you've never used Composer for global packages run `composer global status`. It should output:
+
+```
+Changed current directory to <directory>
+```
 
-   ```
-   php composer.phar require --dev "codeception/codeception: 2.0.*" "codeception/specify: *" "codeception/verify: *"
-   ```
-2. In the file `_bootstrap.php`, modify the definition of the constant `TEST_ENTRY_URL` so
-   that it points to the correct entry script URL.
-3. Go to the application base directory and build the test suites:
+Then add `<directory>/vendor/bin` to you `PATH` environment variable. Now we're able to use `codecept` from command
+line globally.
 
-   ```
-   vendor/bin/codecept build
-   ```
+2. Build the test suites:
+
+```
+codecept build
+```
+
+3. In order to be able to run acceptance tests you need to start a webserver. The simplest way is to use PHP built in
+webserver. In the `web` directory execute the following:
+
+```
+php -S localhost:8080
+```
 
-Now you can run the tests with the following commands:
+4. Now you can run the tests with the following commands:
 
 ```
 # run all available tests
-vendor/bin/codecept run
+codecept run
 # run acceptance tests
-vendor/bin/codecept run acceptance
+codecept run acceptance
 # run functional tests
-vendor/bin/codecept run functional
+codecept run functional
 # run unit tests
-vendor/bin/codecept run unit
+codecept run unit
 ```
 
 Please refer to [Codeception tutorial](http://codeception.com/docs/01-Introduction) for
diff --git a/tests/acceptance/_console.php b/tests/acceptance/_console.php
deleted file mode 100644
index 03cdd1ff6..000000000
--- a/tests/acceptance/_console.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/console.php'),
-    require(__DIR__ . '/../_config.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance',
-            ],
-        ],
-    ]
-);
diff --git a/tests/acceptance/yii b/tests/acceptance/yii
deleted file mode 100644
index e587ba400..000000000
--- a/tests/acceptance/yii
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-require_once __DIR__ . '/../_console_bootstrap.php';
-
-$config = require(__DIR__ . '/_console.php');
-
-$application = new yii\console\Application($config);
-$exitCode = $application->run();
-exit($exitCode);
diff --git a/codeception.yml b/tests/codeception.yml
similarity index 62%
rename from codeception.yml
rename to tests/codeception.yml
index 496ebd9c3..64952529e 100644
--- a/codeception.yml
+++ b/tests/codeception.yml
@@ -1,9 +1,9 @@
 actor: Tester
 paths:
-    tests: tests
-    log: tests/_log
-    data: tests/_data
-    helpers: tests/_helpers
+    tests: codeception
+    log: codeception/_log
+    data: codeception/_data
+    helpers: codeception/_helpers
 settings:
     bootstrap: _bootstrap.php
     suite_class: \PHPUnit_Framework_TestSuite
@@ -16,4 +16,4 @@ modules:
             dsn: ''
             user: ''
             password: ''
-            dump: tests/_data/dump.sql
+            dump: codeception/_data/dump.sql
diff --git a/tests/.gitignore b/tests/codeception/.gitignore
similarity index 100%
rename from tests/.gitignore
rename to tests/codeception/.gitignore
diff --git a/tests/_bootstrap.php b/tests/codeception/_bootstrap.php
similarity index 65%
rename from tests/_bootstrap.php
rename to tests/codeception/_bootstrap.php
index 4890b3ed7..ecd76de93 100644
--- a/tests/_bootstrap.php
+++ b/tests/codeception/_bootstrap.php
@@ -2,22 +2,22 @@
 
 // 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') or define('TEST_ENTRY_URL', '/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') or define('TEST_ENTRY_FILE', dirname(dirname(__DIR__)) . '/web/index-test.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/autoload.php');
 
-require_once(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
 
 // set correct script paths
 $_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
 $_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
 $_SERVER['SERVER_NAME'] = 'localhost';
 
-Yii::setAlias('@tests', __DIR__);
+Yii::setAlias('@codeception', __DIR__);
diff --git a/tests/_config.php b/tests/codeception/_config.php
similarity index 100%
rename from tests/_config.php
rename to tests/codeception/_config.php
diff --git a/tests/_data/dump.sql b/tests/codeception/_data/dump.sql
similarity index 100%
rename from tests/_data/dump.sql
rename to tests/codeception/_data/dump.sql
diff --git a/tests/_log/.gitignore b/tests/codeception/_log/.gitignore
similarity index 100%
rename from tests/_log/.gitignore
rename to tests/codeception/_log/.gitignore
diff --git a/tests/_pages/AboutPage.php b/tests/codeception/_pages/AboutPage.php
similarity index 78%
rename from tests/_pages/AboutPage.php
rename to tests/codeception/_pages/AboutPage.php
index 77acdb815..727cd3859 100644
--- a/tests/_pages/AboutPage.php
+++ b/tests/codeception/_pages/AboutPage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\_pages;
+namespace codeception\_pages;
 
 use yii\codeception\BasePage;
 
diff --git a/tests/_pages/ContactPage.php b/tests/codeception/_pages/ContactPage.php
similarity index 94%
rename from tests/_pages/ContactPage.php
rename to tests/codeception/_pages/ContactPage.php
index 24c8dfa56..63c053c90 100644
--- a/tests/_pages/ContactPage.php
+++ b/tests/codeception/_pages/ContactPage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\_pages;
+namespace codeception\_pages;
 
 use yii\codeception\BasePage;
 
diff --git a/tests/_pages/LoginPage.php b/tests/codeception/_pages/LoginPage.php
similarity index 93%
rename from tests/_pages/LoginPage.php
rename to tests/codeception/_pages/LoginPage.php
index c73d729af..35ada9cd8 100644
--- a/tests/_pages/LoginPage.php
+++ b/tests/codeception/_pages/LoginPage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\_pages;
+namespace codeception\_pages;
 
 use yii\codeception\BasePage;
 
diff --git a/tests/acceptance.suite.yml b/tests/codeception/acceptance.suite.yml
similarity index 100%
rename from tests/acceptance.suite.yml
rename to tests/codeception/acceptance.suite.yml
diff --git a/tests/acceptance/AboutCept.php b/tests/codeception/acceptance/AboutCept.php
similarity index 78%
rename from tests/acceptance/AboutCept.php
rename to tests/codeception/acceptance/AboutCept.php
index deecee72c..251cad274 100644
--- a/tests/acceptance/AboutCept.php
+++ b/tests/codeception/acceptance/AboutCept.php
@@ -1,6 +1,6 @@
 <?php
 
-use tests\_pages\AboutPage;
+use codeception\_pages\AboutPage;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure that about works');
diff --git a/tests/acceptance/ContactCept.php b/tests/codeception/acceptance/ContactCept.php
similarity index 97%
rename from tests/acceptance/ContactCept.php
rename to tests/codeception/acceptance/ContactCept.php
index e76ac9beb..50aa69acb 100644
--- a/tests/acceptance/ContactCept.php
+++ b/tests/codeception/acceptance/ContactCept.php
@@ -1,6 +1,6 @@
 <?php
 
-use tests\_pages\ContactPage;
+use codeception\_pages\ContactPage;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure that contact works');
diff --git a/tests/acceptance/HomeCept.php b/tests/codeception/acceptance/HomeCept.php
similarity index 100%
rename from tests/acceptance/HomeCept.php
rename to tests/codeception/acceptance/HomeCept.php
diff --git a/tests/acceptance/LoginCept.php b/tests/codeception/acceptance/LoginCept.php
similarity index 95%
rename from tests/acceptance/LoginCept.php
rename to tests/codeception/acceptance/LoginCept.php
index c7c9ae306..ff093b3bd 100644
--- a/tests/acceptance/LoginCept.php
+++ b/tests/codeception/acceptance/LoginCept.php
@@ -1,6 +1,6 @@
 <?php
 
-use tests\_pages\LoginPage;
+use codeception\_pages\LoginPage;
 
 $I = new WebGuy($scenario);
 $I->wantTo('ensure that login works');
diff --git a/tests/acceptance/_bootstrap.php b/tests/codeception/acceptance/_bootstrap.php
similarity index 100%
rename from tests/acceptance/_bootstrap.php
rename to tests/codeception/acceptance/_bootstrap.php
diff --git a/tests/acceptance/_config.php b/tests/codeception/acceptance/_config.php
similarity index 83%
rename from tests/acceptance/_config.php
rename to tests/codeception/acceptance/_config.php
index 857a804f4..d620a7d9e 100644
--- a/tests/acceptance/_config.php
+++ b/tests/codeception/acceptance/_config.php
@@ -1,7 +1,7 @@
 <?php
 
 return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/web.php'),
+    require(__DIR__ . '/../../../config/web.php'),
     require(__DIR__ . '/../_config.php'),
     [
         'components' => [
diff --git a/tests/_console_bootstrap.php b/tests/codeception/bin/_console_bootstrap.php
similarity index 62%
rename from tests/_console_bootstrap.php
rename to tests/codeception/bin/_console_bootstrap.php
index 81287f3d8..eff8b403f 100644
--- a/tests/_console_bootstrap.php
+++ b/tests/codeception/bin/_console_bootstrap.php
@@ -8,5 +8,7 @@
 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');
+defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__))));
+
+require(ROOT_DIR . '/vendor/autoload.php');
+require(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
diff --git a/tests/codeception/bin/yii_acceptance b/tests/codeception/bin/yii_acceptance
new file mode 100644
index 000000000..a02d9daf1
--- /dev/null
+++ b/tests/codeception/bin/yii_acceptance
@@ -0,0 +1,27 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Yii console bootstrap file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+require_once __DIR__ . '/_console_bootstrap.php';
+
+$config = yii\helpers\ArrayHelper::merge(
+    require(ROOT_DIR . '/config/console.php'),
+    require(__DIR__ . '/../_config.php'),
+    [
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance',
+            ],
+        ],
+    ]
+);
+
+$application = new yii\console\Application($config);
+$exitCode = $application->run();
+exit($exitCode);
diff --git a/tests/unit/yii.bat b/tests/codeception/bin/yii_acceptance.bat
similarity index 91%
rename from tests/unit/yii.bat
rename to tests/codeception/bin/yii_acceptance.bat
index 5e21e2e99..389f89325 100644
--- a/tests/unit/yii.bat
+++ b/tests/codeception/bin/yii_acceptance.bat
@@ -15,6 +15,6 @@ set YII_PATH=%~dp0
 
 if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
 
-"%PHP_COMMAND%" "%YII_PATH%yii" %*
+"%PHP_COMMAND%" "%YII_PATH%yii_acceptance" %*
 
 @endlocal
diff --git a/tests/codeception/bin/yii_functional b/tests/codeception/bin/yii_functional
new file mode 100644
index 000000000..44051e2ca
--- /dev/null
+++ b/tests/codeception/bin/yii_functional
@@ -0,0 +1,27 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Yii console bootstrap file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+require_once __DIR__ . '/_console_bootstrap.php';
+
+$config = yii\helpers\ArrayHelper::merge(
+    require(ROOT_DIR . '/config/console.php'),
+    require(__DIR__ . '/../_config.php'),
+    [
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional',
+            ],
+        ],
+    ]
+);
+
+$application = new yii\console\Application($config);
+$exitCode = $application->run();
+exit($exitCode);
diff --git a/tests/acceptance/yii.bat b/tests/codeception/bin/yii_functional.bat
similarity index 91%
rename from tests/acceptance/yii.bat
rename to tests/codeception/bin/yii_functional.bat
index 5e21e2e99..98fae8853 100644
--- a/tests/acceptance/yii.bat
+++ b/tests/codeception/bin/yii_functional.bat
@@ -15,6 +15,6 @@ set YII_PATH=%~dp0
 
 if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
 
-"%PHP_COMMAND%" "%YII_PATH%yii" %*
+"%PHP_COMMAND%" "%YII_PATH%yii_functional" %*
 
 @endlocal
diff --git a/tests/codeception/bin/yii_unit b/tests/codeception/bin/yii_unit
new file mode 100644
index 000000000..e9b799903
--- /dev/null
+++ b/tests/codeception/bin/yii_unit
@@ -0,0 +1,27 @@
+#!/usr/bin/env php
+<?php
+/**
+ * Yii console bootstrap file.
+ *
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+require_once __DIR__ . '/_console_bootstrap.php';
+
+$config = yii\helpers\ArrayHelper::merge(
+    require(ROOT_DIR . '/config/console.php'),
+    require(__DIR__ . '/../_config.php'),
+    [
+        'components' => [
+            'db' => [
+                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit',
+            ],
+        ],
+    ]
+);
+
+$application = new yii\console\Application($config);
+$exitCode = $application->run();
+exit($exitCode);
diff --git a/tests/functional/yii.bat b/tests/codeception/bin/yii_unit.bat
similarity index 92%
rename from tests/functional/yii.bat
rename to tests/codeception/bin/yii_unit.bat
index 5e21e2e99..511e61d22 100644
--- a/tests/functional/yii.bat
+++ b/tests/codeception/bin/yii_unit.bat
@@ -15,6 +15,6 @@ set YII_PATH=%~dp0
 
 if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
 
-"%PHP_COMMAND%" "%YII_PATH%yii" %*
+"%PHP_COMMAND%" "%YII_PATH%yii_unit" %*
 
 @endlocal
diff --git a/tests/functional.suite.yml b/tests/codeception/functional.suite.yml
similarity index 85%
rename from tests/functional.suite.yml
rename to tests/codeception/functional.suite.yml
index 916ef1aaa..3b5008139 100644
--- a/tests/functional.suite.yml
+++ b/tests/codeception/functional.suite.yml
@@ -13,4 +13,4 @@ modules:
       - Yii2
     config:
         Yii2:
-            configFile: 'tests/functional/_config.php'
+            configFile: 'codeception/functional/_config.php'
diff --git a/tests/functional/AboutCept.php b/tests/codeception/functional/AboutCept.php
similarity index 78%
rename from tests/functional/AboutCept.php
rename to tests/codeception/functional/AboutCept.php
index 1875c2e11..631206144 100644
--- a/tests/functional/AboutCept.php
+++ b/tests/codeception/functional/AboutCept.php
@@ -1,6 +1,6 @@
 <?php
 
-use tests\_pages\AboutPage;
+use codeception\_pages\AboutPage;
 
 $I = new TestGuy($scenario);
 $I->wantTo('ensure that about works');
diff --git a/tests/functional/ContactCept.php b/tests/codeception/functional/ContactCept.php
similarity index 97%
rename from tests/functional/ContactCept.php
rename to tests/codeception/functional/ContactCept.php
index 49d7735fd..f13b51cf2 100644
--- a/tests/functional/ContactCept.php
+++ b/tests/codeception/functional/ContactCept.php
@@ -1,6 +1,6 @@
 <?php
 
-use tests\_pages\ContactPage;
+use codeception\_pages\ContactPage;
 
 $I = new TestGuy($scenario);
 $I->wantTo('ensure that contact works');
diff --git a/tests/functional/HomeCept.php b/tests/codeception/functional/HomeCept.php
similarity index 100%
rename from tests/functional/HomeCept.php
rename to tests/codeception/functional/HomeCept.php
diff --git a/tests/functional/LoginCept.php b/tests/codeception/functional/LoginCept.php
similarity index 95%
rename from tests/functional/LoginCept.php
rename to tests/codeception/functional/LoginCept.php
index e5285cdb2..77189b885 100644
--- a/tests/functional/LoginCept.php
+++ b/tests/codeception/functional/LoginCept.php
@@ -1,6 +1,6 @@
 <?php
 
-use tests\_pages\LoginPage;
+use codeception\_pages\LoginPage;
 
 $I = new TestGuy($scenario);
 $I->wantTo('ensure that login works');
diff --git a/tests/functional/_bootstrap.php b/tests/codeception/functional/_bootstrap.php
similarity index 100%
rename from tests/functional/_bootstrap.php
rename to tests/codeception/functional/_bootstrap.php
diff --git a/tests/functional/_config.php b/tests/codeception/functional/_config.php
similarity index 87%
rename from tests/functional/_config.php
rename to tests/codeception/functional/_config.php
index 512e802bb..3d50fdbaf 100644
--- a/tests/functional/_config.php
+++ b/tests/codeception/functional/_config.php
@@ -5,7 +5,7 @@
 $_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
 
 return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/web.php'),
+    require(__DIR__ . '/../../../config/web.php'),
     require(__DIR__ . '/../_config.php'),
     [
         'components' => [
diff --git a/tests/unit.suite.yml b/tests/codeception/unit.suite.yml
similarity index 100%
rename from tests/unit.suite.yml
rename to tests/codeception/unit.suite.yml
diff --git a/tests/unit/_bootstrap.php b/tests/codeception/unit/_bootstrap.php
similarity index 100%
rename from tests/unit/_bootstrap.php
rename to tests/codeception/unit/_bootstrap.php
diff --git a/tests/unit/_config.php b/tests/codeception/unit/_config.php
similarity index 83%
rename from tests/unit/_config.php
rename to tests/codeception/unit/_config.php
index 2559ef31e..36b011446 100644
--- a/tests/unit/_config.php
+++ b/tests/codeception/unit/_config.php
@@ -1,7 +1,7 @@
 <?php
 
 return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/web.php'),
+    require(__DIR__ . '/../../../config/web.php'),
     require(__DIR__ . '/../_config.php'),
     [
         'components' => [
diff --git a/tests/unit/fixtures/.gitkeep b/tests/codeception/unit/fixtures/.gitkeep
similarity index 100%
rename from tests/unit/fixtures/.gitkeep
rename to tests/codeception/unit/fixtures/.gitkeep
diff --git a/tests/unit/fixtures/data/.gitkeep b/tests/codeception/unit/fixtures/data/.gitkeep
similarity index 100%
rename from tests/unit/fixtures/data/.gitkeep
rename to tests/codeception/unit/fixtures/data/.gitkeep
diff --git a/tests/unit/models/ContactFormTest.php b/tests/codeception/unit/models/ContactFormTest.php
similarity index 98%
rename from tests/unit/models/ContactFormTest.php
rename to tests/codeception/unit/models/ContactFormTest.php
index 6e69cecd3..8adda18c6 100644
--- a/tests/unit/models/ContactFormTest.php
+++ b/tests/codeception/unit/models/ContactFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\unit\models;
+namespace codeception\unit\models;
 
 use Yii;
 use yii\codeception\TestCase;
diff --git a/tests/unit/models/LoginFormTest.php b/tests/codeception/unit/models/LoginFormTest.php
similarity index 98%
rename from tests/unit/models/LoginFormTest.php
rename to tests/codeception/unit/models/LoginFormTest.php
index f2c60f584..5e6762464 100644
--- a/tests/unit/models/LoginFormTest.php
+++ b/tests/codeception/unit/models/LoginFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\unit\models;
+namespace codeception\unit\models;
 
 use Yii;
 use yii\codeception\TestCase;
diff --git a/tests/unit/models/UserTest.php b/tests/codeception/unit/models/UserTest.php
similarity index 89%
rename from tests/unit/models/UserTest.php
rename to tests/codeception/unit/models/UserTest.php
index 19ab30da0..01fde74cb 100644
--- a/tests/unit/models/UserTest.php
+++ b/tests/codeception/unit/models/UserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\unit\models;
+namespace codeception\unit\models;
 
 use yii\codeception\TestCase;
 
diff --git a/tests/unit/templates/fixtures/.gitkeep b/tests/codeception/unit/templates/fixtures/.gitkeep
similarity index 100%
rename from tests/unit/templates/fixtures/.gitkeep
rename to tests/codeception/unit/templates/fixtures/.gitkeep
diff --git a/tests/functional/_console.php b/tests/functional/_console.php
deleted file mode 100644
index abeee696c..000000000
--- a/tests/functional/_console.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/console.php'),
-    require(__DIR__ . '/../_config.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional',
-            ],
-        ],
-    ]
-);
diff --git a/tests/functional/yii b/tests/functional/yii
deleted file mode 100644
index e587ba400..000000000
--- a/tests/functional/yii
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-require_once __DIR__ . '/../_console_bootstrap.php';
-
-$config = require(__DIR__ . '/_console.php');
-
-$application = new yii\console\Application($config);
-$exitCode = $application->run();
-exit($exitCode);
diff --git a/tests/unit/_console.php b/tests/unit/_console.php
deleted file mode 100644
index 04272a321..000000000
--- a/tests/unit/_console.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/console.php'),
-    require(__DIR__ . '/../_config.php'),
-    [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit',
-            ],
-        ],
-    ]
-);
diff --git a/tests/unit/yii b/tests/unit/yii
deleted file mode 100644
index e587ba400..000000000
--- a/tests/unit/yii
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-require_once __DIR__ . '/../_console_bootstrap.php';
-
-$config = require(__DIR__ . '/_console.php');
-
-$application = new yii\console\Application($config);
-$exitCode = $application->run();
-exit($exitCode);
diff --git a/web/index-test.php b/web/index-test.php
index 326608d21..dd8a4965c 100644
--- a/web/index-test.php
+++ b/web/index-test.php
@@ -11,6 +11,6 @@
 require(__DIR__ . '/../vendor/autoload.php');
 require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
 
-$config = require(__DIR__ . '/../tests/acceptance/_config.php');
+$config = require(__DIR__ . '/../tests/codeception/acceptance/_config.php');
 
 (new yii\web\Application($config))->run();

From 9460b93de2cf919c6f13cd5b4634e76fa7f0ae02 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 16 Aug 2014 17:16:05 +0400
Subject: [PATCH 046/390] Removed db module from basic app, renamed _helpers to
 _support and _logs to _output

---
 tests/codeception.yml                          | 11 ++---------
 tests/codeception/_data/dump.sql               |  1 -
 tests/codeception/{_log => _output}/.gitignore |  0
 3 files changed, 2 insertions(+), 10 deletions(-)
 delete mode 100644 tests/codeception/_data/dump.sql
 rename tests/codeception/{_log => _output}/.gitignore (100%)

diff --git a/tests/codeception.yml b/tests/codeception.yml
index 64952529e..851923d16 100644
--- a/tests/codeception.yml
+++ b/tests/codeception.yml
@@ -1,19 +1,12 @@
 actor: Tester
 paths:
     tests: codeception
-    log: codeception/_log
+    log: codeception/_output
     data: codeception/_data
-    helpers: codeception/_helpers
+    helpers: codeception/_support
 settings:
     bootstrap: _bootstrap.php
     suite_class: \PHPUnit_Framework_TestSuite
     memory_limit: 1024M
     log: true
     colors: true
-modules:
-    config:
-        Db:
-            dsn: ''
-            user: ''
-            password: ''
-            dump: codeception/_data/dump.sql
diff --git a/tests/codeception/_data/dump.sql b/tests/codeception/_data/dump.sql
deleted file mode 100644
index 4bc742ce6..000000000
--- a/tests/codeception/_data/dump.sql
+++ /dev/null
@@ -1 +0,0 @@
-/* Replace this file with actual dump of your database */
\ No newline at end of file
diff --git a/tests/codeception/_log/.gitignore b/tests/codeception/_output/.gitignore
similarity index 100%
rename from tests/codeception/_log/.gitignore
rename to tests/codeception/_output/.gitignore

From 3673e6c004ea232fb236c1374cb6dd3b1203be10 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 16 Aug 2014 18:15:41 +0400
Subject: [PATCH 047/390] Renamed guy classes to actors, fixed phpdoc and code
 style

---
 tests/codeception/.gitignore                 |  6 +++---
 tests/codeception/_pages/AboutPage.php       |  4 ++++
 tests/codeception/_pages/ContactPage.php     |  8 ++++++--
 tests/codeception/_pages/LoginPage.php       | 10 +++++++---
 tests/codeception/acceptance.suite.yml       |  2 +-
 tests/codeception/acceptance/AboutCept.php   |  2 +-
 tests/codeception/acceptance/ContactCept.php |  2 +-
 tests/codeception/acceptance/HomeCept.php    |  2 +-
 tests/codeception/acceptance/LoginCept.php   |  2 +-
 tests/codeception/functional.suite.yml       |  2 +-
 tests/codeception/functional/AboutCept.php   |  2 +-
 tests/codeception/functional/ContactCept.php |  2 +-
 tests/codeception/functional/HomeCept.php    |  2 +-
 tests/codeception/functional/LoginCept.php   |  2 +-
 tests/codeception/unit.suite.yml             |  2 +-
 15 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/tests/codeception/.gitignore b/tests/codeception/.gitignore
index c5aa0743d..985dbb423 100644
--- a/tests/codeception/.gitignore
+++ b/tests/codeception/.gitignore
@@ -1,4 +1,4 @@
 # these files are auto generated by codeception build
-/unit/CodeGuy.php
-/functional/TestGuy.php
-/acceptance/WebGuy.php
+/unit/UnitTester.php
+/functional/FunctionalTester.php
+/acceptance/AcceptanceTester.php
diff --git a/tests/codeception/_pages/AboutPage.php b/tests/codeception/_pages/AboutPage.php
index 727cd3859..b6ca34a29 100644
--- a/tests/codeception/_pages/AboutPage.php
+++ b/tests/codeception/_pages/AboutPage.php
@@ -4,6 +4,10 @@
 
 use yii\codeception\BasePage;
 
+/**
+ * Represents about page
+ * @property \AcceptanceTester|\FunctionalTester $actor
+ */
 class AboutPage extends BasePage
 {
     public $route = 'site/about';
diff --git a/tests/codeception/_pages/ContactPage.php b/tests/codeception/_pages/ContactPage.php
index 63c053c90..956125594 100644
--- a/tests/codeception/_pages/ContactPage.php
+++ b/tests/codeception/_pages/ContactPage.php
@@ -4,6 +4,10 @@
 
 use yii\codeception\BasePage;
 
+/**
+ * Represents contact page
+ * @property \AcceptanceTester|\FunctionalTester $actor
+ */
 class ContactPage extends BasePage
 {
     public $route = 'site/contact';
@@ -15,8 +19,8 @@ public function submit(array $contactData)
     {
         foreach ($contactData as $field => $value) {
             $inputType = $field === 'body' ? 'textarea' : 'input';
-            $this->guy->fillField($inputType . '[name="ContactForm[' . $field . ']"]', $value);
+            $this->actor->fillField($inputType . '[name="ContactForm[' . $field . ']"]', $value);
         }
-        $this->guy->click('contact-button');
+        $this->actor->click('contact-button');
     }
 }
diff --git a/tests/codeception/_pages/LoginPage.php b/tests/codeception/_pages/LoginPage.php
index 35ada9cd8..af1004963 100644
--- a/tests/codeception/_pages/LoginPage.php
+++ b/tests/codeception/_pages/LoginPage.php
@@ -4,6 +4,10 @@
 
 use yii\codeception\BasePage;
 
+/**
+ * Represents login page
+ * @property \AcceptanceTester|\FunctionalTester $actor
+ */
 class LoginPage extends BasePage
 {
     public $route = 'site/login';
@@ -14,8 +18,8 @@ class LoginPage extends BasePage
      */
     public function login($username, $password)
     {
-        $this->guy->fillField('input[name="LoginForm[username]"]', $username);
-        $this->guy->fillField('input[name="LoginForm[password]"]', $password);
-        $this->guy->click('login-button');
+        $this->actor->fillField('input[name="LoginForm[username]"]', $username);
+        $this->actor->fillField('input[name="LoginForm[password]"]', $password);
+        $this->actor->click('login-button');
     }
 }
diff --git a/tests/codeception/acceptance.suite.yml b/tests/codeception/acceptance.suite.yml
index bd10f82a1..a045043cd 100644
--- a/tests/codeception/acceptance.suite.yml
+++ b/tests/codeception/acceptance.suite.yml
@@ -8,7 +8,7 @@
 
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
-class_name: WebGuy
+class_name: AcceptanceTester
 modules:
     enabled:
         - PhpBrowser
diff --git a/tests/codeception/acceptance/AboutCept.php b/tests/codeception/acceptance/AboutCept.php
index 251cad274..2dcc6a13b 100644
--- a/tests/codeception/acceptance/AboutCept.php
+++ b/tests/codeception/acceptance/AboutCept.php
@@ -2,7 +2,7 @@
 
 use codeception\_pages\AboutPage;
 
-$I = new WebGuy($scenario);
+$I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that about works');
 AboutPage::openBy($I);
 $I->see('About', 'h1');
diff --git a/tests/codeception/acceptance/ContactCept.php b/tests/codeception/acceptance/ContactCept.php
index 50aa69acb..27858f8e9 100644
--- a/tests/codeception/acceptance/ContactCept.php
+++ b/tests/codeception/acceptance/ContactCept.php
@@ -2,7 +2,7 @@
 
 use codeception\_pages\ContactPage;
 
-$I = new WebGuy($scenario);
+$I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that contact works');
 
 $contactPage = ContactPage::openBy($I);
diff --git a/tests/codeception/acceptance/HomeCept.php b/tests/codeception/acceptance/HomeCept.php
index 62456f930..369ab7f48 100644
--- a/tests/codeception/acceptance/HomeCept.php
+++ b/tests/codeception/acceptance/HomeCept.php
@@ -1,6 +1,6 @@
 <?php
 
-$I = new WebGuy($scenario);
+$I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);
 $I->see('My Company');
diff --git a/tests/codeception/acceptance/LoginCept.php b/tests/codeception/acceptance/LoginCept.php
index ff093b3bd..6d07c0895 100644
--- a/tests/codeception/acceptance/LoginCept.php
+++ b/tests/codeception/acceptance/LoginCept.php
@@ -2,7 +2,7 @@
 
 use codeception\_pages\LoginPage;
 
-$I = new WebGuy($scenario);
+$I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that login works');
 
 $loginPage = LoginPage::openBy($I);
diff --git a/tests/codeception/functional.suite.yml b/tests/codeception/functional.suite.yml
index 3b5008139..94ff0c976 100644
--- a/tests/codeception/functional.suite.yml
+++ b/tests/codeception/functional.suite.yml
@@ -6,7 +6,7 @@
 
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 #basic/web/index.php
-class_name: TestGuy
+class_name: FunctionalTester
 modules:
     enabled:
       - Filesystem
diff --git a/tests/codeception/functional/AboutCept.php b/tests/codeception/functional/AboutCept.php
index 631206144..3edd61da3 100644
--- a/tests/codeception/functional/AboutCept.php
+++ b/tests/codeception/functional/AboutCept.php
@@ -2,7 +2,7 @@
 
 use codeception\_pages\AboutPage;
 
-$I = new TestGuy($scenario);
+$I = new FunctionalTester($scenario);
 $I->wantTo('ensure that about works');
 AboutPage::openBy($I);
 $I->see('About', 'h1');
diff --git a/tests/codeception/functional/ContactCept.php b/tests/codeception/functional/ContactCept.php
index f13b51cf2..c5e83b4f1 100644
--- a/tests/codeception/functional/ContactCept.php
+++ b/tests/codeception/functional/ContactCept.php
@@ -2,7 +2,7 @@
 
 use codeception\_pages\ContactPage;
 
-$I = new TestGuy($scenario);
+$I = new FunctionalTester($scenario);
 $I->wantTo('ensure that contact works');
 
 $contactPage = ContactPage::openBy($I);
diff --git a/tests/codeception/functional/HomeCept.php b/tests/codeception/functional/HomeCept.php
index 3258ba333..80aa551fc 100644
--- a/tests/codeception/functional/HomeCept.php
+++ b/tests/codeception/functional/HomeCept.php
@@ -1,6 +1,6 @@
 <?php
 
-$I = new TestGuy($scenario);
+$I = new FunctionalTester($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);
 $I->see('My Company');
diff --git a/tests/codeception/functional/LoginCept.php b/tests/codeception/functional/LoginCept.php
index 77189b885..4cb283ac9 100644
--- a/tests/codeception/functional/LoginCept.php
+++ b/tests/codeception/functional/LoginCept.php
@@ -2,7 +2,7 @@
 
 use codeception\_pages\LoginPage;
 
-$I = new TestGuy($scenario);
+$I = new FunctionalTester($scenario);
 $I->wantTo('ensure that login works');
 
 $loginPage = LoginPage::openBy($I);
diff --git a/tests/codeception/unit.suite.yml b/tests/codeception/unit.suite.yml
index f0573a843..a0582a536 100644
--- a/tests/codeception/unit.suite.yml
+++ b/tests/codeception/unit.suite.yml
@@ -3,4 +3,4 @@
 # suite for unit (internal) tests.
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
-class_name: CodeGuy
+class_name: UnitTester

From e7dcdf7c7141eb5ff46442fce5577d8c46f3cb6a Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 16 Aug 2014 18:38:56 +0400
Subject: [PATCH 048/390] Exposed basic app entry URL via codeception.yml,
 refactored configs of advanced app to read from config and define entry
 script in a single place

---
 tests/codeception.yml                    |  4 ++++
 tests/codeception/_bootstrap.php         | 14 +++-----------
 tests/codeception/functional/_config.php |  2 --
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/tests/codeception.yml b/tests/codeception.yml
index 851923d16..ba02c81b7 100644
--- a/tests/codeception.yml
+++ b/tests/codeception.yml
@@ -10,3 +10,7 @@ settings:
     memory_limit: 1024M
     log: true
     colors: true
+config:
+    # the entry script URL (without host info) for functional and acceptance tests
+    # PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
+    test_entry_url: /index-test.php
\ No newline at end of file
diff --git a/tests/codeception/_bootstrap.php b/tests/codeception/_bootstrap.php
index ecd76de93..eb61f8f64 100644
--- a/tests/codeception/_bootstrap.php
+++ b/tests/codeception/_bootstrap.php
@@ -1,21 +1,13 @@
 <?php
-
-// 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', '/index-test.php');
-
-// the entry script file path for functional and acceptance tests
-defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(dirname(__DIR__)) . '/web/index-test.php');
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-
 defined('YII_ENV') or define('YII_ENV', 'test');
 
-require_once(__DIR__ . '/../../vendor/autoload.php');
+defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', \Codeception\Configuration::config()['config']['test_entry_url']);
+defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(dirname(__DIR__)) . '/web/index-test.php');
 
+require_once(__DIR__ . '/../../vendor/autoload.php');
 require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
 
-// set correct script paths
 $_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
 $_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
 $_SERVER['SERVER_NAME'] = 'localhost';
diff --git a/tests/codeception/functional/_config.php b/tests/codeception/functional/_config.php
index 3d50fdbaf..515c90487 100644
--- a/tests/codeception/functional/_config.php
+++ b/tests/codeception/functional/_config.php
@@ -1,6 +1,4 @@
 <?php
-
-// set correct script paths
 $_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
 $_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
 

From 229c352f78f53e49c4de08252b6f0f1ffcce4e75 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sun, 17 Aug 2014 18:45:58 +0400
Subject: [PATCH 049/390] Adjusted test configs structure

---
 tests/codeception/acceptance/ContactCept.php  | 20 +++++++++----------
 tests/codeception/acceptance/_bootstrap.php   |  3 +--
 ...{_console_bootstrap.php => _bootstrap.php} |  2 --
 tests/codeception/bin/yii_acceptance          |  4 ++--
 tests/codeception/bin/yii_functional          |  4 ++--
 tests/codeception/bin/yii_unit                |  4 ++--
 .../_config.php => config/acceptance.php}     |  6 ++++--
 .../{_config.php => config/config.php}        |  2 +-
 .../_config.php => config/functional.php}     |  5 ++++-
 .../{unit/_config.php => config/unit.php}     |  6 ++++--
 tests/codeception/functional.suite.yml        |  2 +-
 tests/codeception/functional/_bootstrap.php   |  3 +--
 web/index-test.php                            |  2 +-
 13 files changed, 33 insertions(+), 30 deletions(-)
 rename tests/codeception/bin/{_console_bootstrap.php => _bootstrap.php} (99%)
 rename tests/codeception/{acceptance/_config.php => config/acceptance.php} (73%)
 rename tests/codeception/{_config.php => config/config.php} (78%)
 rename tests/codeception/{functional/_config.php => config/functional.php} (78%)
 rename tests/codeception/{unit/_config.php => config/unit.php} (74%)

diff --git a/tests/codeception/acceptance/ContactCept.php b/tests/codeception/acceptance/ContactCept.php
index 27858f8e9..c9adc7e15 100644
--- a/tests/codeception/acceptance/ContactCept.php
+++ b/tests/codeception/acceptance/ContactCept.php
@@ -21,11 +21,11 @@
 
 $I->amGoingTo('submit contact form with not correct email');
 $contactPage->submit([
-    'name'			=>	'tester',
-    'email'			=>	'tester.email',
-    'subject'		=>	'test subject',
-    'body'			=>	'test content',
-    'verifyCode'	=>	'testme',
+    'name' => 'tester',
+    'email' => 'tester.email',
+    'subject' => 'test subject',
+    'body' => 'test content',
+    'verifyCode' => 'testme',
 ]);
 $I->expectTo('see that email adress is wrong');
 $I->dontSee('Name cannot be blank', '.help-inline');
@@ -36,11 +36,11 @@
 
 $I->amGoingTo('submit contact form with correct data');
 $contactPage->submit([
-    'name'			=>	'tester',
-    'email'			=>	'tester@example.com',
-    'subject'		=>	'test subject',
-    'body'			=>	'test content',
-    'verifyCode'	=>	'testme',
+    'name' => 'tester',
+    'email' => 'tester@example.com',
+    'subject' => 'test subject',
+    'body' => 'test content',
+    'verifyCode' => 'testme',
 ]);
 if (method_exists($I, 'wait')) {
     $I->wait(3); // only for selenium
diff --git a/tests/codeception/acceptance/_bootstrap.php b/tests/codeception/acceptance/_bootstrap.php
index 6ce3d175b..36f9f1d11 100644
--- a/tests/codeception/acceptance/_bootstrap.php
+++ b/tests/codeception/acceptance/_bootstrap.php
@@ -1,3 +1,2 @@
 <?php
-
-new yii\web\Application(require(__DIR__ . '/_config.php'));
+new yii\web\Application(require(dirname(__DIR__) . '/config/acceptance.php'));
diff --git a/tests/codeception/bin/_console_bootstrap.php b/tests/codeception/bin/_bootstrap.php
similarity index 99%
rename from tests/codeception/bin/_console_bootstrap.php
rename to tests/codeception/bin/_bootstrap.php
index eff8b403f..fcff15411 100644
--- a/tests/codeception/bin/_console_bootstrap.php
+++ b/tests/codeception/bin/_bootstrap.php
@@ -1,7 +1,5 @@
 <?php
-
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-
 defined('YII_ENV') or define('YII_ENV', 'test');
 
 // fcgi doesn't have STDIN and STDOUT defined by default
diff --git a/tests/codeception/bin/yii_acceptance b/tests/codeception/bin/yii_acceptance
index a02d9daf1..89a6e3c3e 100644
--- a/tests/codeception/bin/yii_acceptance
+++ b/tests/codeception/bin/yii_acceptance
@@ -8,11 +8,11 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require_once __DIR__ . '/_console_bootstrap.php';
+require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/config/console.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/../config/config.php'),
     [
         'components' => [
             'db' => [
diff --git a/tests/codeception/bin/yii_functional b/tests/codeception/bin/yii_functional
index 44051e2ca..148420fe0 100644
--- a/tests/codeception/bin/yii_functional
+++ b/tests/codeception/bin/yii_functional
@@ -8,11 +8,11 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require_once __DIR__ . '/_console_bootstrap.php';
+require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/config/console.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/../config/config.php'),
     [
         'components' => [
             'db' => [
diff --git a/tests/codeception/bin/yii_unit b/tests/codeception/bin/yii_unit
index e9b799903..5fb938e51 100644
--- a/tests/codeception/bin/yii_unit
+++ b/tests/codeception/bin/yii_unit
@@ -8,11 +8,11 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require_once __DIR__ . '/_console_bootstrap.php';
+require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
     require(ROOT_DIR . '/config/console.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/../config/config.php'),
     [
         'components' => [
             'db' => [
diff --git a/tests/codeception/acceptance/_config.php b/tests/codeception/config/acceptance.php
similarity index 73%
rename from tests/codeception/acceptance/_config.php
rename to tests/codeception/config/acceptance.php
index d620a7d9e..c80d4687a 100644
--- a/tests/codeception/acceptance/_config.php
+++ b/tests/codeception/config/acceptance.php
@@ -1,8 +1,10 @@
 <?php
-
+/**
+ * Application configuration for acceptance tests
+ */
 return yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../../config/web.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/config.php'),
     [
         'components' => [
             'db' => [
diff --git a/tests/codeception/_config.php b/tests/codeception/config/config.php
similarity index 78%
rename from tests/codeception/_config.php
rename to tests/codeception/config/config.php
index 8629dd0d9..005d365c4 100644
--- a/tests/codeception/_config.php
+++ b/tests/codeception/config/config.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * application configurations shared by all test types
+ * Application configuration shared by all test types
  */
 return [
     'components' => [
diff --git a/tests/codeception/functional/_config.php b/tests/codeception/config/functional.php
similarity index 78%
rename from tests/codeception/functional/_config.php
rename to tests/codeception/config/functional.php
index 515c90487..13cfc6458 100644
--- a/tests/codeception/functional/_config.php
+++ b/tests/codeception/config/functional.php
@@ -2,9 +2,12 @@
 $_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
 $_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
 
+/**
+ * Application configuration for functional tests
+ */
 return yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../../config/web.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/config.php'),
     [
         'components' => [
             'db' => [
diff --git a/tests/codeception/unit/_config.php b/tests/codeception/config/unit.php
similarity index 74%
rename from tests/codeception/unit/_config.php
rename to tests/codeception/config/unit.php
index 36b011446..1b8772d5b 100644
--- a/tests/codeception/unit/_config.php
+++ b/tests/codeception/config/unit.php
@@ -1,8 +1,10 @@
 <?php
-
+/**
+ * Application configuration for unit tests
+ */
 return yii\helpers\ArrayHelper::merge(
     require(__DIR__ . '/../../../config/web.php'),
-    require(__DIR__ . '/../_config.php'),
+    require(__DIR__ . '/config.php'),
     [
         'components' => [
             'db' => [
diff --git a/tests/codeception/functional.suite.yml b/tests/codeception/functional.suite.yml
index 94ff0c976..ad7164cb6 100644
--- a/tests/codeception/functional.suite.yml
+++ b/tests/codeception/functional.suite.yml
@@ -13,4 +13,4 @@ modules:
       - Yii2
     config:
         Yii2:
-            configFile: 'codeception/functional/_config.php'
+            configFile: 'codeception/config/functional.php'
diff --git a/tests/codeception/functional/_bootstrap.php b/tests/codeception/functional/_bootstrap.php
index 6ce3d175b..8aac0915b 100644
--- a/tests/codeception/functional/_bootstrap.php
+++ b/tests/codeception/functional/_bootstrap.php
@@ -1,3 +1,2 @@
 <?php
-
-new yii\web\Application(require(__DIR__ . '/_config.php'));
+new yii\web\Application(require(dirname(__DIR__) . '/config/functional.php'));
diff --git a/web/index-test.php b/web/index-test.php
index dd8a4965c..32b4ce3e1 100644
--- a/web/index-test.php
+++ b/web/index-test.php
@@ -11,6 +11,6 @@
 require(__DIR__ . '/../vendor/autoload.php');
 require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
 
-$config = require(__DIR__ . '/../tests/codeception/acceptance/_config.php');
+$config = require(__DIR__ . '/../tests/codeception/config/acceptance.php');
 
 (new yii\web\Application($config))->run();

From bc2ec5c68453522b155f8a804ebd152272d52eaf Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sun, 17 Aug 2014 18:55:24 +0400
Subject: [PATCH 050/390] Fixed copyright year in batch files

---
 config/web.php                           | 6 +++++-
 tests/codeception/bin/yii_acceptance.bat | 2 +-
 tests/codeception/bin/yii_functional.bat | 2 +-
 tests/codeception/bin/yii_unit.bat       | 2 +-
 yii.bat                                  | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/config/web.php b/config/web.php
index 1632a5aab..4fde1b686 100644
--- a/config/web.php
+++ b/config/web.php
@@ -9,7 +9,7 @@
     'components' => [
         'request' => [
             // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
-            'cookieValidationKey' => '',
+            'cookieValidationKey' => 'thisIsAKey',
         ],
         'cache' => [
             'class' => 'yii\caching\FileCache',
@@ -38,6 +38,10 @@
             ],
         ],
         'db' => require(__DIR__ . '/db.php'),
+        'urlManager' => [
+            'enablePrettyUrl' => true,
+            'showScriptName' => false,
+        ],
     ],
     'params' => $params,
 ];
diff --git a/tests/codeception/bin/yii_acceptance.bat b/tests/codeception/bin/yii_acceptance.bat
index 389f89325..3edcabe95 100644
--- a/tests/codeception/bin/yii_acceptance.bat
+++ b/tests/codeception/bin/yii_acceptance.bat
@@ -5,7 +5,7 @@ rem  Yii command line bootstrap script for Windows.
 rem
 rem  @author Qiang Xue <qiang.xue@gmail.com>
 rem  @link http://www.yiiframework.com/
-rem  @copyright Copyright &copy; 2012 Yii Software LLC
+rem  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 
diff --git a/tests/codeception/bin/yii_functional.bat b/tests/codeception/bin/yii_functional.bat
index 98fae8853..2d04dcc71 100644
--- a/tests/codeception/bin/yii_functional.bat
+++ b/tests/codeception/bin/yii_functional.bat
@@ -5,7 +5,7 @@ rem  Yii command line bootstrap script for Windows.
 rem
 rem  @author Qiang Xue <qiang.xue@gmail.com>
 rem  @link http://www.yiiframework.com/
-rem  @copyright Copyright &copy; 2012 Yii Software LLC
+rem  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 
diff --git a/tests/codeception/bin/yii_unit.bat b/tests/codeception/bin/yii_unit.bat
index 511e61d22..6852bf0ca 100644
--- a/tests/codeception/bin/yii_unit.bat
+++ b/tests/codeception/bin/yii_unit.bat
@@ -5,7 +5,7 @@ rem  Yii command line bootstrap script for Windows.
 rem
 rem  @author Qiang Xue <qiang.xue@gmail.com>
 rem  @link http://www.yiiframework.com/
-rem  @copyright Copyright &copy; 2012 Yii Software LLC
+rem  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 
diff --git a/yii.bat b/yii.bat
index 5e21e2e99..d516b3a19 100644
--- a/yii.bat
+++ b/yii.bat
@@ -5,7 +5,7 @@ rem  Yii command line bootstrap script for Windows.
 rem
 rem  @author Qiang Xue <qiang.xue@gmail.com>
 rem  @link http://www.yiiframework.com/
-rem  @copyright Copyright &copy; 2012 Yii Software LLC
+rem  @copyright Copyright (c) 2008 Yii Software LLC
 rem  @license http://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 

From f85a0f7dd24cc643699e1c605f806166dfb3ec62 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Mon, 18 Aug 2014 01:56:36 +0400
Subject: [PATCH 051/390] Prefixed constants to avoid possible naming conflicts

---
 tests/codeception/_bootstrap.php        | 8 ++++----
 tests/codeception/bin/_bootstrap.php    | 6 +++---
 tests/codeception/bin/yii_acceptance    | 2 +-
 tests/codeception/bin/yii_functional    | 2 +-
 tests/codeception/bin/yii_unit          | 2 +-
 tests/codeception/config/functional.php | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/codeception/_bootstrap.php b/tests/codeception/_bootstrap.php
index eb61f8f64..5f5ae10b4 100644
--- a/tests/codeception/_bootstrap.php
+++ b/tests/codeception/_bootstrap.php
@@ -2,14 +2,14 @@
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or define('YII_ENV', 'test');
 
-defined('TEST_ENTRY_URL') or define('TEST_ENTRY_URL', \Codeception\Configuration::config()['config']['test_entry_url']);
-defined('TEST_ENTRY_FILE') or define('TEST_ENTRY_FILE', dirname(dirname(__DIR__)) . '/web/index-test.php');
+defined('YII_TEST_ENTRY_URL') or define('YII_TEST_ENTRY_URL', \Codeception\Configuration::config()['config']['test_entry_url']);
+defined('YII_TEST_ENTRY_FILE') or define('YII_TEST_ENTRY_FILE', dirname(dirname(__DIR__)) . '/web/index-test.php');
 
 require_once(__DIR__ . '/../../vendor/autoload.php');
 require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
 
-$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+$_SERVER['SCRIPT_FILENAME'] = YII_TEST_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = YII_TEST_ENTRY_URL;
 $_SERVER['SERVER_NAME'] = 'localhost';
 
 Yii::setAlias('@codeception', __DIR__);
diff --git a/tests/codeception/bin/_bootstrap.php b/tests/codeception/bin/_bootstrap.php
index fcff15411..de57b2006 100644
--- a/tests/codeception/bin/_bootstrap.php
+++ b/tests/codeception/bin/_bootstrap.php
@@ -6,7 +6,7 @@
 defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
 defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
 
-defined('ROOT_DIR') or define('ROOT_DIR', dirname(dirname(dirname(__DIR__))));
+defined('YII_ROOT_DIR') or define('YII_ROOT_DIR', dirname(dirname(dirname(__DIR__))));
 
-require(ROOT_DIR . '/vendor/autoload.php');
-require(ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
+require(YII_ROOT_DIR . '/vendor/autoload.php');
+require(YII_ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
diff --git a/tests/codeception/bin/yii_acceptance b/tests/codeception/bin/yii_acceptance
index 89a6e3c3e..f454a1cf7 100644
--- a/tests/codeception/bin/yii_acceptance
+++ b/tests/codeception/bin/yii_acceptance
@@ -11,7 +11,7 @@
 require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
-    require(ROOT_DIR . '/config/console.php'),
+    require(YII_ROOT_DIR . '/config/console.php'),
     require(__DIR__ . '/../config/config.php'),
     [
         'components' => [
diff --git a/tests/codeception/bin/yii_functional b/tests/codeception/bin/yii_functional
index 148420fe0..af5563e4d 100644
--- a/tests/codeception/bin/yii_functional
+++ b/tests/codeception/bin/yii_functional
@@ -11,7 +11,7 @@
 require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
-    require(ROOT_DIR . '/config/console.php'),
+    require(YII_ROOT_DIR . '/config/console.php'),
     require(__DIR__ . '/../config/config.php'),
     [
         'components' => [
diff --git a/tests/codeception/bin/yii_unit b/tests/codeception/bin/yii_unit
index 5fb938e51..92750bb15 100644
--- a/tests/codeception/bin/yii_unit
+++ b/tests/codeception/bin/yii_unit
@@ -11,7 +11,7 @@
 require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
-    require(ROOT_DIR . '/config/console.php'),
+    require(YII_ROOT_DIR . '/config/console.php'),
     require(__DIR__ . '/../config/config.php'),
     [
         'components' => [
diff --git a/tests/codeception/config/functional.php b/tests/codeception/config/functional.php
index 13cfc6458..32cd7c899 100644
--- a/tests/codeception/config/functional.php
+++ b/tests/codeception/config/functional.php
@@ -1,6 +1,6 @@
 <?php
-$_SERVER['SCRIPT_FILENAME'] = TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = TEST_ENTRY_URL;
+$_SERVER['SCRIPT_FILENAME'] = YII_TEST_ENTRY_FILE;
+$_SERVER['SCRIPT_NAME'] = YII_TEST_ENTRY_URL;
 
 /**
  * Application configuration for functional tests

From 6b67d0ec522f626d16c2e26d7e5adfcb9a01adce Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 19 Aug 2014 20:42:40 +0400
Subject: [PATCH 052/390] =?UTF-8?q?Renamed=20YII=5FROOT=5FDIR=20=E2=86=92?=
 =?UTF-8?q?=20YII=5FAPP=5FBASE=5FPATH?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/codeception/bin/_bootstrap.php | 6 +++---
 tests/codeception/bin/yii_acceptance | 2 +-
 tests/codeception/bin/yii_functional | 2 +-
 tests/codeception/bin/yii_unit       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/codeception/bin/_bootstrap.php b/tests/codeception/bin/_bootstrap.php
index de57b2006..e56da4efa 100644
--- a/tests/codeception/bin/_bootstrap.php
+++ b/tests/codeception/bin/_bootstrap.php
@@ -6,7 +6,7 @@
 defined('STDIN') or define('STDIN', fopen('php://stdin', 'r'));
 defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'w'));
 
-defined('YII_ROOT_DIR') or define('YII_ROOT_DIR', dirname(dirname(dirname(__DIR__))));
+defined('YII_APP_BASE_PATH') or define('YII_APP_BASE_PATH', dirname(dirname(dirname(__DIR__))));
 
-require(YII_ROOT_DIR . '/vendor/autoload.php');
-require(YII_ROOT_DIR . '/vendor/yiisoft/yii2/Yii.php');
+require(YII_APP_BASE_PATH . '/vendor/autoload.php');
+require(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.php');
diff --git a/tests/codeception/bin/yii_acceptance b/tests/codeception/bin/yii_acceptance
index f454a1cf7..f67a47fbb 100644
--- a/tests/codeception/bin/yii_acceptance
+++ b/tests/codeception/bin/yii_acceptance
@@ -11,7 +11,7 @@
 require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
-    require(YII_ROOT_DIR . '/config/console.php'),
+    require(YII_APP_BASE_PATH . '/config/console.php'),
     require(__DIR__ . '/../config/config.php'),
     [
         'components' => [
diff --git a/tests/codeception/bin/yii_functional b/tests/codeception/bin/yii_functional
index af5563e4d..f6e3988a0 100644
--- a/tests/codeception/bin/yii_functional
+++ b/tests/codeception/bin/yii_functional
@@ -11,7 +11,7 @@
 require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
-    require(YII_ROOT_DIR . '/config/console.php'),
+    require(YII_APP_BASE_PATH . '/config/console.php'),
     require(__DIR__ . '/../config/config.php'),
     [
         'components' => [
diff --git a/tests/codeception/bin/yii_unit b/tests/codeception/bin/yii_unit
index 92750bb15..1ab8e1fba 100644
--- a/tests/codeception/bin/yii_unit
+++ b/tests/codeception/bin/yii_unit
@@ -11,7 +11,7 @@
 require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
-    require(YII_ROOT_DIR . '/config/console.php'),
+    require(YII_APP_BASE_PATH . '/config/console.php'),
     require(__DIR__ . '/../config/config.php'),
     [
         'components' => [

From a3efcafd38d3b21d7c8a422f8ee621143567f18f Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sun, 24 Aug 2014 14:14:35 +0400
Subject: [PATCH 053/390] Adjusted testing namespaces in application templates

---
 tests/codeception/_bootstrap.php                  | 2 +-
 tests/codeception/_pages/AboutPage.php            | 2 +-
 tests/codeception/_pages/ContactPage.php          | 2 +-
 tests/codeception/_pages/LoginPage.php            | 2 +-
 tests/codeception/acceptance/AboutCept.php        | 2 +-
 tests/codeception/acceptance/ContactCept.php      | 2 +-
 tests/codeception/acceptance/LoginCept.php        | 2 +-
 tests/codeception/functional/AboutCept.php        | 2 +-
 tests/codeception/functional/ContactCept.php      | 2 +-
 tests/codeception/functional/LoginCept.php        | 2 +-
 tests/codeception/unit/models/ContactFormTest.php | 2 +-
 tests/codeception/unit/models/LoginFormTest.php   | 2 +-
 tests/codeception/unit/models/UserTest.php        | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/codeception/_bootstrap.php b/tests/codeception/_bootstrap.php
index 5f5ae10b4..985593978 100644
--- a/tests/codeception/_bootstrap.php
+++ b/tests/codeception/_bootstrap.php
@@ -12,4 +12,4 @@
 $_SERVER['SCRIPT_NAME'] = YII_TEST_ENTRY_URL;
 $_SERVER['SERVER_NAME'] = 'localhost';
 
-Yii::setAlias('@codeception', __DIR__);
+Yii::setAlias('@tests', dirname(__DIR__));
diff --git a/tests/codeception/_pages/AboutPage.php b/tests/codeception/_pages/AboutPage.php
index b6ca34a29..b56320d09 100644
--- a/tests/codeception/_pages/AboutPage.php
+++ b/tests/codeception/_pages/AboutPage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace codeception\_pages;
+namespace tests\codeception\_pages;
 
 use yii\codeception\BasePage;
 
diff --git a/tests/codeception/_pages/ContactPage.php b/tests/codeception/_pages/ContactPage.php
index 956125594..5701e2cb4 100644
--- a/tests/codeception/_pages/ContactPage.php
+++ b/tests/codeception/_pages/ContactPage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace codeception\_pages;
+namespace tests\codeception\_pages;
 
 use yii\codeception\BasePage;
 
diff --git a/tests/codeception/_pages/LoginPage.php b/tests/codeception/_pages/LoginPage.php
index af1004963..c3a2ef2dd 100644
--- a/tests/codeception/_pages/LoginPage.php
+++ b/tests/codeception/_pages/LoginPage.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace codeception\_pages;
+namespace tests\codeception\_pages;
 
 use yii\codeception\BasePage;
 
diff --git a/tests/codeception/acceptance/AboutCept.php b/tests/codeception/acceptance/AboutCept.php
index 2dcc6a13b..1ef220ebe 100644
--- a/tests/codeception/acceptance/AboutCept.php
+++ b/tests/codeception/acceptance/AboutCept.php
@@ -1,6 +1,6 @@
 <?php
 
-use codeception\_pages\AboutPage;
+use tests\codeception\_pages\AboutPage;
 
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that about works');
diff --git a/tests/codeception/acceptance/ContactCept.php b/tests/codeception/acceptance/ContactCept.php
index c9adc7e15..98ba2ef12 100644
--- a/tests/codeception/acceptance/ContactCept.php
+++ b/tests/codeception/acceptance/ContactCept.php
@@ -1,6 +1,6 @@
 <?php
 
-use codeception\_pages\ContactPage;
+use tests\codeception\_pages\ContactPage;
 
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that contact works');
diff --git a/tests/codeception/acceptance/LoginCept.php b/tests/codeception/acceptance/LoginCept.php
index 6d07c0895..4f022e1c2 100644
--- a/tests/codeception/acceptance/LoginCept.php
+++ b/tests/codeception/acceptance/LoginCept.php
@@ -1,6 +1,6 @@
 <?php
 
-use codeception\_pages\LoginPage;
+use tests\codeception\_pages\LoginPage;
 
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that login works');
diff --git a/tests/codeception/functional/AboutCept.php b/tests/codeception/functional/AboutCept.php
index 3edd61da3..ae7b45b30 100644
--- a/tests/codeception/functional/AboutCept.php
+++ b/tests/codeception/functional/AboutCept.php
@@ -1,6 +1,6 @@
 <?php
 
-use codeception\_pages\AboutPage;
+use tests\codeception\_pages\AboutPage;
 
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that about works');
diff --git a/tests/codeception/functional/ContactCept.php b/tests/codeception/functional/ContactCept.php
index c5e83b4f1..47604058d 100644
--- a/tests/codeception/functional/ContactCept.php
+++ b/tests/codeception/functional/ContactCept.php
@@ -1,6 +1,6 @@
 <?php
 
-use codeception\_pages\ContactPage;
+use tests\codeception\_pages\ContactPage;
 
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that contact works');
diff --git a/tests/codeception/functional/LoginCept.php b/tests/codeception/functional/LoginCept.php
index 4cb283ac9..991d27c3c 100644
--- a/tests/codeception/functional/LoginCept.php
+++ b/tests/codeception/functional/LoginCept.php
@@ -1,6 +1,6 @@
 <?php
 
-use codeception\_pages\LoginPage;
+use tests\codeception\_pages\LoginPage;
 
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that login works');
diff --git a/tests/codeception/unit/models/ContactFormTest.php b/tests/codeception/unit/models/ContactFormTest.php
index 8adda18c6..323482943 100644
--- a/tests/codeception/unit/models/ContactFormTest.php
+++ b/tests/codeception/unit/models/ContactFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace codeception\unit\models;
+namespace tests\codeception\unit\models;
 
 use Yii;
 use yii\codeception\TestCase;
diff --git a/tests/codeception/unit/models/LoginFormTest.php b/tests/codeception/unit/models/LoginFormTest.php
index 5e6762464..c7f971a06 100644
--- a/tests/codeception/unit/models/LoginFormTest.php
+++ b/tests/codeception/unit/models/LoginFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace codeception\unit\models;
+namespace tests\codeception\unit\models;
 
 use Yii;
 use yii\codeception\TestCase;
diff --git a/tests/codeception/unit/models/UserTest.php b/tests/codeception/unit/models/UserTest.php
index 01fde74cb..f4f4f4bb9 100644
--- a/tests/codeception/unit/models/UserTest.php
+++ b/tests/codeception/unit/models/UserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace codeception\unit\models;
+namespace tests\codeception\unit\models;
 
 use yii\codeception\TestCase;
 

From 2e9a0839ddf330d2d88d7506b5a4ac206374631e Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sun, 24 Aug 2014 15:26:57 +0400
Subject: [PATCH 054/390] Added faker to basic app console commands, adjusted
 readme to mention database setup

---
 tests/README.md                        | 26 +++++++++++++++++++++++---
 tests/codeception/bin/yii_acceptance   |  7 +++++++
 tests/codeception/bin/yii_functional   |  7 +++++++
 tests/codeception/bin/yii_unit         |  7 +++++++
 tests/codeception/fixtures/.gitignore  |  2 ++
 tests/codeception/templates/.gitignore |  2 ++
 6 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 tests/codeception/fixtures/.gitignore
 create mode 100644 tests/codeception/templates/.gitignore

diff --git a/tests/README.md b/tests/README.md
index 1c4b50bca..34439f8a2 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -21,20 +21,40 @@ Changed current directory to <directory>
 Then add `<directory>/vendor/bin` to you `PATH` environment variable. Now we're able to use `codecept` from command
 line globally.
 
-2. Build the test suites:
+2. Install faker extension by running the following from template root directory where `composer.json` is:
+
+```
+composer require --dev yiisoft/yii2-faker:*
+```
+
+3. Create three databases that are used in tests:
+
+* `yii2_basic_unit` - for unit tests;
+* `yii2_basic_functional` - for functional tests;
+* `yii2_basic_acceptance` - for acceptance tests.
+
+Then update databases by applying migrations:
+
+```
+codeception/bin/yii_acceptance migrate
+codeception/bin/yii_functional migrate
+codeception/bin/yii_unit migrate
+```
+
+4. Build the test suites:
 
 ```
 codecept build
 ```
 
-3. In order to be able to run acceptance tests you need to start a webserver. The simplest way is to use PHP built in
+5. In order to be able to run acceptance tests you need to start a webserver. The simplest way is to use PHP built in
 webserver. In the `web` directory execute the following:
 
 ```
 php -S localhost:8080
 ```
 
-4. Now you can run the tests with the following commands:
+6. Now you can run the tests with the following commands:
 
 ```
 # run all available tests
diff --git a/tests/codeception/bin/yii_acceptance b/tests/codeception/bin/yii_acceptance
index f67a47fbb..99ac41747 100644
--- a/tests/codeception/bin/yii_acceptance
+++ b/tests/codeception/bin/yii_acceptance
@@ -14,6 +14,13 @@ $config = yii\helpers\ArrayHelper::merge(
     require(YII_APP_BASE_PATH . '/config/console.php'),
     require(__DIR__ . '/../config/config.php'),
     [
+        'controllerMap' => [
+            'fixture' => [
+                'class' => 'yii\faker\FixtureController',
+                'fixtureDataPath' => dirname(__DIR__) . 'fixtures',
+                'templatePath' => dirname(__DIR__) . 'templates'
+            ],
+        ],
         'components' => [
             'db' => [
                 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance',
diff --git a/tests/codeception/bin/yii_functional b/tests/codeception/bin/yii_functional
index f6e3988a0..39efa983b 100644
--- a/tests/codeception/bin/yii_functional
+++ b/tests/codeception/bin/yii_functional
@@ -14,6 +14,13 @@ $config = yii\helpers\ArrayHelper::merge(
     require(YII_APP_BASE_PATH . '/config/console.php'),
     require(__DIR__ . '/../config/config.php'),
     [
+        'controllerMap' => [
+            'fixture' => [
+                'class' => 'yii\faker\FixtureController',
+                'fixtureDataPath' => dirname(__DIR__) . 'fixtures',
+                'templatePath' => dirname(__DIR__) . 'templates'
+            ],
+        ],
         'components' => [
             'db' => [
                 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional',
diff --git a/tests/codeception/bin/yii_unit b/tests/codeception/bin/yii_unit
index 1ab8e1fba..f99ec5333 100644
--- a/tests/codeception/bin/yii_unit
+++ b/tests/codeception/bin/yii_unit
@@ -14,6 +14,13 @@ $config = yii\helpers\ArrayHelper::merge(
     require(YII_APP_BASE_PATH . '/config/console.php'),
     require(__DIR__ . '/../config/config.php'),
     [
+        'controllerMap' => [
+            'fixture' => [
+                'class' => 'yii\faker\FixtureController',
+                'fixtureDataPath' => dirname(__DIR__) . 'fixtures',
+                'templatePath' => dirname(__DIR__) . 'templates'
+            ],
+        ],
         'components' => [
             'db' => [
                 'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit',
diff --git a/tests/codeception/fixtures/.gitignore b/tests/codeception/fixtures/.gitignore
new file mode 100644
index 000000000..c96a04f00
--- /dev/null
+++ b/tests/codeception/fixtures/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/tests/codeception/templates/.gitignore b/tests/codeception/templates/.gitignore
new file mode 100644
index 000000000..c96a04f00
--- /dev/null
+++ b/tests/codeception/templates/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file

From 459ac478a2f2edab76f2a7058a104590fadc6605 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Mon, 25 Aug 2014 02:00:49 +0400
Subject: [PATCH 055/390] Used a single database and a single CLI entry point
 for all test types. Added faker to basic app dev requirements.

---
 composer.json                                 |  3 +-
 tests/README.md                               | 12 ++-----
 tests/codeception/bin/{yii_unit => yii}       |  5 ---
 .../bin/{yii_acceptance.bat => yii.bat}       |  0
 tests/codeception/bin/yii_acceptance          | 34 -------------------
 tests/codeception/bin/yii_functional          | 34 -------------------
 tests/codeception/bin/yii_functional.bat      | 20 -----------
 tests/codeception/bin/yii_unit.bat            | 20 -----------
 tests/codeception/config/acceptance.php       |  6 +---
 tests/codeception/config/config.php           |  3 ++
 tests/codeception/config/functional.php       |  6 +---
 tests/codeception/config/unit.php             |  6 +---
 12 files changed, 10 insertions(+), 139 deletions(-)
 rename tests/codeception/bin/{yii_unit => yii} (84%)
 rename tests/codeception/bin/{yii_acceptance.bat => yii.bat} (100%)
 delete mode 100644 tests/codeception/bin/yii_acceptance
 delete mode 100644 tests/codeception/bin/yii_functional
 delete mode 100644 tests/codeception/bin/yii_functional.bat
 delete mode 100644 tests/codeception/bin/yii_unit.bat

diff --git a/composer.json b/composer.json
index 607accb1b..0966855a7 100644
--- a/composer.json
+++ b/composer.json
@@ -22,7 +22,8 @@
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
         "yiisoft/yii2-debug": "*",
-        "yiisoft/yii2-gii": "*"
+        "yiisoft/yii2-gii": "*",
+        "yiisoft/yii2-faker": "*"
     },
     "scripts": {
         "post-create-project-cmd": [
diff --git a/tests/README.md b/tests/README.md
index 34439f8a2..f14db26a5 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -27,18 +27,10 @@ line globally.
 composer require --dev yiisoft/yii2-faker:*
 ```
 
-3. Create three databases that are used in tests:
-
-* `yii2_basic_unit` - for unit tests;
-* `yii2_basic_functional` - for functional tests;
-* `yii2_basic_acceptance` - for acceptance tests.
-
-Then update databases by applying migrations:
+3. Create `yii2_basic_tests` database and update it by applying migrations:
 
 ```
-codeception/bin/yii_acceptance migrate
-codeception/bin/yii_functional migrate
-codeception/bin/yii_unit migrate
+codeception/bin/yii migrate
 ```
 
 4. Build the test suites:
diff --git a/tests/codeception/bin/yii_unit b/tests/codeception/bin/yii
similarity index 84%
rename from tests/codeception/bin/yii_unit
rename to tests/codeception/bin/yii
index f99ec5333..9046b488e 100644
--- a/tests/codeception/bin/yii_unit
+++ b/tests/codeception/bin/yii
@@ -21,11 +21,6 @@ $config = yii\helpers\ArrayHelper::merge(
                 'templatePath' => dirname(__DIR__) . 'templates'
             ],
         ],
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit',
-            ],
-        ],
     ]
 );
 
diff --git a/tests/codeception/bin/yii_acceptance.bat b/tests/codeception/bin/yii.bat
similarity index 100%
rename from tests/codeception/bin/yii_acceptance.bat
rename to tests/codeception/bin/yii.bat
diff --git a/tests/codeception/bin/yii_acceptance b/tests/codeception/bin/yii_acceptance
deleted file mode 100644
index 99ac41747..000000000
--- a/tests/codeception/bin/yii_acceptance
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-require_once __DIR__ . '/_bootstrap.php';
-
-$config = yii\helpers\ArrayHelper::merge(
-    require(YII_APP_BASE_PATH . '/config/console.php'),
-    require(__DIR__ . '/../config/config.php'),
-    [
-        'controllerMap' => [
-            'fixture' => [
-                'class' => 'yii\faker\FixtureController',
-                'fixtureDataPath' => dirname(__DIR__) . 'fixtures',
-                'templatePath' => dirname(__DIR__) . 'templates'
-            ],
-        ],
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance',
-            ],
-        ],
-    ]
-);
-
-$application = new yii\console\Application($config);
-$exitCode = $application->run();
-exit($exitCode);
diff --git a/tests/codeception/bin/yii_functional b/tests/codeception/bin/yii_functional
deleted file mode 100644
index 39efa983b..000000000
--- a/tests/codeception/bin/yii_functional
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env php
-<?php
-/**
- * Yii console bootstrap file.
- *
- * @link http://www.yiiframework.com/
- * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
- */
-
-require_once __DIR__ . '/_bootstrap.php';
-
-$config = yii\helpers\ArrayHelper::merge(
-    require(YII_APP_BASE_PATH . '/config/console.php'),
-    require(__DIR__ . '/../config/config.php'),
-    [
-        'controllerMap' => [
-            'fixture' => [
-                'class' => 'yii\faker\FixtureController',
-                'fixtureDataPath' => dirname(__DIR__) . 'fixtures',
-                'templatePath' => dirname(__DIR__) . 'templates'
-            ],
-        ],
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional',
-            ],
-        ],
-    ]
-);
-
-$application = new yii\console\Application($config);
-$exitCode = $application->run();
-exit($exitCode);
diff --git a/tests/codeception/bin/yii_functional.bat b/tests/codeception/bin/yii_functional.bat
deleted file mode 100644
index 2d04dcc71..000000000
--- a/tests/codeception/bin/yii_functional.bat
+++ /dev/null
@@ -1,20 +0,0 @@
-@echo off
-
-rem -------------------------------------------------------------
-rem  Yii command line bootstrap script for Windows.
-rem
-rem  @author Qiang Xue <qiang.xue@gmail.com>
-rem  @link http://www.yiiframework.com/
-rem  @copyright Copyright (c) 2008 Yii Software LLC
-rem  @license http://www.yiiframework.com/license/
-rem -------------------------------------------------------------
-
-@setlocal
-
-set YII_PATH=%~dp0
-
-if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
-
-"%PHP_COMMAND%" "%YII_PATH%yii_functional" %*
-
-@endlocal
diff --git a/tests/codeception/bin/yii_unit.bat b/tests/codeception/bin/yii_unit.bat
deleted file mode 100644
index 6852bf0ca..000000000
--- a/tests/codeception/bin/yii_unit.bat
+++ /dev/null
@@ -1,20 +0,0 @@
-@echo off
-
-rem -------------------------------------------------------------
-rem  Yii command line bootstrap script for Windows.
-rem
-rem  @author Qiang Xue <qiang.xue@gmail.com>
-rem  @link http://www.yiiframework.com/
-rem  @copyright Copyright (c) 2008 Yii Software LLC
-rem  @license http://www.yiiframework.com/license/
-rem -------------------------------------------------------------
-
-@setlocal
-
-set YII_PATH=%~dp0
-
-if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
-
-"%PHP_COMMAND%" "%YII_PATH%yii_unit" %*
-
-@endlocal
diff --git a/tests/codeception/config/acceptance.php b/tests/codeception/config/acceptance.php
index c80d4687a..c688575b6 100644
--- a/tests/codeception/config/acceptance.php
+++ b/tests/codeception/config/acceptance.php
@@ -6,10 +6,6 @@
     require(__DIR__ . '/../../../config/web.php'),
     require(__DIR__ . '/config.php'),
     [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_acceptance',
-            ],
-        ],
+
     ]
 );
diff --git a/tests/codeception/config/config.php b/tests/codeception/config/config.php
index 005d365c4..bac901d63 100644
--- a/tests/codeception/config/config.php
+++ b/tests/codeception/config/config.php
@@ -4,6 +4,9 @@
  */
 return [
     'components' => [
+        'db' => [
+            'dsn' => 'mysql:host=localhost;dbname=yii2_basic_tests',
+        ],
         'mailer' => [
             'useFileTransport' => true,
         ],
diff --git a/tests/codeception/config/functional.php b/tests/codeception/config/functional.php
index 32cd7c899..499ad5a9c 100644
--- a/tests/codeception/config/functional.php
+++ b/tests/codeception/config/functional.php
@@ -9,10 +9,6 @@
     require(__DIR__ . '/../../../config/web.php'),
     require(__DIR__ . '/config.php'),
     [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_functional',
-            ],
-        ],
+
     ]
 );
diff --git a/tests/codeception/config/unit.php b/tests/codeception/config/unit.php
index 1b8772d5b..5bab5eaec 100644
--- a/tests/codeception/config/unit.php
+++ b/tests/codeception/config/unit.php
@@ -6,10 +6,6 @@
     require(__DIR__ . '/../../../config/web.php'),
     require(__DIR__ . '/config.php'),
     [
-        'components' => [
-            'db' => [
-                'dsn' => 'mysql:host=localhost;dbname=yii2_basic_unit',
-            ],
-        ],
+
     ]
 );

From 58842e3a249e6e3b9c4ae75e36ef3322dfd77017 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 26 Aug 2014 01:51:41 +0400
Subject: [PATCH 056/390] Used aliases for fixture directory definitions

---
 tests/codeception/bin/_bootstrap.php | 2 ++
 tests/codeception/bin/yii            | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/codeception/bin/_bootstrap.php b/tests/codeception/bin/_bootstrap.php
index e56da4efa..c923193a3 100644
--- a/tests/codeception/bin/_bootstrap.php
+++ b/tests/codeception/bin/_bootstrap.php
@@ -10,3 +10,5 @@
 
 require(YII_APP_BASE_PATH . '/vendor/autoload.php');
 require(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.php');
+
+Yii::setAlias('@tests', dirname(dirname(__DIR__)));
diff --git a/tests/codeception/bin/yii b/tests/codeception/bin/yii
index 9046b488e..fda028efc 100644
--- a/tests/codeception/bin/yii
+++ b/tests/codeception/bin/yii
@@ -17,8 +17,8 @@ $config = yii\helpers\ArrayHelper::merge(
         'controllerMap' => [
             'fixture' => [
                 'class' => 'yii\faker\FixtureController',
-                'fixtureDataPath' => dirname(__DIR__) . 'fixtures',
-                'templatePath' => dirname(__DIR__) . 'templates'
+                'fixtureDataPath' => '@tests/codeception/fixtures',
+                'templatePath' => '@tests/codeception/templates'
             ],
         ],
     ]

From 078fb5b48fcb3ba1874f545d876b2e8e9b8fa02c Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Wed, 27 Aug 2014 16:44:00 -0400
Subject: [PATCH 057/390] new asset management WIP

---
 .bowerrc   | 3 +++
 bower.json | 8 ++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 .bowerrc
 create mode 100644 bower.json

diff --git a/.bowerrc b/.bowerrc
new file mode 100644
index 000000000..16098e93d
--- /dev/null
+++ b/.bowerrc
@@ -0,0 +1,3 @@
+{
+    "directory" : "web/assets"
+}
\ No newline at end of file
diff --git a/bower.json b/bower.json
new file mode 100644
index 000000000..b3ec7cd2f
--- /dev/null
+++ b/bower.json
@@ -0,0 +1,8 @@
+{
+    "name": "yii2-basic",
+    "version": "1.0.0",
+    "dependencies": {
+    },
+    "devDependencies": {
+    }
+}

From 7690a93b7fd285650691e86967773f88aab5f500 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Fri, 29 Aug 2014 14:54:49 -0400
Subject: [PATCH 058/390] new asset WIP [skip ci]

---
 bower.json            | 2 +-
 web/assets/.gitignore | 2 --
 web/assets/.gitkeep   | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 100644 web/assets/.gitignore
 create mode 100644 web/assets/.gitkeep

diff --git a/bower.json b/bower.json
index b3ec7cd2f..2bcac4fbe 100644
--- a/bower.json
+++ b/bower.json
@@ -1,5 +1,5 @@
 {
-    "name": "yii2-basic",
+    "name": "yii2-basic-app",
     "version": "1.0.0",
     "dependencies": {
     },
diff --git a/web/assets/.gitignore b/web/assets/.gitignore
deleted file mode 100644
index c96a04f00..000000000
--- a/web/assets/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/web/assets/.gitkeep b/web/assets/.gitkeep
new file mode 100644
index 000000000..72e8ffc0d
--- /dev/null
+++ b/web/assets/.gitkeep
@@ -0,0 +1 @@
+*

From 74266596cf983f00ee279cae1d51e120623ccc35 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 2 Sep 2014 14:51:44 -0400
Subject: [PATCH 059/390] new asset WIP: renabled asset publishing

---
 .bowerrc              | 4 ++--
 web/assets/.gitignore | 2 ++
 web/assets/.gitkeep   | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)
 create mode 100644 web/assets/.gitignore
 delete mode 100644 web/assets/.gitkeep

diff --git a/.bowerrc b/.bowerrc
index 16098e93d..1669168f2 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,3 +1,3 @@
 {
-    "directory" : "web/assets"
-}
\ No newline at end of file
+    "directory" : "vendor/bower"
+}
diff --git a/web/assets/.gitignore b/web/assets/.gitignore
new file mode 100644
index 000000000..d6b7ef32c
--- /dev/null
+++ b/web/assets/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/web/assets/.gitkeep b/web/assets/.gitkeep
deleted file mode 100644
index 72e8ffc0d..000000000
--- a/web/assets/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-*

From 8efbbcc66259d842d960c8b50428d17113d3e97b Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 2 Sep 2014 17:03:19 -0400
Subject: [PATCH 060/390] new asset WIP [skip ci]

---
 composer.json | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 0966855a7..72c67f28a 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,12 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": "*",
         "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*"
+        "yiisoft/yii2-swiftmailer": "*",
+        /* bower packages, added temporarily to test "composer-asset-plugin" */
+        "bower-asset/bootstrap": "3.2.* | 3.1.* | 3.0.*",
+        "bower-asset/jquery": "2.1.1",
+        "bower-asset/jquery-ui": "1.11.*",
+        "bower-asset/typeahead.js": "0.10.*"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
@@ -44,6 +49,10 @@
         ],
         "config": [
             "config/web.php"
-        ]
+        ],
+        "asset-installer-paths": {
+            "npm-asset-library": "vendor/npm",
+            "bower-asset-library": "vendor/bower"
+        }
     }
 }

From d2840ad8fc1f3abe08f1a94274a3181dfed33fc1 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 2 Sep 2014 23:17:50 -0400
Subject: [PATCH 061/390] Added `yii\composer\Installer::postCreateProject()`
 and modified the syntax of calling installer methods in composer.json [skip
 ci]

---
 composer.json | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/composer.json b/composer.json
index 0966855a7..ba8cfd03c 100644
--- a/composer.json
+++ b/composer.json
@@ -25,25 +25,26 @@
         "yiisoft/yii2-gii": "*",
         "yiisoft/yii2-faker": "*"
     },
+    "config": {
+        "process-timeout": 1800
+    },
     "scripts": {
         "post-create-project-cmd": [
-            "yii\\composer\\Installer::setPermission",
-            "yii\\composer\\Installer::generateCookieValidationKey"
+            "yii\\composer\\Installer::postCreateProject"
         ]
     },
-    "config": {
-        "process-timeout": 1800
-    },
     "extra": {
-        "writable": [
-            "runtime",
-            "web/assets"
-        ],
-        "executable": [
-            "yii"
-        ],
-        "config": [
-            "config/web.php"
-        ]
+        "yii\\composer\\Installer::postCreateProject": {
+            "setPermission": [
+                {
+                    "runtime": "0777",
+                    "web/assets": "0777",
+                    "yii": "0755"
+                }
+            ],
+            "generateCookieValidationKey": [
+                "config/web.php"
+            ]
+        }
     }
 }

From a6b38ddef6b9354463aecc491fad0cb6ef8336a5 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Wed, 3 Sep 2014 10:02:31 -0400
Subject: [PATCH 062/390] cleaned up the key so that it can be filled up with a
 random key automatically when installed.

---
 config/web.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/web.php b/config/web.php
index 4fde1b686..0b4c75295 100644
--- a/config/web.php
+++ b/config/web.php
@@ -9,7 +9,7 @@
     'components' => [
         'request' => [
             // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
-            'cookieValidationKey' => 'thisIsAKey',
+            'cookieValidationKey' => '',
         ],
         'cache' => [
             'class' => 'yii\caching\FileCache',

From f1df2e43363b70d3b746c3cfafa6d4551f9fcd70 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 4 Sep 2014 03:27:13 +0400
Subject: [PATCH 063/390] Fixes #4914

---
 commands/HelloController.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/commands/HelloController.php b/commands/HelloController.php
index 86ab8b853..9314fe7fd 100644
--- a/commands/HelloController.php
+++ b/commands/HelloController.php
@@ -27,4 +27,20 @@ public function actionIndex($message = 'hello world')
     {
         echo $message . "\n";
     }
+
+    public function actionTest()
+    {
+        echo 'Test?';
+    }
+
+//    public function getDescription($actionID = null)
+//    {
+//        return "I'm custom description for $actionID!";
+//    }
+
+
+    public function getHelp($actionID = null)
+    {
+        return "I'm custom help for $actionID!";
+    }
 }

From 8017996cccc7f3f55bc5f21738ab89c542a7759f Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 4 Sep 2014 12:13:28 +0400
Subject: [PATCH 064/390] Reverted accidentally edited HelloController

---
 commands/HelloController.php | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/commands/HelloController.php b/commands/HelloController.php
index 9314fe7fd..86ab8b853 100644
--- a/commands/HelloController.php
+++ b/commands/HelloController.php
@@ -27,20 +27,4 @@ public function actionIndex($message = 'hello world')
     {
         echo $message . "\n";
     }
-
-    public function actionTest()
-    {
-        echo 'Test?';
-    }
-
-//    public function getDescription($actionID = null)
-//    {
-//        return "I'm custom description for $actionID!";
-//    }
-
-
-    public function getHelp($actionID = null)
-    {
-        return "I'm custom help for $actionID!";
-    }
 }

From cc50af25ec39fd4ac3955ea599816279a76623bd Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 14 Sep 2014 14:15:16 -0400
Subject: [PATCH 065/390] Finished console Gii.

---
 config/console.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/console.php b/config/console.php
index 85297b3cb..31ed9c720 100644
--- a/config/console.php
+++ b/config/console.php
@@ -8,8 +8,11 @@
 return [
     'id' => 'basic-console',
     'basePath' => dirname(__DIR__),
-    'bootstrap' => ['log'],
+    'bootstrap' => ['log', 'gii'],
     'controllerNamespace' => 'app\commands',
+    'modules' => [
+        'gii' => 'yii\gii\Module',
+    ],
     'components' => [
         'cache' => [
             'class' => 'yii\caching\FileCache',

From 867182b31f8a7ab120f8517401109acc2a7290cc Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 16 Sep 2014 13:31:32 -0400
Subject: [PATCH 066/390] WIP

---
 README.md     | 1 +
 composer.json | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 452d030c2..43aaed8f7 100644
--- a/README.md
+++ b/README.md
@@ -55,6 +55,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this application template using the following command:
 
 ~~~
+php composer.phar global require "fxp/composer-asset-plugin:~1.0"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 
diff --git a/composer.json b/composer.json
index 72c67f28a..dc168d06e 100644
--- a/composer.json
+++ b/composer.json
@@ -17,12 +17,7 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": "*",
         "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*",
-        /* bower packages, added temporarily to test "composer-asset-plugin" */
-        "bower-asset/bootstrap": "3.2.* | 3.1.* | 3.0.*",
-        "bower-asset/jquery": "2.1.1",
-        "bower-asset/jquery-ui": "1.11.*",
-        "bower-asset/typeahead.js": "0.10.*"
+        "yiisoft/yii2-swiftmailer": "*"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",

From 7411e65c5ebf1a7295a8f2b7b7db971976ca2119 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 16 Sep 2014 16:28:49 -0400
Subject: [PATCH 067/390] reverted a prior change.

---
 config/web.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/config/web.php b/config/web.php
index 0b4c75295..1632a5aab 100644
--- a/config/web.php
+++ b/config/web.php
@@ -38,10 +38,6 @@
             ],
         ],
         'db' => require(__DIR__ . '/db.php'),
-        'urlManager' => [
-            'enablePrettyUrl' => true,
-            'showScriptName' => false,
-        ],
     ],
     'params' => $params,
 ];

From 70c5f2eba08dbbe1d0ea97796c35797eaba04aad Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 16 Sep 2014 20:58:57 -0400
Subject: [PATCH 068/390] Fixed wrong instruction.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 43aaed8f7..bef61bd59 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this application template using the following command:
 
 ~~~
-php composer.phar global require "fxp/composer-asset-plugin:~1.0"
+php composer.phar global require "fxp/composer-asset-plugin:1.0.*@dev"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 

From 928d41cb5a97bf916d936b974cedc3d58c951a03 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Tue, 16 Sep 2014 23:26:40 -0400
Subject: [PATCH 069/390] removed empty bower.json files [skip ci]

---
 bower.json | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 bower.json

diff --git a/bower.json b/bower.json
deleted file mode 100644
index 2bcac4fbe..000000000
--- a/bower.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "name": "yii2-basic-app",
-    "version": "1.0.0",
-    "dependencies": {
-    },
-    "devDependencies": {
-    }
-}

From 1484e58b1bf8f43217a5d22c2a469773934975c5 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Fri, 19 Sep 2014 08:32:47 -0400
Subject: [PATCH 070/390] Switch to 1.0.0-beta1 for the composer asset plugin.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bef61bd59..b4f20c83f 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this application template using the following command:
 
 ~~~
-php composer.phar global require "fxp/composer-asset-plugin:1.0.*@dev"
+php composer.phar global require "fxp/composer-asset-plugin:1.0.0-beta1"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 

From 5c6b89762902a57202420ca013ba1463d60657b1 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Mon, 22 Sep 2014 13:10:46 +0200
Subject: [PATCH 071/390] Changed version constratints to be semantic
 versioning again

- in composer the `~` operator is just a shortcut for `~1.0` = `>=1.0.0,<2.0.0`
  it does not prevent dev versions to be installed but neither does `1.*`
- dev versions are constrolled via `minimum-stability` setting and the
  `@dev`, `@beta`, `@stable`,... settings.
- setting bower packages that ship compiled files only with the stable
  release to use `@stable` in composer.json of the applictaions. This
  setting can be removed when we remove the `minimum-stability=dev`
  setting after GA.
---
 composer.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 56756ec81..64364dc9c 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,10 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": "*",
         "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*"
+        "yiisoft/yii2-swiftmailer": "*",
+        "bower-asset/jquery": "@stable",
+        "bower-asset/jquery-ui": "@stable",
+        "bower-asset/jquery.inputmask": "@stable"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",

From e0fb805eea2306fbd87b3ccf4c67bc0e4e145411 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Mon, 22 Sep 2014 17:34:18 +0200
Subject: [PATCH 072/390] improved version constraints for bower asset packages

---
 composer.json | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 64364dc9c..56756ec81 100644
--- a/composer.json
+++ b/composer.json
@@ -17,10 +17,7 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": "*",
         "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*",
-        "bower-asset/jquery": "@stable",
-        "bower-asset/jquery-ui": "@stable",
-        "bower-asset/jquery.inputmask": "@stable"
+        "yiisoft/yii2-swiftmailer": "*"
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",

From 969b7a59968688709093013dcc8fd4a86fb4246f Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 27 Sep 2014 12:57:43 -0400
Subject: [PATCH 073/390] use 1.0.0-beta2 version for composer asset plugin.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b4f20c83f..61cb4a19c 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this application template using the following command:
 
 ~~~
-php composer.phar global require "fxp/composer-asset-plugin:1.0.0-beta1"
+php composer.phar global require "fxp/composer-asset-plugin:1.0.0-beta2"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 

From e3195677d58d7cfe0669a8cd98f33354c7296a71 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sat, 27 Sep 2014 21:59:54 -0400
Subject: [PATCH 074/390] prepare for 2.0.0-rc release.

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

diff --git a/composer.json b/composer.json
index 56756ec81..e56ed648d 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "RC",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "*",

From 039225e550fbb4712da713fc1648ee1817c74077 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 28 Sep 2014 01:44:31 -0400
Subject: [PATCH 075/390] prepare for next release.

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

diff --git a/composer.json b/composer.json
index e56ed648d..56756ec81 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "RC",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "*",

From ac46b6dab6de9854b462ebee36ab6c3a24b481d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20H=C3=A4rtl?= <haertl.mike@gmail.com>
Date: Mon, 29 Sep 2014 13:18:59 +0200
Subject: [PATCH 076/390] Issue 5160: Update base app to use bootstrap
 ActiveForm

---
 views/site/contact.php | 4 ++--
 views/site/login.php   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/site/contact.php b/views/site/contact.php
index fad2d7ced..e964a3426 100644
--- a/views/site/contact.php
+++ b/views/site/contact.php
@@ -1,10 +1,10 @@
 <?php
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap\ActiveForm;
 use yii\captcha\Captcha;
 
 /* @var $this yii\web\View */
-/* @var $form yii\widgets\ActiveForm */
+/* @var $form yii\bootstrap\ActiveForm */
 /* @var $model app\models\ContactForm */
 
 $this->title = 'Contact';
diff --git a/views/site/login.php b/views/site/login.php
index df0c812aa..916be9808 100644
--- a/views/site/login.php
+++ b/views/site/login.php
@@ -1,9 +1,9 @@
 <?php
 use yii\helpers\Html;
-use yii\widgets\ActiveForm;
+use yii\bootstrap\ActiveForm;
 
 /* @var $this yii\web\View */
-/* @var $form yii\widgets\ActiveForm */
+/* @var $form yii\bootstrap\ActiveForm */
 /* @var $model app\models\LoginForm */
 
 $this->title = 'Login';

From 2ab0180a5912e306c2646829af26957a4746739d Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 12 Oct 2014 13:09:06 -0400
Subject: [PATCH 077/390] 2.0.0 release.

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

diff --git a/composer.json b/composer.json
index 56756ec81..faf0732a1 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "*",

From 8ac36163c19b13cbb868c42ed0ee584926c17479 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 12 Oct 2014 16:44:45 -0400
Subject: [PATCH 078/390] prepare for next release.

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

diff --git a/composer.json b/composer.json
index faf0732a1..56756ec81 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "*",

From 0a636b8cbd4874218fdec5f0917bc050f056582d Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 12 Oct 2014 18:13:22 -0400
Subject: [PATCH 079/390] Fixes #5509.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 61cb4a19c..36c3ec944 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this application template using the following command:
 
 ~~~
-php composer.phar global require "fxp/composer-asset-plugin:1.0.0-beta2"
+php composer.phar global require "fxp/composer-asset-plugin:1.0.0-beta3"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 

From e8aed03f1abcc35b8b7100d2bf226cff59729e24 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 18 Oct 2014 19:31:39 +0400
Subject: [PATCH 080/390] Fixed entry script name

---
 tests/codeception/bin/yii.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/codeception/bin/yii.bat b/tests/codeception/bin/yii.bat
index 3edcabe95..d516b3a19 100644
--- a/tests/codeception/bin/yii.bat
+++ b/tests/codeception/bin/yii.bat
@@ -15,6 +15,6 @@ set YII_PATH=%~dp0
 
 if "%PHP_COMMAND%" == "" set PHP_COMMAND=php.exe
 
-"%PHP_COMMAND%" "%YII_PATH%yii_acceptance" %*
+"%PHP_COMMAND%" "%YII_PATH%yii" %*
 
 @endlocal

From d33ea353eba6f5df67ecfd52ccf54688efc61ed9 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sun, 19 Oct 2014 01:22:26 +0400
Subject: [PATCH 081/390] Fixes #5598: added ImageMagick with PNG and GD with
 FreeType checks to requirements of basic and advanced applications, used
 better Captcha exception message

---
 requirements.php | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/requirements.php b/requirements.php
index a38b9363f..4da063113 100644
--- a/requirements.php
+++ b/requirements.php
@@ -23,6 +23,28 @@
 require_once($frameworkPath . '/requirements/YiiRequirementChecker.php');
 $requirementsChecker = new YiiRequirementChecker();
 
+$gdMemo = $imagickMemo = 'Either GD PHP extension with FreeType support or ImageMagick PHP extension with PNG support is required for image CAPTCHA.';
+$gdOK = $imagickOK = false;
+
+if (extension_loaded('imagick')) {
+    $imagick = new Imagick();
+    $imagickFormats = $imagick->queryFormats('PNG');
+    if (in_array('PNG', $imagickFormats)) {
+        $imagickOK = true;
+    } else {
+        $imagickMemo = 'Imagick extension should be installed with PNG support in order to be used for image CAPTCHA.';
+    }
+}
+
+if (extension_loaded('gd')) {
+    $gdInfo = gd_info();
+    if (!empty($gdInfo['FreeType Support'])) {
+        $gdOK = true;
+    } else {
+        $gdMemo = 'GD extension should be installed with FreeType support in order to be used for image CAPTCHA.';
+    }
+}
+
 /**
  * Adjust requirements according to your application specifics.
  */
@@ -69,6 +91,21 @@
         'condition' => extension_loaded('apc'),
         'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-caching-apccache.html">ApcCache</a>',
     ),
+    // CAPTCHA:
+    array(
+        'name' => 'GD PHP extension with FreeType support',
+        'mandatory' => false,
+        'condition' => $gdOK,
+        'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-captcha-captcha.html">Captcha</a>',
+        'memo' => $gdMemo,
+    ),
+    array(
+        'name' => 'ImageMagick PHP extension with PNG support',
+        'mandatory' => false,
+        'condition' => $imagickOK,
+        'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-captcha-captcha.html">Captcha</a>',
+        'memo' => $imagickMemo,
+    ),
     // PHP ini :
     'phpSafeMode' => array(
         'name' => 'PHP safe mode',

From d06d027a1ff35a2fcaa42afe9e87c3043faf0400 Mon Sep 17 00:00:00 2001
From: Alexander Mohorev <dev.mohorev@gmail.com>
Date: Sat, 25 Oct 2014 16:28:36 +0300
Subject: [PATCH 082/390] Correct order of property declaration

---
 models/LoginForm.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/models/LoginForm.php b/models/LoginForm.php
index 687d29ded..7bd44d402 100644
--- a/models/LoginForm.php
+++ b/models/LoginForm.php
@@ -16,6 +16,7 @@ class LoginForm extends Model
 
     private $_user = false;
 
+
     /**
      * @return array the validation rules.
      */

From c6908c8b438891550d821bfdbd76334ce75109a1 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 28 Oct 2014 02:03:02 +0300
Subject: [PATCH 083/390] Fixes #4827: default config for functional tests of
 both basic and advanced app now turns off CSRF validation while providing
 commented out alternative setting cookie domain to localhost

---
 tests/codeception/config/functional.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/codeception/config/functional.php b/tests/codeception/config/functional.php
index 499ad5a9c..6d22bd97b 100644
--- a/tests/codeception/config/functional.php
+++ b/tests/codeception/config/functional.php
@@ -9,6 +9,17 @@
     require(__DIR__ . '/../../../config/web.php'),
     require(__DIR__ . '/config.php'),
     [
-
+        'components' => [
+            'request' => [
+                // it's not recommended to run functional tests with CSRF validation enabled
+                'enableCsrfValidation' => false,
+                // but if you absolutely need it set cookie domain to localhost
+                /*
+                'csrfCookie' => [
+                    'domain' => 'localhost',
+                ],
+                */
+            ],
+        ],
     ]
 );

From 995c79103dade1c00a324274fd0a8d14320291ec Mon Sep 17 00:00:00 2001
From: Mark Ragazzo <mark.github@yandex.ru>
Date: Fri, 7 Nov 2014 23:20:03 +0400
Subject: [PATCH 084/390] fixed fixture controller config for applications

---
 tests/codeception/bin/yii | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/codeception/bin/yii b/tests/codeception/bin/yii
index fda028efc..c7f2653ff 100644
--- a/tests/codeception/bin/yii
+++ b/tests/codeception/bin/yii
@@ -18,7 +18,8 @@ $config = yii\helpers\ArrayHelper::merge(
             'fixture' => [
                 'class' => 'yii\faker\FixtureController',
                 'fixtureDataPath' => '@tests/codeception/fixtures',
-                'templatePath' => '@tests/codeception/templates'
+                'templatePath' => '@tests/codeception/templates',
+                'namespace' => 'tests\codeception\fixtures',
             ],
         ],
     ]

From c10a6b46be2527cd8a8dabca1b94819519ff3fb6 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 23 Nov 2014 20:56:33 -0500
Subject: [PATCH 085/390] Fixes #6189

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 36c3ec944..36df77895 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this application template using the following command:
 
 ~~~
-php composer.phar global require "fxp/composer-asset-plugin:1.0.0-beta3"
+php composer.phar global require "fxp/composer-asset-plugin:1.0.0-beta4"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 

From 6b4ad97e43d09517a6b5681c3e753f8cd1dc58e6 Mon Sep 17 00:00:00 2001
From: Anton Andersen <trianman@gmail.com>
Date: Wed, 19 Nov 2014 14:37:13 +0300
Subject: [PATCH 086/390] Fixes #6103: Improved codeception config in app
 templates to ease testing of advanced app on multiple hosts

---
 tests/codeception.yml                  | 4 ++--
 tests/codeception/_bootstrap.php       | 5 +++--
 tests/codeception/acceptance.suite.yml | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/codeception.yml b/tests/codeception.yml
index ba02c81b7..0a45a0c08 100644
--- a/tests/codeception.yml
+++ b/tests/codeception.yml
@@ -11,6 +11,6 @@ settings:
     log: true
     colors: true
 config:
-    # the entry script URL (without host info) for functional and acceptance tests
+    # the entry script URL (with host info) for functional and acceptance tests
     # PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
-    test_entry_url: /index-test.php
\ No newline at end of file
+    test_entry_url: http://localhost:8080/index-test.php
\ No newline at end of file
diff --git a/tests/codeception/_bootstrap.php b/tests/codeception/_bootstrap.php
index 985593978..755029ef3 100644
--- a/tests/codeception/_bootstrap.php
+++ b/tests/codeception/_bootstrap.php
@@ -2,7 +2,7 @@
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or define('YII_ENV', 'test');
 
-defined('YII_TEST_ENTRY_URL') or define('YII_TEST_ENTRY_URL', \Codeception\Configuration::config()['config']['test_entry_url']);
+defined('YII_TEST_ENTRY_URL') or define('YII_TEST_ENTRY_URL', parse_url(http://github.com/Codeception/Configuration::config()['config']['test_entry_url'], PHP_URL_PATH));
 defined('YII_TEST_ENTRY_FILE') or define('YII_TEST_ENTRY_FILE', dirname(dirname(__DIR__)) . '/web/index-test.php');
 
 require_once(__DIR__ . '/../../vendor/autoload.php');
@@ -10,6 +10,7 @@
 
 $_SERVER['SCRIPT_FILENAME'] = YII_TEST_ENTRY_FILE;
 $_SERVER['SCRIPT_NAME'] = YII_TEST_ENTRY_URL;
-$_SERVER['SERVER_NAME'] = 'localhost';
+$_SERVER['SERVER_NAME'] = parse_url(http://github.com/Codeception/Configuration::config()['config']['test_entry_url'], PHP_URL_HOST);
+$_SERVER['SERVER_PORT'] =  parse_url(http://github.com/Codeception/Configuration::config()['config']['test_entry_url'], PHP_URL_PORT) ?: '80';
 
 Yii::setAlias('@tests', dirname(__DIR__));
diff --git a/tests/codeception/acceptance.suite.yml b/tests/codeception/acceptance.suite.yml
index a045043cd..1781b0077 100644
--- a/tests/codeception/acceptance.suite.yml
+++ b/tests/codeception/acceptance.suite.yml
@@ -19,8 +19,9 @@ modules:
 #        - WebDriver
     config:
         PhpBrowser:
-            url: 'http://localhost:8080/'
+# PLEASE ADJUST IT TO THE ACTUAL ENTRY POINT WITHOUT PATH INFO
+            url: http://localhost:8080
 #        WebDriver:
-#            url: 'http://localhost/'
+#            url: http://localhost:8080
 #            browser: firefox
 #            restart: true

From abba09d7e6a656500ae4ce0ef1b1bb22225cd137 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 7 Dec 2014 11:42:41 -0500
Subject: [PATCH 087/390] prepare for 2.0.1 release

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

diff --git a/composer.json b/composer.json
index 56756ec81..faf0732a1 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "*",

From dcc2e8fc6a2dc18615333cb44864bac7941eae67 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 7 Dec 2014 11:46:05 -0500
Subject: [PATCH 088/390] prepare for next release.

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

diff --git a/composer.json b/composer.json
index faf0732a1..56756ec81 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "*",

From c6627551999ae6a266e774bbad57d0ce96bc34cd Mon Sep 17 00:00:00 2001
From: Mark Ragazzo <mark.github@yandex.ru>
Date: Wed, 10 Dec 2014 22:44:27 +0400
Subject: [PATCH 089/390] added code coverage ti yii2_basic

---
 tests/README.md       | 48 +++++++++++++++++++++++++++++++++++++++++++
 tests/codeception.yml | 20 ++++++++++++++++++
 2 files changed, 68 insertions(+)

diff --git a/tests/README.md b/tests/README.md
index f14db26a5..b5c014176 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -59,5 +59,53 @@ codecept run functional
 codecept run unit
 ```
 
+Code coverage support
+---------------------
+
+By default, code coverage is disabled in `codeception.yaml` configuration file, you should uncomment needed rows to be able
+to collect code coverage. You can run your tests and collect coverage with the following command:
+
+```
+#collect coverage for all tests
+codecept run --coverage-html --coverage-xml
+
+#collect coverage only for unit tests
+codecept run unit --coverage-html --coverage-xml
+
+#collect coverage for unit and functional tests
+codecept run functional,unit --coverage-html --coverage-xml
+```
+
+You can see code coverage output under the `tests/_output` directory.
+
+###Remote code coverage
+
+When you run your tests not in the same process where code coverage is collected, then you should uncomment `remote` option and its
+related options, to be able to collect code coverage correctly. To setup remote code coverage you should follow [instructions](http://codeception.com/docs/11-Codecoverage)
+from codeception site.
+
+1. install Codeception c3 remote support `composer require "codeception/c3:*"`;
+
+2. copy c3.php file under your `web` directory and include;
+
+3. include `c3.php` file in your `index-test.php` file before application run, so it can catch needed requests.
+
+Configuration options that are used by remote code coverage:
+
+- c3_url: url pointing to entry script that includes `c3.php` file, so `Codeception` will be able to produce code coverage;
+- remote: whether to enable remote code coverage or not;
+- remote_config: path to the `codeception.yaml` configuration file, from the directory where `c3.php` file is located. This is needed
+  so that `Codeception` can create itself instance and collect code coverage correctly.
+
+By default `c3_url` and `remote_config` setup correctly, you only need to copy and include `c3.php` file in your `index-test.php`
+
+After that you should be able to collect code coverage from tests that run through `PhpBrowser` or `WebDriver` with same command
+as for other tests:
+
+```
+#collect coverage from remote
+codecept run acceptance --coverage-html --coverage-xml
+```
+
 Please refer to [Codeception tutorial](http://codeception.com/docs/01-Introduction) for
 more details about writing and running acceptance, functional and unit tests.
diff --git a/tests/codeception.yml b/tests/codeception.yml
index 0a45a0c08..b71ba31c1 100644
--- a/tests/codeception.yml
+++ b/tests/codeception.yml
@@ -1,4 +1,24 @@
 actor: Tester
+#coverage:
+#    #c3_url: http://localhost:8080/index-test.php/
+#    enabled: true
+#    #remote: true
+#    #remote_config: '../tests/codeception.yml'
+#    white_list:
+#        include:
+#            - ../models/*
+#            - ../controllers/*
+#            - ../commands/*
+#            - ../mail/*
+#    blacklist:
+#        include:
+#            - ../assets/*
+#            - ../config/*
+#            - ../runtime/*
+#            - ../vendor/*
+#            - ../views/*
+#            - ../web/*
+#            - ../tests/*
 paths:
     tests: codeception
     log: codeception/_output

From aa583103a615d1d411e66d92cc37c7dd2e09d98a Mon Sep 17 00:00:00 2001
From: Mark Ragazzo <mark.github@yandex.ru>
Date: Wed, 10 Dec 2014 22:46:53 +0400
Subject: [PATCH 090/390] doc fix

---
 tests/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index b5c014176..3041b5f42 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -84,9 +84,9 @@ When you run your tests not in the same process where code coverage is collected
 related options, to be able to collect code coverage correctly. To setup remote code coverage you should follow [instructions](http://codeception.com/docs/11-Codecoverage)
 from codeception site.
 
-1. install Codeception c3 remote support `composer require "codeception/c3:*"`;
+1. install `Codeception c3` remote support `composer require "codeception/c3:*"`;
 
-2. copy c3.php file under your `web` directory and include;
+2. copy `c3.php` file under your `web` directory;
 
 3. include `c3.php` file in your `index-test.php` file before application run, so it can catch needed requests.
 

From aef33fd9698bdee5450581ed818e811c7e6aa10e Mon Sep 17 00:00:00 2001
From: Mark Ragazzo <mark.github@yandex.ru>
Date: Wed, 10 Dec 2014 23:01:08 +0400
Subject: [PATCH 091/390] fixed docs

---
 tests/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index 3041b5f42..8134fb3a7 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -62,7 +62,7 @@ codecept run unit
 Code coverage support
 ---------------------
 
-By default, code coverage is disabled in `codeception.yaml` configuration file, you should uncomment needed rows to be able
+By default, code coverage is disabled in `codeception.yml` configuration file, you should uncomment needed rows to be able
 to collect code coverage. You can run your tests and collect coverage with the following command:
 
 ```
@@ -94,7 +94,7 @@ Configuration options that are used by remote code coverage:
 
 - c3_url: url pointing to entry script that includes `c3.php` file, so `Codeception` will be able to produce code coverage;
 - remote: whether to enable remote code coverage or not;
-- remote_config: path to the `codeception.yaml` configuration file, from the directory where `c3.php` file is located. This is needed
+- remote_config: path to the `codeception.yml` configuration file, from the directory where `c3.php` file is located. This is needed
   so that `Codeception` can create itself instance and collect code coverage correctly.
 
 By default `c3_url` and `remote_config` setup correctly, you only need to copy and include `c3.php` file in your `index-test.php`

From 8bcb38960fec5bb978b6b7cc86c0d1e284f66038 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 26 Dec 2014 23:18:52 +0300
Subject: [PATCH 092/390] Fixes #6624: Added delays to acceptance tests in
 order to make Selenium run more reliable

---
 tests/codeception/acceptance/ContactCept.php | 6 ++++++
 tests/codeception/acceptance/LoginCept.php   | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/tests/codeception/acceptance/ContactCept.php b/tests/codeception/acceptance/ContactCept.php
index 98ba2ef12..4e8ee80b4 100644
--- a/tests/codeception/acceptance/ContactCept.php
+++ b/tests/codeception/acceptance/ContactCept.php
@@ -11,6 +11,9 @@
 
 $I->amGoingTo('submit contact form with no data');
 $contactPage->submit([]);
+if (method_exists($I, 'wait')) {
+    $I->wait(3); // only for selenium
+}
 $I->expectTo('see validations errors');
 $I->see('Contact', 'h1');
 $I->see('Name cannot be blank');
@@ -27,6 +30,9 @@
     'body' => 'test content',
     'verifyCode' => 'testme',
 ]);
+if (method_exists($I, 'wait')) {
+    $I->wait(3); // only for selenium
+}
 $I->expectTo('see that email adress is wrong');
 $I->dontSee('Name cannot be blank', '.help-inline');
 $I->see('Email is not a valid email address.');
diff --git a/tests/codeception/acceptance/LoginCept.php b/tests/codeception/acceptance/LoginCept.php
index 4f022e1c2..7575caf58 100644
--- a/tests/codeception/acceptance/LoginCept.php
+++ b/tests/codeception/acceptance/LoginCept.php
@@ -11,6 +11,9 @@
 
 $I->amGoingTo('try to login with empty credentials');
 $loginPage->login('', '');
+if (method_exists($I, 'wait')) {
+    $I->wait(3); // only for selenium
+}
 $I->expectTo('see validations errors');
 $I->see('Username cannot be blank.');
 $I->see('Password cannot be blank.');

From b528289495bf9721d2b8c628d69caad42e45b0ce Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Fri, 2 Jan 2015 13:47:15 +0100
Subject: [PATCH 093/390] removed safe mode check

this is not available in PHP >5.4.0 anyway.

> This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP
5.4.0.

http://php.net/manual/en/features.safe-mode.php
---
 requirements.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/requirements.php b/requirements.php
index 4da063113..ee6b2cb53 100644
--- a/requirements.php
+++ b/requirements.php
@@ -107,13 +107,6 @@
         'memo' => $imagickMemo,
     ),
     // PHP ini :
-    'phpSafeMode' => array(
-        'name' => 'PHP safe mode',
-        'mandatory' => false,
-        'condition' => $requirementsChecker->checkPhpIniOff("safe_mode"),
-        'by' => 'File uploading and console command execution',
-        'memo' => '"safe_mode" should be disabled at php.ini',
-    ),
     'phpExposePhp' => array(
         'name' => 'Expose PHP',
         'mandatory' => false,

From c302ff98ed31e7c247b36ab720a46e1a7837d315 Mon Sep 17 00:00:00 2001
From: Alex Solomaha <cyanofresh@gmail.com>
Date: Sat, 24 Jan 2015 20:45:04 +0200
Subject: [PATCH 094/390] Odd symbol in meta tag

There is no needed the "/" before closing.
---
 views/layouts/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/layouts/main.php b/views/layouts/main.php
index b9dcfb97a..d5bba3a04 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -14,7 +14,7 @@
 <!DOCTYPE html>
 <html lang="<?= Yii::$app->language ?>">
 <head>
-    <meta charset="<?= Yii::$app->charset ?>"/>
+    <meta charset="<?= Yii::$app->charset ?>">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <?= Html::csrfMetaTags() ?>
     <title><?= Html::encode($this->title) ?></title>

From 7b63966035f6418fc216b19d06206952c4a1b424 Mon Sep 17 00:00:00 2001
From: Davidson Alencar <davidson.t.i@gmail.com>
Date: Mon, 26 Jan 2015 08:52:46 -0200
Subject: [PATCH 095/390] adjust version composer-asset-plugin to 1.0.0 [ci
 skip]

close #7024
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 36df77895..c5bec59a4 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this application template using the following command:
 
 ~~~
-php composer.phar global require "fxp/composer-asset-plugin:1.0.0-beta4"
+php composer.phar global require "fxp/composer-asset-plugin:1.0.0"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 

From d59a57c383fe0553f57a457734c3d2a67def272b Mon Sep 17 00:00:00 2001
From: Evgeniy Tkachenko <e.jeka.mail@gmail.com>
Date: Thu, 29 Jan 2015 09:34:42 +0300
Subject: [PATCH 096/390] Fix undefined variable $scenario in test files.

---
 tests/codeception/acceptance/AboutCept.php   | 2 ++
 tests/codeception/acceptance/ContactCept.php | 2 ++
 tests/codeception/acceptance/HomeCept.php    | 2 ++
 tests/codeception/acceptance/LoginCept.php   | 2 ++
 tests/codeception/functional/AboutCept.php   | 2 ++
 tests/codeception/functional/ContactCept.php | 2 ++
 tests/codeception/functional/HomeCept.php    | 2 ++
 tests/codeception/functional/LoginCept.php   | 2 ++
 8 files changed, 16 insertions(+)

diff --git a/tests/codeception/acceptance/AboutCept.php b/tests/codeception/acceptance/AboutCept.php
index 1ef220ebe..88a550698 100644
--- a/tests/codeception/acceptance/AboutCept.php
+++ b/tests/codeception/acceptance/AboutCept.php
@@ -2,6 +2,8 @@
 
 use tests\codeception\_pages\AboutPage;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that about works');
 AboutPage::openBy($I);
diff --git a/tests/codeception/acceptance/ContactCept.php b/tests/codeception/acceptance/ContactCept.php
index 4e8ee80b4..b51d1c085 100644
--- a/tests/codeception/acceptance/ContactCept.php
+++ b/tests/codeception/acceptance/ContactCept.php
@@ -2,6 +2,8 @@
 
 use tests\codeception\_pages\ContactPage;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that contact works');
 
diff --git a/tests/codeception/acceptance/HomeCept.php b/tests/codeception/acceptance/HomeCept.php
index 369ab7f48..1f9353595 100644
--- a/tests/codeception/acceptance/HomeCept.php
+++ b/tests/codeception/acceptance/HomeCept.php
@@ -1,5 +1,7 @@
 <?php
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);
diff --git a/tests/codeception/acceptance/LoginCept.php b/tests/codeception/acceptance/LoginCept.php
index 7575caf58..90d063583 100644
--- a/tests/codeception/acceptance/LoginCept.php
+++ b/tests/codeception/acceptance/LoginCept.php
@@ -2,6 +2,8 @@
 
 use tests\codeception\_pages\LoginPage;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that login works');
 
diff --git a/tests/codeception/functional/AboutCept.php b/tests/codeception/functional/AboutCept.php
index ae7b45b30..09260612f 100644
--- a/tests/codeception/functional/AboutCept.php
+++ b/tests/codeception/functional/AboutCept.php
@@ -2,6 +2,8 @@
 
 use tests\codeception\_pages\AboutPage;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that about works');
 AboutPage::openBy($I);
diff --git a/tests/codeception/functional/ContactCept.php b/tests/codeception/functional/ContactCept.php
index 47604058d..074820a70 100644
--- a/tests/codeception/functional/ContactCept.php
+++ b/tests/codeception/functional/ContactCept.php
@@ -2,6 +2,8 @@
 
 use tests\codeception\_pages\ContactPage;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that contact works');
 
diff --git a/tests/codeception/functional/HomeCept.php b/tests/codeception/functional/HomeCept.php
index 80aa551fc..94efb09cd 100644
--- a/tests/codeception/functional/HomeCept.php
+++ b/tests/codeception/functional/HomeCept.php
@@ -1,5 +1,7 @@
 <?php
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);
diff --git a/tests/codeception/functional/LoginCept.php b/tests/codeception/functional/LoginCept.php
index 991d27c3c..66e760989 100644
--- a/tests/codeception/functional/LoginCept.php
+++ b/tests/codeception/functional/LoginCept.php
@@ -2,6 +2,8 @@
 
 use tests\codeception\_pages\LoginPage;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that login works');
 

From d0d066faad37cb5258b75b9e40c1c21eddc2a952 Mon Sep 17 00:00:00 2001
From: Evgeniy Tkachenko <e.jeka.mail@gmail.com>
Date: Thu, 29 Jan 2015 14:49:12 +0300
Subject: [PATCH 097/390] Move fixture configuration in config file

---
 tests/codeception/bin/yii           | 12 +-----------
 tests/codeception/config/config.php | 10 ++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/codeception/bin/yii b/tests/codeception/bin/yii
index c7f2653ff..c6df160d8 100644
--- a/tests/codeception/bin/yii
+++ b/tests/codeception/bin/yii
@@ -12,17 +12,7 @@ require_once __DIR__ . '/_bootstrap.php';
 
 $config = yii\helpers\ArrayHelper::merge(
     require(YII_APP_BASE_PATH . '/config/console.php'),
-    require(__DIR__ . '/../config/config.php'),
-    [
-        'controllerMap' => [
-            'fixture' => [
-                'class' => 'yii\faker\FixtureController',
-                'fixtureDataPath' => '@tests/codeception/fixtures',
-                'templatePath' => '@tests/codeception/templates',
-                'namespace' => 'tests\codeception\fixtures',
-            ],
-        ],
-    ]
+    require(__DIR__ . '/../config/config.php')
 );
 
 $application = new yii\console\Application($config);
diff --git a/tests/codeception/config/config.php b/tests/codeception/config/config.php
index bac901d63..e949051f2 100644
--- a/tests/codeception/config/config.php
+++ b/tests/codeception/config/config.php
@@ -3,6 +3,16 @@
  * Application configuration shared by all test types
  */
 return [
+    [
+        'controllerMap' => [
+            'fixture' => [
+                'class' => 'yii\faker\FixtureController',
+                'fixtureDataPath' => '@tests/codeception/fixtures',
+                'templatePath' => '@tests/codeception/templates',
+                'namespace' => 'tests\codeception\fixtures',
+            ],
+        ],
+    ],
     'components' => [
         'db' => [
             'dsn' => 'mysql:host=localhost;dbname=yii2_basic_tests',

From cea040a7cd327c52d6dbac22673dffc84731ad75 Mon Sep 17 00:00:00 2001
From: githubjeka <et.coder@gmail.com>
Date: Thu, 29 Jan 2015 15:20:45 +0300
Subject: [PATCH 098/390] To fix break test

---
 tests/codeception/config/config.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/codeception/config/config.php b/tests/codeception/config/config.php
index e949051f2..ffc416bc6 100644
--- a/tests/codeception/config/config.php
+++ b/tests/codeception/config/config.php
@@ -3,14 +3,12 @@
  * Application configuration shared by all test types
  */
 return [
-    [
-        'controllerMap' => [
-            'fixture' => [
-                'class' => 'yii\faker\FixtureController',
-                'fixtureDataPath' => '@tests/codeception/fixtures',
-                'templatePath' => '@tests/codeception/templates',
-                'namespace' => 'tests\codeception\fixtures',
-            ],
+    'controllerMap' => [
+        'fixture' => [
+            'class' => 'yii\faker\FixtureController',
+            'fixtureDataPath' => '@tests/codeception/fixtures',
+            'templatePath' => '@tests/codeception/templates',
+            'namespace' => 'tests\codeception\fixtures',
         ],
     ],
     'components' => [

From 22d6b9404b3473e3da2053094cc56fe414efc417 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Thu, 26 Feb 2015 04:11:27 +0300
Subject: [PATCH 099/390] Fixed composer.json for basic app template

---
 composer.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 56756ec81..8479f76fe 100644
--- a/composer.json
+++ b/composer.json
@@ -15,15 +15,15 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
-        "yiisoft/yii2": "*",
-        "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*"
+        "yiisoft/yii2": "~2.0.0",
+        "yiisoft/yii2-bootstrap": "~2.0.0",
+        "yiisoft/yii2-swiftmailer": "~2.0.0"
     },
     "require-dev": {
-        "yiisoft/yii2-codeception": "*",
-        "yiisoft/yii2-debug": "*",
-        "yiisoft/yii2-gii": "*",
-        "yiisoft/yii2-faker": "*"
+        "yiisoft/yii2-codeception": "~2.0.0",
+        "yiisoft/yii2-debug": "~2.0.0",
+        "yiisoft/yii2-gii": "~2.0.0",
+        "yiisoft/yii2-faker": "~2.0.0"
     },
     "config": {
         "process-timeout": 1800

From 3bdaca21e4f176c934d2a25cd82f8016ad6d74f2 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Thu, 26 Feb 2015 18:18:25 +0300
Subject: [PATCH 100/390] Removed min stability from composer.json for basic
 application template

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

diff --git a/composer.json b/composer.json
index 8479f76fe..fdab5999a 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,6 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.0",

From 53443f822a438c2bc067053e93e4f06b99c3d1f0 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Thu, 26 Feb 2015 18:20:50 +0300
Subject: [PATCH 101/390] Added prefered install option to composer.json for
 basic app template

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

diff --git a/composer.json b/composer.json
index fdab5999a..8b85c98af 100644
--- a/composer.json
+++ b/composer.json
@@ -25,6 +25,7 @@
         "yiisoft/yii2-faker": "~2.0.0"
     },
     "config": {
+        "preferred-install": "dist",
         "process-timeout": 1800
     },
     "scripts": {

From ec62b3af3423464a14d7694a690c80de66f91aa6 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Thu, 26 Feb 2015 18:21:58 +0300
Subject: [PATCH 102/390] Updated basic app template README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c5bec59a4..1207736ea 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ You can then install this application template using the following command:
 
 ~~~
 php composer.phar global require "fxp/composer-asset-plugin:1.0.0"
-php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
+php composer.phar create-project yiisoft/yii2-app-basic basic
 ~~~
 
 Now you should be able to access the application through the following URL, assuming `basic` is the directory

From 413638137bfd0fcd61bbc37efdecc717fbb34fb4 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 27 Feb 2015 02:25:54 +0300
Subject: [PATCH 103/390] Reverted #7459, #7469, #7470

---
 README.md     |  2 +-
 composer.json | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 1207736ea..c5bec59a4 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ You can then install this application template using the following command:
 
 ~~~
 php composer.phar global require "fxp/composer-asset-plugin:1.0.0"
-php composer.phar create-project yiisoft/yii2-app-basic basic
+php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 
 Now you should be able to access the application through the following URL, assuming `basic` is the directory
diff --git a/composer.json b/composer.json
index 8b85c98af..56756ec81 100644
--- a/composer.json
+++ b/composer.json
@@ -12,20 +12,20 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
-        "yiisoft/yii2": "~2.0.0",
-        "yiisoft/yii2-bootstrap": "~2.0.0",
-        "yiisoft/yii2-swiftmailer": "~2.0.0"
+        "yiisoft/yii2": "*",
+        "yiisoft/yii2-bootstrap": "*",
+        "yiisoft/yii2-swiftmailer": "*"
     },
     "require-dev": {
-        "yiisoft/yii2-codeception": "~2.0.0",
-        "yiisoft/yii2-debug": "~2.0.0",
-        "yiisoft/yii2-gii": "~2.0.0",
-        "yiisoft/yii2-faker": "~2.0.0"
+        "yiisoft/yii2-codeception": "*",
+        "yiisoft/yii2-debug": "*",
+        "yiisoft/yii2-gii": "*",
+        "yiisoft/yii2-faker": "*"
     },
     "config": {
-        "preferred-install": "dist",
         "process-timeout": 1800
     },
     "scripts": {

From 4ba6fe13b307a4a28f8e99cb81f0fbe7ddd3b08d Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sun, 22 Mar 2015 20:14:19 +0100
Subject: [PATCH 104/390] added travis.yml

---
 .travis.yml | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..dc8724f4e
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,47 @@
+language: php
+
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+#  - hhvm
+#  - hhvm-nightly
+
+# run build against hhvm but allow them to fail
+# http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail
+matrix:
+  fast_finish: true
+  allow_failures:
+#    - php: hhvm-nightly
+    - php: 7.0
+
+# faster builds on new travis setup not using sudo
+sudo: false
+
+# cache vendor dirs
+cache:
+  directories:
+    - vendor
+    - $HOME/.composer/cache
+
+install:
+  - travis_retry composer self-update && composer --version
+  - travis_retry composer global require "fxp/composer-asset-plugin:1.0.0"
+  - export PATH="$HOME/.composer/vendor/bin:$PATH"
+  - travis_retry composer install --dev --prefer-dist --no-interaction
+# codeception
+  - travis_retry composer global require "codeception/codeception=2.0.*" "codeception/specify=*" "codeception/verify=*"
+# setup application:
+  - |
+    sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web.php
+    cd tests
+    codecept build
+    cd ..
+
+script:
+  - |
+    cd web
+    php -S localhost:8080 > /dev/null 2>&1 &
+    cd ../tests
+    codecept run

From 5b0679bddeb1139a5aa0f74d5ac5c1c415e0288b Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sun, 22 Mar 2015 20:19:01 +0100
Subject: [PATCH 105/390] added travis and packagist badges

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index c5bec59a4..c0d14d56b 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,9 @@ The template contains the basic features including user login/logout and a conta
 It includes all commonly used configurations that would allow you to focus on adding new
 features to your application.
 
+[![Latest Stable Version](https://poser.pugx.org/yiisoft/yii2-app-basic/v/stable.png)](https://packagist.org/packages/yiisoft/yii2-app-basic)
+[![Total Downloads](https://poser.pugx.org/yiisoft/yii2-app-basic/downloads.png)](https://packagist.org/packages/yiisoft/yii2-app-basic)
+[![Build Status](https://travis-ci.org/yiisoft/yii2-app-basic.svg?branch=master)](https://travis-ci.org/yiisoft/yii2-app-basic)
 
 DIRECTORY STRUCTURE
 -------------------

From b20814fea9e717215161aebcee329221770e1b31 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sun, 22 Mar 2015 21:55:09 +0100
Subject: [PATCH 106/390] update readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c0d14d56b..7245bcb6a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Yii 2 Basic Application Template
 ================================
 
-Yii 2 Basic Application Template is a skeleton Yii 2 application best for
+Yii 2 Basic Application Template is a skeleton [Yii 2](http://www.yiiframework.com/) application best for
 rapidly creating small projects.
 
 The template contains the basic features including user login/logout and a contact page.

From d091d08d17ebbd24be574a89b8050720dd511db7 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 2 Apr 2015 16:09:56 +0300
Subject: [PATCH 107/390] Renamed application template into project template in
 docs

---
 README.md     | 10 +++++-----
 composer.json |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 7245bcb6a..587e755b8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-Yii 2 Basic Application Template
-================================
+Yii 2 Basic Project Template
+============================
 
-Yii 2 Basic Application Template is a skeleton [Yii 2](http://www.yiiframework.com/) application best for
+Yii 2 Basic Project Template is a skeleton [Yii 2](http://www.yiiframework.com/) application best for
 rapidly creating small projects.
 
 The template contains the basic features including user login/logout and a contact page.
@@ -32,7 +32,7 @@ DIRECTORY STRUCTURE
 REQUIREMENTS
 ------------
 
-The minimum requirement by this application template that your Web server supports PHP 5.4.0.
+The minimum requirement by this project template that your Web server supports PHP 5.4.0.
 
 
 INSTALLATION
@@ -55,7 +55,7 @@ http://localhost/basic/web/
 If you do not have [Composer](http://getcomposer.org/), you may install it by following the instructions
 at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 
-You can then install this application template using the following command:
+You can then install this project template using the following command:
 
 ~~~
 php composer.phar global require "fxp/composer-asset-plugin:1.0.0"
diff --git a/composer.json b/composer.json
index 56756ec81..a5cc0db57 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "yiisoft/yii2-app-basic",
-    "description": "Yii 2 Basic Application Template",
-    "keywords": ["yii2", "framework", "basic", "application template"],
+    "description": "Yii 2 Basic Project Template",
+    "keywords": ["yii2", "framework", "basic", "project template"],
     "homepage": "http://www.yiiframework.com/",
     "type": "project",
     "license": "BSD-3-Clause",

From d72cfa6b634841569558326768b507eb5030ebd0 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 3 Apr 2015 00:48:16 +0300
Subject: [PATCH 108/390] Added .gitattributes

---
 .gitattributes | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..db48bac2b
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,7 @@
+# Ignore all test and documentation for archive
+/.gitattributes     export-ignore
+/.gitignore         export-ignore
+/.scrutinizer.yml   export-ignore
+/.travis.yml        export-ignore
+/phpunit.xml.dist   export-ignore
+/docs               export-ignore

From 70148b06d83e22ce59399b565c2d86ff2a2d3d03 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 7 Apr 2015 12:32:38 +0300
Subject: [PATCH 109/390] Removed .gitignore from .gitattributes

---
 .gitattributes | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index db48bac2b..6b9d3d398 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,5 @@
 # Ignore all test and documentation for archive
 /.gitattributes     export-ignore
-/.gitignore         export-ignore
 /.scrutinizer.yml   export-ignore
 /.travis.yml        export-ignore
-/phpunit.xml.dist   export-ignore
 /docs               export-ignore

From f71c712b8dd0036f78ef0e1394e8a229b31ae275 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 7 Apr 2015 13:00:08 +0300
Subject: [PATCH 110/390] Removed vendor from travis cache because it causes
 git build errors

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index dc8724f4e..8a9bd1cfb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,6 @@ sudo: false
 # cache vendor dirs
 cache:
   directories:
-    - vendor
     - $HOME/.composer/cache
 
 install:

From 8ed0dfbdeb46f16b13e35fb76e5fd832ee8ad35a Mon Sep 17 00:00:00 2001
From: BlueZED <tgeppert@gmail.com>
Date: Wed, 22 Apr 2015 10:06:08 +0200
Subject: [PATCH 111/390] Fix for issue #5

Apply the template to the checkbox, not the field.
---
 views/site/login.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/views/site/login.php b/views/site/login.php
index 916be9808..bca488c3f 100644
--- a/views/site/login.php
+++ b/views/site/login.php
@@ -27,9 +27,9 @@
 
     <?= $form->field($model, 'password')->passwordInput() ?>
 
-    <?= $form->field($model, 'rememberMe', [
-        'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
-    ])->checkbox() ?>
+    <?= $form->field($model, 'rememberMe')->checkbox([
+        'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input} {label}</div>\n<div class=\"col-lg-8\">{error}</div>",
+    ]) ?>
 
     <div class="form-group">
         <div class="col-lg-offset-1 col-lg-11">

From 8b4e2143ff7c3138b14a88fb6c7c03fc302048d1 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 6 May 2015 16:18:56 +0200
Subject: [PATCH 112/390] updated fxp/composer-asset-plugin version constraint

---
 .travis.yml | 2 +-
 README.md   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8a9bd1cfb..72d788d58 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ cache:
 
 install:
   - travis_retry composer self-update && composer --version
-  - travis_retry composer global require "fxp/composer-asset-plugin:1.0.0"
+  - travis_retry composer global require "fxp/composer-asset-plugin:~1.0.0"
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - travis_retry composer install --dev --prefer-dist --no-interaction
 # codeception
diff --git a/README.md b/README.md
index 587e755b8..e5a2d9f76 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this project template using the following command:
 
 ~~~
-php composer.phar global require "fxp/composer-asset-plugin:1.0.0"
+php composer.phar global require "fxp/composer-asset-plugin:~1.0.0"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 

From a8719e2ef34ded2a7e38f784b4c6ef667d01b157 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sun, 10 May 2015 01:01:36 +0200
Subject: [PATCH 113/390] Update README.md

fixed markdown to display steps correctly.
---
 tests/README.md | 66 ++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index 8134fb3a7..ddd70a53a 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -6,58 +6,58 @@ After creating the basic application, follow these steps to prepare for the test
 
 1. Install Codeception if it's not yet installed:
 
-```
-composer global require "codeception/codeception=2.0.*"
-composer global require "codeception/specify=*"
-composer global require "codeception/verify=*"
-```
+   ```
+   composer global require "codeception/codeception=2.0.*"
+   composer global require "codeception/specify=*"
+   composer global require "codeception/verify=*"
+   ```
 
-If you've never used Composer for global packages run `composer global status`. It should output:
+   If you've never used Composer for global packages run `composer global status`. It should output:
 
-```
-Changed current directory to <directory>
-```
+   ```
+   Changed current directory to <directory>
+   ```
 
-Then add `<directory>/vendor/bin` to you `PATH` environment variable. Now we're able to use `codecept` from command
-line globally.
+  Then add `<directory>/vendor/bin` to you `PATH` environment variable. Now we're able to use `codecept` from command
+  line globally.
 
 2. Install faker extension by running the following from template root directory where `composer.json` is:
 
-```
-composer require --dev yiisoft/yii2-faker:*
-```
+   ```
+   composer require --dev yiisoft/yii2-faker:*
+   ```
 
 3. Create `yii2_basic_tests` database and update it by applying migrations:
 
-```
-codeception/bin/yii migrate
-```
+   ```
+   codeception/bin/yii migrate
+   ```
 
 4. Build the test suites:
 
-```
-codecept build
-```
+   ```
+   codecept build
+   ```
 
 5. In order to be able to run acceptance tests you need to start a webserver. The simplest way is to use PHP built in
 webserver. In the `web` directory execute the following:
 
-```
-php -S localhost:8080
-```
+   ```
+   php -S localhost:8080
+   ```
 
 6. Now you can run the tests with the following commands:
 
-```
-# run all available tests
-codecept run
-# run acceptance tests
-codecept run acceptance
-# run functional tests
-codecept run functional
-# run unit tests
-codecept run unit
-```
+   ```
+   # run all available tests
+   codecept run
+   # run acceptance tests
+   codecept run acceptance
+   # run functional tests
+   codecept run functional
+   # run unit tests
+   codecept run unit
+   ```
 
 Code coverage support
 ---------------------

From 9954bb3b51c6196d23563c0301e46f53ca2c1390 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sun, 10 May 2015 01:17:26 +0200
Subject: [PATCH 114/390] be more clear about migrations

---
 tests/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/README.md b/tests/README.md
index ddd70a53a..eb2f24b6a 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -27,7 +27,7 @@ After creating the basic application, follow these steps to prepare for the test
    composer require --dev yiisoft/yii2-faker:*
    ```
 
-3. Create `yii2_basic_tests` database and update it by applying migrations:
+3. Create `yii2_basic_tests` database and update it by applying migrations (you may skip this step if you do not have created any migrations yet):
 
    ```
    codeception/bin/yii migrate

From 6db812e9891200dd834c8bf47db39bddc6c9da74 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 10 May 2015 18:06:11 -0400
Subject: [PATCH 115/390] 2.0.4 release

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index a5cc0db57..3b5c61697 100644
--- a/composer.json
+++ b/composer.json
@@ -12,10 +12,10 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
-        "yiisoft/yii2": "*",
+        "yiisoft/yii2": ">=2.0.4",
         "yiisoft/yii2-bootstrap": "*",
         "yiisoft/yii2-swiftmailer": "*"
     },

From ff7b5adae524ec52fe0d99d3e1a7ccd4d4edbef1 Mon Sep 17 00:00:00 2001
From: Qiang Xue <qiang.xue@gmail.com>
Date: Sun, 10 May 2015 18:27:13 -0400
Subject: [PATCH 116/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 3b5c61697..1dabd3bc1 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.4",

From ff0a3944bfb5edfd38fa8989603778178f186191 Mon Sep 17 00:00:00 2001
From: Evgeniy Tkachenko <et.coder@gmail.com>
Date: Wed, 13 May 2015 14:14:06 +0300
Subject: [PATCH 117/390] Update config.php

---
 tests/codeception/config/config.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/codeception/config/config.php b/tests/codeception/config/config.php
index ffc416bc6..d4e1f77ce 100644
--- a/tests/codeception/config/config.php
+++ b/tests/codeception/config/config.php
@@ -3,6 +3,7 @@
  * Application configuration shared by all test types
  */
 return [
+    'language' => 'en-US',
     'controllerMap' => [
         'fixture' => [
             'class' => 'yii\faker\FixtureController',

From 8a1f362e9f64b54a725e1b4b1ba42d6eae3512b5 Mon Sep 17 00:00:00 2001
From: MaximAL <almaximal@ya.ru>
Date: Fri, 5 Jun 2015 17:39:43 +0300
Subject: [PATCH 118/390] Remove redundant `else`s

---
 controllers/SiteController.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/controllers/SiteController.php b/controllers/SiteController.php
index f95994160..4ffba24cb 100644
--- a/controllers/SiteController.php
+++ b/controllers/SiteController.php
@@ -61,11 +61,10 @@ public function actionLogin()
         $model = new LoginForm();
         if ($model->load(Yii::$app->request->post()) && $model->login()) {
             return $this->goBack();
-        } else {
-            return $this->render('login', [
-                'model' => $model,
-            ]);
         }
+        return $this->render('login', [
+            'model' => $model,
+        ]);
     }
 
     public function actionLogout()
@@ -82,11 +81,10 @@ public function actionContact()
             Yii::$app->session->setFlash('contactFormSubmitted');
 
             return $this->refresh();
-        } else {
-            return $this->render('contact', [
-                'model' => $model,
-            ]);
         }
+        return $this->render('contact', [
+            'model' => $model,
+        ]);
     }
 
     public function actionAbout()

From a52ca24ecd14aacb307a5dd011ff2dc6690e0371 Mon Sep 17 00:00:00 2001
From: MaximAL <almaximal@ya.ru>
Date: Fri, 5 Jun 2015 17:40:49 +0300
Subject: [PATCH 119/390] Update LoginForm.php

---
 models/LoginForm.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/models/LoginForm.php b/models/LoginForm.php
index 7bd44d402..227168cf6 100644
--- a/models/LoginForm.php
+++ b/models/LoginForm.php
@@ -58,9 +58,8 @@ public function login()
     {
         if ($this->validate()) {
             return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600*24*30 : 0);
-        } else {
-            return false;
         }
+        return false;
     }
 
     /**

From 0915b934abed59654094d399616f54a40e55ac1e Mon Sep 17 00:00:00 2001
From: MaximAL <almaximal@ya.ru>
Date: Fri, 5 Jun 2015 17:41:11 +0300
Subject: [PATCH 120/390] Update ContactForm.php

---
 models/ContactForm.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/models/ContactForm.php b/models/ContactForm.php
index d4052ee93..361b80b39 100644
--- a/models/ContactForm.php
+++ b/models/ContactForm.php
@@ -57,8 +57,7 @@ public function contact($email)
                 ->send();
 
             return true;
-        } else {
-            return false;
         }
+        return false;
     }
 }

From 72c2d75419c95f99ee7cc0a800b45a95ae765622 Mon Sep 17 00:00:00 2001
From: Alex Solomaha <cyanofresh@gmail.com>
Date: Thu, 9 Jul 2015 12:47:20 +0300
Subject: [PATCH 121/390] Views match Yii2 View Code Style

close #18
---
 views/layouts/main.php | 82 +++++++++++++++++++++--------------------
 views/site/about.php   |  4 +-
 views/site/contact.php | 83 ++++++++++++++++++++++++------------------
 views/site/error.php   |  4 +-
 views/site/index.php   |  2 +
 views/site/login.php   | 23 ++++++------
 6 files changed, 109 insertions(+), 89 deletions(-)

diff --git a/views/layouts/main.php b/views/layouts/main.php
index d5bba3a04..d5b1b49ee 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -1,13 +1,14 @@
 <?php
+
+/* @var $this \yii\web\View */
+/* @var $content string */
+
 use yii\helpers\Html;
 use yii\bootstrap\Nav;
 use yii\bootstrap\NavBar;
 use yii\widgets\Breadcrumbs;
 use app\assets\AppAsset;
 
-/* @var $this \yii\web\View */
-/* @var $content string */
-
 AppAsset::register($this);
 ?>
 <?php $this->beginPage() ?>
@@ -21,47 +22,50 @@
     <?php $this->head() ?>
 </head>
 <body>
-
 <?php $this->beginBody() ?>
-    <div class="wrap">
-        <?php
-            NavBar::begin([
-                'brandLabel' => 'My Company',
-                'brandUrl' => Yii::$app->homeUrl,
-                'options' => [
-                    'class' => 'navbar-inverse navbar-fixed-top',
-                ],
-            ]);
-            echo Nav::widget([
-                'options' => ['class' => 'navbar-nav navbar-right'],
-                'items' => [
-                    ['label' => 'Home', 'url' => ['/site/index']],
-                    ['label' => 'About', 'url' => ['/site/about']],
-                    ['label' => 'Contact', 'url' => ['/site/contact']],
-                    Yii::$app->user->isGuest ?
-                        ['label' => 'Login', 'url' => ['/site/login']] :
-                        ['label' => 'Logout (' . Yii::$app->user->identity->username . ')',
-                            'url' => ['/site/logout'],
-                            'linkOptions' => ['data-method' => 'post']],
+
+<div class="wrap">
+    <?php
+    NavBar::begin([
+        'brandLabel' => 'My Company',
+        'brandUrl' => Yii::$app->homeUrl,
+        'options' => [
+            'class' => 'navbar-inverse navbar-fixed-top',
+        ],
+    ]);
+    echo Nav::widget([
+        'options' => ['class' => 'navbar-nav navbar-right'],
+        'items' => [
+            ['label' => 'Home', 'url' => ['/site/index']],
+            ['label' => 'About', 'url' => ['/site/about']],
+            ['label' => 'Contact', 'url' => ['/site/contact']],
+            Yii::$app->user->isGuest ?
+                ['label' => 'Login', 'url' => ['/site/login']] :
+                [
+                    'label' => 'Logout (' . Yii::$app->user->identity->username . ')',
+                    'url' => ['/site/logout'],
+                    'linkOptions' => ['data-method' => 'post']
                 ],
-            ]);
-            NavBar::end();
-        ?>
+        ],
+    ]);
+    NavBar::end();
+    ?>
 
-        <div class="container">
-            <?= Breadcrumbs::widget([
-                'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
-            ]) ?>
-            <?= $content ?>
-        </div>
+    <div class="container">
+        <?= Breadcrumbs::widget([
+            'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
+        ]) ?>
+        <?= $content ?>
     </div>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <p class="pull-left">&copy; My Company <?= date('Y') ?></p>
 
-    <footer class="footer">
-        <div class="container">
-            <p class="pull-left">&copy; My Company <?= date('Y') ?></p>
-            <p class="pull-right"><?= Yii::powered() ?></p>
-        </div>
-    </footer>
+        <p class="pull-right"><?= Yii::powered() ?></p>
+    </div>
+</footer>
 
 <?php $this->endBody() ?>
 </body>
diff --git a/views/site/about.php b/views/site/about.php
index 13d85a618..68d5cf3bd 100644
--- a/views/site/about.php
+++ b/views/site/about.php
@@ -1,7 +1,9 @@
 <?php
-use yii\helpers\Html;
 
 /* @var $this yii\web\View */
+
+use yii\helpers\Html;
+
 $this->title = 'About';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
diff --git a/views/site/contact.php b/views/site/contact.php
index e964a3426..22a75bbcc 100644
--- a/views/site/contact.php
+++ b/views/site/contact.php
@@ -1,12 +1,13 @@
 <?php
-use yii\helpers\Html;
-use yii\bootstrap\ActiveForm;
-use yii\captcha\Captcha;
 
 /* @var $this yii\web\View */
 /* @var $form yii\bootstrap\ActiveForm */
 /* @var $model app\models\ContactForm */
 
+use yii\helpers\Html;
+use yii\bootstrap\ActiveForm;
+use yii\captcha\Captcha;
+
 $this->title = 'Contact';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -15,43 +16,53 @@
 
     <?php if (Yii::$app->session->hasFlash('contactFormSubmitted')): ?>
 
-    <div class="alert alert-success">
-        Thank you for contacting us. We will respond to you as soon as possible.
-    </div>
-
-    <p>
-        Note that if you turn on the Yii debugger, you should be able
-        to view the mail message on the mail panel of the debugger.
-        <?php if (Yii::$app->mailer->useFileTransport): ?>
-        Because the application is in development mode, the email is not sent but saved as
-        a file under <code><?= Yii::getAlias(Yii::$app->mailer->fileTransportPath) ?></code>.
-        Please configure the <code>useFileTransport</code> property of the <code>mail</code>
-        application component to be false to enable email sending.
-        <?php endif; ?>
-    </p>
+        <div class="alert alert-success">
+            Thank you for contacting us. We will respond to you as soon as possible.
+        </div>
+
+        <p>
+            Note that if you turn on the Yii debugger, you should be able
+            to view the mail message on the mail panel of the debugger.
+            <?php if (Yii::$app->mailer->useFileTransport): ?>
+                Because the application is in development mode, the email is not sent but saved as
+                a file under <code><?= Yii::getAlias(Yii::$app->mailer->fileTransportPath) ?></code>.
+                Please configure the <code>useFileTransport</code> property of the <code>mail</code>
+                application component to be false to enable email sending.
+            <?php endif; ?>
+        </p>
 
     <?php else: ?>
 
-    <p>
-        If you have business inquiries or other questions, please fill out the following form to contact us. Thank you.
-    </p>
-
-    <div class="row">
-        <div class="col-lg-5">
-            <?php $form = ActiveForm::begin(['id' => 'contact-form']); ?>
-                <?= $form->field($model, 'name') ?>
-                <?= $form->field($model, 'email') ?>
-                <?= $form->field($model, 'subject') ?>
-                <?= $form->field($model, 'body')->textArea(['rows' => 6]) ?>
-                <?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [
-                    'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
-                ]) ?>
-                <div class="form-group">
-                    <?= Html::submitButton('Submit', ['class' => 'btn btn-primary', 'name' => 'contact-button']) ?>
-                </div>
-            <?php ActiveForm::end(); ?>
+        <p>
+            If you have business inquiries or other questions, please fill out the following form to contact us.
+            Thank you.
+        </p>
+
+        <div class="row">
+            <div class="col-lg-5">
+
+                <?php $form = ActiveForm::begin(['id' => 'contact-form']); ?>
+
+                    <?= $form->field($model, 'name') ?>
+
+                    <?= $form->field($model, 'email') ?>
+
+                    <?= $form->field($model, 'subject') ?>
+
+                    <?= $form->field($model, 'body')->textArea(['rows' => 6]) ?>
+
+                    <?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [
+                        'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
+                    ]) ?>
+
+                    <div class="form-group">
+                        <?= Html::submitButton('Submit', ['class' => 'btn btn-primary', 'name' => 'contact-button']) ?>
+                    </div>
+
+                <?php ActiveForm::end(); ?>
+
+            </div>
         </div>
-    </div>
 
     <?php endif; ?>
 </div>
diff --git a/views/site/error.php b/views/site/error.php
index b9812c488..0ba257465 100644
--- a/views/site/error.php
+++ b/views/site/error.php
@@ -1,12 +1,12 @@
 <?php
 
-use yii\helpers\Html;
-
 /* @var $this yii\web\View */
 /* @var $name string */
 /* @var $message string */
 /* @var $exception Exception */
 
+use yii\helpers\Html;
+
 $this->title = $name;
 ?>
 <div class="site-error">
diff --git a/views/site/index.php b/views/site/index.php
index a00ee4da6..f78061088 100644
--- a/views/site/index.php
+++ b/views/site/index.php
@@ -1,5 +1,7 @@
 <?php
+
 /* @var $this yii\web\View */
+
 $this->title = 'My Yii Application';
 ?>
 <div class="site-index">
diff --git a/views/site/login.php b/views/site/login.php
index bca488c3f..059ef8048 100644
--- a/views/site/login.php
+++ b/views/site/login.php
@@ -1,11 +1,12 @@
 <?php
-use yii\helpers\Html;
-use yii\bootstrap\ActiveForm;
 
 /* @var $this yii\web\View */
 /* @var $form yii\bootstrap\ActiveForm */
 /* @var $model app\models\LoginForm */
 
+use yii\helpers\Html;
+use yii\bootstrap\ActiveForm;
+
 $this->title = 'Login';
 $this->params['breadcrumbs'][] = $this->title;
 ?>
@@ -23,19 +24,19 @@
         ],
     ]); ?>
 
-    <?= $form->field($model, 'username') ?>
+        <?= $form->field($model, 'username') ?>
 
-    <?= $form->field($model, 'password')->passwordInput() ?>
+        <?= $form->field($model, 'password')->passwordInput() ?>
 
-    <?= $form->field($model, 'rememberMe')->checkbox([
-        'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input} {label}</div>\n<div class=\"col-lg-8\">{error}</div>",
-    ]) ?>
+        <?= $form->field($model, 'rememberMe')->checkbox([
+            'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input} {label}</div>\n<div class=\"col-lg-8\">{error}</div>",
+        ]) ?>
 
-    <div class="form-group">
-        <div class="col-lg-offset-1 col-lg-11">
-            <?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
+        <div class="form-group">
+            <div class="col-lg-offset-1 col-lg-11">
+                <?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
+            </div>
         </div>
-    </div>
 
     <?php ActiveForm::end(); ?>
 

From 757f5dc6bddedaa848c4f183eaccf6a72b95f181 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sat, 11 Jul 2015 14:21:16 +0200
Subject: [PATCH 122/390] bump yii version for security fix

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

diff --git a/composer.json b/composer.json
index 1dabd3bc1..4ad378784 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
-        "yiisoft/yii2": ">=2.0.4",
+        "yiisoft/yii2": ">=2.0.5",
         "yiisoft/yii2-bootstrap": "*",
         "yiisoft/yii2-swiftmailer": "*"
     },

From 734f8b419d3fa6c0685355450a58d534fdafb4ff Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sat, 11 Jul 2015 18:05:41 +0200
Subject: [PATCH 123/390] removed duplicate declares

these are now defined automatically by console application if needed.

see https://github.com/yiisoft/yii2/issues/6853
---
 tests/codeception/bin/_bootstrap.php | 4 ----
 yii                                  | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/tests/codeception/bin/_bootstrap.php b/tests/codeception/bin/_bootstrap.php
index c923193a3..bbadc36ef 100644
--- a/tests/codeception/bin/_bootstrap.php
+++ b/tests/codeception/bin/_bootstrap.php
@@ -2,10 +2,6 @@
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 defined('YII_ENV') or 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('YII_APP_BASE_PATH') or define('YII_APP_BASE_PATH', dirname(dirname(dirname(__DIR__))));
 
 require(YII_APP_BASE_PATH . '/vendor/autoload.php');
diff --git a/yii b/yii
index b032ebdbc..43aa26056 100755
--- a/yii
+++ b/yii
@@ -10,10 +10,6 @@
 
 defined('YII_DEBUG') or 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'));
-
 require(__DIR__ . '/vendor/autoload.php');
 require(__DIR__ . '/vendor/yiisoft/yii2/Yii.php');
 

From 73ede01ebd2d4459d62de54923b1016ece7cbb1d Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 21 Jul 2015 00:57:16 +0300
Subject: [PATCH 124/390] More novice friendly config for gii/debug

---
 config/web.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/config/web.php b/config/web.php
index 1632a5aab..fd03861d7 100644
--- a/config/web.php
+++ b/config/web.php
@@ -45,10 +45,14 @@
 if (YII_ENV_DEV) {
     // configuration adjustments for 'dev' environment
     $config['bootstrap'][] = 'debug';
-    $config['modules']['debug'] = 'yii\debug\Module';
+    $config['modules']['debug'] = [
+        'class' => 'yii\debug\Module',
+    ];
 
     $config['bootstrap'][] = 'gii';
-    $config['modules']['gii'] = 'yii\gii\Module';
+    $config['modules']['gii'] = [
+        'class' => 'yii\gii\Module',
+    ];
 }
 
 return $config;

From a418720887ea4220a8415bab443d22e51c168cad Mon Sep 17 00:00:00 2001
From: MaximAL <almaximal@ya.ru>
Date: Tue, 28 Jul 2015 18:45:49 +0300
Subject: [PATCH 125/390] Add `cookieValidationKey` setting to the `Install
 from an Archive File`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without this, basic application doesn’t work.
---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index e5a2d9f76..09426cb81 100644
--- a/README.md
+++ b/README.md
@@ -43,6 +43,15 @@ INSTALLATION
 Extract the archive file downloaded from [yiiframework.com](http://www.yiiframework.com/download/) to
 a directory named `basic` that is directly under the Web root.
 
+Set cookie validation key in `config/web.php` file to some random secret string:
+
+```php
+'request' => [
+    // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
+    'cookieValidationKey' => '<secret random string goes here>',
+],
+```
+
 You can then access the application through the following URL:
 
 ~~~

From 5598a50160cb133ea1c90b2bd807539275f3aab8 Mon Sep 17 00:00:00 2001
From: alcaneo <ncheutin@alcaneo.fr>
Date: Tue, 4 Aug 2015 10:18:35 +0200
Subject: [PATCH 126/390] Add step to setup config file path in c3.php

Hi,

I've been struggling in making remote code coverage work and I finally figured out that the config file path was wrong.
I haven't seen any documentation telling to update that path (weird).

Furthermore, it is kind of impossible to debug as it generates a corrupted tar file (because of the error generated by the wrong config file path probably) that ends up by having an non-related error message (like "unable to decompress gzipped phar archive").

There is another way to do it, by setting the env var HTTP_X_CODECEPTION_CODECOVERAGE_CONFIG but, even though I don't like changing manually c3.php, I still prefer that than using env var as it wouldn't be linked anymore with your project but with your environment (that can be shared with other projects) settings.
And I don't know if it would be possible that codeception set this var (as it actually knows the path) to make it available to c3.php, in fact I haven't seen anything setting this var up in codeception code.

Cheers,
Nico
---
 tests/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/README.md b/tests/README.md
index eb2f24b6a..266bcf929 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -90,6 +90,8 @@ from codeception site.
 
 3. include `c3.php` file in your `index-test.php` file before application run, so it can catch needed requests.
 
+4. edit `c3.php` to update config file path (~ line 55) with `$config_file = realpath(__DIR__ . '../tests/codeception.yml');`
+
 Configuration options that are used by remote code coverage:
 
 - c3_url: url pointing to entry script that includes `c3.php` file, so `Codeception` will be able to produce code coverage;

From e01b9d1cbdff51c1edc69bbbd564d083cc37f91d Mon Sep 17 00:00:00 2001
From: alcaneo <ncheutin@alcaneo.fr>
Date: Tue, 4 Aug 2015 10:49:22 +0200
Subject: [PATCH 127/390] Missing directory separator in config file path

Ugly typo, my bad sorry
---
 tests/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/README.md b/tests/README.md
index 266bcf929..2e1b1aedb 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -90,7 +90,7 @@ from codeception site.
 
 3. include `c3.php` file in your `index-test.php` file before application run, so it can catch needed requests.
 
-4. edit `c3.php` to update config file path (~ line 55) with `$config_file = realpath(__DIR__ . '../tests/codeception.yml');`
+4. edit `c3.php` to update config file path (~ line 55) with `$config_file = realpath(__DIR__ . '/../tests/codeception.yml');`
 
 Configuration options that are used by remote code coverage:
 

From bea667efdcbc4a861f888394cba48b79ad5e51f2 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 6 Aug 2015 00:21:54 +0200
Subject: [PATCH 128/390] updated tests readme

close #4
---
 tests/README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/README.md b/tests/README.md
index 2e1b1aedb..a34f68bb9 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -33,6 +33,9 @@ After creating the basic application, follow these steps to prepare for the test
    codeception/bin/yii migrate
    ```
 
+   The command needs to be run in the `tests` directory.
+   The database configuration can be found at `tests/codeception/config/config.php`.
+
 4. Build the test suites:
 
    ```

From 3159d797b754d99c5d8adf8a492ba7522b467ddd Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 6 Aug 2015 00:23:55 +0200
Subject: [PATCH 129/390] prepare for release 2.0.6

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

diff --git a/composer.json b/composer.json
index 4ad378784..1631da65c 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.5",

From 698c3b849ecca98f43ab30db8f0d1970f21f81af Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 6 Aug 2015 00:25:54 +0200
Subject: [PATCH 130/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 1631da65c..4ad378784 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.5",

From 4cedb4db03e1cbdef80f66a64d2b3df1788ad265 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 8 Sep 2015 01:33:03 +0300
Subject: [PATCH 131/390] Added commented urlManager configuration example to
 config file

---
 config/web.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/config/web.php b/config/web.php
index fd03861d7..90a82876b 100644
--- a/config/web.php
+++ b/config/web.php
@@ -38,6 +38,14 @@
             ],
         ],
         'db' => require(__DIR__ . '/db.php'),
+        /*
+        'urlManager' => [
+            'enablePrettyUrl' => true,
+            'showScriptName' => false,
+            'rules' => [
+            ],
+        ],
+        */
     ],
     'params' => $params,
 ];

From f60f7647c57d7ec535812c77fe34cc7b9020c403 Mon Sep 17 00:00:00 2001
From: Daniel Gomez Pan <pana_1990@hotmail.com>
Date: Tue, 8 Sep 2015 23:18:39 +0200
Subject: [PATCH 132/390] remove gii module in production

---
 config/console.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/config/console.php b/config/console.php
index 31ed9c720..e5315b913 100644
--- a/config/console.php
+++ b/config/console.php
@@ -5,14 +5,11 @@
 $params = require(__DIR__ . '/params.php');
 $db = require(__DIR__ . '/db.php');
 
-return [
+$config = [
     'id' => 'basic-console',
     'basePath' => dirname(__DIR__),
-    'bootstrap' => ['log', 'gii'],
+    'bootstrap' => ['log'],
     'controllerNamespace' => 'app\commands',
-    'modules' => [
-        'gii' => 'yii\gii\Module',
-    ],
     'components' => [
         'cache' => [
             'class' => 'yii\caching\FileCache',
@@ -29,3 +26,11 @@
     ],
     'params' => $params,
 ];
+
+if (YII_ENV_DEV) {
+    // configuration adjustments for 'dev' environment
+    $config['bootstrap'][] = 'gii';
+    $config['modules']['gii'] = [
+        'class' => 'yii\gii\Module',
+    ];
+}

From 23a48e8d2300b92d49010ca0662a803fc3e98ad2 Mon Sep 17 00:00:00 2001
From: Anatoly Garkusha <anatoly.garkusha@starcode.ru>
Date: Fri, 11 Sep 2015 16:16:28 +0300
Subject: [PATCH 133/390] Modify config/console.php add return $config

---
 config/console.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/console.php b/config/console.php
index e5315b913..7c810de99 100644
--- a/config/console.php
+++ b/config/console.php
@@ -34,3 +34,5 @@
         'class' => 'yii\gii\Module',
     ];
 }
+
+return $config;

From 1dd087dbf10fb7b1b67a5932a395039fee4c17ed Mon Sep 17 00:00:00 2001
From: andreybolonin <andreybolonin1989@gmail.com>
Date: Fri, 25 Sep 2015 14:54:10 +0300
Subject: [PATCH 134/390] OPcache checking less php 5.5

---
 requirements.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/requirements.php b/requirements.php
index ee6b2cb53..ee3184f72 100644
--- a/requirements.php
+++ b/requirements.php
@@ -85,12 +85,6 @@
         'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-caching-memcache.html">MemCache</a>',
         'memo' => extension_loaded('memcached') ? 'To use memcached set <a href="http://www.yiiframework.com/doc-2.0/yii-caching-memcache.html#$useMemcached-detail">MemCache::useMemcached</a> to <code>true</code>.' : ''
     ),
-    array(
-        'name' => 'APC extension',
-        'mandatory' => false,
-        'condition' => extension_loaded('apc'),
-        'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-caching-apccache.html">ApcCache</a>',
-    ),
     // CAPTCHA:
     array(
         'name' => 'GD PHP extension with FreeType support',
@@ -124,9 +118,20 @@
     'phpSmtp' => array(
         'name' => 'PHP mail SMTP',
         'mandatory' => false,
-        'condition' => strlen(ini_get('SMTP'))>0,
+        'condition' => strlen(ini_get('SMTP')) > 0,
         'by' => 'Email sending',
         'memo' => 'PHP mail SMTP server required',
     ),
 );
+
+// OPcache check
+if (!version_compare(phpversion(), '5.5', '>=')) {
+    $requirements[] = array(
+        'name' => 'APC extension',
+        'mandatory' => false,
+        'condition' => extension_loaded('apc'),
+        'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-caching-apccache.html">ApcCache</a>',
+    );
+}
+
 $requirementsChecker->checkYii()->check($requirements)->render();

From f68cd5d1f5b2931c4e372ef77f46af891bde8b01 Mon Sep 17 00:00:00 2001
From: Daniel Gomez Pan <pana_1990@hotmail.com>
Date: Sun, 27 Sep 2015 22:24:43 +0200
Subject: [PATCH 135/390] update composer-asset-plugin

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 09426cb81..9a1a4b317 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this project template using the following command:
 
 ~~~
-php composer.phar global require "fxp/composer-asset-plugin:~1.0.0"
+php composer.phar global require "fxp/composer-asset-plugin:~1.0.3"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 

From 0bfc5f9af50c0ed081318e3fb4cde8f79a6f02e9 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 21 Oct 2015 01:05:51 +0300
Subject: [PATCH 136/390] Allow logout when JavaScript is disabled

---
 views/layouts/main.php | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/views/layouts/main.php b/views/layouts/main.php
index d5b1b49ee..b0f613de1 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -39,13 +39,18 @@
             ['label' => 'Home', 'url' => ['/site/index']],
             ['label' => 'About', 'url' => ['/site/about']],
             ['label' => 'Contact', 'url' => ['/site/contact']],
-            Yii::$app->user->isGuest ?
-                ['label' => 'Login', 'url' => ['/site/login']] :
-                [
-                    'label' => 'Logout (' . Yii::$app->user->identity->username . ')',
-                    'url' => ['/site/logout'],
-                    'linkOptions' => ['data-method' => 'post']
-                ],
+            Yii::$app->user->isGuest ? (
+                ['label' => 'Login', 'url' => ['/site/login']]
+            ) : (
+                '<li>'
+                . Html::beginForm(['/site/logout'], 'post')
+                . Html::submitButton(
+                    'Logout (' . Yii::$app->user->identity->username . ')',
+                    ['class' => 'btn btn-link']
+                )
+                . Html::endForm()
+                . '</li>'
+            )
         ],
     ]);
     NavBar::end();

From 4e8ed67326ceb00b78e2f1e8c92ec0140dcbf27e Mon Sep 17 00:00:00 2001
From: Yasser Hassan <yhassan@yahoo.com>
Date: Wed, 21 Oct 2015 03:07:07 +0200
Subject: [PATCH 137/390] Modified default @tests value and updated READMEs.

---
 README.md          |  7 ++++---
 config/console.php |  9 ++++++++-
 tests/README.md    | 11 +++++++++++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9a1a4b317..d658d52fd 100644
--- a/README.md
+++ b/README.md
@@ -96,6 +96,7 @@ return [
 ];
 ```
 
-**NOTE:** Yii won't create the database for you, this has to be done manually before you can access it.
-
-Also check and edit the other files in the `config/` directory to customize your application.
+**NOTES:**
+- Yii won't create the database for you, this has to be done manually before you can access it.
+- Check and edit the other files in the `config/` directory to customize your application as required.
+- Refer to the README in the `tests` direcotry for information specific to basic application tests.
diff --git a/config/console.php b/config/console.php
index 7c810de99..7306e2764 100644
--- a/config/console.php
+++ b/config/console.php
@@ -1,6 +1,6 @@
 <?php
 
-Yii::setAlias('@tests', dirname(__DIR__) . '/tests');
+Yii::setAlias('@tests', dirname(__DIR__) . '/tests/codeception');
 
 $params = require(__DIR__ . '/params.php');
 $db = require(__DIR__ . '/db.php');
@@ -25,6 +25,13 @@
         'db' => $db,
     ],
     'params' => $params,
+    /*
+    'controllerMap' => [
+        'fixture' => [ // Fixture generation command line.
+            'class' => 'yii\faker\FixtureController',
+        ],
+    ],
+    */
 ];
 
 if (YII_ENV_DEV) {
diff --git a/tests/README.md b/tests/README.md
index a34f68bb9..15cb0b8f6 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -62,6 +62,17 @@ webserver. In the `web` directory execute the following:
    codecept run unit
    ```
 
+Fixtures Default Configuration
+------------------------------
+The `fixture` commands refer to the following `ActiveFixture` configuration by default:
+
+- Fixtures path: `@tests/unit/fixtures`
+- Fixtures data path: `@tests/unit/fixtures/data`
+- Template files path: `@tests/unit/templates/fixtures`
+- Namespace: `tests\unit\fixtures`
+
+Where `@tests` refers to `@app/tests/codeception`.
+
 Code coverage support
 ---------------------
 

From b4f23d82f553737a0afe9de3e8b1b10751448527 Mon Sep 17 00:00:00 2001
From: Jason McCallister <themccallister@gmail.com>
Date: Wed, 21 Oct 2015 18:06:24 -0700
Subject: [PATCH 138/390] Update the command for Faker

Updates the syntax for the command to composer require yii2-faker.
---
 tests/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/README.md b/tests/README.md
index 15cb0b8f6..fd80fe55c 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -24,7 +24,7 @@ After creating the basic application, follow these steps to prepare for the test
 2. Install faker extension by running the following from template root directory where `composer.json` is:
 
    ```
-   composer require --dev yiisoft/yii2-faker:*
+   composer require --dev "yiisoft/yii2-faker:*"
    ```
 
 3. Create `yii2_basic_tests` database and update it by applying migrations (you may skip this step if you do not have created any migrations yet):

From edd5c574c8e4a6b70e152f036af3dadae6b53a19 Mon Sep 17 00:00:00 2001
From: Jani Mikkonen <jani.mikkonen@whitesheep.fi>
Date: Thu, 12 Nov 2015 14:06:30 +0200
Subject: [PATCH 139/390] Update travis composer-asset-plugin

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 72d788d58..cb7617b3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ cache:
 
 install:
   - travis_retry composer self-update && composer --version
-  - travis_retry composer global require "fxp/composer-asset-plugin:~1.0.0"
+  - travis_retry composer global require "fxp/composer-asset-plugin:~1.1.0"
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - travis_retry composer install --dev --prefer-dist --no-interaction
 # codeception

From 1c7ac9d07a807b7304f6202977c77cab188a52f6 Mon Sep 17 00:00:00 2001
From: Jani Mikkonen <jani.mikkonen@whitesheep.fi>
Date: Thu, 12 Nov 2015 14:08:02 +0200
Subject: [PATCH 140/390] Update docs composer-asset-plugin [skip ci]

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d658d52fd..2a413917b 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this project template using the following command:
 
 ~~~
-php composer.phar global require "fxp/composer-asset-plugin:~1.0.3"
+php composer.phar global require "fxp/composer-asset-plugin:~1.1.0"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 

From fd77e14939bcf4de36df6d1afccb049f9caa0af1 Mon Sep 17 00:00:00 2001
From: niks999 <niks999@gmail.com>
Date: Sun, 29 Nov 2015 12:33:37 +0530
Subject: [PATCH 141/390] Fix typo in README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2a413917b..f8ce641ed 100644
--- a/README.md
+++ b/README.md
@@ -99,4 +99,4 @@ return [
 **NOTES:**
 - Yii won't create the database for you, this has to be done manually before you can access it.
 - Check and edit the other files in the `config/` directory to customize your application as required.
-- Refer to the README in the `tests` direcotry for information specific to basic application tests.
+- Refer to the README in the `tests` directory for information specific to basic application tests.

From 7cf2418d88aeb77a7facdd0766eafadb0deecd8f Mon Sep 17 00:00:00 2001
From: MaximAL <almaximal@ya.ru>
Date: Tue, 1 Dec 2015 19:58:38 +0300
Subject: [PATCH 142/390] Autofocus on username field

Useful UX improvement
---
 views/site/login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/site/login.php b/views/site/login.php
index 059ef8048..559be64f9 100644
--- a/views/site/login.php
+++ b/views/site/login.php
@@ -24,7 +24,7 @@
         ],
     ]); ?>
 
-        <?= $form->field($model, 'username') ?>
+        <?= $form->field($model, 'username')->textInput(['autofocus' => 'autofocus']) ?>
 
         <?= $form->field($model, 'password')->passwordInput() ?>
 

From 4b2e0713e3ba282f9c992e157953147ba7d821c2 Mon Sep 17 00:00:00 2001
From: MaximAL <almaximal@ya.ru>
Date: Tue, 1 Dec 2015 20:11:46 +0300
Subject: [PATCH 143/390] HTML5 shorthand for attribute value

---
 views/site/login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/site/login.php b/views/site/login.php
index 559be64f9..498f46fce 100644
--- a/views/site/login.php
+++ b/views/site/login.php
@@ -24,7 +24,7 @@
         ],
     ]); ?>
 
-        <?= $form->field($model, 'username')->textInput(['autofocus' => 'autofocus']) ?>
+        <?= $form->field($model, 'username')->textInput(['autofocus' => true]) ?>
 
         <?= $form->field($model, 'password')->passwordInput() ?>
 

From 3527b6712c6b2a93c6f12f0673ec14cd14f3b7ed Mon Sep 17 00:00:00 2001
From: MaximAL <almaximal@ya.ru>
Date: Tue, 1 Dec 2015 20:16:24 +0300
Subject: [PATCH 144/390] Update contact.php

---
 views/site/contact.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/site/contact.php b/views/site/contact.php
index 22a75bbcc..b98840918 100644
--- a/views/site/contact.php
+++ b/views/site/contact.php
@@ -43,7 +43,7 @@
 
                 <?php $form = ActiveForm::begin(['id' => 'contact-form']); ?>
 
-                    <?= $form->field($model, 'name') ?>
+                    <?= $form->field($model, 'name')->textInput(['autofocus' => true]) ?>
 
                     <?= $form->field($model, 'email') ?>
 

From ce4ad9c851a89cc9fcee9375d4429419d4f206ce Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 2 Dec 2015 01:12:00 +0100
Subject: [PATCH 145/390] Added missing environment definition in console

fixes https://github.com/yiisoft/yii2/issues/10300
---
 yii | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yii b/yii
index 43aa26056..fc7090f77 100755
--- a/yii
+++ b/yii
@@ -9,6 +9,7 @@
  */
 
 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');

From ad3e23a27a36acff551e4f100fb8f8efbe2f08f2 Mon Sep 17 00:00:00 2001
From: Daniel Gomez Pan <pana_1990@hotmail.com>
Date: Sat, 16 Jan 2016 17:53:38 +0200
Subject: [PATCH 146/390] Updated travis.yml to run on PHP7

---
 .travis.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cb7617b3c..7ff498f3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,16 +5,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
-#  - hhvm
-#  - hhvm-nightly
-
-# run build against hhvm but allow them to fail
-# http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail
-matrix:
-  fast_finish: true
-  allow_failures:
-#    - php: hhvm-nightly
-    - php: 7.0
+  - hhvm
 
 # faster builds on new travis setup not using sudo
 sudo: false

From 7f7fcb61204f56da71809190137da270578ab0bc Mon Sep 17 00:00:00 2001
From: SilverFire - Dmitry Naumenko <d.naumenko.a@gmail.com>
Date: Sat, 16 Jan 2016 19:08:23 +0200
Subject: [PATCH 147/390] Updated travis.yml commented HHVM

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7ff498f3c..0d2db1c64 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
+#  - hhvm
 
 # faster builds on new travis setup not using sudo
 sudo: false

From 5eaf2dc07904a0a1ccf23faadf31729345fca919 Mon Sep 17 00:00:00 2001
From: SilverFire - Dmitry Naumenko <d.naumenko.a@gmail.com>
Date: Sat, 16 Jan 2016 19:11:06 +0200
Subject: [PATCH 148/390] Updated travis.yml fxp-plugin updated to 1.1.1

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0d2db1c64..24b5d54ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ cache:
 
 install:
   - travis_retry composer self-update && composer --version
-  - travis_retry composer global require "fxp/composer-asset-plugin:~1.1.0"
+  - travis_retry composer global require "fxp/composer-asset-plugin:~1.1.1"
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - travis_retry composer install --dev --prefer-dist --no-interaction
 # codeception

From aa6c28ed1352fd9736cbe11aafc7ff045479bba3 Mon Sep 17 00:00:00 2001
From: Daniel Gomez Pan <pana_1990@hotmail.com>
Date: Sun, 17 Jan 2016 19:24:05 +0100
Subject: [PATCH 149/390] Update composer-asset-plugin

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f8ce641ed..598f9637b 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this project template using the following command:
 
 ~~~
-php composer.phar global require "fxp/composer-asset-plugin:~1.1.0"
+php composer.phar global require "fxp/composer-asset-plugin:~1.1.1"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 

From df2a935b329df2596f325736e321a5cd518c1935 Mon Sep 17 00:00:00 2001
From: Edo Freriks <edofre@gmail.com>
Date: Mon, 1 Feb 2016 00:39:43 +0100
Subject: [PATCH 150/390] #47, Typo fix address tests

---
 tests/codeception/acceptance/ContactCept.php | 2 +-
 tests/codeception/functional/ContactCept.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/codeception/acceptance/ContactCept.php b/tests/codeception/acceptance/ContactCept.php
index b51d1c085..f848443da 100644
--- a/tests/codeception/acceptance/ContactCept.php
+++ b/tests/codeception/acceptance/ContactCept.php
@@ -35,7 +35,7 @@
 if (method_exists($I, 'wait')) {
     $I->wait(3); // only for selenium
 }
-$I->expectTo('see that email adress is wrong');
+$I->expectTo('see that email address is wrong');
 $I->dontSee('Name cannot be blank', '.help-inline');
 $I->see('Email is not a valid email address.');
 $I->dontSee('Subject cannot be blank', '.help-inline');
diff --git a/tests/codeception/functional/ContactCept.php b/tests/codeception/functional/ContactCept.php
index 074820a70..b17a7576d 100644
--- a/tests/codeception/functional/ContactCept.php
+++ b/tests/codeception/functional/ContactCept.php
@@ -29,7 +29,7 @@
     'body'			=>	'test content',
     'verifyCode'	=>	'testme',
 ]);
-$I->expectTo('see that email adress is wrong');
+$I->expectTo('see that email address is wrong');
 $I->dontSee('Name cannot be blank', '.help-inline');
 $I->see('Email is not a valid email address.');
 $I->dontSee('Subject cannot be blank', '.help-inline');

From 940451bc8f264217977dca5ee097035c9426c743 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sun, 14 Feb 2016 15:56:01 +0100
Subject: [PATCH 151/390] prepare for 2.0.7 release

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

diff --git a/composer.json b/composer.json
index 4ad378784..1631da65c 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.5",

From acb438affb993f51d9712852635c8135239e9e8a Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Sun, 14 Feb 2016 15:56:44 +0100
Subject: [PATCH 152/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 1631da65c..4ad378784 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.5",

From f002567220b9ce9670f4d7fd71701df17c87a86b Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 9 Mar 2016 18:47:19 +0300
Subject: [PATCH 153/390] Removed unnecessary slash

---
 controllers/SiteController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/SiteController.php b/controllers/SiteController.php
index 4ffba24cb..df1a0d376 100644
--- a/controllers/SiteController.php
+++ b/controllers/SiteController.php
@@ -54,7 +54,7 @@ public function actionIndex()
 
     public function actionLogin()
     {
-        if (!\Yii::$app->user->isGuest) {
+        if (!Yii::$app->user->isGuest) {
             return $this->goHome();
         }
 

From 27fbea32d82a57f98d56ad1e2f60295e5fdda5a0 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Mon, 21 Mar 2016 22:10:44 +0300
Subject: [PATCH 154/390] Added issue templates

---
 .gitattributes                   |  1 +
 .github/CONTRIBUTING.md          |  7 +++++++
 .github/ISSUE_TEMPLATE.md        | 14 ++++++++++++++
 .github/PULL_REQUEST_TEMPLATE.md |  7 +++++++
 4 files changed, 29 insertions(+)
 create mode 100644 .github/CONTRIBUTING.md
 create mode 100644 .github/ISSUE_TEMPLATE.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.gitattributes b/.gitattributes
index 6b9d3d398..3e9092c68 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,5 @@
 # Ignore all test and documentation for archive
+/.github            export-ignore
 /.gitattributes     export-ignore
 /.scrutinizer.yml   export-ignore
 /.travis.yml        export-ignore
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
new file mode 100644
index 000000000..b0924689b
--- /dev/null
+++ b/.github/CONTRIBUTING.md
@@ -0,0 +1,7 @@
+Contributing to Yii2
+====================
+
+- [Report an issue](docs/internals/report-an-issue.md)
+- [Translate documentation or messages](docs/internals/translation-workflow.md)
+- [Give us feedback or start a design discussion](http://www.yiiframework.com/forum/index.php/forum/42-general-discussions-for-yii-20/)
+- [Contribute to the core code or fix bugs](docs/internals/git-workflow.md)
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..52ec8692f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,14 @@
+### What steps will reproduce the problem?
+
+### What's expected?
+
+### What do you get instead?
+
+
+### Additional info
+
+| Q                | A
+| ---------------- | ---
+| Yii vesion       |
+| PHP version      |
+| Operating system |
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..968a845de
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,7 @@
+| Q             | A
+| ------------- | ---
+| Is bugfix?    | yes/no
+| New feature?  | yes/no
+| Breaks BC?    | yes/no
+| Tests pass?   | yes/no
+| Fixed issues  | comma-separated list of tickets # fixed by the PR, if any

From c97c8c605d7a8b6f8ed1646093f131ca80bd1444 Mon Sep 17 00:00:00 2001
From: Bulat Damdinov <dbulats88@gmail.com>
Date: Wed, 23 Mar 2016 19:55:38 +0800
Subject: [PATCH 155/390] #51 logout btn

---
 views/layouts/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/layouts/main.php b/views/layouts/main.php
index b0f613de1..2974d6d89 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -43,7 +43,7 @@
                 ['label' => 'Login', 'url' => ['/site/login']]
             ) : (
                 '<li>'
-                . Html::beginForm(['/site/logout'], 'post')
+                . Html::beginForm(['/site/logout'], 'post', ['class' => 'navbar-form'])
                 . Html::submitButton(
                     'Logout (' . Yii::$app->user->identity->username . ')',
                     ['class' => 'btn btn-link']

From af67434e7e57b6133219bd1ebfdbaee67c73e0d9 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 14 Apr 2016 11:45:41 +0300
Subject: [PATCH 156/390] Fixed links in CONTRIBUTING.md

---
 .github/CONTRIBUTING.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b0924689b..3d8d32c25 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 Contributing to Yii2
 ====================
 
-- [Report an issue](docs/internals/report-an-issue.md)
-- [Translate documentation or messages](docs/internals/translation-workflow.md)
+- [Report an issue](https://github.com/yiisoft/yii2/blob/master/docs/internals/report-an-issue.md)
+- [Translate documentation or messages](https://github.com/yiisoft/yii2/blob/master/docs/internals/translation-workflow.md)
 - [Give us feedback or start a design discussion](http://www.yiiframework.com/forum/index.php/forum/42-general-discussions-for-yii-20/)
-- [Contribute to the core code or fix bugs](docs/internals/git-workflow.md)
+- [Contribute to the core code or fix bugs](https://github.com/yiisoft/yii2/blob/master/docs/internals/git-workflow.md)

From 6962834f3715a5a9a27556ca53f8527ff1737828 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 28 Apr 2016 18:06:20 +0200
Subject: [PATCH 157/390] release version 2.0.8

---
 composer.json          | 2 +-
 models/ContactForm.php | 3 ++-
 models/LoginForm.php   | 3 +++
 models/User.php        | 5 +++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 4ad378784..1631da65c 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.5",
diff --git a/models/ContactForm.php b/models/ContactForm.php
index 361b80b39..37f48b312 100644
--- a/models/ContactForm.php
+++ b/models/ContactForm.php
@@ -16,6 +16,7 @@ class ContactForm extends Model
     public $body;
     public $verifyCode;
 
+
     /**
      * @return array the validation rules.
      */
@@ -43,7 +44,7 @@ public function attributeLabels()
 
     /**
      * Sends an email to the specified email address using the information collected by this model.
-     * @param  string  $email the target email address
+     * @param string $email the target email address
      * @return boolean whether the model passes validation
      */
     public function contact($email)
diff --git a/models/LoginForm.php b/models/LoginForm.php
index 227168cf6..7ef5c99b3 100644
--- a/models/LoginForm.php
+++ b/models/LoginForm.php
@@ -7,6 +7,9 @@
 
 /**
  * LoginForm is the model behind the login form.
+ *
+ * @property User|null $user This property is read-only.
+ *
  */
 class LoginForm extends Model
 {
diff --git a/models/User.php b/models/User.php
index cbfb9fefc..163a64fcd 100644
--- a/models/User.php
+++ b/models/User.php
@@ -27,6 +27,7 @@ class User extends \yii\base\Object implements \yii\web\IdentityInterface
         ],
     ];
 
+
     /**
      * @inheritdoc
      */
@@ -52,7 +53,7 @@ public static function findIdentityByAccessToken($token, $type = null)
     /**
      * Finds user by username
      *
-     * @param  string      $username
+     * @param string $username
      * @return static|null
      */
     public static function findByUsername($username)
@@ -93,7 +94,7 @@ public function validateAuthKey($authKey)
     /**
      * Validates password
      *
-     * @param  string  $password password to validate
+     * @param string $password password to validate
      * @return boolean if password provided is valid for current user
      */
     public function validatePassword($password)

From 655b5c3502972ebdb701558b0906cf8d524e92c0 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 28 Apr 2016 18:06:57 +0200
Subject: [PATCH 158/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 1631da65c..4ad378784 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.5",

From dd0c43247f2a7f45a276be220c98ea8fd81f0d2f Mon Sep 17 00:00:00 2001
From: Bulat Damdinov <dbulats88@gmail.com>
Date: Tue, 24 May 2016 18:14:58 +0800
Subject: [PATCH 159/390] fixed link for AcceptanceTest Selenuim Webdriver

---
 tests/codeception/acceptance.suite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/codeception/acceptance.suite.yml b/tests/codeception/acceptance.suite.yml
index 1781b0077..d36d7360b 100644
--- a/tests/codeception/acceptance.suite.yml
+++ b/tests/codeception/acceptance.suite.yml
@@ -13,7 +13,7 @@ modules:
     enabled:
         - PhpBrowser
 # you can use WebDriver instead of PhpBrowser to test javascript and ajax.
-# This will require you to install selenium. See http://codeception.com/docs/04-AcceptanceTests#Selenium
+# This will require you to install selenium. See http://codeception.com/docs/03-AcceptanceTests#selenium-webdriver
 # "restart" option is used by the WebDriver to start each time per test-file new session and cookies,
 # it is useful if you want to login in your app in each test.
 #        - WebDriver

From ddeab345bb178025fcb3931b0be4f3c84b0b74ab Mon Sep 17 00:00:00 2001
From: Kalinin Alexandr <aik84from@gmail.com>
Date: Sun, 19 Jun 2016 16:56:22 +0300
Subject: [PATCH 160/390] Update SiteController.php (#61) [skip ci]

---
 controllers/SiteController.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/controllers/SiteController.php b/controllers/SiteController.php
index df1a0d376..36dc9591b 100644
--- a/controllers/SiteController.php
+++ b/controllers/SiteController.php
@@ -11,6 +11,9 @@
 
 class SiteController extends Controller
 {
+    /**
+     * @inheritdoc
+     */
     public function behaviors()
     {
         return [
@@ -34,6 +37,9 @@ public function behaviors()
         ];
     }
 
+    /**
+     * @inheritdoc
+     */
     public function actions()
     {
         return [
@@ -47,11 +53,21 @@ public function actions()
         ];
     }
 
+    /**
+     * Displays homepage.
+     *
+     * @return string
+     */
     public function actionIndex()
     {
         return $this->render('index');
     }
 
+    /**
+     * Login action.
+     *
+     * @return string
+     */
     public function actionLogin()
     {
         if (!Yii::$app->user->isGuest) {
@@ -67,6 +83,11 @@ public function actionLogin()
         ]);
     }
 
+    /**
+     * Logout action.
+     *
+     * @return string
+     */
     public function actionLogout()
     {
         Yii::$app->user->logout();
@@ -74,6 +95,11 @@ public function actionLogout()
         return $this->goHome();
     }
 
+    /**
+     * Displays contact page.
+     *
+     * @return string
+     */
     public function actionContact()
     {
         $model = new ContactForm();
@@ -87,6 +113,11 @@ public function actionContact()
         ]);
     }
 
+    /**
+     * Displays about page.
+     *
+     * @return string
+     */
     public function actionAbout()
     {
         return $this->render('about');

From c200693b05704bbe50ffe88513b62715ea737f1c Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 2 Jul 2016 19:51:35 +0300
Subject: [PATCH 161/390] Fixes #62: Changed usage of deprecated getMock() to
 current createMock()

---
 tests/codeception/unit/models/ContactFormTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/codeception/unit/models/ContactFormTest.php b/tests/codeception/unit/models/ContactFormTest.php
index 323482943..9bc36d174 100644
--- a/tests/codeception/unit/models/ContactFormTest.php
+++ b/tests/codeception/unit/models/ContactFormTest.php
@@ -26,7 +26,7 @@ protected function tearDown()
 
     public function testContact()
     {
-        $model = $this->getMock('app\models\ContactForm', ['validate']);
+        $model = $this->createMock('app\models\ContactForm', ['validate']);
         $model->expects($this->once())->method('validate')->will($this->returnValue(true));
 
         $model->attributes = [

From e6cdaa5a1abc25f619d53a7745de33e645b48359 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 2 Jul 2016 20:13:40 +0300
Subject: [PATCH 162/390] Fixed test to mock form properly

---
 tests/codeception/unit/models/ContactFormTest.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/codeception/unit/models/ContactFormTest.php b/tests/codeception/unit/models/ContactFormTest.php
index 9bc36d174..7dc4fe433 100644
--- a/tests/codeception/unit/models/ContactFormTest.php
+++ b/tests/codeception/unit/models/ContactFormTest.php
@@ -2,6 +2,7 @@
 
 namespace tests\codeception\unit\models;
 
+use app\models\ContactForm;
 use Yii;
 use yii\codeception\TestCase;
 use Codeception\Specify;
@@ -26,7 +27,10 @@ protected function tearDown()
 
     public function testContact()
     {
-        $model = $this->createMock('app\models\ContactForm', ['validate']);
+        /** @var ContactForm $model */
+        $model = $this->getMockBuilder('app\models\ContactForm')
+            ->setMethods(['validate'])
+            ->getMock();
         $model->expects($this->once())->method('validate')->will($this->returnValue(true));
 
         $model->attributes = [
@@ -36,9 +40,8 @@ public function testContact()
             'body' => 'body of current message',
         ];
 
-        $model->contact('admin@example.com');
-
-        $this->specify('email should be send', function () {
+        $this->specify('email should be send', function () use ($model) {
+            expect('ContactForm::contact() should return true', $model->contact('admin@example.com'))->true();
             expect('email file should exist', file_exists($this->getMessageFile()))->true();
         });
 

From d579eb6434e070c1ca8820b61371db4d2d1e64f4 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 2 Jul 2016 20:22:42 +0300
Subject: [PATCH 163/390] Changed php -S to ./yii serve in tests readme

---
 tests/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/README.md b/tests/README.md
index fd80fe55c..4b2519665 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -42,11 +42,11 @@ After creating the basic application, follow these steps to prepare for the test
    codecept build
    ```
 
-5. In order to be able to run acceptance tests you need to start a webserver. The simplest way is to use PHP built in
-webserver. In the `web` directory execute the following:
+5. In order to be able to run acceptance tests you need to start a webserver. The simplest way is to use built-in Yii
+command:
 
    ```
-   php -S localhost:8080
+   ./yii serve
    ```
 
 6. Now you can run the tests with the following commands:

From e0954011ce9ae0227c12e174a58e15ff3503c90d Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 5 Jul 2016 01:17:16 +0300
Subject: [PATCH 164/390] Added "cd tests" as suggested in
 https://github.com/yiisoft/yii2-app-basic/issues/63#issuecomment-230354273

---
 tests/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/README.md b/tests/README.md
index 4b2519665..35142d612 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -30,6 +30,7 @@ After creating the basic application, follow these steps to prepare for the test
 3. Create `yii2_basic_tests` database and update it by applying migrations (you may skip this step if you do not have created any migrations yet):
 
    ```
+   cd tests
    codeception/bin/yii migrate
    ```
 

From 6545745e88677afb4637bad127c4926120882e99 Mon Sep 17 00:00:00 2001
From: Mohamed Cherif Bouchelaghem <cherifbouchelaghem@yahoo.fr>
Date: Mon, 11 Jul 2016 13:43:55 +0100
Subject: [PATCH 165/390] configure Codeception::Scpecify to not deep clone
 properties by default (#57)

---
 tests/codeception/_bootstrap.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/codeception/_bootstrap.php b/tests/codeception/_bootstrap.php
index 755029ef3..f24347fe5 100644
--- a/tests/codeception/_bootstrap.php
+++ b/tests/codeception/_bootstrap.php
@@ -14,3 +14,10 @@
 $_SERVER['SERVER_PORT'] =  parse_url(http://github.com/Codeception/Configuration::config()['config']['test_entry_url'], PHP_URL_PORT) ?: '80';
 
 Yii::setAlias('@tests', dirname(__DIR__));
+
+/**
+ * this configure codeception specify to not deep clone objects properties
+ * it can be configure localy in your tests
+ * @see https://github.com/Codeception/Specify/tree/master/docs
+ */
+\Codeception\Specify\Config::setDeepClone(false);

From 5319c23281f4543da41f7f5ed72837f597fe9ab4 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Mon, 11 Jul 2016 15:43:39 +0200
Subject: [PATCH 166/390] release version 2.0.9

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

diff --git a/composer.json b/composer.json
index 4ad378784..1631da65c 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.5",

From 548af0eacdd8d000bde121b122d0f36e2c218605 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Mon, 11 Jul 2016 15:43:58 +0200
Subject: [PATCH 167/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 1631da65c..4ad378784 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.5",

From 71ee8a08a0fbe6856d50075d92a35b10be39ab77 Mon Sep 17 00:00:00 2001
From: Davert <davert.php@resend.cc>
Date: Thu, 14 Jul 2016 17:20:08 +0300
Subject: [PATCH 168/390] dependencies should be stable

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

diff --git a/composer.json b/composer.json
index 4ad378784..1631da65c 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.5",

From 75a273eb40535cc3e4ed27211e53ee243bccebaa Mon Sep 17 00:00:00 2001
From: Oleg Kostiushko <o.kostyshko@gmail.com>
Date: Thu, 14 Jul 2016 19:19:59 +0300
Subject: [PATCH 169/390] Acceptance test refactoring - Contact form (#2)

* directory _support should exists before build with ignore inside

* added test for contact page availability

* added test for empty contact form submit

* added test for submit contact form

* remove test contact page

* delete old contact page test

* test index-test instead index

* change stage description
---
 tests/codeception/_pages/ContactPage.php     | 26 ---------
 tests/codeception/_support/.gitignore        |  2 +
 tests/codeception/acceptance/ContactCept.php | 57 --------------------
 tests/codeception/acceptance/ContactCest.php | 33 ++++++++++++
 4 files changed, 35 insertions(+), 83 deletions(-)
 delete mode 100644 tests/codeception/_pages/ContactPage.php
 create mode 100644 tests/codeception/_support/.gitignore
 delete mode 100644 tests/codeception/acceptance/ContactCept.php
 create mode 100644 tests/codeception/acceptance/ContactCest.php

diff --git a/tests/codeception/_pages/ContactPage.php b/tests/codeception/_pages/ContactPage.php
deleted file mode 100644
index 5701e2cb4..000000000
--- a/tests/codeception/_pages/ContactPage.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace tests\codeception\_pages;
-
-use yii\codeception\BasePage;
-
-/**
- * Represents contact page
- * @property \AcceptanceTester|\FunctionalTester $actor
- */
-class ContactPage extends BasePage
-{
-    public $route = 'site/contact';
-
-    /**
-     * @param array $contactData
-     */
-    public function submit(array $contactData)
-    {
-        foreach ($contactData as $field => $value) {
-            $inputType = $field === 'body' ? 'textarea' : 'input';
-            $this->actor->fillField($inputType . '[name="ContactForm[' . $field . ']"]', $value);
-        }
-        $this->actor->click('contact-button');
-    }
-}
diff --git a/tests/codeception/_support/.gitignore b/tests/codeception/_support/.gitignore
new file mode 100644
index 000000000..c96a04f00
--- /dev/null
+++ b/tests/codeception/_support/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/tests/codeception/acceptance/ContactCept.php b/tests/codeception/acceptance/ContactCept.php
deleted file mode 100644
index f848443da..000000000
--- a/tests/codeception/acceptance/ContactCept.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-use tests\codeception\_pages\ContactPage;
-
-/* @var $scenario Codeception\Scenario */
-
-$I = new AcceptanceTester($scenario);
-$I->wantTo('ensure that contact works');
-
-$contactPage = ContactPage::openBy($I);
-
-$I->see('Contact', 'h1');
-
-$I->amGoingTo('submit contact form with no data');
-$contactPage->submit([]);
-if (method_exists($I, 'wait')) {
-    $I->wait(3); // only for selenium
-}
-$I->expectTo('see validations errors');
-$I->see('Contact', 'h1');
-$I->see('Name cannot be blank');
-$I->see('Email cannot be blank');
-$I->see('Subject cannot be blank');
-$I->see('Body cannot be blank');
-$I->see('The verification code is incorrect');
-
-$I->amGoingTo('submit contact form with not correct email');
-$contactPage->submit([
-    'name' => 'tester',
-    'email' => 'tester.email',
-    'subject' => 'test subject',
-    'body' => 'test content',
-    'verifyCode' => 'testme',
-]);
-if (method_exists($I, 'wait')) {
-    $I->wait(3); // only for selenium
-}
-$I->expectTo('see that email address is wrong');
-$I->dontSee('Name cannot be blank', '.help-inline');
-$I->see('Email is not a valid email address.');
-$I->dontSee('Subject cannot be blank', '.help-inline');
-$I->dontSee('Body cannot be blank', '.help-inline');
-$I->dontSee('The verification code is incorrect', '.help-inline');
-
-$I->amGoingTo('submit contact form with correct data');
-$contactPage->submit([
-    'name' => 'tester',
-    'email' => 'tester@example.com',
-    'subject' => 'test subject',
-    'body' => 'test content',
-    'verifyCode' => 'testme',
-]);
-if (method_exists($I, 'wait')) {
-    $I->wait(3); // only for selenium
-}
-$I->dontSeeElement('#contact-form');
-$I->see('Thank you for contacting us. We will respond to you as soon as possible.');
diff --git a/tests/codeception/acceptance/ContactCest.php b/tests/codeception/acceptance/ContactCest.php
new file mode 100644
index 000000000..0a317ce50
--- /dev/null
+++ b/tests/codeception/acceptance/ContactCest.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * Class ContactCest
+ */
+class ContactCest
+{
+    public function _before(\AcceptanceTester $I)
+    {
+        $I->amOnPage('index-test.php?r=site%2Fcontact');
+    }
+    
+    public function contactPageWorks(AcceptanceTester $I)
+    {
+        $I->wantTo('ensure that contact page works');
+        $I->see('Contact', 'h1');
+    }
+
+    public function contactFormCanBeSubmitted(AcceptanceTester $I)
+    {
+        $I->amGoingTo('submit contact form with correct data');
+        $I->fillField('#contactform-name', 'tester');
+        $I->fillField('#contactform-email', 'tester@example.com');
+        $I->fillField('#contactform-subject', 'test subject');
+        $I->fillField('#contactform-body', 'test content');
+        $I->fillField('#contactform-verifycode', 'testme');
+
+        $I->click('contact-button');
+
+        $I->dontSeeElement('#contact-form');
+        $I->see('Thank you for contacting us. We will respond to you as soon as possible.');
+    }
+}

From aaee0841e13f46614911e05e83670a60fe2bc1e7 Mon Sep 17 00:00:00 2001
From: Maxim Shcherbakov <maxhero90@gmail.com>
Date: Thu, 14 Jul 2016 19:20:28 +0300
Subject: [PATCH 170/390] Acceptance tests refactoring (#1)

---
 .../codeception/_support/AcceptanceTester.php | 26 +++++++++++++
 .../codeception/_support/FunctionalTester.php | 26 +++++++++++++
 tests/codeception/_support/UnitTester.php     | 26 +++++++++++++
 .../_support/_generated/.gitignore            |  2 +
 tests/codeception/acceptance.suite.yml        |  2 +
 tests/codeception/acceptance/AboutCept.php    | 10 -----
 tests/codeception/acceptance/AboutCest.php    | 11 ++++++
 tests/codeception/acceptance/HomeCept.php     | 11 ------
 tests/codeception/acceptance/HomeCest.php     | 16 ++++++++
 tests/codeception/acceptance/LoginCept.php    | 37 -------------------
 tests/codeception/acceptance/LoginCest.php    | 19 ++++++++++
 11 files changed, 128 insertions(+), 58 deletions(-)
 create mode 100644 tests/codeception/_support/AcceptanceTester.php
 create mode 100644 tests/codeception/_support/FunctionalTester.php
 create mode 100644 tests/codeception/_support/UnitTester.php
 create mode 100644 tests/codeception/_support/_generated/.gitignore
 delete mode 100644 tests/codeception/acceptance/AboutCept.php
 create mode 100644 tests/codeception/acceptance/AboutCest.php
 delete mode 100644 tests/codeception/acceptance/HomeCept.php
 create mode 100644 tests/codeception/acceptance/HomeCest.php
 delete mode 100644 tests/codeception/acceptance/LoginCept.php
 create mode 100644 tests/codeception/acceptance/LoginCest.php

diff --git a/tests/codeception/_support/AcceptanceTester.php b/tests/codeception/_support/AcceptanceTester.php
new file mode 100644
index 000000000..4c7dcbb6d
--- /dev/null
+++ b/tests/codeception/_support/AcceptanceTester.php
@@ -0,0 +1,26 @@
+<?php
+
+
+/**
+ * Inherited Methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void execute($callable)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($achieveValue)
+ * @method void comment($description)
+ * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ *
+ * @SuppressWarnings(PHPMD)
+*/
+class AcceptanceTester extends \Codeception\Actor
+{
+    use _generated\AcceptanceTesterActions;
+
+   /**
+    * Define custom actions here
+    */
+}
diff --git a/tests/codeception/_support/FunctionalTester.php b/tests/codeception/_support/FunctionalTester.php
new file mode 100644
index 000000000..7e888f8b2
--- /dev/null
+++ b/tests/codeception/_support/FunctionalTester.php
@@ -0,0 +1,26 @@
+<?php
+
+
+/**
+ * Inherited Methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void execute($callable)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($achieveValue)
+ * @method void comment($description)
+ * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ *
+ * @SuppressWarnings(PHPMD)
+*/
+class FunctionalTester extends \Codeception\Actor
+{
+    use _generated\FunctionalTesterActions;
+
+   /**
+    * Define custom actions here
+    */
+}
diff --git a/tests/codeception/_support/UnitTester.php b/tests/codeception/_support/UnitTester.php
new file mode 100644
index 000000000..28353572c
--- /dev/null
+++ b/tests/codeception/_support/UnitTester.php
@@ -0,0 +1,26 @@
+<?php
+
+
+/**
+ * Inherited Methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void execute($callable)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($achieveValue)
+ * @method void comment($description)
+ * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ *
+ * @SuppressWarnings(PHPMD)
+*/
+class UnitTester extends \Codeception\Actor
+{
+    use _generated\UnitTesterActions;
+
+   /**
+    * Define custom actions here
+    */
+}
diff --git a/tests/codeception/_support/_generated/.gitignore b/tests/codeception/_support/_generated/.gitignore
new file mode 100644
index 000000000..c96a04f00
--- /dev/null
+++ b/tests/codeception/_support/_generated/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/tests/codeception/acceptance.suite.yml b/tests/codeception/acceptance.suite.yml
index d36d7360b..ee88ebd3e 100644
--- a/tests/codeception/acceptance.suite.yml
+++ b/tests/codeception/acceptance.suite.yml
@@ -12,6 +12,8 @@ class_name: AcceptanceTester
 modules:
     enabled:
         - PhpBrowser
+#        - Yii2:
+#           configFile: '/codeception/config/acceptance.php'
 # you can use WebDriver instead of PhpBrowser to test javascript and ajax.
 # This will require you to install selenium. See http://codeception.com/docs/03-AcceptanceTests#selenium-webdriver
 # "restart" option is used by the WebDriver to start each time per test-file new session and cookies,
diff --git a/tests/codeception/acceptance/AboutCept.php b/tests/codeception/acceptance/AboutCept.php
deleted file mode 100644
index 88a550698..000000000
--- a/tests/codeception/acceptance/AboutCept.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-use tests\codeception\_pages\AboutPage;
-
-/* @var $scenario Codeception\Scenario */
-
-$I = new AcceptanceTester($scenario);
-$I->wantTo('ensure that about works');
-AboutPage::openBy($I);
-$I->see('About', 'h1');
diff --git a/tests/codeception/acceptance/AboutCest.php b/tests/codeception/acceptance/AboutCest.php
new file mode 100644
index 000000000..a3cbef66b
--- /dev/null
+++ b/tests/codeception/acceptance/AboutCest.php
@@ -0,0 +1,11 @@
+<?php
+
+class AboutCest
+{
+    public function ensureThatAboutWorks(AcceptanceTester $I)
+    {
+        //$I->amOnPage(['site/about']);
+        $I->amOnPage('index.php?r=site%2Fabout');
+        $I->see('About', 'h1');
+    }
+}
diff --git a/tests/codeception/acceptance/HomeCept.php b/tests/codeception/acceptance/HomeCept.php
deleted file mode 100644
index 1f9353595..000000000
--- a/tests/codeception/acceptance/HomeCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/* @var $scenario Codeception\Scenario */
-
-$I = new AcceptanceTester($scenario);
-$I->wantTo('ensure that home page works');
-$I->amOnPage(Yii::$app->homeUrl);
-$I->see('My Company');
-$I->seeLink('About');
-$I->click('About');
-$I->see('This is the About page.');
diff --git a/tests/codeception/acceptance/HomeCest.php b/tests/codeception/acceptance/HomeCest.php
new file mode 100644
index 000000000..cd7b22436
--- /dev/null
+++ b/tests/codeception/acceptance/HomeCest.php
@@ -0,0 +1,16 @@
+<?php
+
+class HomeCest
+{
+    public function ensureThatHomePageWorks(AcceptanceTester $I)
+    {
+        //$I->amOnPage(Yii::$app->homeUrl);
+        $I->amOnPage('index.php?r=site%2Findex');        
+        $I->see('My Company');
+        
+        $I->seeLink('About');
+        $I->click('About');
+        
+        $I->see('This is the About page.');
+    }
+}
diff --git a/tests/codeception/acceptance/LoginCept.php b/tests/codeception/acceptance/LoginCept.php
deleted file mode 100644
index 90d063583..000000000
--- a/tests/codeception/acceptance/LoginCept.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-use tests\codeception\_pages\LoginPage;
-
-/* @var $scenario Codeception\Scenario */
-
-$I = new AcceptanceTester($scenario);
-$I->wantTo('ensure that login works');
-
-$loginPage = LoginPage::openBy($I);
-
-$I->see('Login', 'h1');
-
-$I->amGoingTo('try to login with empty credentials');
-$loginPage->login('', '');
-if (method_exists($I, 'wait')) {
-    $I->wait(3); // only for selenium
-}
-$I->expectTo('see validations errors');
-$I->see('Username cannot be blank.');
-$I->see('Password cannot be blank.');
-
-$I->amGoingTo('try to login with wrong credentials');
-$loginPage->login('admin', 'wrong');
-if (method_exists($I, 'wait')) {
-    $I->wait(3); // only for selenium
-}
-$I->expectTo('see validations errors');
-$I->see('Incorrect username or password.');
-
-$I->amGoingTo('try to login with correct credentials');
-$loginPage->login('admin', 'admin');
-if (method_exists($I, 'wait')) {
-    $I->wait(3); // only for selenium
-}
-$I->expectTo('see user info');
-$I->see('Logout (admin)');
diff --git a/tests/codeception/acceptance/LoginCest.php b/tests/codeception/acceptance/LoginCest.php
new file mode 100644
index 000000000..97f39800a
--- /dev/null
+++ b/tests/codeception/acceptance/LoginCest.php
@@ -0,0 +1,19 @@
+<?php
+
+class LoginCest
+{
+    public function ensureThatLoginWorks(AcceptanceTester $I)
+    {
+        //$I->amOnPage(['site/login']);
+        $I->amOnPage('index.php?r=site%2Flogin');
+        $I->see('Login', 'h1');
+
+        $I->amGoingTo('try to login with correct credentials');
+        $I->fillField('input[name="LoginForm[username]"]', 'admin');
+        $I->fillField('input[name="LoginForm[password]"]', 'admin');
+        $I->click('login-button');
+
+        $I->expectTo('see user info');
+        $I->see('Logout (admin)');
+    }
+}

From b1015559e013357b16acd1cdd8ab13eb95015509 Mon Sep 17 00:00:00 2001
From: Davert <davert.php@resend.cc>
Date: Thu, 14 Jul 2016 21:03:28 +0300
Subject: [PATCH 171/390] refactoring

---
 .gitignore                                    |    2 +
 tests/codeception.yml => codeception.yml      |   17 +-
 composer.json                                 |    2 +
 composer.lock                                 | 1025 +++++++
 config/test.php                               |   35 +
 config/web.php                                |    2 +-
 tests/_bootstrap.php                          |   10 +
 tests/{codeception => }/_output/.gitignore    |    0
 tests/{codeception => }/_pages/AboutPage.php  |    0
 tests/_pages/ContactPage.php                  |   26 +
 tests/{codeception => }/_pages/LoginPage.php  |    0
 tests/_support/AcceptanceTester.php           |   26 +
 tests/_support/FunctionalTester.php           |   26 +
 tests/_support/UnitTester.php                 |   26 +
 .../_generated/AcceptanceTesterActions.php    | 2247 ++++++++++++++
 .../_generated/FunctionalTesterActions.php    | 2691 +++++++++++++++++
 .../_support/_generated/UnitTesterActions.php |  576 ++++
 tests/acceptance.suite.yml.example            |   27 +
 tests/acceptance/AboutCept.php                |   10 +
 tests/acceptance/ContactCept.php              |   57 +
 tests/acceptance/HomeCept.php                 |   11 +
 tests/acceptance/LoginCept.php                |   37 +
 .../acceptance/_bootstrap.php                 |    0
 tests/{codeception => }/bin/_bootstrap.php    |    0
 tests/{codeception => }/bin/yii               |    0
 tests/{codeception => }/bin/yii.bat           |    0
 tests/codeception/_bootstrap.php              |   23 -
 tests/codeception/config/config.php           |   26 -
 tests/codeception/functional/_bootstrap.php   |    2 -
 tests/{codeception => }/config/acceptance.php |    2 +-
 tests/{codeception => }/config/functional.php |    5 +-
 tests/{codeception => }/config/unit.php       |    2 +-
 tests/{codeception => }/fixtures/.gitignore   |    0
 tests/{codeception => }/functional.suite.yml  |    6 +-
 .../functional/AboutCept.php                  |    0
 .../functional/ContactCept.php                |    0
 .../{codeception => }/functional/HomeCept.php |    0
 .../functional/LoginCept.php                  |    0
 tests/functional/_bootstrap.php               |    1 +
 tests/{codeception => }/templates/.gitignore  |    0
 tests/{codeception => }/unit.suite.yml        |    6 +
 tests/{codeception => }/unit/_bootstrap.php   |    0
 .../{codeception => }/unit/fixtures/.gitkeep  |    0
 .../unit/fixtures/data/.gitkeep               |    0
 .../unit/models/ContactFormTest.php           |    0
 .../unit/models/LoginFormTest.php             |    0
 .../unit/models/UserTest.php                  |    0
 .../unit/templates/fixtures/.gitkeep          |    0
 48 files changed, 6853 insertions(+), 73 deletions(-)
 rename tests/codeception.yml => codeception.yml (60%)
 create mode 100644 composer.lock
 create mode 100644 config/test.php
 create mode 100644 tests/_bootstrap.php
 rename tests/{codeception => }/_output/.gitignore (100%)
 rename tests/{codeception => }/_pages/AboutPage.php (100%)
 create mode 100644 tests/_pages/ContactPage.php
 rename tests/{codeception => }/_pages/LoginPage.php (100%)
 create mode 100644 tests/_support/AcceptanceTester.php
 create mode 100644 tests/_support/FunctionalTester.php
 create mode 100644 tests/_support/UnitTester.php
 create mode 100644 tests/_support/_generated/AcceptanceTesterActions.php
 create mode 100644 tests/_support/_generated/FunctionalTesterActions.php
 create mode 100644 tests/_support/_generated/UnitTesterActions.php
 create mode 100644 tests/acceptance.suite.yml.example
 create mode 100644 tests/acceptance/AboutCept.php
 create mode 100644 tests/acceptance/ContactCept.php
 create mode 100644 tests/acceptance/HomeCept.php
 create mode 100644 tests/acceptance/LoginCept.php
 rename tests/{codeception => }/acceptance/_bootstrap.php (100%)
 rename tests/{codeception => }/bin/_bootstrap.php (100%)
 rename tests/{codeception => }/bin/yii (100%)
 rename tests/{codeception => }/bin/yii.bat (100%)
 delete mode 100644 tests/codeception/_bootstrap.php
 delete mode 100644 tests/codeception/config/config.php
 delete mode 100644 tests/codeception/functional/_bootstrap.php
 rename tests/{codeception => }/config/acceptance.php (75%)
 rename tests/{codeception => }/config/functional.php (79%)
 rename tests/{codeception => }/config/unit.php (74%)
 rename tests/{codeception => }/fixtures/.gitignore (100%)
 rename tests/{codeception => }/functional.suite.yml (76%)
 rename tests/{codeception => }/functional/AboutCept.php (100%)
 rename tests/{codeception => }/functional/ContactCept.php (100%)
 rename tests/{codeception => }/functional/HomeCept.php (100%)
 rename tests/{codeception => }/functional/LoginCept.php (100%)
 create mode 100644 tests/functional/_bootstrap.php
 rename tests/{codeception => }/templates/.gitignore (100%)
 rename tests/{codeception => }/unit.suite.yml (56%)
 rename tests/{codeception => }/unit/_bootstrap.php (100%)
 rename tests/{codeception => }/unit/fixtures/.gitkeep (100%)
 rename tests/{codeception => }/unit/fixtures/data/.gitkeep (100%)
 rename tests/{codeception => }/unit/models/ContactFormTest.php (100%)
 rename tests/{codeception => }/unit/models/LoginFormTest.php (100%)
 rename tests/{codeception => }/unit/models/UserTest.php (100%)
 rename tests/{codeception => }/unit/templates/fixtures/.gitkeep (100%)

diff --git a/.gitignore b/.gitignore
index 45bf7bf41..9af11e24d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,5 @@ composer.phar
 phpunit.phar
 # local phpunit config
 /phpunit.xml
+
+tests/_output/*
\ No newline at end of file
diff --git a/tests/codeception.yml b/codeception.yml
similarity index 60%
rename from tests/codeception.yml
rename to codeception.yml
index b71ba31c1..d5d1aaf24 100644
--- a/tests/codeception.yml
+++ b/codeception.yml
@@ -1,4 +1,5 @@
 actor: Tester
+# To enable code coverage:
 #coverage:
 #    #c3_url: http://localhost:8080/index-test.php/
 #    enabled: true
@@ -20,17 +21,11 @@ actor: Tester
 #            - ../web/*
 #            - ../tests/*
 paths:
-    tests: codeception
-    log: codeception/_output
-    data: codeception/_data
-    helpers: codeception/_support
+    tests: tests
+    log: tests/_output
+    data: tests/_data
+    helpers: tests/_support
 settings:
     bootstrap: _bootstrap.php
-    suite_class: \PHPUnit_Framework_TestSuite
     memory_limit: 1024M
-    log: true
-    colors: true
-config:
-    # the entry script URL (with host info) for functional and acceptance tests
-    # PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
-    test_entry_url: http://localhost:8080/index-test.php
\ No newline at end of file
+    colors: true
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 1631da65c..137ee77a6 100644
--- a/composer.json
+++ b/composer.json
@@ -21,6 +21,8 @@
     },
     "require-dev": {
         "yiisoft/yii2-codeception": "*",
+        "codeception/specify": "*",
+        "codeception/verify": "*",
         "yiisoft/yii2-debug": "*",
         "yiisoft/yii2-gii": "*",
         "yiisoft/yii2-faker": "*"
diff --git a/composer.lock b/composer.lock
new file mode 100644
index 000000000..ce0248cb8
--- /dev/null
+++ b/composer.lock
@@ -0,0 +1,1025 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "93894a180950d67c2b9edc7a95038f87",
+    "content-hash": "c8959aaf297f5e79479a01ef1dd73b02",
+    "packages": [
+        {
+            "name": "bower-asset/bootstrap",
+            "version": "v3.3.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twbs/bootstrap.git",
+                "reference": "16b48259a62f576e52c903c476bd42b90ab22482"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/16b48259a62f576e52c903c476bd42b90ab22482",
+                "reference": "16b48259a62f576e52c903c476bd42b90ab22482",
+                "shasum": ""
+            },
+            "require": {
+                "bower-asset/jquery": ">=1.9.1"
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": [
+                    "less/bootstrap.less",
+                    "dist/js/bootstrap.js"
+                ],
+                "bower-asset-ignore": [
+                    "/.*",
+                    "_config.yml",
+                    "CNAME",
+                    "composer.json",
+                    "CONTRIBUTING.md",
+                    "docs",
+                    "js/tests",
+                    "test-infra"
+                ]
+            },
+            "license": [
+                "MIT"
+            ],
+            "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
+            "keywords": [
+                "css",
+                "framework",
+                "front-end",
+                "js",
+                "less",
+                "mobile-first",
+                "responsive",
+                "web"
+            ]
+        },
+        {
+            "name": "bower-asset/jquery",
+            "version": "2.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/jquery/jquery-dist.git",
+                "reference": "c0185ab7c75aab88762c5aae780b9d83b80eda72"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/c0185ab7c75aab88762c5aae780b9d83b80eda72",
+                "reference": "c0185ab7c75aab88762c5aae780b9d83b80eda72",
+                "shasum": ""
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": "dist/jquery.js",
+                "bower-asset-ignore": [
+                    "package.json"
+                ]
+            },
+            "license": [
+                "MIT"
+            ],
+            "keywords": [
+                "browser",
+                "javascript",
+                "jquery",
+                "library"
+            ]
+        },
+        {
+            "name": "bower-asset/jquery.inputmask",
+            "version": "3.2.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/RobinHerbots/jquery.inputmask.git",
+                "reference": "5a72c563b502b8e05958a524cdfffafe9987be38"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/RobinHerbots/jquery.inputmask/zipball/5a72c563b502b8e05958a524cdfffafe9987be38",
+                "reference": "5a72c563b502b8e05958a524cdfffafe9987be38",
+                "shasum": ""
+            },
+            "require": {
+                "bower-asset/jquery": ">=1.7"
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": [
+                    "./dist/inputmask/inputmask.js"
+                ],
+                "bower-asset-ignore": [
+                    "**/*",
+                    "!dist/*",
+                    "!dist/inputmask/*",
+                    "!dist/min/*",
+                    "!dist/min/inputmask/*",
+                    "!extra/bindings/*",
+                    "!extra/dependencyLibs/*",
+                    "!extra/phone-codes/*"
+                ]
+            },
+            "license": [
+                "http://opensource.org/licenses/mit-license.php"
+            ],
+            "description": "jquery.inputmask is a jquery plugin which create an input mask.",
+            "keywords": [
+                "form",
+                "input",
+                "inputmask",
+                "jquery",
+                "mask",
+                "plugins"
+            ]
+        },
+        {
+            "name": "bower-asset/punycode",
+            "version": "v1.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bestiejs/punycode.js.git",
+                "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bestiejs/punycode.js/zipball/38c8d3131a82567bfef18da09f7f4db68c84f8a3",
+                "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3",
+                "shasum": ""
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": "punycode.js",
+                "bower-asset-ignore": [
+                    "coverage",
+                    "tests",
+                    ".*",
+                    "component.json",
+                    "Gruntfile.js",
+                    "node_modules",
+                    "package.json"
+                ]
+            }
+        },
+        {
+            "name": "bower-asset/yii2-pjax",
+            "version": "v2.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/yiisoft/jquery-pjax.git",
+                "reference": "60728da6ade5879e807a49ce59ef9a72039b8978"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/60728da6ade5879e807a49ce59ef9a72039b8978",
+                "reference": "60728da6ade5879e807a49ce59ef9a72039b8978",
+                "shasum": ""
+            },
+            "require": {
+                "bower-asset/jquery": ">=1.8"
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": "./jquery.pjax.js",
+                "bower-asset-ignore": [
+                    ".travis.yml",
+                    "Gemfile",
+                    "Gemfile.lock",
+                    "CONTRIBUTING.md",
+                    "vendor/",
+                    "script/",
+                    "test/"
+                ]
+            },
+            "license": [
+                "MIT"
+            ]
+        },
+        {
+            "name": "cebe/markdown",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/cebe/markdown.git",
+                "reference": "54a2c49de31cc44e864ebf0500a35ef21d0010b2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/cebe/markdown/zipball/54a2c49de31cc44e864ebf0500a35ef21d0010b2",
+                "reference": "54a2c49de31cc44e864ebf0500a35ef21d0010b2",
+                "shasum": ""
+            },
+            "require": {
+                "lib-pcre": "*",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "cebe/indent": "*",
+                "facebook/xhprof": "*@dev",
+                "phpunit/phpunit": "4.1.*"
+            },
+            "bin": [
+                "bin/markdown"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "cebe\\markdown\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Carsten Brandt",
+                    "email": "mail@cebe.cc",
+                    "homepage": "http://cebe.cc/",
+                    "role": "Creator"
+                }
+            ],
+            "description": "A super fast, highly extensible markdown parser for PHP",
+            "homepage": "https://github.com/cebe/markdown#readme",
+            "keywords": [
+                "extensible",
+                "fast",
+                "gfm",
+                "markdown",
+                "markdown-extra"
+            ],
+            "time": "2015-03-06 05:28:07"
+        },
+        {
+            "name": "ezyang/htmlpurifier",
+            "version": "v4.7.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ezyang/htmlpurifier.git",
+                "reference": "ae1828d955112356f7677c465f94f7deb7d27a40"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/ae1828d955112356f7677c465f94f7deb7d27a40",
+                "reference": "ae1828d955112356f7677c465f94f7deb7d27a40",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "HTMLPurifier": "library/"
+                },
+                "files": [
+                    "library/HTMLPurifier.composer.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL"
+            ],
+            "authors": [
+                {
+                    "name": "Edward Z. Yang",
+                    "email": "admin@htmlpurifier.org",
+                    "homepage": "http://ezyang.com/"
+                }
+            ],
+            "description": "Standards compliant HTML filter written in PHP",
+            "homepage": "http://htmlpurifier.org/",
+            "keywords": [
+                "html"
+            ],
+            "time": "2015-08-05 01:03:42"
+        },
+        {
+            "name": "swiftmailer/swiftmailer",
+            "version": "v5.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/swiftmailer/swiftmailer.git",
+                "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
+                "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "mockery/mockery": "~0.9.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.4-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "lib/swift_required.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Corbyn"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Swiftmailer, free feature-rich PHP mailer",
+            "homepage": "http://swiftmailer.org/",
+            "keywords": [
+                "email",
+                "mail",
+                "mailer"
+            ],
+            "time": "2016-07-08 11:51:25"
+        },
+        {
+            "name": "yiisoft/yii2",
+            "version": "2.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/yiisoft/yii2-framework.git",
+                "reference": "2b75151ea60e1fd820046416eee2e89c3dda1133"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/2b75151ea60e1fd820046416eee2e89c3dda1133",
+                "reference": "2b75151ea60e1fd820046416eee2e89c3dda1133",
+                "shasum": ""
+            },
+            "require": {
+                "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
+                "bower-asset/jquery.inputmask": "~3.2.2",
+                "bower-asset/punycode": "1.3.*",
+                "bower-asset/yii2-pjax": "~2.0.1",
+                "cebe/markdown": "~1.0.0 | ~1.1.0",
+                "ext-ctype": "*",
+                "ext-mbstring": "*",
+                "ezyang/htmlpurifier": "~4.6",
+                "lib-pcre": "*",
+                "php": ">=5.4.0",
+                "yiisoft/yii2-composer": "~2.0.4"
+            },
+            "bin": [
+                "yii"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "yii\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Qiang Xue",
+                    "email": "qiang.xue@gmail.com",
+                    "homepage": "http://www.yiiframework.com/",
+                    "role": "Founder and project lead"
+                },
+                {
+                    "name": "Alexander Makarov",
+                    "email": "sam@rmcreative.ru",
+                    "homepage": "http://rmcreative.ru/",
+                    "role": "Core framework development"
+                },
+                {
+                    "name": "Maurizio Domba",
+                    "homepage": "http://mdomba.info/",
+                    "role": "Core framework development"
+                },
+                {
+                    "name": "Carsten Brandt",
+                    "email": "mail@cebe.cc",
+                    "homepage": "http://cebe.cc/",
+                    "role": "Core framework development"
+                },
+                {
+                    "name": "Timur Ruziev",
+                    "email": "resurtm@gmail.com",
+                    "homepage": "http://resurtm.com/",
+                    "role": "Core framework development"
+                },
+                {
+                    "name": "Paul Klimov",
+                    "email": "klimov.paul@gmail.com",
+                    "role": "Core framework development"
+                },
+                {
+                    "name": "Dmitry Naumenko",
+                    "email": "d.naumenko.a@gmail.com",
+                    "role": "Core framework development"
+                }
+            ],
+            "description": "Yii PHP Framework Version 2",
+            "homepage": "http://www.yiiframework.com/",
+            "keywords": [
+                "framework",
+                "yii2"
+            ],
+            "time": "2016-07-11 13:36:42"
+        },
+        {
+            "name": "yiisoft/yii2-bootstrap",
+            "version": "2.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/yiisoft/yii2-bootstrap.git",
+                "reference": "3fd2b8c950cce79d60e9702d6bcb24eb3c80f6c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/3fd2b8c950cce79d60e9702d6bcb24eb3c80f6c5",
+                "reference": "3fd2b8c950cce79d60e9702d6bcb24eb3c80f6c5",
+                "shasum": ""
+            },
+            "require": {
+                "bower-asset/bootstrap": "3.3.* | 3.2.* | 3.1.*",
+                "yiisoft/yii2": ">=2.0.6"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                },
+                "asset-installer-paths": {
+                    "npm-asset-library": "vendor/npm",
+                    "bower-asset-library": "vendor/bower"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "yii\\bootstrap\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Qiang Xue",
+                    "email": "qiang.xue@gmail.com"
+                }
+            ],
+            "description": "The Twitter Bootstrap extension for the Yii framework",
+            "keywords": [
+                "bootstrap",
+                "yii2"
+            ],
+            "time": "2016-03-17 03:29:28"
+        },
+        {
+            "name": "yiisoft/yii2-composer",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/yiisoft/yii2-composer.git",
+                "reference": "7452fd908a5023b8bb5ea1b123a174ca080de464"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/7452fd908a5023b8bb5ea1b123a174ca080de464",
+                "reference": "7452fd908a5023b8bb5ea1b123a174ca080de464",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "yii\\composer\\Plugin",
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "yii\\composer\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Qiang Xue",
+                    "email": "qiang.xue@gmail.com"
+                }
+            ],
+            "description": "The composer plugin for Yii extension installer",
+            "keywords": [
+                "composer",
+                "extension installer",
+                "yii2"
+            ],
+            "time": "2016-02-06 00:49:24"
+        },
+        {
+            "name": "yiisoft/yii2-swiftmailer",
+            "version": "2.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/yiisoft/yii2-swiftmailer.git",
+                "reference": "e2c6315caff30a9271a7afad4d684627721dc69a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/e2c6315caff30a9271a7afad4d684627721dc69a",
+                "reference": "e2c6315caff30a9271a7afad4d684627721dc69a",
+                "shasum": ""
+            },
+            "require": {
+                "swiftmailer/swiftmailer": "~5.0",
+                "yiisoft/yii2": ">=2.0.4"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "yii\\swiftmailer\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Paul Klimov",
+                    "email": "klimov.paul@gmail.com"
+                }
+            ],
+            "description": "The SwiftMailer integration for the Yii framework",
+            "keywords": [
+                "email",
+                "mail",
+                "mailer",
+                "swift",
+                "swiftmailer",
+                "yii2"
+            ],
+            "time": "2016-03-17 03:58:49"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "bower-asset/typeahead.js",
+            "version": "v0.11.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twitter/typeahead.js.git",
+                "reference": "588440f66559714280628a4f9799f0c4eb880a4a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twitter/typeahead.js/zipball/588440f66559714280628a4f9799f0c4eb880a4a",
+                "reference": "588440f66559714280628a4f9799f0c4eb880a4a",
+                "shasum": ""
+            },
+            "require": {
+                "bower-asset/jquery": ">=1.7"
+            },
+            "require-dev": {
+                "bower-asset/jasmine-ajax": "~1.3.1",
+                "bower-asset/jasmine-jquery": "~1.5.2",
+                "bower-asset/jquery": "~1.7"
+            },
+            "type": "bower-asset-library",
+            "extra": {
+                "bower-asset-main": "dist/typeahead.bundle.js"
+            }
+        },
+        {
+            "name": "codeception/specify",
+            "version": "0.4.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/Specify.git",
+                "reference": "8efcd017687ebdae9c4d95bcbc1dc22a28561874"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/Specify/zipball/8efcd017687ebdae9c4d95bcbc1dc22a28561874",
+                "reference": "8efcd017687ebdae9c4d95bcbc1dc22a28561874",
+                "shasum": ""
+            },
+            "require": {
+                "myclabs/deep-copy": "~1.1",
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Codeception\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk",
+                    "email": "davert.php@mailican.com"
+                }
+            ],
+            "description": "BDD code blocks for PHPUnit and Codeception",
+            "time": "2015-11-26 23:35:52"
+        },
+        {
+            "name": "codeception/verify",
+            "version": "0.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/Verify.git",
+                "reference": "d3721cfc668d96b41acbda3ecd01d3499381db64"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/Verify/zipball/d3721cfc668d96b41acbda3ecd01d3499381db64",
+                "reference": "d3721cfc668d96b41acbda3ecd01d3499381db64",
+                "shasum": ""
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/Codeception/function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk",
+                    "email": "davert.php@mailican.com"
+                }
+            ],
+            "description": "BDD assertion library for PHPUnit",
+            "time": "2015-11-26 23:23:25"
+        },
+        {
+            "name": "fzaninotto/faker",
+            "version": "v1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/fzaninotto/Faker.git",
+                "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123",
+                "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3|^7.0"
+            },
+            "require-dev": {
+                "ext-intl": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~1.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": []
+            },
+            "autoload": {
+                "psr-4": {
+                    "Faker\\": "src/Faker/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "François Zaninotto"
+                }
+            ],
+            "description": "Faker is a PHP library that generates fake data for you.",
+            "keywords": [
+                "data",
+                "faker",
+                "fixtures"
+            ],
+            "time": "2016-04-29 12:21:54"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "a8773992b362b58498eed24bf85005f363c34771"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/a8773992b362b58498eed24bf85005f363c34771",
+                "reference": "a8773992b362b58498eed24bf85005f363c34771",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "1.*",
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "homepage": "https://github.com/myclabs/DeepCopy",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2015-11-20 12:04:31"
+        },
+        {
+            "name": "phpspec/php-diff",
+            "version": "v1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/php-diff.git",
+                "reference": "0464787bfa7cd13576c5a1e318709768798bec6a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/php-diff/zipball/0464787bfa7cd13576c5a1e318709768798bec6a",
+                "reference": "0464787bfa7cd13576c5a1e318709768798bec6a",
+                "shasum": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Diff": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Chris Boulton",
+                    "homepage": "http://github.com/chrisboulton"
+                }
+            ],
+            "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).",
+            "time": "2016-04-07 12:29:16"
+        },
+        {
+            "name": "yiisoft/yii2-codeception",
+            "version": "2.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/yiisoft/yii2-codeception.git",
+                "reference": "c916a36d09fc128b05a374e7922bc56854334d56"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/yiisoft/yii2-codeception/zipball/c916a36d09fc128b05a374e7922bc56854334d56",
+                "reference": "c916a36d09fc128b05a374e7922bc56854334d56",
+                "shasum": ""
+            },
+            "require": {
+                "yiisoft/yii2": ">=2.0.4"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "yii\\codeception\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Jebri",
+                    "email": "mark.github@yandex.ru"
+                }
+            ],
+            "description": "The Codeception integration for the Yii framework",
+            "keywords": [
+                "codeception",
+                "yii2"
+            ],
+            "time": "2016-03-17 03:41:26"
+        },
+        {
+            "name": "yiisoft/yii2-debug",
+            "version": "2.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/yiisoft/yii2-debug.git",
+                "reference": "55ed2e853ed8050a34415f63a4da84f88a56f895"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/55ed2e853ed8050a34415f63a4da84f88a56f895",
+                "reference": "55ed2e853ed8050a34415f63a4da84f88a56f895",
+                "shasum": ""
+            },
+            "require": {
+                "yiisoft/yii2": ">=2.0.4",
+                "yiisoft/yii2-bootstrap": "*"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "yii\\debug\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Qiang Xue",
+                    "email": "qiang.xue@gmail.com"
+                }
+            ],
+            "description": "The debugger extension for the Yii framework",
+            "keywords": [
+                "debug",
+                "debugger",
+                "yii2"
+            ],
+            "time": "2016-03-17 03:50:19"
+        },
+        {
+            "name": "yiisoft/yii2-faker",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/yiisoft/yii2-faker.git",
+                "reference": "b88ca69ee226a3610b2c26c026c3203d7ac50f6c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/b88ca69ee226a3610b2c26c026c3203d7ac50f6c",
+                "reference": "b88ca69ee226a3610b2c26c026c3203d7ac50f6c",
+                "shasum": ""
+            },
+            "require": {
+                "fzaninotto/faker": "*",
+                "yiisoft/yii2": "*"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "yii\\faker\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Mark Jebri",
+                    "email": "mark.github@yandex.ru"
+                }
+            ],
+            "description": "Fixture generator. The Faker integration for the Yii framework.",
+            "keywords": [
+                "Fixture",
+                "faker",
+                "yii2"
+            ],
+            "time": "2015-03-01 06:22:44"
+        },
+        {
+            "name": "yiisoft/yii2-gii",
+            "version": "2.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/yiisoft/yii2-gii.git",
+                "reference": "1bd6df6804ca077ec022587905a0d43eb286f507"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/1bd6df6804ca077ec022587905a0d43eb286f507",
+                "reference": "1bd6df6804ca077ec022587905a0d43eb286f507",
+                "shasum": ""
+            },
+            "require": {
+                "bower-asset/typeahead.js": "0.10.* | ~0.11.0",
+                "phpspec/php-diff": ">=1.0.2",
+                "yiisoft/yii2": ">=2.0.4",
+                "yiisoft/yii2-bootstrap": "~2.0"
+            },
+            "type": "yii2-extension",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                },
+                "asset-installer-paths": {
+                    "npm-asset-library": "vendor/npm",
+                    "bower-asset-library": "vendor/bower"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "yii\\gii\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Qiang Xue",
+                    "email": "qiang.xue@gmail.com"
+                }
+            ],
+            "description": "The Gii extension for the Yii framework",
+            "keywords": [
+                "code generator",
+                "gii",
+                "yii2"
+            ],
+            "time": "2016-03-18 14:09:46"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=5.4.0"
+    },
+    "platform-dev": []
+}
diff --git a/config/test.php b/config/test.php
new file mode 100644
index 000000000..03b6580dd
--- /dev/null
+++ b/config/test.php
@@ -0,0 +1,35 @@
+<?php
+$params = require(__DIR__ . '/params.php');
+$dbParams = require(__DIR__ . '/db.php');
+
+// test database! Important not to run tests on production or development databases
+$dbParams['dsn'] = 'mysql:host=localhost;dbname=yii2_basic_tests';
+
+/**
+ * Application configuration shared by all test types
+ */
+return [
+    'id' => 'basic-tests',
+    'basePath' => dirname(__DIR__),    
+    'language' => 'en-US',
+    'components' => [
+        'db' => $dbParams,
+        'mailer' => [
+            'useFileTransport' => true,
+        ],
+        'urlManager' => [
+            'showScriptName' => true,
+        ],
+        'request' => [
+            // it's not recommended to run functional tests with CSRF validation enabled
+            'enableCsrfValidation' => false,
+            // but if you absolutely need it set cookie domain to localhost
+            /*
+            'csrfCookie' => [
+                'domain' => 'localhost',
+            ],
+            */
+        ],        
+    ],
+    'params' => $params,
+];
diff --git a/config/web.php b/config/web.php
index 90a82876b..a45b77cd8 100644
--- a/config/web.php
+++ b/config/web.php
@@ -9,7 +9,7 @@
     'components' => [
         'request' => [
             // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
-            'cookieValidationKey' => '',
+            'cookieValidationKey' => '12334543543',
         ],
         'cache' => [
             'class' => 'yii\caching\FileCache',
diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
new file mode 100644
index 000000000..c7f5cfc4f
--- /dev/null
+++ b/tests/_bootstrap.php
@@ -0,0 +1,10 @@
+<?php
+require_once(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+
+defined('YII_DEBUG') or define('YII_DEBUG', true);
+defined('YII_ENV') or define('YII_ENV', 'test');
+
+$_SERVER['SCRIPT_FILENAME'] = codecept_root_dir() . '/web/index.php';
+$_SERVER['SCRIPT_NAME'] = 'http://localhost:8080/index-test.php';
+
+\Codeception\Specify\Config::setDeepClone(false);
\ No newline at end of file
diff --git a/tests/codeception/_output/.gitignore b/tests/_output/.gitignore
similarity index 100%
rename from tests/codeception/_output/.gitignore
rename to tests/_output/.gitignore
diff --git a/tests/codeception/_pages/AboutPage.php b/tests/_pages/AboutPage.php
similarity index 100%
rename from tests/codeception/_pages/AboutPage.php
rename to tests/_pages/AboutPage.php
diff --git a/tests/_pages/ContactPage.php b/tests/_pages/ContactPage.php
new file mode 100644
index 000000000..5701e2cb4
--- /dev/null
+++ b/tests/_pages/ContactPage.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace tests\codeception\_pages;
+
+use yii\codeception\BasePage;
+
+/**
+ * Represents contact page
+ * @property \AcceptanceTester|\FunctionalTester $actor
+ */
+class ContactPage extends BasePage
+{
+    public $route = 'site/contact';
+
+    /**
+     * @param array $contactData
+     */
+    public function submit(array $contactData)
+    {
+        foreach ($contactData as $field => $value) {
+            $inputType = $field === 'body' ? 'textarea' : 'input';
+            $this->actor->fillField($inputType . '[name="ContactForm[' . $field . ']"]', $value);
+        }
+        $this->actor->click('contact-button');
+    }
+}
diff --git a/tests/codeception/_pages/LoginPage.php b/tests/_pages/LoginPage.php
similarity index 100%
rename from tests/codeception/_pages/LoginPage.php
rename to tests/_pages/LoginPage.php
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
new file mode 100644
index 000000000..4c7dcbb6d
--- /dev/null
+++ b/tests/_support/AcceptanceTester.php
@@ -0,0 +1,26 @@
+<?php
+
+
+/**
+ * Inherited Methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void execute($callable)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($achieveValue)
+ * @method void comment($description)
+ * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ *
+ * @SuppressWarnings(PHPMD)
+*/
+class AcceptanceTester extends \Codeception\Actor
+{
+    use _generated\AcceptanceTesterActions;
+
+   /**
+    * Define custom actions here
+    */
+}
diff --git a/tests/_support/FunctionalTester.php b/tests/_support/FunctionalTester.php
new file mode 100644
index 000000000..7e888f8b2
--- /dev/null
+++ b/tests/_support/FunctionalTester.php
@@ -0,0 +1,26 @@
+<?php
+
+
+/**
+ * Inherited Methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void execute($callable)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($achieveValue)
+ * @method void comment($description)
+ * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ *
+ * @SuppressWarnings(PHPMD)
+*/
+class FunctionalTester extends \Codeception\Actor
+{
+    use _generated\FunctionalTesterActions;
+
+   /**
+    * Define custom actions here
+    */
+}
diff --git a/tests/_support/UnitTester.php b/tests/_support/UnitTester.php
new file mode 100644
index 000000000..28353572c
--- /dev/null
+++ b/tests/_support/UnitTester.php
@@ -0,0 +1,26 @@
+<?php
+
+
+/**
+ * Inherited Methods
+ * @method void wantToTest($text)
+ * @method void wantTo($text)
+ * @method void execute($callable)
+ * @method void expectTo($prediction)
+ * @method void expect($prediction)
+ * @method void amGoingTo($argumentation)
+ * @method void am($role)
+ * @method void lookForwardTo($achieveValue)
+ * @method void comment($description)
+ * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ *
+ * @SuppressWarnings(PHPMD)
+*/
+class UnitTester extends \Codeception\Actor
+{
+    use _generated\UnitTesterActions;
+
+   /**
+    * Define custom actions here
+    */
+}
diff --git a/tests/_support/_generated/AcceptanceTesterActions.php b/tests/_support/_generated/AcceptanceTesterActions.php
new file mode 100644
index 000000000..0965f3368
--- /dev/null
+++ b/tests/_support/_generated/AcceptanceTesterActions.php
@@ -0,0 +1,2247 @@
+<?php  //[STAMP] 8a9cb37ad1be9f4fbb46bb2f0f40e6d4
+namespace _generated;
+
+// This class was automatically generated by build task
+// You should not change it manually as it will be overwritten on next build
+// @codingStandardsIgnoreFile
+
+use Codeception\Module\PhpBrowser;
+
+trait AcceptanceTesterActions
+{
+    /**
+     * @return \Codeception\Scenario
+     */
+    abstract protected function getScenario();
+
+    
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Alias to `haveHttpHeader`
+     *
+     * @param $name
+     * @param $value
+     * @see \Codeception\Module\PhpBrowser::setHeader()
+     */
+    public function setHeader($name, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('setHeader', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Authenticates user for HTTP_AUTH
+     *
+     * @param $username
+     * @param $password
+     * @see \Codeception\Module\PhpBrowser::amHttpAuthenticated()
+     */
+    public function amHttpAuthenticated($username, $password) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amHttpAuthenticated', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Open web page at the given absolute URL and sets its hostname as the base host.
+     *
+     * ``` php
+     * <?php
+     * $I->amOnUrl('http://codeception.com/');
+     * $I->amOnPage('/quickstart'); // moves to http://codeception.com/quickstart
+     * ?>
+     * ```
+     * @see \Codeception\Module\PhpBrowser::amOnUrl()
+     */
+    public function amOnUrl($url) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnUrl', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Changes the subdomain for the 'url' configuration parameter.
+     * Does not open a page; use `amOnPage` for that.
+     *
+     * ``` php
+     * <?php
+     * // If config is: 'http://mysite.com/'
+     * // or config is: 'http://www.mysite.com/'
+     * // or config is: 'http://company.mysite.com/'
+     *
+     * $I->amOnSubdomain('user');
+     * $I->amOnPage('/');
+     * // moves to http://user.mysite.com/
+     * ?>
+     * ```
+     *
+     * @param $subdomain
+     *
+     * @return mixed
+     * @see \Codeception\Module\PhpBrowser::amOnSubdomain()
+     */
+    public function amOnSubdomain($subdomain) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnSubdomain', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Low-level API method.
+     * If Codeception commands are not enough, use [Guzzle HTTP Client](http://guzzlephp.org/) methods directly
+     *
+     * Example:
+     *
+     * ``` php
+     * <?php
+     * $I->executeInGuzzle(function (\GuzzleHttp\Client $client) {
+     *      $client->get('/get', ['query' => ['foo' => 'bar']]);
+     * });
+     * ?>
+     * ```
+     *
+     * It is not recommended to use this command on a regular basis.
+     * If Codeception lacks important Guzzle Client methods, implement them and submit patches.
+     *
+     * @param callable $function
+     * @see \Codeception\Module\PhpBrowser::executeInGuzzle()
+     */
+    public function executeInGuzzle($function) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('executeInGuzzle', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Sets the HTTP header to the passed value - which is used on
+     * subsequent HTTP requests through PhpBrowser.
+     *
+     * Example:
+     * ```php
+     * <?php
+     * $I->setHeader('X-Requested-With', 'Codeception');
+     * $I->amOnPage('test-headers.php');
+     * ?>
+     * ```
+     *
+     * @param string $name the name of the request header
+     * @param string $value the value to set it to for subsequent
+     *        requests
+     * @see \Codeception\Lib\InnerBrowser::haveHttpHeader()
+     */
+    public function haveHttpHeader($name, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveHttpHeader', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Deletes the header with the passed name.  Subsequent requests
+     * will not have the deleted header in its request.
+     *
+     * Example:
+     * ```php
+     * <?php
+     * $I->haveHttpHeader('X-Requested-With', 'Codeception');
+     * $I->amOnPage('test-headers.php');
+     * // ...
+     * $I->deleteHeader('X-Requested-With');
+     * $I->amOnPage('some-other-page.php');
+     * ?>
+     * ```
+     *
+     * @param string $name the name of the header to delete.
+     * @see \Codeception\Lib\InnerBrowser::deleteHeader()
+     */
+    public function deleteHeader($name) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteHeader', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Opens the page for the given relative URI.
+     *
+     * ``` php
+     * <?php
+     * // opens front page
+     * $I->amOnPage('/');
+     * // opens /register page
+     * $I->amOnPage('/register');
+     * ```
+     *
+     * @param $page
+     * @see \Codeception\Lib\InnerBrowser::amOnPage()
+     */
+    public function amOnPage($page) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnPage', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Perform a click on a link or a button, given by a locator.
+     * If a fuzzy locator is given, the page will be searched for a button, link, or image matching the locator string.
+     * For buttons, the "value" attribute, "name" attribute, and inner text are searched.
+     * For links, the link text is searched.
+     * For images, the "alt" attribute and inner text of any parent links are searched.
+     *
+     * The second parameter is a context (CSS or XPath locator) to narrow the search.
+     *
+     * Note that if the locator matches a button of type `submit`, the form will be submitted.
+     *
+     * ``` php
+     * <?php
+     * // simple link
+     * $I->click('Logout');
+     * // button of form
+     * $I->click('Submit');
+     * // CSS button
+     * $I->click('#form input[type=submit]');
+     * // XPath
+     * $I->click('//form/*[@type=submit]');
+     * // link in context
+     * $I->click('Logout', '#nav');
+     * // using strict locator
+     * $I->click(['link' => 'Login']);
+     * ?>
+     * ```
+     *
+     * @param $link
+     * @param $context
+     * @see \Codeception\Lib\InnerBrowser::click()
+     */
+    public function click($link, $context = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('click', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page contains the given string (case insensitive).
+     *
+     * You can specify a specific HTML element (via CSS or XPath) as the second
+     * parameter to only search within that element.
+     *
+     * ``` php
+     * <?php
+     * $I->see('Logout');                 // I can suppose user is logged in
+     * $I->see('Sign Up', 'h1');          // I can suppose it's a signup page
+     * $I->see('Sign Up', '//body/h1');   // with XPath
+     * ```
+     *
+     * Note that the search is done after stripping all HTML tags from the body,
+     * so `$I->see('strong')` will return true for strings like:
+     *
+     *   - `<p>I am Stronger than thou</p>`
+     *   - `<script>document.createElement('strong');</script>`
+     *
+     * But will *not* be true for strings like:
+     *
+     *   - `<strong>Home</strong>`
+     *   - `<div class="strong">Home</strong>`
+     *   - `<!-- strong -->`
+     *
+     * For checking the raw source code, use `seeInSource()`.
+     *
+     * @param      $text
+     * @param null $selector
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::see()
+     */
+    public function canSee($text, $selector = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('see', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page contains the given string (case insensitive).
+     *
+     * You can specify a specific HTML element (via CSS or XPath) as the second
+     * parameter to only search within that element.
+     *
+     * ``` php
+     * <?php
+     * $I->see('Logout');                 // I can suppose user is logged in
+     * $I->see('Sign Up', 'h1');          // I can suppose it's a signup page
+     * $I->see('Sign Up', '//body/h1');   // with XPath
+     * ```
+     *
+     * Note that the search is done after stripping all HTML tags from the body,
+     * so `$I->see('strong')` will return true for strings like:
+     *
+     *   - `<p>I am Stronger than thou</p>`
+     *   - `<script>document.createElement('strong');</script>`
+     *
+     * But will *not* be true for strings like:
+     *
+     *   - `<strong>Home</strong>`
+     *   - `<div class="strong">Home</strong>`
+     *   - `<!-- strong -->`
+     *
+     * For checking the raw source code, use `seeInSource()`.
+     *
+     * @param      $text
+     * @param null $selector
+     * @see \Codeception\Lib\InnerBrowser::see()
+     */
+    public function see($text, $selector = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('see', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page doesn't contain the text specified (case insensitive).
+     * Give a locator as the second parameter to match a specific region.
+     *
+     * ```php
+     * <?php
+     * $I->dontSee('Login');                    // I can suppose user is already logged in
+     * $I->dontSee('Sign Up','h1');             // I can suppose it's not a signup page
+     * $I->dontSee('Sign Up','//body/h1');      // with XPath
+     * ```
+     *
+     * Note that the search is done after stripping all HTML tags from the body,
+     * so `$I->dontSee('strong')` will fail on strings like:
+     *
+     *   - `<p>I am Stronger than thou</p>`
+     *   - `<script>document.createElement('strong');</script>`
+     *
+     * But will ignore strings like:
+     *
+     *   - `<strong>Home</strong>`
+     *   - `<div class="strong">Home</strong>`
+     *   - `<!-- strong -->`
+     *
+     * For checking the raw source code, use `seeInSource()`.
+     *
+     * @param      $text
+     * @param null $selector
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSee()
+     */
+    public function cantSee($text, $selector = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSee', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page doesn't contain the text specified (case insensitive).
+     * Give a locator as the second parameter to match a specific region.
+     *
+     * ```php
+     * <?php
+     * $I->dontSee('Login');                    // I can suppose user is already logged in
+     * $I->dontSee('Sign Up','h1');             // I can suppose it's not a signup page
+     * $I->dontSee('Sign Up','//body/h1');      // with XPath
+     * ```
+     *
+     * Note that the search is done after stripping all HTML tags from the body,
+     * so `$I->dontSee('strong')` will fail on strings like:
+     *
+     *   - `<p>I am Stronger than thou</p>`
+     *   - `<script>document.createElement('strong');</script>`
+     *
+     * But will ignore strings like:
+     *
+     *   - `<strong>Home</strong>`
+     *   - `<div class="strong">Home</strong>`
+     *   - `<!-- strong -->`
+     *
+     * For checking the raw source code, use `seeInSource()`.
+     *
+     * @param      $text
+     * @param null $selector
+     * @see \Codeception\Lib\InnerBrowser::dontSee()
+     */
+    public function dontSee($text, $selector = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSee', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page contains the given string in its
+     * raw source code.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInSource('<h1>Green eggs &amp; ham</h1>');
+     * ```
+     *
+     * @param      $raw
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeInSource()
+     */
+    public function canSeeInSource($raw) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInSource', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page contains the given string in its
+     * raw source code.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInSource('<h1>Green eggs &amp; ham</h1>');
+     * ```
+     *
+     * @param      $raw
+     * @see \Codeception\Lib\InnerBrowser::seeInSource()
+     */
+    public function seeInSource($raw) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInSource', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page contains the given string in its
+     * raw source code.
+     *
+     * ```php
+     * <?php
+     * $I->dontSeeInSource('<h1>Green eggs &amp; ham</h1>');
+     * ```
+     *
+     * @param      $raw
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
+     */
+    public function cantSeeInSource($raw) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInSource', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page contains the given string in its
+     * raw source code.
+     *
+     * ```php
+     * <?php
+     * $I->dontSeeInSource('<h1>Green eggs &amp; ham</h1>');
+     * ```
+     *
+     * @param      $raw
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
+     */
+    public function dontSeeInSource($raw) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInSource', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there's a link with the specified text.
+     * Give a full URL as the second parameter to match links with that exact URL.
+     *
+     * ``` php
+     * <?php
+     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
+     * $I->seeLink('Logout','/logout'); // matches <a href="http://github.com/logout">Logout</a>
+     * ?>
+     * ```
+     *
+     * @param      $text
+     * @param null $url
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeLink()
+     */
+    public function canSeeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeLink', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there's a link with the specified text.
+     * Give a full URL as the second parameter to match links with that exact URL.
+     *
+     * ``` php
+     * <?php
+     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
+     * $I->seeLink('Logout','/logout'); // matches <a href="http://github.com/logout">Logout</a>
+     * ?>
+     * ```
+     *
+     * @param      $text
+     * @param null $url
+     * @see \Codeception\Lib\InnerBrowser::seeLink()
+     */
+    public function seeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeLink', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page doesn't contain a link with the given string.
+     * If the second parameter is given, only links with a matching "href" attribute will be checked.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
+     * $I->dontSeeLink('Checkout now', '/store/cart.php');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * @param null $url
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
+     */
+    public function cantSeeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeLink', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page doesn't contain a link with the given string.
+     * If the second parameter is given, only links with a matching "href" attribute will be checked.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
+     * $I->dontSeeLink('Checkout now', '/store/cart.php');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * @param null $url
+     * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
+     */
+    public function dontSeeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeLink', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current URI contains the given string.
+     *
+     * ``` php
+     * <?php
+     * // to match: /home/dashboard
+     * $I->seeInCurrentUrl('home');
+     * // to match: /users/1
+     * $I->seeInCurrentUrl('/users/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
+     */
+    public function canSeeInCurrentUrl($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInCurrentUrl', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current URI contains the given string.
+     *
+     * ``` php
+     * <?php
+     * // to match: /home/dashboard
+     * $I->seeInCurrentUrl('home');
+     * // to match: /users/1
+     * $I->seeInCurrentUrl('/users/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
+     */
+    public function seeInCurrentUrl($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInCurrentUrl', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URI doesn't contain the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInCurrentUrl('/users/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
+     */
+    public function cantSeeInCurrentUrl($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInCurrentUrl', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URI doesn't contain the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInCurrentUrl('/users/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
+     */
+    public function dontSeeInCurrentUrl($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInCurrentUrl', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL is equal to the given string.
+     * Unlike `seeInCurrentUrl`, this only matches the full URL.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->seeCurrentUrlEquals('/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
+     */
+    public function canSeeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlEquals', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL is equal to the given string.
+     * Unlike `seeInCurrentUrl`, this only matches the full URL.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->seeCurrentUrlEquals('/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
+     */
+    public function seeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlEquals', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL doesn't equal the given string.
+     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
+     *
+     * ``` php
+     * <?php
+     * // current url is not root
+     * $I->dontSeeCurrentUrlEquals('/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
+     */
+    public function cantSeeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL doesn't equal the given string.
+     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
+     *
+     * ``` php
+     * <?php
+     * // current url is not root
+     * $I->dontSeeCurrentUrlEquals('/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
+     */
+    public function dontSeeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlEquals', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL matches the given regular expression.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
+     */
+    public function canSeeCurrentUrlMatches($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlMatches', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL matches the given regular expression.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
+     */
+    public function seeCurrentUrlMatches($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlMatches', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current url doesn't match the given regular expression.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->dontSeeCurrentUrlMatches('~$/users/(\d+)~');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
+     */
+    public function cantSeeCurrentUrlMatches($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current url doesn't match the given regular expression.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->dontSeeCurrentUrlMatches('~$/users/(\d+)~');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
+     */
+    public function dontSeeCurrentUrlMatches($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlMatches', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Executes the given regular expression against the current URI and returns the first match.
+     * If no parameters are provided, the full URI is returned.
+     *
+     * ``` php
+     * <?php
+     * $user_id = $I->grabFromCurrentUrl('~$/user/(\d+)/~');
+     * $uri = $I->grabFromCurrentUrl();
+     * ?>
+     * ```
+     *
+     * @param null $uri
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::grabFromCurrentUrl()
+     */
+    public function grabFromCurrentUrl($uri = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromCurrentUrl', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the specified checkbox is checked.
+     *
+     * ``` php
+     * <?php
+     * $I->seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
+     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form.
+     * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]');
+     * ?>
+     * ```
+     *
+     * @param $checkbox
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
+     */
+    public function canSeeCheckboxIsChecked($checkbox) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCheckboxIsChecked', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the specified checkbox is checked.
+     *
+     * ``` php
+     * <?php
+     * $I->seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
+     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form.
+     * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]');
+     * ?>
+     * ```
+     *
+     * @param $checkbox
+     * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
+     */
+    public function seeCheckboxIsChecked($checkbox) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCheckboxIsChecked', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Check that the specified checkbox is unchecked.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms
+     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form.
+     * ?>
+     * ```
+     *
+     * @param $checkbox
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
+     */
+    public function cantSeeCheckboxIsChecked($checkbox) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Check that the specified checkbox is unchecked.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms
+     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form.
+     * ?>
+     * ```
+     *
+     * @param $checkbox
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
+     */
+    public function dontSeeCheckboxIsChecked($checkbox) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCheckboxIsChecked', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given input field or textarea contains the given value.
+     * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInField('Body','Type your comment here');
+     * $I->seeInField('form textarea[name=body]','Type your comment here');
+     * $I->seeInField('form input[type=hidden]','hidden_value');
+     * $I->seeInField('#searchform input','Search');
+     * $I->seeInField('//form/*[@name=search]','Search');
+     * $I->seeInField(['name' => 'search'], 'Search');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeInField()
+     */
+    public function canSeeInField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInField', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given input field or textarea contains the given value.
+     * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInField('Body','Type your comment here');
+     * $I->seeInField('form textarea[name=body]','Type your comment here');
+     * $I->seeInField('form input[type=hidden]','hidden_value');
+     * $I->seeInField('#searchform input','Search');
+     * $I->seeInField('//form/*[@name=search]','Search');
+     * $I->seeInField(['name' => 'search'], 'Search');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * @see \Codeception\Lib\InnerBrowser::seeInField()
+     */
+    public function seeInField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInField', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that an input field or textarea doesn't contain the given value.
+     * For fuzzy locators, the field is matched by label text, CSS and XPath.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInField('Body','Type your comment here');
+     * $I->dontSeeInField('form textarea[name=body]','Type your comment here');
+     * $I->dontSeeInField('form input[type=hidden]','hidden_value');
+     * $I->dontSeeInField('#searchform input','Search');
+     * $I->dontSeeInField('//form/*[@name=search]','Search');
+     * $I->dontSeeInField(['name' => 'search'], 'Search');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
+     */
+    public function cantSeeInField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInField', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that an input field or textarea doesn't contain the given value.
+     * For fuzzy locators, the field is matched by label text, CSS and XPath.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInField('Body','Type your comment here');
+     * $I->dontSeeInField('form textarea[name=body]','Type your comment here');
+     * $I->dontSeeInField('form input[type=hidden]','hidden_value');
+     * $I->dontSeeInField('#searchform input','Search');
+     * $I->dontSeeInField('//form/*[@name=search]','Search');
+     * $I->dontSeeInField(['name' => 'search'], 'Search');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
+     */
+    public function dontSeeInField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInField', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if the array of form parameters (name => value) are set on the form matched with the
+     * passed selector.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('form[name=myform]', [
+     *      'input1' => 'value',
+     *      'input2' => 'other value',
+     * ]);
+     * ?>
+     * ```
+     *
+     * For multi-select elements, or to check values of multiple elements with the same name, an
+     * array may be passed:
+     *
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('.form-class', [
+     *      'multiselect' => [
+     *          'value1',
+     *          'value2',
+     *      ],
+     *      'checkbox[]' => [
+     *          'a checked value',
+     *          'another checked value',
+     *      ],
+     * ]);
+     * ?>
+     * ```
+     *
+     * Additionally, checkbox values can be checked with a boolean.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('#form-id', [
+     *      'checkbox1' => true,        // passes if checked
+     *      'checkbox2' => false,       // passes if unchecked
+     * ]);
+     * ?>
+     * ```
+     *
+     * Pair this with submitForm for quick testing magic.
+     *
+     * ``` php
+     * <?php
+     * $form = [
+     *      'field1' => 'value',
+     *      'field2' => 'another value',
+     *      'checkbox1' => true,
+     *      // ...
+     * ];
+     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
+     * // $I->amOnPage('/path/to/form-page') may be needed
+     * $I->seeInFormFields('//form[@id=my-form]', $form);
+     * ?>
+     * ```
+     *
+     * @param $formSelector
+     * @param $params
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
+     */
+    public function canSeeInFormFields($formSelector, $params) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInFormFields', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if the array of form parameters (name => value) are set on the form matched with the
+     * passed selector.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('form[name=myform]', [
+     *      'input1' => 'value',
+     *      'input2' => 'other value',
+     * ]);
+     * ?>
+     * ```
+     *
+     * For multi-select elements, or to check values of multiple elements with the same name, an
+     * array may be passed:
+     *
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('.form-class', [
+     *      'multiselect' => [
+     *          'value1',
+     *          'value2',
+     *      ],
+     *      'checkbox[]' => [
+     *          'a checked value',
+     *          'another checked value',
+     *      ],
+     * ]);
+     * ?>
+     * ```
+     *
+     * Additionally, checkbox values can be checked with a boolean.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('#form-id', [
+     *      'checkbox1' => true,        // passes if checked
+     *      'checkbox2' => false,       // passes if unchecked
+     * ]);
+     * ?>
+     * ```
+     *
+     * Pair this with submitForm for quick testing magic.
+     *
+     * ``` php
+     * <?php
+     * $form = [
+     *      'field1' => 'value',
+     *      'field2' => 'another value',
+     *      'checkbox1' => true,
+     *      // ...
+     * ];
+     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
+     * // $I->amOnPage('/path/to/form-page') may be needed
+     * $I->seeInFormFields('//form[@id=my-form]', $form);
+     * ?>
+     * ```
+     *
+     * @param $formSelector
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
+     */
+    public function seeInFormFields($formSelector, $params) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInFormFields', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if the array of form parameters (name => value) are not set on the form matched with
+     * the passed selector.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('form[name=myform]', [
+     *      'input1' => 'non-existent value',
+     *      'input2' => 'other non-existent value',
+     * ]);
+     * ?>
+     * ```
+     *
+     * To check that an element hasn't been assigned any one of many values, an array can be passed
+     * as the value:
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('.form-class', [
+     *      'fieldName' => [
+     *          'This value shouldn\'t be set',
+     *          'And this value shouldn\'t be set',
+     *      ],
+     * ]);
+     * ?>
+     * ```
+     *
+     * Additionally, checkbox values can be checked with a boolean.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('#form-id', [
+     *      'checkbox1' => true,        // fails if checked
+     *      'checkbox2' => false,       // fails if unchecked
+     * ]);
+     * ?>
+     * ```
+     *
+     * @param $formSelector
+     * @param $params
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
+     */
+    public function cantSeeInFormFields($formSelector, $params) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInFormFields', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if the array of form parameters (name => value) are not set on the form matched with
+     * the passed selector.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('form[name=myform]', [
+     *      'input1' => 'non-existent value',
+     *      'input2' => 'other non-existent value',
+     * ]);
+     * ?>
+     * ```
+     *
+     * To check that an element hasn't been assigned any one of many values, an array can be passed
+     * as the value:
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('.form-class', [
+     *      'fieldName' => [
+     *          'This value shouldn\'t be set',
+     *          'And this value shouldn\'t be set',
+     *      ],
+     * ]);
+     * ?>
+     * ```
+     *
+     * Additionally, checkbox values can be checked with a boolean.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('#form-id', [
+     *      'checkbox1' => true,        // fails if checked
+     *      'checkbox2' => false,       // fails if unchecked
+     * ]);
+     * ?>
+     * ```
+     *
+     * @param $formSelector
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
+     */
+    public function dontSeeInFormFields($formSelector, $params) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInFormFields', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Submits the given form on the page, optionally with the given form
+     * values.  Pass the form field's values as an array in the second
+     * parameter.
+     *
+     * Although this function can be used as a short-hand version of
+     * `fillField()`, `selectOption()`, `click()` etc. it has some important
+     * differences:
+     *
+     *  * Only field *names* may be used, not CSS/XPath selectors nor field labels
+     *  * If a field is sent to this function that does *not* exist on the page,
+     *    it will silently be added to the HTTP request.  This is helpful for testing
+     *    some types of forms, but be aware that you will *not* get an exception
+     *    like you would if you called `fillField()` or `selectOption()` with
+     *    a missing field.
+     *
+     * Fields that are not provided will be filled by their values from the page,
+     * or from any previous calls to `fillField()`, `selectOption()` etc.
+     * You don't need to click the 'Submit' button afterwards.
+     * This command itself triggers the request to form's action.
+     *
+     * You can optionally specify which button's value to include
+     * in the request with the last parameter (as an alternative to
+     * explicitly setting its value in the second parameter), as
+     * button values are not otherwise included in the request.
+     *
+     * Examples:
+     *
+     * ``` php
+     * <?php
+     * $I->submitForm('#login', [
+     *     'login' => 'davert',
+     *     'password' => '123456'
+     * ]);
+     * // or
+     * $I->submitForm('#login', [
+     *     'login' => 'davert',
+     *     'password' => '123456'
+     * ], 'submitButtonName');
+     *
+     * ```
+     *
+     * For example, given this sample "Sign Up" form:
+     *
+     * ``` html
+     * <form action="http://github.com/sign_up">
+     *     Login:
+     *     <input type="text" name="user[login]" /><br/>
+     *     Password:
+     *     <input type="password" name="user[password]" /><br/>
+     *     Do you agree to our terms?
+     *     <input type="checkbox" name="user[agree]" /><br/>
+     *     Select pricing plan:
+     *     <select name="plan">
+     *         <option value="1">Free</option>
+     *         <option value="2" selected="selected">Paid</option>
+     *     </select>
+     *     <input type="submit" name="submitButton" value="Submit" />
+     * </form>
+     * ```
+     *
+     * You could write the following to submit it:
+     *
+     * ``` php
+     * <?php
+     * $I->submitForm(
+     *     '#userForm',
+     *     [
+     *         'user' => [
+     *             'login' => 'Davert',
+     *             'password' => '123456',
+     *             'agree' => true
+     *         ]
+     *     ],
+     *     'submitButton'
+     * );
+     * ```
+     * Note that "2" will be the submitted value for the "plan" field, as it is
+     * the selected option.
+     *
+     * You can also emulate a JavaScript submission by not specifying any
+     * buttons in the third parameter to submitForm.
+     *
+     * ```php
+     * <?php
+     * $I->submitForm(
+     *     '#userForm',
+     *     [
+     *         'user' => [
+     *             'login' => 'Davert',
+     *             'password' => '123456',
+     *             'agree' => true
+     *         ]
+     *     ]
+     * );
+     * ```
+     *
+     * This function works well when paired with `seeInFormFields()`
+     * for quickly testing CRUD interfaces and form validation logic.
+     *
+     * ``` php
+     * <?php
+     * $form = [
+     *      'field1' => 'value',
+     *      'field2' => 'another value',
+     *      'checkbox1' => true,
+     *      // ...
+     * ];
+     * $I->submitForm('#my-form', $form, 'submitButton');
+     * // $I->amOnPage('/path/to/form-page') may be needed
+     * $I->seeInFormFields('#my-form', $form);
+     * ```
+     *
+     * Parameter values can be set to arrays for multiple input fields
+     * of the same name, or multi-select combo boxes.  For checkboxes,
+     * you can use either the string value or boolean `true`/`false` which will
+     * be replaced by the checkbox's value in the DOM.
+     *
+     * ``` php
+     * <?php
+     * $I->submitForm('#my-form', [
+     *      'field1' => 'value',
+     *      'checkbox' => [
+     *          'value of first checkbox',
+     *          'value of second checkbox',
+     *      ],
+     *      'otherCheckboxes' => [
+     *          true,
+     *          false,
+     *          false
+     *      ],
+     *      'multiselect' => [
+     *          'first option value',
+     *          'second option value'
+     *      ]
+     * ]);
+     * ```
+     *
+     * Mixing string and boolean values for a checkbox's value is not supported
+     * and may produce unexpected results.
+     *
+     * Field names ending in `[]` must be passed without the trailing square
+     * bracket characters, and must contain an array for its value.  This allows
+     * submitting multiple values with the same name, consider:
+     *
+     * ```php
+     * <?php
+     * // This will NOT work correctly
+     * $I->submitForm('#my-form', [
+     *     'field[]' => 'value',
+     *     'field[]' => 'another value',  // 'field[]' is already a defined key
+     * ]);
+     * ```
+     *
+     * The solution is to pass an array value:
+     *
+     * ```php
+     * <?php
+     * // This way both values are submitted
+     * $I->submitForm('#my-form', [
+     *     'field' => [
+     *         'value',
+     *         'another value',
+     *     ]
+     * ]);
+     * ```
+     *
+     * @param $selector
+     * @param $params
+     * @param $button
+     * @see \Codeception\Lib\InnerBrowser::submitForm()
+     */
+    public function submitForm($selector, $params, $button = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Fills a text field or textarea with the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->fillField("//input[@type='text']", "Hello World!");
+     * $I->fillField(['name' => 'email'], 'jon@mail.com');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * @see \Codeception\Lib\InnerBrowser::fillField()
+     */
+    public function fillField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('fillField', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Selects an option in a select tag or in radio button group.
+     *
+     * ``` php
+     * <?php
+     * $I->selectOption('form select[name=account]', 'Premium');
+     * $I->selectOption('form input[name=payment]', 'Monthly');
+     * $I->selectOption('//form/select[@name=account]', 'Monthly');
+     * ?>
+     * ```
+     *
+     * Provide an array for the second argument to select multiple options:
+     *
+     * ``` php
+     * <?php
+     * $I->selectOption('Which OS do you use?', array('Windows','Linux'));
+     * ?>
+     * ```
+     *
+     * Or provide an associative array for the second argument to specifically define which selection method should be used:
+     *
+     * ``` php
+     * <?php
+     * $I->selectOption('Which OS do you use?', array('text' => 'Windows')); // Only search by text 'Windows'
+     * $I->selectOption('Which OS do you use?', array('value' => 'windows')); // Only search by value 'windows'
+     * ?>
+     + ```
+     *
+     * @param $select
+     * @param $option
+     * @see \Codeception\Lib\InnerBrowser::selectOption()
+     */
+    public function selectOption($select, $option) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('selectOption', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Ticks a checkbox. For radio buttons, use the `selectOption` method instead.
+     *
+     * ``` php
+     * <?php
+     * $I->checkOption('#agree');
+     * ?>
+     * ```
+     *
+     * @param $option
+     * @see \Codeception\Lib\InnerBrowser::checkOption()
+     */
+    public function checkOption($option) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('checkOption', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Unticks a checkbox.
+     *
+     * ``` php
+     * <?php
+     * $I->uncheckOption('#notify');
+     * ?>
+     * ```
+     *
+     * @param $option
+     * @see \Codeception\Lib\InnerBrowser::uncheckOption()
+     */
+    public function uncheckOption($option) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('uncheckOption', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Attaches a file relative to the Codeception data directory to the given file upload field.
+     *
+     * ``` php
+     * <?php
+     * // file is stored in 'tests/_data/prices.xls'
+     * $I->attachFile('input[@type="file"]', 'prices.xls');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $filename
+     * @see \Codeception\Lib\InnerBrowser::attachFile()
+     */
+    public function attachFile($field, $filename) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('attachFile', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * If your page triggers an ajax request, you can perform it manually.
+     * This action sends a GET ajax request with specified params.
+     *
+     * See ->sendAjaxPostRequest for examples.
+     *
+     * @param $uri
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::sendAjaxGetRequest()
+     */
+    public function sendAjaxGetRequest($uri, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxGetRequest', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * If your page triggers an ajax request, you can perform it manually.
+     * This action sends a POST ajax request with specified params.
+     * Additional params can be passed as array.
+     *
+     * Example:
+     *
+     * Imagine that by clicking checkbox you trigger ajax request which updates user settings.
+     * We emulate that click by running this ajax request manually.
+     *
+     * ``` php
+     * <?php
+     * $I->sendAjaxPostRequest('/updateSettings', array('notifications' => true)); // POST
+     * $I->sendAjaxGetRequest('/updateSettings', array('notifications' => true)); // GET
+     *
+     * ```
+     *
+     * @param $uri
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::sendAjaxPostRequest()
+     */
+    public function sendAjaxPostRequest($uri, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxPostRequest', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * If your page triggers an ajax request, you can perform it manually.
+     * This action sends an ajax request with specified method and params.
+     *
+     * Example:
+     *
+     * You need to perform an ajax request specifying the HTTP method.
+     *
+     * ``` php
+     * <?php
+     * $I->sendAjaxRequest('PUT', '/posts/7', array('title' => 'new title'));
+     *
+     * ```
+     *
+     * @param $method
+     * @param $uri
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::sendAjaxRequest()
+     */
+    public function sendAjaxRequest($method, $uri, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxRequest', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Finds and returns the text contents of the given element.
+     * If a fuzzy locator is used, the element is found using CSS, XPath,
+     * and by matching the full page source by regular expression.
+     *
+     * ``` php
+     * <?php
+     * $heading = $I->grabTextFrom('h1');
+     * $heading = $I->grabTextFrom('descendant-or-self::h1');
+     * $value = $I->grabTextFrom('~<input value=(.*?)]~sgi'); // match with a regex
+     * ?>
+     * ```
+     *
+     * @param $cssOrXPathOrRegex
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::grabTextFrom()
+     */
+    public function grabTextFrom($cssOrXPathOrRegex) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabTextFrom', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Grabs the value of the given attribute value from the given element.
+     * Fails if element is not found.
+     *
+     * ``` php
+     * <?php
+     * $I->grabAttributeFrom('#tooltip', 'title');
+     * ?>
+     * ```
+     *
+     *
+     * @param $cssOrXpath
+     * @param $attribute
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::grabAttributeFrom()
+     */
+    public function grabAttributeFrom($cssOrXpath, $attribute) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabAttributeFrom', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Grabs either the text content, or attribute values, of nodes
+     * matched by $cssOrXpath and returns them as an array.
+     *
+     * ```html
+     * <a href="#first">First</a>
+     * <a href="#second">Second</a>
+     * <a href="#third">Third</a>
+     * ```
+     *
+     * ```php
+     * <?php
+     * // would return ['First', 'Second', 'Third']
+     * $aLinkText = $I->grabMultiple('a');
+     *
+     * // would return ['#first', '#second', '#third']
+     * $aLinks = $I->grabMultiple('a', 'href');
+     * ?>
+     * ```
+     *
+     * @param $cssOrXpath
+     * @param $attribute
+     * @return string[]
+     * @see \Codeception\Lib\InnerBrowser::grabMultiple()
+     */
+    public function grabMultiple($cssOrXpath, $attribute = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabMultiple', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * @param $field
+     *
+     * @return array|mixed|null|string
+     * @see \Codeception\Lib\InnerBrowser::grabValueFrom()
+     */
+    public function grabValueFrom($field) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabValueFrom', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Sets a cookie with the given name and value.
+     * You can set additional cookie params like `domain`, `path`, `expires`, `secure` in array passed as last argument.
+     *
+     * ``` php
+     * <?php
+     * $I->setCookie('PHPSESSID', 'el4ukv0kqbvoirg7nkp4dncpk3');
+     * ?>
+     * ```
+     *
+     * @param $name
+     * @param $val
+     * @param array $params
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::setCookie()
+     */
+    public function setCookie($name, $val, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Grabs a cookie value.
+     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
+     *
+     * @param $cookie
+     *
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::grabCookie()
+     */
+    public function grabCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that a cookie with the given name is set.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     *
+     * ``` php
+     * <?php
+     * $I->seeCookie('PHPSESSID');
+     * ?>
+     * ```
+     *
+     * @param $cookie
+     * @param array $params
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeCookie()
+     */
+    public function canSeeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCookie', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that a cookie with the given name is set.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     *
+     * ``` php
+     * <?php
+     * $I->seeCookie('PHPSESSID');
+     * ?>
+     * ```
+     *
+     * @param $cookie
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::seeCookie()
+     */
+    public function seeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there isn't a cookie with the given name.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     *
+     * @param $cookie
+     *
+     * @param array $params
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
+     */
+    public function cantSeeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCookie', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there isn't a cookie with the given name.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     *
+     * @param $cookie
+     *
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
+     */
+    public function dontSeeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Unsets cookie with the given name.
+     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
+     *
+     * @param $cookie
+     *
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::resetCookie()
+     */
+    public function resetCookie($name, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element exists on the page and is visible.
+     * You can also specify expected attributes of this element.
+     *
+     * ``` php
+     * <?php
+     * $I->seeElement('.error');
+     * $I->seeElement('//form/input[1]');
+     * $I->seeElement('input', ['name' => 'login']);
+     * $I->seeElement('input', ['value' => '123456']);
+     *
+     * // strict locator in first arg, attributes in second
+     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param array $attributes
+     * @return
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeElement()
+     */
+    public function canSeeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElement', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element exists on the page and is visible.
+     * You can also specify expected attributes of this element.
+     *
+     * ``` php
+     * <?php
+     * $I->seeElement('.error');
+     * $I->seeElement('//form/input[1]');
+     * $I->seeElement('input', ['name' => 'login']);
+     * $I->seeElement('input', ['value' => '123456']);
+     *
+     * // strict locator in first arg, attributes in second
+     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param array $attributes
+     * @return
+     * @see \Codeception\Lib\InnerBrowser::seeElement()
+     */
+    public function seeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElement', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element is invisible or not present on the page.
+     * You can also specify expected attributes of this element.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeElement('.error');
+     * $I->dontSeeElement('//form/input[1]');
+     * $I->dontSeeElement('input', ['name' => 'login']);
+     * $I->dontSeeElement('input', ['value' => '123456']);
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param array $attributes
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
+     */
+    public function cantSeeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElement', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element is invisible or not present on the page.
+     * You can also specify expected attributes of this element.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeElement('.error');
+     * $I->dontSeeElement('//form/input[1]');
+     * $I->dontSeeElement('input', ['name' => 'login']);
+     * $I->dontSeeElement('input', ['value' => '123456']);
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param array $attributes
+     * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
+     */
+    public function dontSeeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElement', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there are a certain number of elements matched by the given locator on the page.
+     *
+     * ``` php
+     * <?php
+     * $I->seeNumberOfElements('tr', 10);
+     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
+     * ?>
+     * ```
+     * @param $selector
+     * @param mixed $expected :
+     * - string: strict number
+     * - array: range of numbers [0,10]
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
+     */
+    public function canSeeNumberOfElements($selector, $expected) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElements', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there are a certain number of elements matched by the given locator on the page.
+     *
+     * ``` php
+     * <?php
+     * $I->seeNumberOfElements('tr', 10);
+     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
+     * ?>
+     * ```
+     * @param $selector
+     * @param mixed $expected :
+     * - string: strict number
+     * - array: range of numbers [0,10]
+     * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
+     */
+    public function seeNumberOfElements($selector, $expected) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElements', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given option is selected.
+     *
+     * ``` php
+     * <?php
+     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
+     */
+    public function canSeeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeOptionIsSelected', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given option is selected.
+     *
+     * ``` php
+     * <?php
+     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
+     */
+    public function seeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeOptionIsSelected', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given option is not selected.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
+     */
+    public function cantSeeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeOptionIsSelected', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given option is not selected.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
+     */
+    public function dontSeeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeOptionIsSelected', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Asserts that current page has 404 response status code.
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
+     */
+    public function canSeePageNotFound() {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seePageNotFound', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Asserts that current page has 404 response status code.
+     * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
+     */
+    public function seePageNotFound() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seePageNotFound', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that response code is equal to value provided.
+     *
+     * ```php
+     * <?php
+     * $I->seeResponseCodeIs(200);
+     *
+     * // recommended \Codeception\Util\HttpCode
+     * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
+     * ```
+     *
+     * @param $code
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
+     */
+    public function canSeeResponseCodeIs($code) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIs', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that response code is equal to value provided.
+     *
+     * ```php
+     * <?php
+     * $I->seeResponseCodeIs(200);
+     *
+     * // recommended \Codeception\Util\HttpCode
+     * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
+     * ```
+     *
+     * @param $code
+     * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
+     */
+    public function seeResponseCodeIs($code) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIs', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that response code is equal to value provided.
+     *
+     * ```php
+     * <?php
+     * $I->dontSeeResponseCodeIs(200);
+     *
+     * // recommended \Codeception\Util\HttpCode
+     * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
+     * ```
+     * @param $code
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
+     */
+    public function cantSeeResponseCodeIs($code) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeResponseCodeIs', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that response code is equal to value provided.
+     *
+     * ```php
+     * <?php
+     * $I->dontSeeResponseCodeIs(200);
+     *
+     * // recommended \Codeception\Util\HttpCode
+     * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
+     * ```
+     * @param $code
+     * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
+     */
+    public function dontSeeResponseCodeIs($code) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeResponseCodeIs', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title contains the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInTitle('Blog - Post #1');
+     * ?>
+     * ```
+     *
+     * @param $title
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeInTitle()
+     */
+    public function canSeeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInTitle', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title contains the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInTitle('Blog - Post #1');
+     * ?>
+     * ```
+     *
+     * @param $title
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::seeInTitle()
+     */
+    public function seeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInTitle', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title does not contain the given string.
+     *
+     * @param $title
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
+     */
+    public function cantSeeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInTitle', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title does not contain the given string.
+     *
+     * @param $title
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
+     */
+    public function dontSeeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInTitle', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Switch to iframe or frame on the page.
+     *
+     * Example:
+     * ``` html
+     * <iframe name="another_frame" src="http://example.com/">
+     * ```
+     *
+     * ``` php
+     * <?php
+     * # switch to iframe
+     * $I->switchToIframe("another_frame");
+     * ```
+     *
+     * @param string $name
+     * @see \Codeception\Lib\InnerBrowser::switchToIframe()
+     */
+    public function switchToIframe($name) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('switchToIframe', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Moves back in history.
+     *
+     * @param int $numberOfSteps (default value 1)
+     * @see \Codeception\Lib\InnerBrowser::moveBack()
+     */
+    public function moveBack($numberOfSteps = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('moveBack', func_get_args()));
+    }
+}
diff --git a/tests/_support/_generated/FunctionalTesterActions.php b/tests/_support/_generated/FunctionalTesterActions.php
new file mode 100644
index 000000000..9623023e8
--- /dev/null
+++ b/tests/_support/_generated/FunctionalTesterActions.php
@@ -0,0 +1,2691 @@
+<?php  //[STAMP] 7d7cf724fdb83651f402d30bb414a1e4
+namespace _generated;
+
+// This class was automatically generated by build task
+// You should not change it manually as it will be overwritten on next build
+// @codingStandardsIgnoreFile
+
+use Codeception\Module\Filesystem;
+use Codeception\Module\Yii2;
+
+trait FunctionalTesterActions
+{
+    /**
+     * @return \Codeception\Scenario
+     */
+    abstract protected function getScenario();
+
+    
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Enters a directory In local filesystem.
+     * Project root directory is used by default
+     *
+     * @param $path
+     * @see \Codeception\Module\Filesystem::amInPath()
+     */
+    public function amInPath($path) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amInPath', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Opens a file and stores it's content.
+     *
+     * Usage:
+     *
+     * ``` php
+     * <?php
+     * $I->openFile('composer.json');
+     * $I->seeInThisFile('codeception/codeception');
+     * ?>
+     * ```
+     *
+     * @param $filename
+     * @see \Codeception\Module\Filesystem::openFile()
+     */
+    public function openFile($filename) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('openFile', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Deletes a file
+     *
+     * ``` php
+     * <?php
+     * $I->deleteFile('composer.lock');
+     * ?>
+     * ```
+     *
+     * @param $filename
+     * @see \Codeception\Module\Filesystem::deleteFile()
+     */
+    public function deleteFile($filename) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteFile', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Deletes directory with all subdirectories
+     *
+     * ``` php
+     * <?php
+     * $I->deleteDir('vendor');
+     * ?>
+     * ```
+     *
+     * @param $dirname
+     * @see \Codeception\Module\Filesystem::deleteDir()
+     */
+    public function deleteDir($dirname) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteDir', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Copies directory with all contents
+     *
+     * ``` php
+     * <?php
+     * $I->copyDir('vendor','old_vendor');
+     * ?>
+     * ```
+     *
+     * @param $src
+     * @param $dst
+     * @see \Codeception\Module\Filesystem::copyDir()
+     */
+    public function copyDir($src, $dst) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('copyDir', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks If opened file has `text` in it.
+     *
+     * Usage:
+     *
+     * ``` php
+     * <?php
+     * $I->openFile('composer.json');
+     * $I->seeInThisFile('codeception/codeception');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Filesystem::seeInThisFile()
+     */
+    public function canSeeInThisFile($text) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInThisFile', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks If opened file has `text` in it.
+     *
+     * Usage:
+     *
+     * ``` php
+     * <?php
+     * $I->openFile('composer.json');
+     * $I->seeInThisFile('codeception/codeception');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * @see \Codeception\Module\Filesystem::seeInThisFile()
+     */
+    public function seeInThisFile($text) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInThisFile', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks If opened file has the `number` of new lines.
+     *
+     * Usage:
+     *
+     * ``` php
+     * <?php
+     * $I->openFile('composer.json');
+     * $I->seeNumberNewLines(5);
+     * ?>
+     * ```
+     *
+     * @param int $number New lines
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Filesystem::seeNumberNewLines()
+     */
+    public function canSeeNumberNewLines($number) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberNewLines', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks If opened file has the `number` of new lines.
+     *
+     * Usage:
+     *
+     * ``` php
+     * <?php
+     * $I->openFile('composer.json');
+     * $I->seeNumberNewLines(5);
+     * ?>
+     * ```
+     *
+     * @param int $number New lines
+     * @see \Codeception\Module\Filesystem::seeNumberNewLines()
+     */
+    public function seeNumberNewLines($number) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberNewLines', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that contents of currently opened file matches $regex
+     *
+     * @param $regex
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Filesystem::seeThisFileMatches()
+     */
+    public function canSeeThisFileMatches($regex) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeThisFileMatches', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that contents of currently opened file matches $regex
+     *
+     * @param $regex
+     * @see \Codeception\Module\Filesystem::seeThisFileMatches()
+     */
+    public function seeThisFileMatches($regex) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeThisFileMatches', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks the strict matching of file contents.
+     * Unlike `seeInThisFile` will fail if file has something more than expected lines.
+     * Better to use with HEREDOC strings.
+     * Matching is done after removing "\r" chars from file content.
+     *
+     * ``` php
+     * <?php
+     * $I->openFile('process.pid');
+     * $I->seeFileContentsEqual('3192');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Filesystem::seeFileContentsEqual()
+     */
+    public function canSeeFileContentsEqual($text) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeFileContentsEqual', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks the strict matching of file contents.
+     * Unlike `seeInThisFile` will fail if file has something more than expected lines.
+     * Better to use with HEREDOC strings.
+     * Matching is done after removing "\r" chars from file content.
+     *
+     * ``` php
+     * <?php
+     * $I->openFile('process.pid');
+     * $I->seeFileContentsEqual('3192');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * @see \Codeception\Module\Filesystem::seeFileContentsEqual()
+     */
+    public function seeFileContentsEqual($text) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeFileContentsEqual', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks If opened file doesn't contain `text` in it
+     *
+     * ``` php
+     * <?php
+     * $I->openFile('composer.json');
+     * $I->dontSeeInThisFile('codeception/codeception');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Filesystem::dontSeeInThisFile()
+     */
+    public function cantSeeInThisFile($text) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInThisFile', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks If opened file doesn't contain `text` in it
+     *
+     * ``` php
+     * <?php
+     * $I->openFile('composer.json');
+     * $I->dontSeeInThisFile('codeception/codeception');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * @see \Codeception\Module\Filesystem::dontSeeInThisFile()
+     */
+    public function dontSeeInThisFile($text) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInThisFile', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Deletes a file
+     * @see \Codeception\Module\Filesystem::deleteThisFile()
+     */
+    public function deleteThisFile() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteThisFile', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if file exists in path.
+     * Opens a file when it's exists
+     *
+     * ``` php
+     * <?php
+     * $I->seeFileFound('UserModel.php','app/models');
+     * ?>
+     * ```
+     *
+     * @param $filename
+     * @param string $path
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Filesystem::seeFileFound()
+     */
+    public function canSeeFileFound($filename, $path = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeFileFound', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if file exists in path.
+     * Opens a file when it's exists
+     *
+     * ``` php
+     * <?php
+     * $I->seeFileFound('UserModel.php','app/models');
+     * ?>
+     * ```
+     *
+     * @param $filename
+     * @param string $path
+     * @see \Codeception\Module\Filesystem::seeFileFound()
+     */
+    public function seeFileFound($filename, $path = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeFileFound', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if file does not exist in path
+     *
+     * @param $filename
+     * @param string $path
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Filesystem::dontSeeFileFound()
+     */
+    public function cantSeeFileFound($filename, $path = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeFileFound', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if file does not exist in path
+     *
+     * @param $filename
+     * @param string $path
+     * @see \Codeception\Module\Filesystem::dontSeeFileFound()
+     */
+    public function dontSeeFileFound($filename, $path = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeFileFound', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Erases directory contents
+     *
+     * ``` php
+     * <?php
+     * $I->cleanDir('logs');
+     * ?>
+     * ```
+     *
+     * @param $dirname
+     * @see \Codeception\Module\Filesystem::cleanDir()
+     */
+    public function cleanDir($dirname) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('cleanDir', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Saves contents to file
+     *
+     * @param $filename
+     * @param $contents
+     * @see \Codeception\Module\Filesystem::writeToFile()
+     */
+    public function writeToFile($filename, $contents) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('writeToFile', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Inserts record into the database.
+     *
+     * ``` php
+     * <?php
+     * $user_id = $I->haveRecord('app\models\User', array('name' => 'Davert'));
+     * ?>
+     * ```
+     *
+     * @param $model
+     * @param array $attributes
+     * @return mixed
+     * @part orm
+     * @see \Codeception\Module\Yii2::haveRecord()
+     */
+    public function haveRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveRecord', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that record exists in database.
+     *
+     * ``` php
+     * $I->seeRecord('app\models\User', array('name' => 'davert'));
+     * ```
+     *
+     * @param $model
+     * @param array $attributes
+     * @part orm
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Yii2::seeRecord()
+     */
+    public function canSeeRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeRecord', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that record exists in database.
+     *
+     * ``` php
+     * $I->seeRecord('app\models\User', array('name' => 'davert'));
+     * ```
+     *
+     * @param $model
+     * @param array $attributes
+     * @part orm
+     * @see \Codeception\Module\Yii2::seeRecord()
+     */
+    public function seeRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeRecord', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that record does not exist in database.
+     *
+     * ``` php
+     * $I->dontSeeRecord('app\models\User', array('name' => 'davert'));
+     * ```
+     *
+     * @param $model
+     * @param array $attributes
+     * @part orm
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Yii2::dontSeeRecord()
+     */
+    public function cantSeeRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeRecord', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that record does not exist in database.
+     *
+     * ``` php
+     * $I->dontSeeRecord('app\models\User', array('name' => 'davert'));
+     * ```
+     *
+     * @param $model
+     * @param array $attributes
+     * @part orm
+     * @see \Codeception\Module\Yii2::dontSeeRecord()
+     */
+    public function dontSeeRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeRecord', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Retrieves record from database
+     *
+     * ``` php
+     * $category = $I->grabRecord('app\models\User', array('name' => 'davert'));
+     * ```
+     *
+     * @param $model
+     * @param array $attributes
+     * @return mixed
+     * @part orm
+     * @see \Codeception\Module\Yii2::grabRecord()
+     */
+    public function grabRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabRecord', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Converting $page to valid Yii 2 URL
+     *
+     * Allows input like:
+     *
+     * ```php
+     * $I->amOnPage(['site/view','page'=>'about']);
+     * $I->amOnPage('index-test.php?site/index');
+     * $I->amOnPage('http://localhost/index-test.php?site/index');
+     * ```
+     *
+     * @param $page string|array parameter for \yii\web\UrlManager::createUrl()
+     * @see \Codeception\Module\Yii2::amOnPage()
+     */
+    public function amOnPage($page) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnPage', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Returns a list of regex patterns for recognized domain names
+     *
+     * @return array
+     * @see \Codeception\Module\Yii2::getInternalDomains()
+     */
+    public function getInternalDomains() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('getInternalDomains', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Authenticates user for HTTP_AUTH
+     *
+     * @param $username
+     * @param $password
+     * @see \Codeception\Lib\InnerBrowser::amHttpAuthenticated()
+     */
+    public function amHttpAuthenticated($username, $password) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amHttpAuthenticated', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Sets the HTTP header to the passed value - which is used on
+     * subsequent HTTP requests through PhpBrowser.
+     *
+     * Example:
+     * ```php
+     * <?php
+     * $I->setHeader('X-Requested-With', 'Codeception');
+     * $I->amOnPage('test-headers.php');
+     * ?>
+     * ```
+     *
+     * @param string $name the name of the request header
+     * @param string $value the value to set it to for subsequent
+     *        requests
+     * @see \Codeception\Lib\InnerBrowser::haveHttpHeader()
+     */
+    public function haveHttpHeader($name, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveHttpHeader', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Deletes the header with the passed name.  Subsequent requests
+     * will not have the deleted header in its request.
+     *
+     * Example:
+     * ```php
+     * <?php
+     * $I->haveHttpHeader('X-Requested-With', 'Codeception');
+     * $I->amOnPage('test-headers.php');
+     * // ...
+     * $I->deleteHeader('X-Requested-With');
+     * $I->amOnPage('some-other-page.php');
+     * ?>
+     * ```
+     *
+     * @param string $name the name of the header to delete.
+     * @see \Codeception\Lib\InnerBrowser::deleteHeader()
+     */
+    public function deleteHeader($name) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteHeader', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Perform a click on a link or a button, given by a locator.
+     * If a fuzzy locator is given, the page will be searched for a button, link, or image matching the locator string.
+     * For buttons, the "value" attribute, "name" attribute, and inner text are searched.
+     * For links, the link text is searched.
+     * For images, the "alt" attribute and inner text of any parent links are searched.
+     *
+     * The second parameter is a context (CSS or XPath locator) to narrow the search.
+     *
+     * Note that if the locator matches a button of type `submit`, the form will be submitted.
+     *
+     * ``` php
+     * <?php
+     * // simple link
+     * $I->click('Logout');
+     * // button of form
+     * $I->click('Submit');
+     * // CSS button
+     * $I->click('#form input[type=submit]');
+     * // XPath
+     * $I->click('//form/*[@type=submit]');
+     * // link in context
+     * $I->click('Logout', '#nav');
+     * // using strict locator
+     * $I->click(['link' => 'Login']);
+     * ?>
+     * ```
+     *
+     * @param $link
+     * @param $context
+     * @see \Codeception\Lib\InnerBrowser::click()
+     */
+    public function click($link, $context = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('click', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page contains the given string (case insensitive).
+     *
+     * You can specify a specific HTML element (via CSS or XPath) as the second
+     * parameter to only search within that element.
+     *
+     * ``` php
+     * <?php
+     * $I->see('Logout');                 // I can suppose user is logged in
+     * $I->see('Sign Up', 'h1');          // I can suppose it's a signup page
+     * $I->see('Sign Up', '//body/h1');   // with XPath
+     * ```
+     *
+     * Note that the search is done after stripping all HTML tags from the body,
+     * so `$I->see('strong')` will return true for strings like:
+     *
+     *   - `<p>I am Stronger than thou</p>`
+     *   - `<script>document.createElement('strong');</script>`
+     *
+     * But will *not* be true for strings like:
+     *
+     *   - `<strong>Home</strong>`
+     *   - `<div class="strong">Home</strong>`
+     *   - `<!-- strong -->`
+     *
+     * For checking the raw source code, use `seeInSource()`.
+     *
+     * @param      $text
+     * @param null $selector
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::see()
+     */
+    public function canSee($text, $selector = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('see', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page contains the given string (case insensitive).
+     *
+     * You can specify a specific HTML element (via CSS or XPath) as the second
+     * parameter to only search within that element.
+     *
+     * ``` php
+     * <?php
+     * $I->see('Logout');                 // I can suppose user is logged in
+     * $I->see('Sign Up', 'h1');          // I can suppose it's a signup page
+     * $I->see('Sign Up', '//body/h1');   // with XPath
+     * ```
+     *
+     * Note that the search is done after stripping all HTML tags from the body,
+     * so `$I->see('strong')` will return true for strings like:
+     *
+     *   - `<p>I am Stronger than thou</p>`
+     *   - `<script>document.createElement('strong');</script>`
+     *
+     * But will *not* be true for strings like:
+     *
+     *   - `<strong>Home</strong>`
+     *   - `<div class="strong">Home</strong>`
+     *   - `<!-- strong -->`
+     *
+     * For checking the raw source code, use `seeInSource()`.
+     *
+     * @param      $text
+     * @param null $selector
+     * @see \Codeception\Lib\InnerBrowser::see()
+     */
+    public function see($text, $selector = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('see', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page doesn't contain the text specified (case insensitive).
+     * Give a locator as the second parameter to match a specific region.
+     *
+     * ```php
+     * <?php
+     * $I->dontSee('Login');                    // I can suppose user is already logged in
+     * $I->dontSee('Sign Up','h1');             // I can suppose it's not a signup page
+     * $I->dontSee('Sign Up','//body/h1');      // with XPath
+     * ```
+     *
+     * Note that the search is done after stripping all HTML tags from the body,
+     * so `$I->dontSee('strong')` will fail on strings like:
+     *
+     *   - `<p>I am Stronger than thou</p>`
+     *   - `<script>document.createElement('strong');</script>`
+     *
+     * But will ignore strings like:
+     *
+     *   - `<strong>Home</strong>`
+     *   - `<div class="strong">Home</strong>`
+     *   - `<!-- strong -->`
+     *
+     * For checking the raw source code, use `seeInSource()`.
+     *
+     * @param      $text
+     * @param null $selector
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSee()
+     */
+    public function cantSee($text, $selector = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSee', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page doesn't contain the text specified (case insensitive).
+     * Give a locator as the second parameter to match a specific region.
+     *
+     * ```php
+     * <?php
+     * $I->dontSee('Login');                    // I can suppose user is already logged in
+     * $I->dontSee('Sign Up','h1');             // I can suppose it's not a signup page
+     * $I->dontSee('Sign Up','//body/h1');      // with XPath
+     * ```
+     *
+     * Note that the search is done after stripping all HTML tags from the body,
+     * so `$I->dontSee('strong')` will fail on strings like:
+     *
+     *   - `<p>I am Stronger than thou</p>`
+     *   - `<script>document.createElement('strong');</script>`
+     *
+     * But will ignore strings like:
+     *
+     *   - `<strong>Home</strong>`
+     *   - `<div class="strong">Home</strong>`
+     *   - `<!-- strong -->`
+     *
+     * For checking the raw source code, use `seeInSource()`.
+     *
+     * @param      $text
+     * @param null $selector
+     * @see \Codeception\Lib\InnerBrowser::dontSee()
+     */
+    public function dontSee($text, $selector = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSee', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page contains the given string in its
+     * raw source code.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInSource('<h1>Green eggs &amp; ham</h1>');
+     * ```
+     *
+     * @param      $raw
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeInSource()
+     */
+    public function canSeeInSource($raw) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInSource', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page contains the given string in its
+     * raw source code.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInSource('<h1>Green eggs &amp; ham</h1>');
+     * ```
+     *
+     * @param      $raw
+     * @see \Codeception\Lib\InnerBrowser::seeInSource()
+     */
+    public function seeInSource($raw) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInSource', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page contains the given string in its
+     * raw source code.
+     *
+     * ```php
+     * <?php
+     * $I->dontSeeInSource('<h1>Green eggs &amp; ham</h1>');
+     * ```
+     *
+     * @param      $raw
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
+     */
+    public function cantSeeInSource($raw) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInSource', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current page contains the given string in its
+     * raw source code.
+     *
+     * ```php
+     * <?php
+     * $I->dontSeeInSource('<h1>Green eggs &amp; ham</h1>');
+     * ```
+     *
+     * @param      $raw
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
+     */
+    public function dontSeeInSource($raw) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInSource', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there's a link with the specified text.
+     * Give a full URL as the second parameter to match links with that exact URL.
+     *
+     * ``` php
+     * <?php
+     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
+     * $I->seeLink('Logout','/logout'); // matches <a href="http://github.com/logout">Logout</a>
+     * ?>
+     * ```
+     *
+     * @param      $text
+     * @param null $url
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeLink()
+     */
+    public function canSeeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeLink', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there's a link with the specified text.
+     * Give a full URL as the second parameter to match links with that exact URL.
+     *
+     * ``` php
+     * <?php
+     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
+     * $I->seeLink('Logout','/logout'); // matches <a href="http://github.com/logout">Logout</a>
+     * ?>
+     * ```
+     *
+     * @param      $text
+     * @param null $url
+     * @see \Codeception\Lib\InnerBrowser::seeLink()
+     */
+    public function seeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeLink', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page doesn't contain a link with the given string.
+     * If the second parameter is given, only links with a matching "href" attribute will be checked.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
+     * $I->dontSeeLink('Checkout now', '/store/cart.php');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * @param null $url
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
+     */
+    public function cantSeeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeLink', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page doesn't contain a link with the given string.
+     * If the second parameter is given, only links with a matching "href" attribute will be checked.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
+     * $I->dontSeeLink('Checkout now', '/store/cart.php');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * @param null $url
+     * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
+     */
+    public function dontSeeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeLink', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current URI contains the given string.
+     *
+     * ``` php
+     * <?php
+     * // to match: /home/dashboard
+     * $I->seeInCurrentUrl('home');
+     * // to match: /users/1
+     * $I->seeInCurrentUrl('/users/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
+     */
+    public function canSeeInCurrentUrl($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInCurrentUrl', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current URI contains the given string.
+     *
+     * ``` php
+     * <?php
+     * // to match: /home/dashboard
+     * $I->seeInCurrentUrl('home');
+     * // to match: /users/1
+     * $I->seeInCurrentUrl('/users/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
+     */
+    public function seeInCurrentUrl($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInCurrentUrl', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URI doesn't contain the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInCurrentUrl('/users/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
+     */
+    public function cantSeeInCurrentUrl($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInCurrentUrl', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URI doesn't contain the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInCurrentUrl('/users/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
+     */
+    public function dontSeeInCurrentUrl($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInCurrentUrl', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL is equal to the given string.
+     * Unlike `seeInCurrentUrl`, this only matches the full URL.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->seeCurrentUrlEquals('/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
+     */
+    public function canSeeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlEquals', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL is equal to the given string.
+     * Unlike `seeInCurrentUrl`, this only matches the full URL.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->seeCurrentUrlEquals('/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
+     */
+    public function seeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlEquals', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL doesn't equal the given string.
+     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
+     *
+     * ``` php
+     * <?php
+     * // current url is not root
+     * $I->dontSeeCurrentUrlEquals('/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
+     */
+    public function cantSeeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL doesn't equal the given string.
+     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
+     *
+     * ``` php
+     * <?php
+     * // current url is not root
+     * $I->dontSeeCurrentUrlEquals('/');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
+     */
+    public function dontSeeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlEquals', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL matches the given regular expression.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
+     */
+    public function canSeeCurrentUrlMatches($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlMatches', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the current URL matches the given regular expression.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
+     */
+    public function seeCurrentUrlMatches($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlMatches', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current url doesn't match the given regular expression.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->dontSeeCurrentUrlMatches('~$/users/(\d+)~');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
+     */
+    public function cantSeeCurrentUrlMatches($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current url doesn't match the given regular expression.
+     *
+     * ``` php
+     * <?php
+     * // to match root url
+     * $I->dontSeeCurrentUrlMatches('~$/users/(\d+)~');
+     * ?>
+     * ```
+     *
+     * @param $uri
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
+     */
+    public function dontSeeCurrentUrlMatches($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlMatches', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Executes the given regular expression against the current URI and returns the first match.
+     * If no parameters are provided, the full URI is returned.
+     *
+     * ``` php
+     * <?php
+     * $user_id = $I->grabFromCurrentUrl('~$/user/(\d+)/~');
+     * $uri = $I->grabFromCurrentUrl();
+     * ?>
+     * ```
+     *
+     * @param null $uri
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::grabFromCurrentUrl()
+     */
+    public function grabFromCurrentUrl($uri = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromCurrentUrl', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the specified checkbox is checked.
+     *
+     * ``` php
+     * <?php
+     * $I->seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
+     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form.
+     * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]');
+     * ?>
+     * ```
+     *
+     * @param $checkbox
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
+     */
+    public function canSeeCheckboxIsChecked($checkbox) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCheckboxIsChecked', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the specified checkbox is checked.
+     *
+     * ``` php
+     * <?php
+     * $I->seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
+     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form.
+     * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]');
+     * ?>
+     * ```
+     *
+     * @param $checkbox
+     * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
+     */
+    public function seeCheckboxIsChecked($checkbox) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCheckboxIsChecked', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Check that the specified checkbox is unchecked.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms
+     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form.
+     * ?>
+     * ```
+     *
+     * @param $checkbox
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
+     */
+    public function cantSeeCheckboxIsChecked($checkbox) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Check that the specified checkbox is unchecked.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms
+     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form.
+     * ?>
+     * ```
+     *
+     * @param $checkbox
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
+     */
+    public function dontSeeCheckboxIsChecked($checkbox) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCheckboxIsChecked', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given input field or textarea contains the given value.
+     * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInField('Body','Type your comment here');
+     * $I->seeInField('form textarea[name=body]','Type your comment here');
+     * $I->seeInField('form input[type=hidden]','hidden_value');
+     * $I->seeInField('#searchform input','Search');
+     * $I->seeInField('//form/*[@name=search]','Search');
+     * $I->seeInField(['name' => 'search'], 'Search');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeInField()
+     */
+    public function canSeeInField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInField', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given input field or textarea contains the given value.
+     * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInField('Body','Type your comment here');
+     * $I->seeInField('form textarea[name=body]','Type your comment here');
+     * $I->seeInField('form input[type=hidden]','hidden_value');
+     * $I->seeInField('#searchform input','Search');
+     * $I->seeInField('//form/*[@name=search]','Search');
+     * $I->seeInField(['name' => 'search'], 'Search');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * @see \Codeception\Lib\InnerBrowser::seeInField()
+     */
+    public function seeInField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInField', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that an input field or textarea doesn't contain the given value.
+     * For fuzzy locators, the field is matched by label text, CSS and XPath.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInField('Body','Type your comment here');
+     * $I->dontSeeInField('form textarea[name=body]','Type your comment here');
+     * $I->dontSeeInField('form input[type=hidden]','hidden_value');
+     * $I->dontSeeInField('#searchform input','Search');
+     * $I->dontSeeInField('//form/*[@name=search]','Search');
+     * $I->dontSeeInField(['name' => 'search'], 'Search');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
+     */
+    public function cantSeeInField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInField', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that an input field or textarea doesn't contain the given value.
+     * For fuzzy locators, the field is matched by label text, CSS and XPath.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInField('Body','Type your comment here');
+     * $I->dontSeeInField('form textarea[name=body]','Type your comment here');
+     * $I->dontSeeInField('form input[type=hidden]','hidden_value');
+     * $I->dontSeeInField('#searchform input','Search');
+     * $I->dontSeeInField('//form/*[@name=search]','Search');
+     * $I->dontSeeInField(['name' => 'search'], 'Search');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
+     */
+    public function dontSeeInField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInField', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if the array of form parameters (name => value) are set on the form matched with the
+     * passed selector.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('form[name=myform]', [
+     *      'input1' => 'value',
+     *      'input2' => 'other value',
+     * ]);
+     * ?>
+     * ```
+     *
+     * For multi-select elements, or to check values of multiple elements with the same name, an
+     * array may be passed:
+     *
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('.form-class', [
+     *      'multiselect' => [
+     *          'value1',
+     *          'value2',
+     *      ],
+     *      'checkbox[]' => [
+     *          'a checked value',
+     *          'another checked value',
+     *      ],
+     * ]);
+     * ?>
+     * ```
+     *
+     * Additionally, checkbox values can be checked with a boolean.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('#form-id', [
+     *      'checkbox1' => true,        // passes if checked
+     *      'checkbox2' => false,       // passes if unchecked
+     * ]);
+     * ?>
+     * ```
+     *
+     * Pair this with submitForm for quick testing magic.
+     *
+     * ``` php
+     * <?php
+     * $form = [
+     *      'field1' => 'value',
+     *      'field2' => 'another value',
+     *      'checkbox1' => true,
+     *      // ...
+     * ];
+     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
+     * // $I->amOnPage('/path/to/form-page') may be needed
+     * $I->seeInFormFields('//form[@id=my-form]', $form);
+     * ?>
+     * ```
+     *
+     * @param $formSelector
+     * @param $params
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
+     */
+    public function canSeeInFormFields($formSelector, $params) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInFormFields', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if the array of form parameters (name => value) are set on the form matched with the
+     * passed selector.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('form[name=myform]', [
+     *      'input1' => 'value',
+     *      'input2' => 'other value',
+     * ]);
+     * ?>
+     * ```
+     *
+     * For multi-select elements, or to check values of multiple elements with the same name, an
+     * array may be passed:
+     *
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('.form-class', [
+     *      'multiselect' => [
+     *          'value1',
+     *          'value2',
+     *      ],
+     *      'checkbox[]' => [
+     *          'a checked value',
+     *          'another checked value',
+     *      ],
+     * ]);
+     * ?>
+     * ```
+     *
+     * Additionally, checkbox values can be checked with a boolean.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInFormFields('#form-id', [
+     *      'checkbox1' => true,        // passes if checked
+     *      'checkbox2' => false,       // passes if unchecked
+     * ]);
+     * ?>
+     * ```
+     *
+     * Pair this with submitForm for quick testing magic.
+     *
+     * ``` php
+     * <?php
+     * $form = [
+     *      'field1' => 'value',
+     *      'field2' => 'another value',
+     *      'checkbox1' => true,
+     *      // ...
+     * ];
+     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
+     * // $I->amOnPage('/path/to/form-page') may be needed
+     * $I->seeInFormFields('//form[@id=my-form]', $form);
+     * ?>
+     * ```
+     *
+     * @param $formSelector
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
+     */
+    public function seeInFormFields($formSelector, $params) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInFormFields', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if the array of form parameters (name => value) are not set on the form matched with
+     * the passed selector.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('form[name=myform]', [
+     *      'input1' => 'non-existent value',
+     *      'input2' => 'other non-existent value',
+     * ]);
+     * ?>
+     * ```
+     *
+     * To check that an element hasn't been assigned any one of many values, an array can be passed
+     * as the value:
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('.form-class', [
+     *      'fieldName' => [
+     *          'This value shouldn\'t be set',
+     *          'And this value shouldn\'t be set',
+     *      ],
+     * ]);
+     * ?>
+     * ```
+     *
+     * Additionally, checkbox values can be checked with a boolean.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('#form-id', [
+     *      'checkbox1' => true,        // fails if checked
+     *      'checkbox2' => false,       // fails if unchecked
+     * ]);
+     * ?>
+     * ```
+     *
+     * @param $formSelector
+     * @param $params
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
+     */
+    public function cantSeeInFormFields($formSelector, $params) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInFormFields', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if the array of form parameters (name => value) are not set on the form matched with
+     * the passed selector.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('form[name=myform]', [
+     *      'input1' => 'non-existent value',
+     *      'input2' => 'other non-existent value',
+     * ]);
+     * ?>
+     * ```
+     *
+     * To check that an element hasn't been assigned any one of many values, an array can be passed
+     * as the value:
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('.form-class', [
+     *      'fieldName' => [
+     *          'This value shouldn\'t be set',
+     *          'And this value shouldn\'t be set',
+     *      ],
+     * ]);
+     * ?>
+     * ```
+     *
+     * Additionally, checkbox values can be checked with a boolean.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeInFormFields('#form-id', [
+     *      'checkbox1' => true,        // fails if checked
+     *      'checkbox2' => false,       // fails if unchecked
+     * ]);
+     * ?>
+     * ```
+     *
+     * @param $formSelector
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
+     */
+    public function dontSeeInFormFields($formSelector, $params) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInFormFields', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Submits the given form on the page, optionally with the given form
+     * values.  Pass the form field's values as an array in the second
+     * parameter.
+     *
+     * Although this function can be used as a short-hand version of
+     * `fillField()`, `selectOption()`, `click()` etc. it has some important
+     * differences:
+     *
+     *  * Only field *names* may be used, not CSS/XPath selectors nor field labels
+     *  * If a field is sent to this function that does *not* exist on the page,
+     *    it will silently be added to the HTTP request.  This is helpful for testing
+     *    some types of forms, but be aware that you will *not* get an exception
+     *    like you would if you called `fillField()` or `selectOption()` with
+     *    a missing field.
+     *
+     * Fields that are not provided will be filled by their values from the page,
+     * or from any previous calls to `fillField()`, `selectOption()` etc.
+     * You don't need to click the 'Submit' button afterwards.
+     * This command itself triggers the request to form's action.
+     *
+     * You can optionally specify which button's value to include
+     * in the request with the last parameter (as an alternative to
+     * explicitly setting its value in the second parameter), as
+     * button values are not otherwise included in the request.
+     *
+     * Examples:
+     *
+     * ``` php
+     * <?php
+     * $I->submitForm('#login', [
+     *     'login' => 'davert',
+     *     'password' => '123456'
+     * ]);
+     * // or
+     * $I->submitForm('#login', [
+     *     'login' => 'davert',
+     *     'password' => '123456'
+     * ], 'submitButtonName');
+     *
+     * ```
+     *
+     * For example, given this sample "Sign Up" form:
+     *
+     * ``` html
+     * <form action="http://github.com/sign_up">
+     *     Login:
+     *     <input type="text" name="user[login]" /><br/>
+     *     Password:
+     *     <input type="password" name="user[password]" /><br/>
+     *     Do you agree to our terms?
+     *     <input type="checkbox" name="user[agree]" /><br/>
+     *     Select pricing plan:
+     *     <select name="plan">
+     *         <option value="1">Free</option>
+     *         <option value="2" selected="selected">Paid</option>
+     *     </select>
+     *     <input type="submit" name="submitButton" value="Submit" />
+     * </form>
+     * ```
+     *
+     * You could write the following to submit it:
+     *
+     * ``` php
+     * <?php
+     * $I->submitForm(
+     *     '#userForm',
+     *     [
+     *         'user' => [
+     *             'login' => 'Davert',
+     *             'password' => '123456',
+     *             'agree' => true
+     *         ]
+     *     ],
+     *     'submitButton'
+     * );
+     * ```
+     * Note that "2" will be the submitted value for the "plan" field, as it is
+     * the selected option.
+     *
+     * You can also emulate a JavaScript submission by not specifying any
+     * buttons in the third parameter to submitForm.
+     *
+     * ```php
+     * <?php
+     * $I->submitForm(
+     *     '#userForm',
+     *     [
+     *         'user' => [
+     *             'login' => 'Davert',
+     *             'password' => '123456',
+     *             'agree' => true
+     *         ]
+     *     ]
+     * );
+     * ```
+     *
+     * This function works well when paired with `seeInFormFields()`
+     * for quickly testing CRUD interfaces and form validation logic.
+     *
+     * ``` php
+     * <?php
+     * $form = [
+     *      'field1' => 'value',
+     *      'field2' => 'another value',
+     *      'checkbox1' => true,
+     *      // ...
+     * ];
+     * $I->submitForm('#my-form', $form, 'submitButton');
+     * // $I->amOnPage('/path/to/form-page') may be needed
+     * $I->seeInFormFields('#my-form', $form);
+     * ```
+     *
+     * Parameter values can be set to arrays for multiple input fields
+     * of the same name, or multi-select combo boxes.  For checkboxes,
+     * you can use either the string value or boolean `true`/`false` which will
+     * be replaced by the checkbox's value in the DOM.
+     *
+     * ``` php
+     * <?php
+     * $I->submitForm('#my-form', [
+     *      'field1' => 'value',
+     *      'checkbox' => [
+     *          'value of first checkbox',
+     *          'value of second checkbox',
+     *      ],
+     *      'otherCheckboxes' => [
+     *          true,
+     *          false,
+     *          false
+     *      ],
+     *      'multiselect' => [
+     *          'first option value',
+     *          'second option value'
+     *      ]
+     * ]);
+     * ```
+     *
+     * Mixing string and boolean values for a checkbox's value is not supported
+     * and may produce unexpected results.
+     *
+     * Field names ending in `[]` must be passed without the trailing square
+     * bracket characters, and must contain an array for its value.  This allows
+     * submitting multiple values with the same name, consider:
+     *
+     * ```php
+     * <?php
+     * // This will NOT work correctly
+     * $I->submitForm('#my-form', [
+     *     'field[]' => 'value',
+     *     'field[]' => 'another value',  // 'field[]' is already a defined key
+     * ]);
+     * ```
+     *
+     * The solution is to pass an array value:
+     *
+     * ```php
+     * <?php
+     * // This way both values are submitted
+     * $I->submitForm('#my-form', [
+     *     'field' => [
+     *         'value',
+     *         'another value',
+     *     ]
+     * ]);
+     * ```
+     *
+     * @param $selector
+     * @param $params
+     * @param $button
+     * @see \Codeception\Lib\InnerBrowser::submitForm()
+     */
+    public function submitForm($selector, $params, $button = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Fills a text field or textarea with the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->fillField("//input[@type='text']", "Hello World!");
+     * $I->fillField(['name' => 'email'], 'jon@mail.com');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $value
+     * @see \Codeception\Lib\InnerBrowser::fillField()
+     */
+    public function fillField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('fillField', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Selects an option in a select tag or in radio button group.
+     *
+     * ``` php
+     * <?php
+     * $I->selectOption('form select[name=account]', 'Premium');
+     * $I->selectOption('form input[name=payment]', 'Monthly');
+     * $I->selectOption('//form/select[@name=account]', 'Monthly');
+     * ?>
+     * ```
+     *
+     * Provide an array for the second argument to select multiple options:
+     *
+     * ``` php
+     * <?php
+     * $I->selectOption('Which OS do you use?', array('Windows','Linux'));
+     * ?>
+     * ```
+     *
+     * Or provide an associative array for the second argument to specifically define which selection method should be used:
+     *
+     * ``` php
+     * <?php
+     * $I->selectOption('Which OS do you use?', array('text' => 'Windows')); // Only search by text 'Windows'
+     * $I->selectOption('Which OS do you use?', array('value' => 'windows')); // Only search by value 'windows'
+     * ?>
+     + ```
+     *
+     * @param $select
+     * @param $option
+     * @see \Codeception\Lib\InnerBrowser::selectOption()
+     */
+    public function selectOption($select, $option) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('selectOption', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Ticks a checkbox. For radio buttons, use the `selectOption` method instead.
+     *
+     * ``` php
+     * <?php
+     * $I->checkOption('#agree');
+     * ?>
+     * ```
+     *
+     * @param $option
+     * @see \Codeception\Lib\InnerBrowser::checkOption()
+     */
+    public function checkOption($option) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('checkOption', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Unticks a checkbox.
+     *
+     * ``` php
+     * <?php
+     * $I->uncheckOption('#notify');
+     * ?>
+     * ```
+     *
+     * @param $option
+     * @see \Codeception\Lib\InnerBrowser::uncheckOption()
+     */
+    public function uncheckOption($option) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('uncheckOption', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Attaches a file relative to the Codeception data directory to the given file upload field.
+     *
+     * ``` php
+     * <?php
+     * // file is stored in 'tests/_data/prices.xls'
+     * $I->attachFile('input[@type="file"]', 'prices.xls');
+     * ?>
+     * ```
+     *
+     * @param $field
+     * @param $filename
+     * @see \Codeception\Lib\InnerBrowser::attachFile()
+     */
+    public function attachFile($field, $filename) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('attachFile', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * If your page triggers an ajax request, you can perform it manually.
+     * This action sends a GET ajax request with specified params.
+     *
+     * See ->sendAjaxPostRequest for examples.
+     *
+     * @param $uri
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::sendAjaxGetRequest()
+     */
+    public function sendAjaxGetRequest($uri, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxGetRequest', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * If your page triggers an ajax request, you can perform it manually.
+     * This action sends a POST ajax request with specified params.
+     * Additional params can be passed as array.
+     *
+     * Example:
+     *
+     * Imagine that by clicking checkbox you trigger ajax request which updates user settings.
+     * We emulate that click by running this ajax request manually.
+     *
+     * ``` php
+     * <?php
+     * $I->sendAjaxPostRequest('/updateSettings', array('notifications' => true)); // POST
+     * $I->sendAjaxGetRequest('/updateSettings', array('notifications' => true)); // GET
+     *
+     * ```
+     *
+     * @param $uri
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::sendAjaxPostRequest()
+     */
+    public function sendAjaxPostRequest($uri, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxPostRequest', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * If your page triggers an ajax request, you can perform it manually.
+     * This action sends an ajax request with specified method and params.
+     *
+     * Example:
+     *
+     * You need to perform an ajax request specifying the HTTP method.
+     *
+     * ``` php
+     * <?php
+     * $I->sendAjaxRequest('PUT', '/posts/7', array('title' => 'new title'));
+     *
+     * ```
+     *
+     * @param $method
+     * @param $uri
+     * @param $params
+     * @see \Codeception\Lib\InnerBrowser::sendAjaxRequest()
+     */
+    public function sendAjaxRequest($method, $uri, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxRequest', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Finds and returns the text contents of the given element.
+     * If a fuzzy locator is used, the element is found using CSS, XPath,
+     * and by matching the full page source by regular expression.
+     *
+     * ``` php
+     * <?php
+     * $heading = $I->grabTextFrom('h1');
+     * $heading = $I->grabTextFrom('descendant-or-self::h1');
+     * $value = $I->grabTextFrom('~<input value=(.*?)]~sgi'); // match with a regex
+     * ?>
+     * ```
+     *
+     * @param $cssOrXPathOrRegex
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::grabTextFrom()
+     */
+    public function grabTextFrom($cssOrXPathOrRegex) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabTextFrom', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Grabs the value of the given attribute value from the given element.
+     * Fails if element is not found.
+     *
+     * ``` php
+     * <?php
+     * $I->grabAttributeFrom('#tooltip', 'title');
+     * ?>
+     * ```
+     *
+     *
+     * @param $cssOrXpath
+     * @param $attribute
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::grabAttributeFrom()
+     */
+    public function grabAttributeFrom($cssOrXpath, $attribute) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabAttributeFrom', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Grabs either the text content, or attribute values, of nodes
+     * matched by $cssOrXpath and returns them as an array.
+     *
+     * ```html
+     * <a href="#first">First</a>
+     * <a href="#second">Second</a>
+     * <a href="#third">Third</a>
+     * ```
+     *
+     * ```php
+     * <?php
+     * // would return ['First', 'Second', 'Third']
+     * $aLinkText = $I->grabMultiple('a');
+     *
+     * // would return ['#first', '#second', '#third']
+     * $aLinks = $I->grabMultiple('a', 'href');
+     * ?>
+     * ```
+     *
+     * @param $cssOrXpath
+     * @param $attribute
+     * @return string[]
+     * @see \Codeception\Lib\InnerBrowser::grabMultiple()
+     */
+    public function grabMultiple($cssOrXpath, $attribute = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabMultiple', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * @param $field
+     *
+     * @return array|mixed|null|string
+     * @see \Codeception\Lib\InnerBrowser::grabValueFrom()
+     */
+    public function grabValueFrom($field) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabValueFrom', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Sets a cookie with the given name and value.
+     * You can set additional cookie params like `domain`, `path`, `expires`, `secure` in array passed as last argument.
+     *
+     * ``` php
+     * <?php
+     * $I->setCookie('PHPSESSID', 'el4ukv0kqbvoirg7nkp4dncpk3');
+     * ?>
+     * ```
+     *
+     * @param $name
+     * @param $val
+     * @param array $params
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::setCookie()
+     */
+    public function setCookie($name, $val, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Grabs a cookie value.
+     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
+     *
+     * @param $cookie
+     *
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::grabCookie()
+     */
+    public function grabCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that a cookie with the given name is set.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     *
+     * ``` php
+     * <?php
+     * $I->seeCookie('PHPSESSID');
+     * ?>
+     * ```
+     *
+     * @param $cookie
+     * @param array $params
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeCookie()
+     */
+    public function canSeeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCookie', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that a cookie with the given name is set.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     *
+     * ``` php
+     * <?php
+     * $I->seeCookie('PHPSESSID');
+     * ?>
+     * ```
+     *
+     * @param $cookie
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::seeCookie()
+     */
+    public function seeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there isn't a cookie with the given name.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     *
+     * @param $cookie
+     *
+     * @param array $params
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
+     */
+    public function cantSeeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCookie', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there isn't a cookie with the given name.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     *
+     * @param $cookie
+     *
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
+     */
+    public function dontSeeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Unsets cookie with the given name.
+     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
+     *
+     * @param $cookie
+     *
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::resetCookie()
+     */
+    public function resetCookie($name, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element exists on the page and is visible.
+     * You can also specify expected attributes of this element.
+     *
+     * ``` php
+     * <?php
+     * $I->seeElement('.error');
+     * $I->seeElement('//form/input[1]');
+     * $I->seeElement('input', ['name' => 'login']);
+     * $I->seeElement('input', ['value' => '123456']);
+     *
+     * // strict locator in first arg, attributes in second
+     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param array $attributes
+     * @return
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeElement()
+     */
+    public function canSeeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElement', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element exists on the page and is visible.
+     * You can also specify expected attributes of this element.
+     *
+     * ``` php
+     * <?php
+     * $I->seeElement('.error');
+     * $I->seeElement('//form/input[1]');
+     * $I->seeElement('input', ['name' => 'login']);
+     * $I->seeElement('input', ['value' => '123456']);
+     *
+     * // strict locator in first arg, attributes in second
+     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param array $attributes
+     * @return
+     * @see \Codeception\Lib\InnerBrowser::seeElement()
+     */
+    public function seeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElement', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element is invisible or not present on the page.
+     * You can also specify expected attributes of this element.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeElement('.error');
+     * $I->dontSeeElement('//form/input[1]');
+     * $I->dontSeeElement('input', ['name' => 'login']);
+     * $I->dontSeeElement('input', ['value' => '123456']);
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param array $attributes
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
+     */
+    public function cantSeeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElement', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element is invisible or not present on the page.
+     * You can also specify expected attributes of this element.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeElement('.error');
+     * $I->dontSeeElement('//form/input[1]');
+     * $I->dontSeeElement('input', ['name' => 'login']);
+     * $I->dontSeeElement('input', ['value' => '123456']);
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param array $attributes
+     * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
+     */
+    public function dontSeeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElement', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there are a certain number of elements matched by the given locator on the page.
+     *
+     * ``` php
+     * <?php
+     * $I->seeNumberOfElements('tr', 10);
+     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
+     * ?>
+     * ```
+     * @param $selector
+     * @param mixed $expected :
+     * - string: strict number
+     * - array: range of numbers [0,10]
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
+     */
+    public function canSeeNumberOfElements($selector, $expected) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElements', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there are a certain number of elements matched by the given locator on the page.
+     *
+     * ``` php
+     * <?php
+     * $I->seeNumberOfElements('tr', 10);
+     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
+     * ?>
+     * ```
+     * @param $selector
+     * @param mixed $expected :
+     * - string: strict number
+     * - array: range of numbers [0,10]
+     * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
+     */
+    public function seeNumberOfElements($selector, $expected) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElements', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given option is selected.
+     *
+     * ``` php
+     * <?php
+     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
+     */
+    public function canSeeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeOptionIsSelected', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given option is selected.
+     *
+     * ``` php
+     * <?php
+     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
+     */
+    public function seeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeOptionIsSelected', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given option is not selected.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
+     */
+    public function cantSeeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeOptionIsSelected', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given option is not selected.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
+     */
+    public function dontSeeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeOptionIsSelected', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Asserts that current page has 404 response status code.
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
+     */
+    public function canSeePageNotFound() {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seePageNotFound', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Asserts that current page has 404 response status code.
+     * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
+     */
+    public function seePageNotFound() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seePageNotFound', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that response code is equal to value provided.
+     *
+     * ```php
+     * <?php
+     * $I->seeResponseCodeIs(200);
+     *
+     * // recommended \Codeception\Util\HttpCode
+     * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
+     * ```
+     *
+     * @param $code
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
+     */
+    public function canSeeResponseCodeIs($code) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIs', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that response code is equal to value provided.
+     *
+     * ```php
+     * <?php
+     * $I->seeResponseCodeIs(200);
+     *
+     * // recommended \Codeception\Util\HttpCode
+     * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
+     * ```
+     *
+     * @param $code
+     * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
+     */
+    public function seeResponseCodeIs($code) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIs', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that response code is equal to value provided.
+     *
+     * ```php
+     * <?php
+     * $I->dontSeeResponseCodeIs(200);
+     *
+     * // recommended \Codeception\Util\HttpCode
+     * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
+     * ```
+     * @param $code
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
+     */
+    public function cantSeeResponseCodeIs($code) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeResponseCodeIs', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that response code is equal to value provided.
+     *
+     * ```php
+     * <?php
+     * $I->dontSeeResponseCodeIs(200);
+     *
+     * // recommended \Codeception\Util\HttpCode
+     * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
+     * ```
+     * @param $code
+     * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
+     */
+    public function dontSeeResponseCodeIs($code) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeResponseCodeIs', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title contains the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInTitle('Blog - Post #1');
+     * ?>
+     * ```
+     *
+     * @param $title
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::seeInTitle()
+     */
+    public function canSeeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInTitle', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title contains the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInTitle('Blog - Post #1');
+     * ?>
+     * ```
+     *
+     * @param $title
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::seeInTitle()
+     */
+    public function seeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInTitle', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title does not contain the given string.
+     *
+     * @param $title
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
+     */
+    public function cantSeeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInTitle', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title does not contain the given string.
+     *
+     * @param $title
+     *
+     * @return mixed
+     * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
+     */
+    public function dontSeeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInTitle', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Switch to iframe or frame on the page.
+     *
+     * Example:
+     * ``` html
+     * <iframe name="another_frame" src="http://example.com/">
+     * ```
+     *
+     * ``` php
+     * <?php
+     * # switch to iframe
+     * $I->switchToIframe("another_frame");
+     * ```
+     *
+     * @param string $name
+     * @see \Codeception\Lib\InnerBrowser::switchToIframe()
+     */
+    public function switchToIframe($name) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('switchToIframe', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Moves back in history.
+     *
+     * @param int $numberOfSteps (default value 1)
+     * @see \Codeception\Lib\InnerBrowser::moveBack()
+     */
+    public function moveBack($numberOfSteps = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('moveBack', func_get_args()));
+    }
+}
diff --git a/tests/_support/_generated/UnitTesterActions.php b/tests/_support/_generated/UnitTesterActions.php
new file mode 100644
index 000000000..a07060947
--- /dev/null
+++ b/tests/_support/_generated/UnitTesterActions.php
@@ -0,0 +1,576 @@
+<?php  //[STAMP] 5277d920e2dff79e69b22748b3b5c29b
+namespace _generated;
+
+// This class was automatically generated by build task
+// You should not change it manually as it will be overwritten on next build
+// @codingStandardsIgnoreFile
+
+use Codeception\Module\Asserts;
+use Codeception\Module\Yii2;
+
+trait UnitTesterActions
+{
+    /**
+     * @return \Codeception\Scenario
+     */
+    abstract protected function getScenario();
+
+    
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that two variables are equal.
+     *
+     * @param        $expected
+     * @param        $actual
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertEquals()
+     */
+    public function assertEquals($expected, $actual, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEquals', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that two variables are not equal
+     *
+     * @param        $expected
+     * @param        $actual
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertNotEquals()
+     */
+    public function assertNotEquals($expected, $actual, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEquals', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that two variables are same
+     *
+     * @param        $expected
+     * @param        $actual
+     * @param string $message
+     * @return mixed|void
+     * @see \Codeception\Module\Asserts::assertSame()
+     */
+    public function assertSame($expected, $actual, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertSame', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that two variables are not same
+     *
+     * @param        $expected
+     * @param        $actual
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertNotSame()
+     */
+    public function assertNotSame($expected, $actual, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotSame', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that actual is greater than expected
+     *
+     * @param        $expected
+     * @param        $actual
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertGreaterThan()
+     */
+    public function assertGreaterThan($expected, $actual, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThan', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that actual is greater or equal than expected
+     *
+     * @param        $expected
+     * @param        $actual
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertGreaterThanOrEqual()
+     */
+    public function assertGreaterThanOrEqual($expected, $actual, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThanOrEqual', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that actual is less than expected
+     *
+     * @param        $expected
+     * @param        $actual
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertLessThan()
+     */
+    public function assertLessThan($expected, $actual, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThan', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that actual is less or equal than expected
+     *
+     * @param        $expected
+     * @param        $actual
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertLessThanOrEqual()
+     */
+    public function assertLessThanOrEqual($expected, $actual, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThanOrEqual', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that haystack contains needle
+     *
+     * @param        $needle
+     * @param        $haystack
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertContains()
+     */
+    public function assertContains($needle, $haystack, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertContains', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that haystack doesn't contain needle.
+     *
+     * @param        $needle
+     * @param        $haystack
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertNotContains()
+     */
+    public function assertNotContains($needle, $haystack, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotContains', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that string match with pattern
+     *
+     * @param string $pattern
+     * @param string $string
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertRegExp()
+     */
+    public function assertRegExp($pattern, $string, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertRegExp', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that string not match with pattern
+     *
+     * @param string $pattern
+     * @param string $string
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertNotRegExp()
+     */
+    public function assertNotRegExp($pattern, $string, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotRegExp', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that variable is empty.
+     *
+     * @param        $actual
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertEmpty()
+     */
+    public function assertEmpty($actual, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEmpty', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that variable is not empty.
+     *
+     * @param        $actual
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertNotEmpty()
+     */
+    public function assertNotEmpty($actual, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEmpty', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that variable is NULL
+     *
+     * @param        $actual
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertNull()
+     */
+    public function assertNull($actual, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNull', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that variable is not NULL
+     *
+     * @param        $actual
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertNotNull()
+     */
+    public function assertNotNull($actual, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotNull', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that condition is positive.
+     *
+     * @param        $condition
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertTrue()
+     */
+    public function assertTrue($condition, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertTrue', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that condition is negative.
+     *
+     * @param        $condition
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertFalse()
+     */
+    public function assertFalse($condition, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFalse', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if file exists
+     *
+     * @param string $filename
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertFileExists()
+     */
+    public function assertFileExists($filename, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileExists', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks if file doesn't exist
+     *
+     * @param string $filename
+     * @param string $message
+     * @see \Codeception\Module\Asserts::assertFileNotExists()
+     */
+    public function assertFileNotExists($filename, $message = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileNotExists', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * @param $expected
+     * @param $actual
+     * @param $description
+     * @see \Codeception\Module\Asserts::assertGreaterOrEquals()
+     */
+    public function assertGreaterOrEquals($expected, $actual, $description = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterOrEquals', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * @param $expected
+     * @param $actual
+     * @param $description
+     * @see \Codeception\Module\Asserts::assertLessOrEquals()
+     */
+    public function assertLessOrEquals($expected, $actual, $description = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessOrEquals', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * @param $actual
+     * @param $description
+     * @see \Codeception\Module\Asserts::assertIsEmpty()
+     */
+    public function assertIsEmpty($actual, $description = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsEmpty', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * @param $key
+     * @param $actual
+     * @param $description
+     * @see \Codeception\Module\Asserts::assertArrayHasKey()
+     */
+    public function assertArrayHasKey($key, $actual, $description = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayHasKey', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * @param $key
+     * @param $actual
+     * @param $description
+     * @see \Codeception\Module\Asserts::assertArrayNotHasKey()
+     */
+    public function assertArrayNotHasKey($key, $actual, $description = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayNotHasKey', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * @param $class
+     * @param $actual
+     * @param $description
+     * @see \Codeception\Module\Asserts::assertInstanceOf()
+     */
+    public function assertInstanceOf($class, $actual, $description = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInstanceOf', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * @param $class
+     * @param $actual
+     * @param $description
+     * @see \Codeception\Module\Asserts::assertNotInstanceOf()
+     */
+    public function assertNotInstanceOf($class, $actual, $description = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotInstanceOf', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * @param $type
+     * @param $actual
+     * @param $description
+     * @see \Codeception\Module\Asserts::assertInternalType()
+     */
+    public function assertInternalType($type, $actual, $description = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInternalType', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Fails the test with message.
+     *
+     * @param $message
+     * @see \Codeception\Module\Asserts::fail()
+     */
+    public function fail($message) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('fail', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Handles and checks exception called inside callback function.
+     * Either exception class name or exception instance should be provided.
+     *
+     * ```php
+     * <?php
+     * $I->expectException(MyException::class, function() {
+     *     $this->doSomethingBad();
+     * });
+     *
+     * $I->expectException(new MyException(), function() {
+     *     $this->doSomethingBad();
+     * });
+     * ```
+     * If you want to check message or exception code, you can pass them with exception instance:
+     * ```php
+     * <?php
+     * // will check that exception MyException is thrown with "Don't do bad things" message
+     * $I->expectException(new MyException("Don't do bad things"), function() {
+     *     $this->doSomethingBad();
+     * });
+     * ```
+     *
+     * @param $exception string or \Exception
+     * @param $callback
+     * @see \Codeception\Module\Asserts::expectException()
+     */
+    public function expectException($exception, $callback) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('expectException', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Inserts record into the database.
+     *
+     * ``` php
+     * <?php
+     * $user_id = $I->haveRecord('app\models\User', array('name' => 'Davert'));
+     * ?>
+     * ```
+     *
+     * @param $model
+     * @param array $attributes
+     * @return mixed
+     * @part orm
+     * @see \Codeception\Module\Yii2::haveRecord()
+     */
+    public function haveRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveRecord', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that record exists in database.
+     *
+     * ``` php
+     * $I->seeRecord('app\models\User', array('name' => 'davert'));
+     * ```
+     *
+     * @param $model
+     * @param array $attributes
+     * @part orm
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Yii2::seeRecord()
+     */
+    public function canSeeRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeRecord', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that record exists in database.
+     *
+     * ``` php
+     * $I->seeRecord('app\models\User', array('name' => 'davert'));
+     * ```
+     *
+     * @param $model
+     * @param array $attributes
+     * @part orm
+     * @see \Codeception\Module\Yii2::seeRecord()
+     */
+    public function seeRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeRecord', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that record does not exist in database.
+     *
+     * ``` php
+     * $I->dontSeeRecord('app\models\User', array('name' => 'davert'));
+     * ```
+     *
+     * @param $model
+     * @param array $attributes
+     * @part orm
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Yii2::dontSeeRecord()
+     */
+    public function cantSeeRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeRecord', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that record does not exist in database.
+     *
+     * ``` php
+     * $I->dontSeeRecord('app\models\User', array('name' => 'davert'));
+     * ```
+     *
+     * @param $model
+     * @param array $attributes
+     * @part orm
+     * @see \Codeception\Module\Yii2::dontSeeRecord()
+     */
+    public function dontSeeRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeRecord', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Retrieves record from database
+     *
+     * ``` php
+     * $category = $I->grabRecord('app\models\User', array('name' => 'davert'));
+     * ```
+     *
+     * @param $model
+     * @param array $attributes
+     * @return mixed
+     * @part orm
+     * @see \Codeception\Module\Yii2::grabRecord()
+     */
+    public function grabRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabRecord', func_get_args()));
+    }
+}
diff --git a/tests/acceptance.suite.yml.example b/tests/acceptance.suite.yml.example
new file mode 100644
index 000000000..d36d7360b
--- /dev/null
+++ b/tests/acceptance.suite.yml.example
@@ -0,0 +1,27 @@
+# Codeception Test Suite Configuration
+
+# suite for acceptance tests.
+# perform tests in browser using the Selenium-like tools.
+# powered by Mink (http://mink.behat.org).
+# (tip: that's what your customer will see).
+# (tip: test your ajax and javascript by one of Mink drivers).
+
+# RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
+
+class_name: AcceptanceTester
+modules:
+    enabled:
+        - PhpBrowser
+# you can use WebDriver instead of PhpBrowser to test javascript and ajax.
+# This will require you to install selenium. See http://codeception.com/docs/03-AcceptanceTests#selenium-webdriver
+# "restart" option is used by the WebDriver to start each time per test-file new session and cookies,
+# it is useful if you want to login in your app in each test.
+#        - WebDriver
+    config:
+        PhpBrowser:
+# PLEASE ADJUST IT TO THE ACTUAL ENTRY POINT WITHOUT PATH INFO
+            url: http://localhost:8080
+#        WebDriver:
+#            url: http://localhost:8080
+#            browser: firefox
+#            restart: true
diff --git a/tests/acceptance/AboutCept.php b/tests/acceptance/AboutCept.php
new file mode 100644
index 000000000..88a550698
--- /dev/null
+++ b/tests/acceptance/AboutCept.php
@@ -0,0 +1,10 @@
+<?php
+
+use tests\codeception\_pages\AboutPage;
+
+/* @var $scenario Codeception\Scenario */
+
+$I = new AcceptanceTester($scenario);
+$I->wantTo('ensure that about works');
+AboutPage::openBy($I);
+$I->see('About', 'h1');
diff --git a/tests/acceptance/ContactCept.php b/tests/acceptance/ContactCept.php
new file mode 100644
index 000000000..f848443da
--- /dev/null
+++ b/tests/acceptance/ContactCept.php
@@ -0,0 +1,57 @@
+<?php
+
+use tests\codeception\_pages\ContactPage;
+
+/* @var $scenario Codeception\Scenario */
+
+$I = new AcceptanceTester($scenario);
+$I->wantTo('ensure that contact works');
+
+$contactPage = ContactPage::openBy($I);
+
+$I->see('Contact', 'h1');
+
+$I->amGoingTo('submit contact form with no data');
+$contactPage->submit([]);
+if (method_exists($I, 'wait')) {
+    $I->wait(3); // only for selenium
+}
+$I->expectTo('see validations errors');
+$I->see('Contact', 'h1');
+$I->see('Name cannot be blank');
+$I->see('Email cannot be blank');
+$I->see('Subject cannot be blank');
+$I->see('Body cannot be blank');
+$I->see('The verification code is incorrect');
+
+$I->amGoingTo('submit contact form with not correct email');
+$contactPage->submit([
+    'name' => 'tester',
+    'email' => 'tester.email',
+    'subject' => 'test subject',
+    'body' => 'test content',
+    'verifyCode' => 'testme',
+]);
+if (method_exists($I, 'wait')) {
+    $I->wait(3); // only for selenium
+}
+$I->expectTo('see that email address is wrong');
+$I->dontSee('Name cannot be blank', '.help-inline');
+$I->see('Email is not a valid email address.');
+$I->dontSee('Subject cannot be blank', '.help-inline');
+$I->dontSee('Body cannot be blank', '.help-inline');
+$I->dontSee('The verification code is incorrect', '.help-inline');
+
+$I->amGoingTo('submit contact form with correct data');
+$contactPage->submit([
+    'name' => 'tester',
+    'email' => 'tester@example.com',
+    'subject' => 'test subject',
+    'body' => 'test content',
+    'verifyCode' => 'testme',
+]);
+if (method_exists($I, 'wait')) {
+    $I->wait(3); // only for selenium
+}
+$I->dontSeeElement('#contact-form');
+$I->see('Thank you for contacting us. We will respond to you as soon as possible.');
diff --git a/tests/acceptance/HomeCept.php b/tests/acceptance/HomeCept.php
new file mode 100644
index 000000000..1f9353595
--- /dev/null
+++ b/tests/acceptance/HomeCept.php
@@ -0,0 +1,11 @@
+<?php
+
+/* @var $scenario Codeception\Scenario */
+
+$I = new AcceptanceTester($scenario);
+$I->wantTo('ensure that home page works');
+$I->amOnPage(Yii::$app->homeUrl);
+$I->see('My Company');
+$I->seeLink('About');
+$I->click('About');
+$I->see('This is the About page.');
diff --git a/tests/acceptance/LoginCept.php b/tests/acceptance/LoginCept.php
new file mode 100644
index 000000000..90d063583
--- /dev/null
+++ b/tests/acceptance/LoginCept.php
@@ -0,0 +1,37 @@
+<?php
+
+use tests\codeception\_pages\LoginPage;
+
+/* @var $scenario Codeception\Scenario */
+
+$I = new AcceptanceTester($scenario);
+$I->wantTo('ensure that login works');
+
+$loginPage = LoginPage::openBy($I);
+
+$I->see('Login', 'h1');
+
+$I->amGoingTo('try to login with empty credentials');
+$loginPage->login('', '');
+if (method_exists($I, 'wait')) {
+    $I->wait(3); // only for selenium
+}
+$I->expectTo('see validations errors');
+$I->see('Username cannot be blank.');
+$I->see('Password cannot be blank.');
+
+$I->amGoingTo('try to login with wrong credentials');
+$loginPage->login('admin', 'wrong');
+if (method_exists($I, 'wait')) {
+    $I->wait(3); // only for selenium
+}
+$I->expectTo('see validations errors');
+$I->see('Incorrect username or password.');
+
+$I->amGoingTo('try to login with correct credentials');
+$loginPage->login('admin', 'admin');
+if (method_exists($I, 'wait')) {
+    $I->wait(3); // only for selenium
+}
+$I->expectTo('see user info');
+$I->see('Logout (admin)');
diff --git a/tests/codeception/acceptance/_bootstrap.php b/tests/acceptance/_bootstrap.php
similarity index 100%
rename from tests/codeception/acceptance/_bootstrap.php
rename to tests/acceptance/_bootstrap.php
diff --git a/tests/codeception/bin/_bootstrap.php b/tests/bin/_bootstrap.php
similarity index 100%
rename from tests/codeception/bin/_bootstrap.php
rename to tests/bin/_bootstrap.php
diff --git a/tests/codeception/bin/yii b/tests/bin/yii
similarity index 100%
rename from tests/codeception/bin/yii
rename to tests/bin/yii
diff --git a/tests/codeception/bin/yii.bat b/tests/bin/yii.bat
similarity index 100%
rename from tests/codeception/bin/yii.bat
rename to tests/bin/yii.bat
diff --git a/tests/codeception/_bootstrap.php b/tests/codeception/_bootstrap.php
deleted file mode 100644
index f24347fe5..000000000
--- a/tests/codeception/_bootstrap.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_ENV') or define('YII_ENV', 'test');
-
-defined('YII_TEST_ENTRY_URL') or define('YII_TEST_ENTRY_URL', parse_url(http://github.com/Codeception/Configuration::config()['config']['test_entry_url'], PHP_URL_PATH));
-defined('YII_TEST_ENTRY_FILE') or define('YII_TEST_ENTRY_FILE', dirname(dirname(__DIR__)) . '/web/index-test.php');
-
-require_once(__DIR__ . '/../../vendor/autoload.php');
-require_once(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
-
-$_SERVER['SCRIPT_FILENAME'] = YII_TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = YII_TEST_ENTRY_URL;
-$_SERVER['SERVER_NAME'] = parse_url(http://github.com/Codeception/Configuration::config()['config']['test_entry_url'], PHP_URL_HOST);
-$_SERVER['SERVER_PORT'] =  parse_url(http://github.com/Codeception/Configuration::config()['config']['test_entry_url'], PHP_URL_PORT) ?: '80';
-
-Yii::setAlias('@tests', dirname(__DIR__));
-
-/**
- * this configure codeception specify to not deep clone objects properties
- * it can be configure localy in your tests
- * @see https://github.com/Codeception/Specify/tree/master/docs
- */
-\Codeception\Specify\Config::setDeepClone(false);
diff --git a/tests/codeception/config/config.php b/tests/codeception/config/config.php
deleted file mode 100644
index d4e1f77ce..000000000
--- a/tests/codeception/config/config.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Application configuration shared by all test types
- */
-return [
-    'language' => 'en-US',
-    'controllerMap' => [
-        'fixture' => [
-            'class' => 'yii\faker\FixtureController',
-            'fixtureDataPath' => '@tests/codeception/fixtures',
-            'templatePath' => '@tests/codeception/templates',
-            'namespace' => 'tests\codeception\fixtures',
-        ],
-    ],
-    'components' => [
-        'db' => [
-            'dsn' => 'mysql:host=localhost;dbname=yii2_basic_tests',
-        ],
-        'mailer' => [
-            'useFileTransport' => true,
-        ],
-        'urlManager' => [
-            'showScriptName' => true,
-        ],
-    ],
-];
diff --git a/tests/codeception/functional/_bootstrap.php b/tests/codeception/functional/_bootstrap.php
deleted file mode 100644
index 8aac0915b..000000000
--- a/tests/codeception/functional/_bootstrap.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-new yii\web\Application(require(dirname(__DIR__) . '/config/functional.php'));
diff --git a/tests/codeception/config/acceptance.php b/tests/config/acceptance.php
similarity index 75%
rename from tests/codeception/config/acceptance.php
rename to tests/config/acceptance.php
index c688575b6..1c893d43a 100644
--- a/tests/codeception/config/acceptance.php
+++ b/tests/config/acceptance.php
@@ -3,7 +3,7 @@
  * Application configuration for acceptance tests
  */
 return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../../config/web.php'),
+    require(__DIR__ . '/../../config/web.php'),
     require(__DIR__ . '/config.php'),
     [
 
diff --git a/tests/codeception/config/functional.php b/tests/config/functional.php
similarity index 79%
rename from tests/codeception/config/functional.php
rename to tests/config/functional.php
index 6d22bd97b..15d9797a0 100644
--- a/tests/codeception/config/functional.php
+++ b/tests/config/functional.php
@@ -1,12 +1,9 @@
 <?php
-$_SERVER['SCRIPT_FILENAME'] = YII_TEST_ENTRY_FILE;
-$_SERVER['SCRIPT_NAME'] = YII_TEST_ENTRY_URL;
-
 /**
  * Application configuration for functional tests
  */
 return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../../config/web.php'),
+    require(__DIR__ . '/../../config/web.php'),
     require(__DIR__ . '/config.php'),
     [
         'components' => [
diff --git a/tests/codeception/config/unit.php b/tests/config/unit.php
similarity index 74%
rename from tests/codeception/config/unit.php
rename to tests/config/unit.php
index 5bab5eaec..455a9e9e0 100644
--- a/tests/codeception/config/unit.php
+++ b/tests/config/unit.php
@@ -3,7 +3,7 @@
  * Application configuration for unit tests
  */
 return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../../config/web.php'),
+    require(__DIR__ . '/../../config/web.php'),
     require(__DIR__ . '/config.php'),
     [
 
diff --git a/tests/codeception/fixtures/.gitignore b/tests/fixtures/.gitignore
similarity index 100%
rename from tests/codeception/fixtures/.gitignore
rename to tests/fixtures/.gitignore
diff --git a/tests/codeception/functional.suite.yml b/tests/functional.suite.yml
similarity index 76%
rename from tests/codeception/functional.suite.yml
rename to tests/functional.suite.yml
index ad7164cb6..027ece093 100644
--- a/tests/codeception/functional.suite.yml
+++ b/tests/functional.suite.yml
@@ -10,7 +10,5 @@ class_name: FunctionalTester
 modules:
     enabled:
       - Filesystem
-      - Yii2
-    config:
-        Yii2:
-            configFile: 'codeception/config/functional.php'
+      - Yii2:
+            configFile: 'config/test.php'
diff --git a/tests/codeception/functional/AboutCept.php b/tests/functional/AboutCept.php
similarity index 100%
rename from tests/codeception/functional/AboutCept.php
rename to tests/functional/AboutCept.php
diff --git a/tests/codeception/functional/ContactCept.php b/tests/functional/ContactCept.php
similarity index 100%
rename from tests/codeception/functional/ContactCept.php
rename to tests/functional/ContactCept.php
diff --git a/tests/codeception/functional/HomeCept.php b/tests/functional/HomeCept.php
similarity index 100%
rename from tests/codeception/functional/HomeCept.php
rename to tests/functional/HomeCept.php
diff --git a/tests/codeception/functional/LoginCept.php b/tests/functional/LoginCept.php
similarity index 100%
rename from tests/codeception/functional/LoginCept.php
rename to tests/functional/LoginCept.php
diff --git a/tests/functional/_bootstrap.php b/tests/functional/_bootstrap.php
new file mode 100644
index 000000000..b3d9bbc7f
--- /dev/null
+++ b/tests/functional/_bootstrap.php
@@ -0,0 +1 @@
+<?php
diff --git a/tests/codeception/templates/.gitignore b/tests/templates/.gitignore
similarity index 100%
rename from tests/codeception/templates/.gitignore
rename to tests/templates/.gitignore
diff --git a/tests/codeception/unit.suite.yml b/tests/unit.suite.yml
similarity index 56%
rename from tests/codeception/unit.suite.yml
rename to tests/unit.suite.yml
index a0582a536..c0a304899 100644
--- a/tests/codeception/unit.suite.yml
+++ b/tests/unit.suite.yml
@@ -4,3 +4,9 @@
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
 class_name: UnitTester
+modules:
+    enabled:
+      - Asserts
+      - Yii2:
+            configFile: 'config/test.php'
+            part: orm
\ No newline at end of file
diff --git a/tests/codeception/unit/_bootstrap.php b/tests/unit/_bootstrap.php
similarity index 100%
rename from tests/codeception/unit/_bootstrap.php
rename to tests/unit/_bootstrap.php
diff --git a/tests/codeception/unit/fixtures/.gitkeep b/tests/unit/fixtures/.gitkeep
similarity index 100%
rename from tests/codeception/unit/fixtures/.gitkeep
rename to tests/unit/fixtures/.gitkeep
diff --git a/tests/codeception/unit/fixtures/data/.gitkeep b/tests/unit/fixtures/data/.gitkeep
similarity index 100%
rename from tests/codeception/unit/fixtures/data/.gitkeep
rename to tests/unit/fixtures/data/.gitkeep
diff --git a/tests/codeception/unit/models/ContactFormTest.php b/tests/unit/models/ContactFormTest.php
similarity index 100%
rename from tests/codeception/unit/models/ContactFormTest.php
rename to tests/unit/models/ContactFormTest.php
diff --git a/tests/codeception/unit/models/LoginFormTest.php b/tests/unit/models/LoginFormTest.php
similarity index 100%
rename from tests/codeception/unit/models/LoginFormTest.php
rename to tests/unit/models/LoginFormTest.php
diff --git a/tests/codeception/unit/models/UserTest.php b/tests/unit/models/UserTest.php
similarity index 100%
rename from tests/codeception/unit/models/UserTest.php
rename to tests/unit/models/UserTest.php
diff --git a/tests/codeception/unit/templates/fixtures/.gitkeep b/tests/unit/templates/fixtures/.gitkeep
similarity index 100%
rename from tests/codeception/unit/templates/fixtures/.gitkeep
rename to tests/unit/templates/fixtures/.gitkeep

From 78909b05453edd09d8fc745f1d2eafd6f16f5b4f Mon Sep 17 00:00:00 2001
From: Tobias Munk <schmunk@usrbin.de>
Date: Thu, 14 Jul 2016 21:18:27 +0200
Subject: [PATCH 172/390] fixed typo in example config (#70)

see also http://codeception.com/docs/11-Codecoverage
---
 tests/codeception.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/codeception.yml b/tests/codeception.yml
index b71ba31c1..28620ac05 100644
--- a/tests/codeception.yml
+++ b/tests/codeception.yml
@@ -4,7 +4,7 @@ actor: Tester
 #    enabled: true
 #    #remote: true
 #    #remote_config: '../tests/codeception.yml'
-#    white_list:
+#    whitelist:
 #        include:
 #            - ../models/*
 #            - ../controllers/*
@@ -33,4 +33,4 @@ settings:
 config:
     # the entry script URL (with host info) for functional and acceptance tests
     # PLEASE ADJUST IT TO THE ACTUAL ENTRY SCRIPT URL
-    test_entry_url: http://localhost:8080/index-test.php
\ No newline at end of file
+    test_entry_url: http://localhost:8080/index-test.php

From 0ef627f7de56f528b5ed0873871eba0fade4f9d3 Mon Sep 17 00:00:00 2001
From: Davert <davert.php@resend.cc>
Date: Sat, 16 Jul 2016 04:13:51 +0300
Subject: [PATCH 173/390] refactored tests

---
 .gitignore                                    |    3 +-
 README.md                                     |   80 +
 codeception.yml                               |   25 +-
 composer.json                                 |    3 +-
 config/console.php                            |    2 -
 config/test.php                               |   10 +-
 config/test_db.php                            |    6 +
 tests/README.md                               |  128 -
 tests/_bootstrap.php                          |    8 +-
 .../_support => _data}/.gitignore             |    0
 tests/_pages/AboutPage.php                    |   14 -
 tests/_pages/ContactPage.php                  |   26 -
 tests/_pages/LoginPage.php                    |   25 -
 tests/_support/FunctionalTester.php           |    3 -
 .../_generated/AcceptanceTesterActions.php    | 2173 +++++++++++------
 .../_generated/FunctionalTesterActions.php    |    2 +-
 .../_support/_generated/UnitTesterActions.php |    2 +-
 tests/acceptance.suite.yml.example            |   30 +-
 tests/acceptance/AboutCept.php                |   10 -
 .../acceptance/AboutCest.php                  |    5 +-
 tests/acceptance/ContactCept.php              |   57 -
 .../acceptance/ContactCest.php                |    9 +-
 tests/acceptance/HomeCept.php                 |   11 -
 .../{codeception => }/acceptance/HomeCest.php |    1 -
 tests/acceptance/LoginCept.php                |   37 -
 .../acceptance/LoginCest.php                  |    7 +-
 tests/acceptance/_bootstrap.php               |    1 -
 tests/bin/_bootstrap.php                      |   10 -
 tests/bin/yii                                 |   17 +-
 tests/codeception/.gitignore                  |    4 -
 .../codeception/_support/AcceptanceTester.php |   26 -
 .../codeception/_support/FunctionalTester.php |   26 -
 tests/codeception/_support/UnitTester.php     |   26 -
 .../_support/_generated/.gitignore            |    2 -
 tests/codeception/acceptance.suite.yml        |   29 -
 tests/config/acceptance.php                   |   11 -
 tests/config/functional.php                   |   22 -
 tests/config/unit.php                         |   11 -
 tests/fixtures/.gitignore                     |    2 -
 tests/functional.suite.yml                    |    3 +-
 tests/functional/AboutCept.php                |   10 -
 tests/functional/ContactCept.php              |   48 -
 tests/functional/ContactFormCest.php          |   55 +
 tests/functional/HomeCept.php                 |   11 -
 tests/functional/LoginCept.php                |   28 -
 tests/functional/LoginFormCest.php            |   41 +
 tests/templates/.gitignore                    |    2 -
 tests/unit.suite.yml                          |    1 -
 tests/unit/fixtures/.gitkeep                  |    0
 tests/unit/fixtures/data/.gitkeep             |    0
 tests/unit/models/ContactFormTest.php         |   49 +-
 tests/unit/models/LoginFormTest.php           |   41 +-
 tests/unit/models/UserTest.php                |   44 +-
 tests/unit/templates/fixtures/.gitkeep        |    0
 web/index-test.php                            |    2 +-
 55 files changed, 1688 insertions(+), 1511 deletions(-)
 create mode 100644 config/test_db.php
 delete mode 100644 tests/README.md
 rename tests/{codeception/_support => _data}/.gitignore (100%)
 delete mode 100644 tests/_pages/AboutPage.php
 delete mode 100644 tests/_pages/ContactPage.php
 delete mode 100644 tests/_pages/LoginPage.php
 delete mode 100644 tests/acceptance/AboutCept.php
 rename tests/{codeception => }/acceptance/AboutCest.php (54%)
 delete mode 100644 tests/acceptance/ContactCept.php
 rename tests/{codeception => }/acceptance/ContactCest.php (85%)
 delete mode 100644 tests/acceptance/HomeCept.php
 rename tests/{codeception => }/acceptance/HomeCest.php (87%)
 delete mode 100644 tests/acceptance/LoginCept.php
 rename tests/{codeception => }/acceptance/LoginCest.php (71%)
 delete mode 100644 tests/bin/_bootstrap.php
 mode change 100644 => 100755 tests/bin/yii
 delete mode 100644 tests/codeception/.gitignore
 delete mode 100644 tests/codeception/_support/AcceptanceTester.php
 delete mode 100644 tests/codeception/_support/FunctionalTester.php
 delete mode 100644 tests/codeception/_support/UnitTester.php
 delete mode 100644 tests/codeception/_support/_generated/.gitignore
 delete mode 100644 tests/codeception/acceptance.suite.yml
 delete mode 100644 tests/config/acceptance.php
 delete mode 100644 tests/config/functional.php
 delete mode 100644 tests/config/unit.php
 delete mode 100644 tests/fixtures/.gitignore
 delete mode 100644 tests/functional/AboutCept.php
 delete mode 100644 tests/functional/ContactCept.php
 create mode 100644 tests/functional/ContactFormCest.php
 delete mode 100644 tests/functional/HomeCept.php
 delete mode 100644 tests/functional/LoginCept.php
 create mode 100644 tests/functional/LoginFormCest.php
 delete mode 100644 tests/templates/.gitignore
 delete mode 100644 tests/unit/fixtures/.gitkeep
 delete mode 100644 tests/unit/fixtures/data/.gitkeep
 delete mode 100644 tests/unit/templates/fixtures/.gitkeep

diff --git a/.gitignore b/.gitignore
index 9af11e24d..6084c1da5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,4 +26,5 @@ phpunit.phar
 # local phpunit config
 /phpunit.xml
 
-tests/_output/*
\ No newline at end of file
+tests/_output/*
+tests/_support/_generated
\ No newline at end of file
diff --git a/README.md b/README.md
index 598f9637b..543d87f48 100644
--- a/README.md
+++ b/README.md
@@ -100,3 +100,83 @@ return [
 - Yii won't create the database for you, this has to be done manually before you can access it.
 - Check and edit the other files in the `config/` directory to customize your application as required.
 - Refer to the README in the `tests` directory for information specific to basic application tests.
+
+
+
+TESTING
+-------
+
+Tests are located in `tests` directory, developed with [Codeception PHP Testing Framework](http://codeception.com/).
+By default there are 3 test suites: `unit`, `functional` and `acceptance`. Tests can be executed by running
+
+   ```
+   composer exec codecept run
+   ``` 
+
+This will execute unit and functional tests. Unit tests are testing the system components, while functional tests are for testing user interaction.
+Acceptance tests are disabled by default as they require additional setup as they perform testing in real browser. 
+
+To execute acceptance tests do the following:  
+
+1. Rename `tests/acceptance.suite.yml.example` to `tests/acceptance.suite.yml` to enable suite configuration
+
+2. Replace `codeception/base` package in `composer.json` with `codeception/codeception` to install full featured version of Codeception.
+
+3. Update dependencies with Composer 
+
+    ```
+    composer update  
+    ```
+
+4. Download [Selenium Server](http://www.seleniumhq.org/download/) and launch it:
+
+    ```
+    java -jar java -jar ~/selenium-server-standalone-x.xx.x.jar
+    ``` 
+
+5. (Optional) Create `yii2_basic_tests` database and update it by applying migrations if you have them.
+
+   ```
+   tests/bin/yii migrate
+   ```
+
+   The database configuration can be found at `config/test_db.php`.
+
+
+6. Start web server:
+
+    ```
+    tests/bin/yii serve
+    ```
+
+7. Now you can run all available tests
+
+   ```
+   # run all available tests
+   composer exec codecept run
+
+   # run acceptance tests
+   composer exec codecept run acceptance
+
+   # run only unit and functional tests
+   composer exec codecept run unit,functional
+   ```
+
+Code coverage support
+---------------------
+
+By default, code coverage is disabled in `codeception.yml` configuration file, you should uncomment needed rows to be able
+to collect code coverage. You can run your tests and collect coverage with the following command:
+
+```
+#collect coverage for all tests
+composer exec codecept run --coverage-html --coverage-xml
+
+#collect coverage only for unit tests
+composer exec codecept run unit --coverage-html --coverage-xml
+
+#collect coverage for unit and functional tests
+composer exec codecept run functional,unit --coverage-html --coverage-xml
+```
+
+You can see code coverage output under the `tests/_output` directory.
\ No newline at end of file
diff --git a/codeception.yml b/codeception.yml
index d5d1aaf24..335165e6d 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -1,4 +1,18 @@
 actor: Tester
+paths:
+    tests: tests
+    log: tests/_output
+    data: tests/_data
+    helpers: tests/_support
+settings:
+    bootstrap: _bootstrap.php
+    memory_limit: 1024M
+    colors: true
+modules:
+    config:
+        Yii2:
+            configFile: 'config/test.php'
+
 # To enable code coverage:
 #coverage:
 #    #c3_url: http://localhost:8080/index-test.php/
@@ -19,13 +33,4 @@ actor: Tester
 #            - ../vendor/*
 #            - ../views/*
 #            - ../web/*
-#            - ../tests/*
-paths:
-    tests: tests
-    log: tests/_output
-    data: tests/_data
-    helpers: tests/_support
-settings:
-    bootstrap: _bootstrap.php
-    memory_limit: 1024M
-    colors: true
\ No newline at end of file
+#            - ../tests/*
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 137ee77a6..b97bcd97b 100644
--- a/composer.json
+++ b/composer.json
@@ -20,8 +20,7 @@
         "yiisoft/yii2-swiftmailer": "*"
     },
     "require-dev": {
-        "yiisoft/yii2-codeception": "*",
-        "codeception/specify": "*",
+        "codeception/base": "^2.2.3",
         "codeception/verify": "*",
         "yiisoft/yii2-debug": "*",
         "yiisoft/yii2-gii": "*",
diff --git a/config/console.php b/config/console.php
index 7306e2764..3945d9eb2 100644
--- a/config/console.php
+++ b/config/console.php
@@ -1,7 +1,5 @@
 <?php
 
-Yii::setAlias('@tests', dirname(__DIR__) . '/tests/codeception');
-
 $params = require(__DIR__ . '/params.php');
 $db = require(__DIR__ . '/db.php');
 
diff --git a/config/test.php b/config/test.php
index 03b6580dd..a23616ee6 100644
--- a/config/test.php
+++ b/config/test.php
@@ -1,9 +1,6 @@
 <?php
 $params = require(__DIR__ . '/params.php');
-$dbParams = require(__DIR__ . '/db.php');
-
-// test database! Important not to run tests on production or development databases
-$dbParams['dsn'] = 'mysql:host=localhost;dbname=yii2_basic_tests';
+$dbParams = require(__DIR__ . '/test_db.php');
 
 /**
  * Application configuration shared by all test types
@@ -20,8 +17,11 @@
         'urlManager' => [
             'showScriptName' => true,
         ],
+        'user' => [
+            'identityClass' => 'app\models\User',
+        ],        
         'request' => [
-            // it's not recommended to run functional tests with CSRF validation enabled
+            'cookieValidationKey' => 'test',
             'enableCsrfValidation' => false,
             // but if you absolutely need it set cookie domain to localhost
             /*
diff --git a/config/test_db.php b/config/test_db.php
new file mode 100644
index 000000000..c951052e3
--- /dev/null
+++ b/config/test_db.php
@@ -0,0 +1,6 @@
+<?php
+$db = require(__DIR__ . '/db.php');
+// test database! Important not to run tests on production or development databases
+$db['dsn'] = 'mysql:host=localhost;dbname=yii2_basic_tests';
+
+return $db;
\ No newline at end of file
diff --git a/tests/README.md b/tests/README.md
deleted file mode 100644
index 35142d612..000000000
--- a/tests/README.md
+++ /dev/null
@@ -1,128 +0,0 @@
-This directory contains various tests for the basic application.
-
-Tests in `codeception` directory are developed with [Codeception PHP Testing Framework](http://codeception.com/).
-
-After creating the basic application, follow these steps to prepare for the tests:
-
-1. Install Codeception if it's not yet installed:
-
-   ```
-   composer global require "codeception/codeception=2.0.*"
-   composer global require "codeception/specify=*"
-   composer global require "codeception/verify=*"
-   ```
-
-   If you've never used Composer for global packages run `composer global status`. It should output:
-
-   ```
-   Changed current directory to <directory>
-   ```
-
-  Then add `<directory>/vendor/bin` to you `PATH` environment variable. Now we're able to use `codecept` from command
-  line globally.
-
-2. Install faker extension by running the following from template root directory where `composer.json` is:
-
-   ```
-   composer require --dev "yiisoft/yii2-faker:*"
-   ```
-
-3. Create `yii2_basic_tests` database and update it by applying migrations (you may skip this step if you do not have created any migrations yet):
-
-   ```
-   cd tests
-   codeception/bin/yii migrate
-   ```
-
-   The command needs to be run in the `tests` directory.
-   The database configuration can be found at `tests/codeception/config/config.php`.
-
-4. Build the test suites:
-
-   ```
-   codecept build
-   ```
-
-5. In order to be able to run acceptance tests you need to start a webserver. The simplest way is to use built-in Yii
-command:
-
-   ```
-   ./yii serve
-   ```
-
-6. Now you can run the tests with the following commands:
-
-   ```
-   # run all available tests
-   codecept run
-   # run acceptance tests
-   codecept run acceptance
-   # run functional tests
-   codecept run functional
-   # run unit tests
-   codecept run unit
-   ```
-
-Fixtures Default Configuration
-------------------------------
-The `fixture` commands refer to the following `ActiveFixture` configuration by default:
-
-- Fixtures path: `@tests/unit/fixtures`
-- Fixtures data path: `@tests/unit/fixtures/data`
-- Template files path: `@tests/unit/templates/fixtures`
-- Namespace: `tests\unit\fixtures`
-
-Where `@tests` refers to `@app/tests/codeception`.
-
-Code coverage support
----------------------
-
-By default, code coverage is disabled in `codeception.yml` configuration file, you should uncomment needed rows to be able
-to collect code coverage. You can run your tests and collect coverage with the following command:
-
-```
-#collect coverage for all tests
-codecept run --coverage-html --coverage-xml
-
-#collect coverage only for unit tests
-codecept run unit --coverage-html --coverage-xml
-
-#collect coverage for unit and functional tests
-codecept run functional,unit --coverage-html --coverage-xml
-```
-
-You can see code coverage output under the `tests/_output` directory.
-
-###Remote code coverage
-
-When you run your tests not in the same process where code coverage is collected, then you should uncomment `remote` option and its
-related options, to be able to collect code coverage correctly. To setup remote code coverage you should follow [instructions](http://codeception.com/docs/11-Codecoverage)
-from codeception site.
-
-1. install `Codeception c3` remote support `composer require "codeception/c3:*"`;
-
-2. copy `c3.php` file under your `web` directory;
-
-3. include `c3.php` file in your `index-test.php` file before application run, so it can catch needed requests.
-
-4. edit `c3.php` to update config file path (~ line 55) with `$config_file = realpath(__DIR__ . '/../tests/codeception.yml');`
-
-Configuration options that are used by remote code coverage:
-
-- c3_url: url pointing to entry script that includes `c3.php` file, so `Codeception` will be able to produce code coverage;
-- remote: whether to enable remote code coverage or not;
-- remote_config: path to the `codeception.yml` configuration file, from the directory where `c3.php` file is located. This is needed
-  so that `Codeception` can create itself instance and collect code coverage correctly.
-
-By default `c3_url` and `remote_config` setup correctly, you only need to copy and include `c3.php` file in your `index-test.php`
-
-After that you should be able to collect code coverage from tests that run through `PhpBrowser` or `WebDriver` with same command
-as for other tests:
-
-```
-#collect coverage from remote
-codecept run acceptance --coverage-html --coverage-xml
-```
-
-Please refer to [Codeception tutorial](http://codeception.com/docs/01-Introduction) for
-more details about writing and running acceptance, functional and unit tests.
diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index c7f5cfc4f..6a865905c 100644
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -1,10 +1,8 @@
 <?php
-require_once(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
-
+define('YII_ENV', 'test');
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_ENV') or define('YII_ENV', 'test');
 
-$_SERVER['SCRIPT_FILENAME'] = codecept_root_dir() . '/web/index.php';
-$_SERVER['SCRIPT_NAME'] = 'http://localhost:8080/index-test.php';
+require_once(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require __DIR__ .'/../vendor/autoload.php';
 
 \Codeception\Specify\Config::setDeepClone(false);
\ No newline at end of file
diff --git a/tests/codeception/_support/.gitignore b/tests/_data/.gitignore
similarity index 100%
rename from tests/codeception/_support/.gitignore
rename to tests/_data/.gitignore
diff --git a/tests/_pages/AboutPage.php b/tests/_pages/AboutPage.php
deleted file mode 100644
index b56320d09..000000000
--- a/tests/_pages/AboutPage.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace tests\codeception\_pages;
-
-use yii\codeception\BasePage;
-
-/**
- * Represents about page
- * @property \AcceptanceTester|\FunctionalTester $actor
- */
-class AboutPage extends BasePage
-{
-    public $route = 'site/about';
-}
diff --git a/tests/_pages/ContactPage.php b/tests/_pages/ContactPage.php
deleted file mode 100644
index 5701e2cb4..000000000
--- a/tests/_pages/ContactPage.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace tests\codeception\_pages;
-
-use yii\codeception\BasePage;
-
-/**
- * Represents contact page
- * @property \AcceptanceTester|\FunctionalTester $actor
- */
-class ContactPage extends BasePage
-{
-    public $route = 'site/contact';
-
-    /**
-     * @param array $contactData
-     */
-    public function submit(array $contactData)
-    {
-        foreach ($contactData as $field => $value) {
-            $inputType = $field === 'body' ? 'textarea' : 'input';
-            $this->actor->fillField($inputType . '[name="ContactForm[' . $field . ']"]', $value);
-        }
-        $this->actor->click('contact-button');
-    }
-}
diff --git a/tests/_pages/LoginPage.php b/tests/_pages/LoginPage.php
deleted file mode 100644
index c3a2ef2dd..000000000
--- a/tests/_pages/LoginPage.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace tests\codeception\_pages;
-
-use yii\codeception\BasePage;
-
-/**
- * Represents login page
- * @property \AcceptanceTester|\FunctionalTester $actor
- */
-class LoginPage extends BasePage
-{
-    public $route = 'site/login';
-
-    /**
-     * @param string $username
-     * @param string $password
-     */
-    public function login($username, $password)
-    {
-        $this->actor->fillField('input[name="LoginForm[username]"]', $username);
-        $this->actor->fillField('input[name="LoginForm[password]"]', $password);
-        $this->actor->click('login-button');
-    }
-}
diff --git a/tests/_support/FunctionalTester.php b/tests/_support/FunctionalTester.php
index 7e888f8b2..db2ce28be 100644
--- a/tests/_support/FunctionalTester.php
+++ b/tests/_support/FunctionalTester.php
@@ -20,7 +20,4 @@ class FunctionalTester extends \Codeception\Actor
 {
     use _generated\FunctionalTesterActions;
 
-   /**
-    * Define custom actions here
-    */
 }
diff --git a/tests/_support/_generated/AcceptanceTesterActions.php b/tests/_support/_generated/AcceptanceTesterActions.php
index 0965f3368..62eb177c9 100644
--- a/tests/_support/_generated/AcceptanceTesterActions.php
+++ b/tests/_support/_generated/AcceptanceTesterActions.php
@@ -1,11 +1,12 @@
-<?php  //[STAMP] 8a9cb37ad1be9f4fbb46bb2f0f40e6d4
+<?php  //[STAMP] 4d43a2a57cc18889c8a0e42fb9175d5b
 namespace _generated;
 
 // This class was automatically generated by build task
 // You should not change it manually as it will be overwritten on next build
 // @codingStandardsIgnoreFile
 
-use Codeception\Module\PhpBrowser;
+use Codeception\Module\WebDriver;
+use Codeception\Module\Yii2;
 
 trait AcceptanceTesterActions
 {
@@ -18,210 +19,253 @@ abstract protected function getScenario();
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Alias to `haveHttpHeader`
-     *
-     * @param $name
-     * @param $value
-     * @see \Codeception\Module\PhpBrowser::setHeader()
+     * Print out latest Selenium Logs in debug mode
+     * @see \Codeception\Module\WebDriver::debugWebDriverLogs()
      */
-    public function setHeader($name, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('setHeader', func_get_args()));
+    public function debugWebDriverLogs() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('debugWebDriverLogs', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Authenticates user for HTTP_AUTH
+     * Changes the subdomain for the 'url' configuration parameter.
+     * Does not open a page; use `amOnPage` for that.
+     *
+     * ``` php
+     * <?php
+     * // If config is: 'http://mysite.com/'
+     * // or config is: 'http://www.mysite.com/'
+     * // or config is: 'http://company.mysite.com/'
+     *
+     * $I->amOnSubdomain('user');
+     * $I->amOnPage('/');
+     * // moves to http://user.mysite.com/
+     * ?>
+     * ```
+     *
+     * @param $subdomain
      *
-     * @param $username
-     * @param $password
-     * @see \Codeception\Module\PhpBrowser::amHttpAuthenticated()
+     * @return mixed
+     * @see \Codeception\Module\WebDriver::amOnSubdomain()
      */
-    public function amHttpAuthenticated($username, $password) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amHttpAuthenticated', func_get_args()));
+    public function amOnSubdomain($subdomain) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnSubdomain', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Open web page at the given absolute URL and sets its hostname as the base host.
+     * Takes a screenshot of the current window and saves it to `tests/_output/debug`.
      *
      * ``` php
      * <?php
-     * $I->amOnUrl('http://codeception.com/');
-     * $I->amOnPage('/quickstart'); // moves to http://codeception.com/quickstart
+     * $I->amOnPage('/user/edit');
+     * $I->makeScreenshot('edit_page');
+     * // saved to: tests/_output/debug/edit_page.png
      * ?>
      * ```
-     * @see \Codeception\Module\PhpBrowser::amOnUrl()
+     *
+     * @param $name
+     * @see \Codeception\Module\WebDriver::makeScreenshot()
      */
-    public function amOnUrl($url) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnUrl', func_get_args()));
+    public function makeScreenshot($name) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('makeScreenshot', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Changes the subdomain for the 'url' configuration parameter.
-     * Does not open a page; use `amOnPage` for that.
+     * Resize the current window.
      *
      * ``` php
      * <?php
-     * // If config is: 'http://mysite.com/'
-     * // or config is: 'http://www.mysite.com/'
-     * // or config is: 'http://company.mysite.com/'
+     * $I->resizeWindow(800, 600);
      *
-     * $I->amOnSubdomain('user');
-     * $I->amOnPage('/');
-     * // moves to http://user.mysite.com/
-     * ?>
      * ```
      *
-     * @param $subdomain
-     *
-     * @return mixed
-     * @see \Codeception\Module\PhpBrowser::amOnSubdomain()
+     * @param int $width
+     * @param int $height
+     * @see \Codeception\Module\WebDriver::resizeWindow()
      */
-    public function amOnSubdomain($subdomain) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnSubdomain', func_get_args()));
+    public function resizeWindow($width, $height) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('resizeWindow', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Low-level API method.
-     * If Codeception commands are not enough, use [Guzzle HTTP Client](http://guzzlephp.org/) methods directly
-     *
-     * Example:
+     * Checks that a cookie with the given name is set.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
      *
      * ``` php
      * <?php
-     * $I->executeInGuzzle(function (\GuzzleHttp\Client $client) {
-     *      $client->get('/get', ['query' => ['foo' => 'bar']]);
-     * });
+     * $I->seeCookie('PHPSESSID');
      * ?>
      * ```
      *
-     * It is not recommended to use this command on a regular basis.
-     * If Codeception lacks important Guzzle Client methods, implement them and submit patches.
-     *
-     * @param callable $function
-     * @see \Codeception\Module\PhpBrowser::executeInGuzzle()
+     * @param $cookie
+     * @param array $params
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\WebDriver::seeCookie()
      */
-    public function executeInGuzzle($function) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('executeInGuzzle', func_get_args()));
+    public function canSeeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCookie', func_get_args()));
     }
-
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Sets the HTTP header to the passed value - which is used on
-     * subsequent HTTP requests through PhpBrowser.
+     * Checks that a cookie with the given name is set.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
      *
-     * Example:
-     * ```php
+     * ``` php
      * <?php
-     * $I->setHeader('X-Requested-With', 'Codeception');
-     * $I->amOnPage('test-headers.php');
+     * $I->seeCookie('PHPSESSID');
      * ?>
      * ```
      *
-     * @param string $name the name of the request header
-     * @param string $value the value to set it to for subsequent
-     *        requests
-     * @see \Codeception\Lib\InnerBrowser::haveHttpHeader()
+     * @param $cookie
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Module\WebDriver::seeCookie()
      */
-    public function haveHttpHeader($name, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveHttpHeader', func_get_args()));
+    public function seeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Deletes the header with the passed name.  Subsequent requests
-     * will not have the deleted header in its request.
+     * Checks that there isn't a cookie with the given name.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     *
+     * @param $cookie
      *
-     * Example:
-     * ```php
-     * <?php
-     * $I->haveHttpHeader('X-Requested-With', 'Codeception');
-     * $I->amOnPage('test-headers.php');
-     * // ...
-     * $I->deleteHeader('X-Requested-With');
-     * $I->amOnPage('some-other-page.php');
-     * ?>
-     * ```
+     * @param array $params
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\WebDriver::dontSeeCookie()
+     */
+    public function cantSeeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCookie', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there isn't a cookie with the given name.
+     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
      *
-     * @param string $name the name of the header to delete.
-     * @see \Codeception\Lib\InnerBrowser::deleteHeader()
+     * @param $cookie
+     *
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Module\WebDriver::dontSeeCookie()
      */
-    public function deleteHeader($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteHeader', func_get_args()));
+    public function dontSeeCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCookie', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Opens the page for the given relative URI.
+     * Sets a cookie with the given name and value.
+     * You can set additional cookie params like `domain`, `path`, `expires`, `secure` in array passed as last argument.
      *
      * ``` php
      * <?php
-     * // opens front page
-     * $I->amOnPage('/');
-     * // opens /register page
-     * $I->amOnPage('/register');
+     * $I->setCookie('PHPSESSID', 'el4ukv0kqbvoirg7nkp4dncpk3');
+     * ?>
      * ```
      *
-     * @param $page
-     * @see \Codeception\Lib\InnerBrowser::amOnPage()
+     * @param $name
+     * @param $val
+     * @param array $params
+     *
+     * @return mixed
+     * @see \Codeception\Module\WebDriver::setCookie()
      */
-    public function amOnPage($page) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnPage', func_get_args()));
+    public function setCookie($cookie, $value, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Perform a click on a link or a button, given by a locator.
-     * If a fuzzy locator is given, the page will be searched for a button, link, or image matching the locator string.
-     * For buttons, the "value" attribute, "name" attribute, and inner text are searched.
-     * For links, the link text is searched.
-     * For images, the "alt" attribute and inner text of any parent links are searched.
+     * Unsets cookie with the given name.
+     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
      *
-     * The second parameter is a context (CSS or XPath locator) to narrow the search.
+     * @param $cookie
      *
-     * Note that if the locator matches a button of type `submit`, the form will be submitted.
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Module\WebDriver::resetCookie()
+     */
+    public function resetCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Grabs a cookie value.
+     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
+     *
+     * @param $cookie
+     *
+     * @param array $params
+     * @return mixed
+     * @see \Codeception\Module\WebDriver::grabCookie()
+     */
+    public function grabCookie($cookie, $params = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Open web page at the given absolute URL and sets its hostname as the base host.
      *
      * ``` php
      * <?php
-     * // simple link
-     * $I->click('Logout');
-     * // button of form
-     * $I->click('Submit');
-     * // CSS button
-     * $I->click('#form input[type=submit]');
-     * // XPath
-     * $I->click('//form/*[@type=submit]');
-     * // link in context
-     * $I->click('Logout', '#nav');
-     * // using strict locator
-     * $I->click(['link' => 'Login']);
+     * $I->amOnUrl('http://codeception.com/');
+     * $I->amOnPage('/quickstart'); // moves to http://codeception.com/quickstart
      * ?>
      * ```
+     * @see \Codeception\Module\WebDriver::amOnUrl()
+     */
+    public function amOnUrl($url) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnUrl', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * @param $link
-     * @param $context
-     * @see \Codeception\Lib\InnerBrowser::click()
+     * Opens the page for the given relative URI.
+     *
+     * ``` php
+     * <?php
+     * // opens front page
+     * $I->amOnPage('/');
+     * // opens /register page
+     * $I->amOnPage('/register');
+     * ```
+     *
+     * @param $page
+     * @see \Codeception\Module\WebDriver::amOnPage()
      */
-    public function click($link, $context = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('click', func_get_args()));
+    public function amOnPage($page) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnPage', func_get_args()));
     }
 
  
@@ -257,7 +301,7 @@ public function click($link, $context = null) {
      * @param      $text
      * @param null $selector
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::see()
+     * @see \Codeception\Module\WebDriver::see()
      */
     public function canSee($text, $selector = null) {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('see', func_get_args()));
@@ -293,7 +337,7 @@ public function canSee($text, $selector = null) {
      *
      * @param      $text
      * @param null $selector
-     * @see \Codeception\Lib\InnerBrowser::see()
+     * @see \Codeception\Module\WebDriver::see()
      */
     public function see($text, $selector = null) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('see', func_get_args()));
@@ -330,7 +374,7 @@ public function see($text, $selector = null) {
      * @param      $text
      * @param null $selector
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSee()
+     * @see \Codeception\Module\WebDriver::dontSee()
      */
     public function cantSee($text, $selector = null) {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSee', func_get_args()));
@@ -364,7 +408,7 @@ public function cantSee($text, $selector = null) {
      *
      * @param      $text
      * @param null $selector
-     * @see \Codeception\Lib\InnerBrowser::dontSee()
+     * @see \Codeception\Module\WebDriver::dontSee()
      */
     public function dontSee($text, $selector = null) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSee', func_get_args()));
@@ -384,7 +428,7 @@ public function dontSee($text, $selector = null) {
      *
      * @param      $raw
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInSource()
+     * @see \Codeception\Module\WebDriver::seeInSource()
      */
     public function canSeeInSource($raw) {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInSource', func_get_args()));
@@ -401,7 +445,7 @@ public function canSeeInSource($raw) {
      * ```
      *
      * @param      $raw
-     * @see \Codeception\Lib\InnerBrowser::seeInSource()
+     * @see \Codeception\Module\WebDriver::seeInSource()
      */
     public function seeInSource($raw) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInSource', func_get_args()));
@@ -421,7 +465,7 @@ public function seeInSource($raw) {
      *
      * @param      $raw
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
+     * @see \Codeception\Module\WebDriver::dontSeeInSource()
      */
     public function cantSeeInSource($raw) {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInSource', func_get_args()));
@@ -438,7 +482,7 @@ public function cantSeeInSource($raw) {
      * ```
      *
      * @param      $raw
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
+     * @see \Codeception\Module\WebDriver::dontSeeInSource()
      */
     public function dontSeeInSource($raw) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInSource', func_get_args()));
@@ -448,106 +492,205 @@ public function dontSeeInSource($raw) {
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that there's a link with the specified text.
-     * Give a full URL as the second parameter to match links with that exact URL.
+     * Checks that the page source contains the given string.
      *
-     * ``` php
+     * ```php
      * <?php
-     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
-     * $I->seeLink('Logout','/logout'); // matches <a href="http://github.com/logout">Logout</a>
-     * ?>
+     * $I->seeInPageSource('<link rel="apple-touch-icon"');
      * ```
      *
-     * @param      $text
-     * @param null $url
+     * @param $text
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeLink()
+     * @see \Codeception\Module\WebDriver::seeInPageSource()
      */
-    public function canSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeLink', func_get_args()));
+    public function canSeeInPageSource($text) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInPageSource', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that there's a link with the specified text.
-     * Give a full URL as the second parameter to match links with that exact URL.
+     * Checks that the page source contains the given string.
      *
-     * ``` php
+     * ```php
      * <?php
-     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
-     * $I->seeLink('Logout','/logout'); // matches <a href="http://github.com/logout">Logout</a>
-     * ?>
+     * $I->seeInPageSource('<link rel="apple-touch-icon"');
      * ```
      *
-     * @param      $text
-     * @param null $url
-     * @see \Codeception\Lib\InnerBrowser::seeLink()
+     * @param $text
+     * @see \Codeception\Module\WebDriver::seeInPageSource()
      */
-    public function seeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeLink', func_get_args()));
+    public function seeInPageSource($text) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInPageSource', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the page doesn't contain a link with the given string.
-     * If the second parameter is given, only links with a matching "href" attribute will be checked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
-     * $I->dontSeeLink('Checkout now', '/store/cart.php');
-     * ?>
-     * ```
+     * Checks that the page source doesn't contain the given string.
      *
      * @param $text
-     * @param null $url
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
+     * @see \Codeception\Module\WebDriver::dontSeeInPageSource()
      */
-    public function cantSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeLink', func_get_args()));
+    public function cantSeeInPageSource($text) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInPageSource', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the page doesn't contain a link with the given string.
-     * If the second parameter is given, only links with a matching "href" attribute will be checked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
-     * $I->dontSeeLink('Checkout now', '/store/cart.php');
-     * ?>
-     * ```
+     * Checks that the page source doesn't contain the given string.
      *
      * @param $text
-     * @param null $url
-     * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
+     * @see \Codeception\Module\WebDriver::dontSeeInPageSource()
      */
-    public function dontSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeLink', func_get_args()));
+    public function dontSeeInPageSource($text) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInPageSource', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that current URI contains the given string.
+     * Perform a click on a link or a button, given by a locator.
+     * If a fuzzy locator is given, the page will be searched for a button, link, or image matching the locator string.
+     * For buttons, the "value" attribute, "name" attribute, and inner text are searched.
+     * For links, the link text is searched.
+     * For images, the "alt" attribute and inner text of any parent links are searched.
+     *
+     * The second parameter is a context (CSS or XPath locator) to narrow the search.
+     *
+     * Note that if the locator matches a button of type `submit`, the form will be submitted.
      *
      * ``` php
      * <?php
-     * // to match: /home/dashboard
-     * $I->seeInCurrentUrl('home');
-     * // to match: /users/1
-     * $I->seeInCurrentUrl('/users/');
-     * ?>
-     * ```
+     * // simple link
+     * $I->click('Logout');
+     * // button of form
+     * $I->click('Submit');
+     * // CSS button
+     * $I->click('#form input[type=submit]');
+     * // XPath
+     * $I->click('//form/*[@type=submit]');
+     * // link in context
+     * $I->click('Logout', '#nav');
+     * // using strict locator
+     * $I->click(['link' => 'Login']);
+     * ?>
+     * ```
+     *
+     * @param $link
+     * @param $context
+     * @see \Codeception\Module\WebDriver::click()
+     */
+    public function click($link, $context = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('click', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there's a link with the specified text.
+     * Give a full URL as the second parameter to match links with that exact URL.
+     *
+     * ``` php
+     * <?php
+     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
+     * $I->seeLink('Logout','/logout'); // matches <a href="http://github.com/logout">Logout</a>
+     * ?>
+     * ```
+     *
+     * @param      $text
+     * @param null $url
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\WebDriver::seeLink()
+     */
+    public function canSeeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeLink', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there's a link with the specified text.
+     * Give a full URL as the second parameter to match links with that exact URL.
+     *
+     * ``` php
+     * <?php
+     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
+     * $I->seeLink('Logout','/logout'); // matches <a href="http://github.com/logout">Logout</a>
+     * ?>
+     * ```
+     *
+     * @param      $text
+     * @param null $url
+     * @see \Codeception\Module\WebDriver::seeLink()
+     */
+    public function seeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeLink', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page doesn't contain a link with the given string.
+     * If the second parameter is given, only links with a matching "href" attribute will be checked.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
+     * $I->dontSeeLink('Checkout now', '/store/cart.php');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * @param null $url
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\WebDriver::dontSeeLink()
+     */
+    public function cantSeeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeLink', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page doesn't contain a link with the given string.
+     * If the second parameter is given, only links with a matching "href" attribute will be checked.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
+     * $I->dontSeeLink('Checkout now', '/store/cart.php');
+     * ?>
+     * ```
+     *
+     * @param $text
+     * @param null $url
+     * @see \Codeception\Module\WebDriver::dontSeeLink()
+     */
+    public function dontSeeLink($text, $url = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeLink', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that current URI contains the given string.
+     *
+     * ``` php
+     * <?php
+     * // to match: /home/dashboard
+     * $I->seeInCurrentUrl('home');
+     * // to match: /users/1
+     * $I->seeInCurrentUrl('/users/');
+     * ?>
+     * ```
      *
      * @param $uri
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
+     * @see \Codeception\Module\WebDriver::seeInCurrentUrl()
      */
     public function canSeeInCurrentUrl($uri) {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInCurrentUrl', func_get_args()));
@@ -567,7 +710,7 @@ public function canSeeInCurrentUrl($uri) {
      * ```
      *
      * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
+     * @see \Codeception\Module\WebDriver::seeInCurrentUrl()
      */
     public function seeInCurrentUrl($uri) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInCurrentUrl', func_get_args()));
@@ -577,158 +720,158 @@ public function seeInCurrentUrl($uri) {
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the current URI doesn't contain the given string.
+     * Checks that the current URL is equal to the given string.
+     * Unlike `seeInCurrentUrl`, this only matches the full URL.
      *
      * ``` php
      * <?php
-     * $I->dontSeeInCurrentUrl('/users/');
+     * // to match root url
+     * $I->seeCurrentUrlEquals('/');
      * ?>
      * ```
      *
      * @param $uri
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
+     * @see \Codeception\Module\WebDriver::seeCurrentUrlEquals()
      */
-    public function cantSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInCurrentUrl', func_get_args()));
+    public function canSeeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlEquals', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the current URI doesn't contain the given string.
+     * Checks that the current URL is equal to the given string.
+     * Unlike `seeInCurrentUrl`, this only matches the full URL.
      *
      * ``` php
      * <?php
-     * $I->dontSeeInCurrentUrl('/users/');
+     * // to match root url
+     * $I->seeCurrentUrlEquals('/');
      * ?>
      * ```
      *
      * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
+     * @see \Codeception\Module\WebDriver::seeCurrentUrlEquals()
      */
-    public function dontSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInCurrentUrl', func_get_args()));
+    public function seeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlEquals', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the current URL is equal to the given string.
-     * Unlike `seeInCurrentUrl`, this only matches the full URL.
+     * Checks that the current URL matches the given regular expression.
      *
      * ``` php
      * <?php
      * // to match root url
-     * $I->seeCurrentUrlEquals('/');
+     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
      * ?>
      * ```
      *
      * @param $uri
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
+     * @see \Codeception\Module\WebDriver::seeCurrentUrlMatches()
      */
-    public function canSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlEquals', func_get_args()));
+    public function canSeeCurrentUrlMatches($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlMatches', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the current URL is equal to the given string.
-     * Unlike `seeInCurrentUrl`, this only matches the full URL.
+     * Checks that the current URL matches the given regular expression.
      *
      * ``` php
      * <?php
      * // to match root url
-     * $I->seeCurrentUrlEquals('/');
+     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
      * ?>
      * ```
      *
      * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
+     * @see \Codeception\Module\WebDriver::seeCurrentUrlMatches()
      */
-    public function seeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlEquals', func_get_args()));
+    public function seeCurrentUrlMatches($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlMatches', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the current URL doesn't equal the given string.
-     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
+     * Checks that the current URI doesn't contain the given string.
      *
      * ``` php
      * <?php
-     * // current url is not root
-     * $I->dontSeeCurrentUrlEquals('/');
+     * $I->dontSeeInCurrentUrl('/users/');
      * ?>
      * ```
      *
      * @param $uri
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
+     * @see \Codeception\Module\WebDriver::dontSeeInCurrentUrl()
      */
-    public function cantSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args()));
+    public function cantSeeInCurrentUrl($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInCurrentUrl', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the current URL doesn't equal the given string.
-     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
+     * Checks that the current URI doesn't contain the given string.
      *
      * ``` php
      * <?php
-     * // current url is not root
-     * $I->dontSeeCurrentUrlEquals('/');
+     * $I->dontSeeInCurrentUrl('/users/');
      * ?>
      * ```
      *
      * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
+     * @see \Codeception\Module\WebDriver::dontSeeInCurrentUrl()
      */
-    public function dontSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlEquals', func_get_args()));
+    public function dontSeeInCurrentUrl($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInCurrentUrl', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the current URL matches the given regular expression.
+     * Checks that the current URL doesn't equal the given string.
+     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
      *
      * ``` php
      * <?php
-     * // to match root url
-     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
+     * // current url is not root
+     * $I->dontSeeCurrentUrlEquals('/');
      * ?>
      * ```
      *
      * @param $uri
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
+     * @see \Codeception\Module\WebDriver::dontSeeCurrentUrlEquals()
      */
-    public function canSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlMatches', func_get_args()));
+    public function cantSeeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the current URL matches the given regular expression.
+     * Checks that the current URL doesn't equal the given string.
+     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
      *
      * ``` php
      * <?php
-     * // to match root url
-     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
+     * // current url is not root
+     * $I->dontSeeCurrentUrlEquals('/');
      * ?>
      * ```
      *
      * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
+     * @see \Codeception\Module\WebDriver::dontSeeCurrentUrlEquals()
      */
-    public function seeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlMatches', func_get_args()));
+    public function dontSeeCurrentUrlEquals($uri) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlEquals', func_get_args()));
     }
 
  
@@ -746,7 +889,7 @@ public function seeCurrentUrlMatches($uri) {
      *
      * @param $uri
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
+     * @see \Codeception\Module\WebDriver::dontSeeCurrentUrlMatches()
      */
     public function cantSeeCurrentUrlMatches($uri) {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args()));
@@ -764,7 +907,7 @@ public function cantSeeCurrentUrlMatches($uri) {
      * ```
      *
      * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
+     * @see \Codeception\Module\WebDriver::dontSeeCurrentUrlMatches()
      */
     public function dontSeeCurrentUrlMatches($uri) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlMatches', func_get_args()));
@@ -787,7 +930,7 @@ public function dontSeeCurrentUrlMatches($uri) {
      * @param null $uri
      *
      * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabFromCurrentUrl()
+     * @see \Codeception\Module\WebDriver::grabFromCurrentUrl()
      */
     public function grabFromCurrentUrl($uri = null) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromCurrentUrl', func_get_args()));
@@ -809,7 +952,7 @@ public function grabFromCurrentUrl($uri = null) {
      *
      * @param $checkbox
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
+     * @see \Codeception\Module\WebDriver::seeCheckboxIsChecked()
      */
     public function canSeeCheckboxIsChecked($checkbox) {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCheckboxIsChecked', func_get_args()));
@@ -828,7 +971,7 @@ public function canSeeCheckboxIsChecked($checkbox) {
      * ```
      *
      * @param $checkbox
-     * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
+     * @see \Codeception\Module\WebDriver::seeCheckboxIsChecked()
      */
     public function seeCheckboxIsChecked($checkbox) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCheckboxIsChecked', func_get_args()));
@@ -849,7 +992,7 @@ public function seeCheckboxIsChecked($checkbox) {
      *
      * @param $checkbox
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
+     * @see \Codeception\Module\WebDriver::dontSeeCheckboxIsChecked()
      */
     public function cantSeeCheckboxIsChecked($checkbox) {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args()));
@@ -867,7 +1010,7 @@ public function cantSeeCheckboxIsChecked($checkbox) {
      * ```
      *
      * @param $checkbox
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
+     * @see \Codeception\Module\WebDriver::dontSeeCheckboxIsChecked()
      */
     public function dontSeeCheckboxIsChecked($checkbox) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCheckboxIsChecked', func_get_args()));
@@ -894,7 +1037,7 @@ public function dontSeeCheckboxIsChecked($checkbox) {
      * @param $field
      * @param $value
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInField()
+     * @see \Codeception\Module\WebDriver::seeInField()
      */
     public function canSeeInField($field, $value) {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInField', func_get_args()));
@@ -918,7 +1061,7 @@ public function canSeeInField($field, $value) {
      *
      * @param $field
      * @param $value
-     * @see \Codeception\Lib\InnerBrowser::seeInField()
+     * @see \Codeception\Module\WebDriver::seeInField()
      */
     public function seeInField($field, $value) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInField', func_get_args()));
@@ -945,7 +1088,7 @@ public function seeInField($field, $value) {
      * @param $field
      * @param $value
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
+     * @see \Codeception\Module\WebDriver::dontSeeInField()
      */
     public function cantSeeInField($field, $value) {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInField', func_get_args()));
@@ -969,7 +1112,7 @@ public function cantSeeInField($field, $value) {
      *
      * @param $field
      * @param $value
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
+     * @see \Codeception\Module\WebDriver::dontSeeInField()
      */
     public function dontSeeInField($field, $value) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInField', func_get_args()));
@@ -1039,7 +1182,7 @@ public function dontSeeInField($field, $value) {
      * @param $formSelector
      * @param $params
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
+     * @see \Codeception\Module\WebDriver::seeInFormFields()
      */
     public function canSeeInFormFields($formSelector, $params) {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInFormFields', func_get_args()));
@@ -1106,7 +1249,7 @@ public function canSeeInFormFields($formSelector, $params) {
      *
      * @param $formSelector
      * @param $params
-     * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
+     * @see \Codeception\Module\WebDriver::seeInFormFields()
      */
     public function seeInFormFields($formSelector, $params) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInFormFields', func_get_args()));
@@ -1156,7 +1299,7 @@ public function seeInFormFields($formSelector, $params) {
      * @param $formSelector
      * @param $params
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
+     * @see \Codeception\Module\WebDriver::dontSeeInFormFields()
      */
     public function cantSeeInFormFields($formSelector, $params) {
         return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInFormFields', func_get_args()));
@@ -1203,7 +1346,7 @@ public function cantSeeInFormFields($formSelector, $params) {
      *
      * @param $formSelector
      * @param $params
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
+     * @see \Codeception\Module\WebDriver::dontSeeInFormFields()
      */
     public function dontSeeInFormFields($formSelector, $params) {
         return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInFormFields', func_get_args()));
@@ -1213,239 +1356,50 @@ public function dontSeeInFormFields($formSelector, $params) {
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Submits the given form on the page, optionally with the given form
-     * values.  Pass the form field's values as an array in the second
-     * parameter.
-     *
-     * Although this function can be used as a short-hand version of
-     * `fillField()`, `selectOption()`, `click()` etc. it has some important
-     * differences:
-     *
-     *  * Only field *names* may be used, not CSS/XPath selectors nor field labels
-     *  * If a field is sent to this function that does *not* exist on the page,
-     *    it will silently be added to the HTTP request.  This is helpful for testing
-     *    some types of forms, but be aware that you will *not* get an exception
-     *    like you would if you called `fillField()` or `selectOption()` with
-     *    a missing field.
-     *
-     * Fields that are not provided will be filled by their values from the page,
-     * or from any previous calls to `fillField()`, `selectOption()` etc.
-     * You don't need to click the 'Submit' button afterwards.
-     * This command itself triggers the request to form's action.
-     *
-     * You can optionally specify which button's value to include
-     * in the request with the last parameter (as an alternative to
-     * explicitly setting its value in the second parameter), as
-     * button values are not otherwise included in the request.
-     *
-     * Examples:
+     * Selects an option in a select tag or in radio button group.
      *
      * ``` php
      * <?php
-     * $I->submitForm('#login', [
-     *     'login' => 'davert',
-     *     'password' => '123456'
-     * ]);
-     * // or
-     * $I->submitForm('#login', [
-     *     'login' => 'davert',
-     *     'password' => '123456'
-     * ], 'submitButtonName');
-     *
-     * ```
-     *
-     * For example, given this sample "Sign Up" form:
-     *
-     * ``` html
-     * <form action="http://github.com/sign_up">
-     *     Login:
-     *     <input type="text" name="user[login]" /><br/>
-     *     Password:
-     *     <input type="password" name="user[password]" /><br/>
-     *     Do you agree to our terms?
-     *     <input type="checkbox" name="user[agree]" /><br/>
-     *     Select pricing plan:
-     *     <select name="plan">
-     *         <option value="1">Free</option>
-     *         <option value="2" selected="selected">Paid</option>
-     *     </select>
-     *     <input type="submit" name="submitButton" value="Submit" />
-     * </form>
+     * $I->selectOption('form select[name=account]', 'Premium');
+     * $I->selectOption('form input[name=payment]', 'Monthly');
+     * $I->selectOption('//form/select[@name=account]', 'Monthly');
+     * ?>
      * ```
      *
-     * You could write the following to submit it:
+     * Provide an array for the second argument to select multiple options:
      *
      * ``` php
      * <?php
-     * $I->submitForm(
-     *     '#userForm',
-     *     [
-     *         'user' => [
-     *             'login' => 'Davert',
-     *             'password' => '123456',
-     *             'agree' => true
-     *         ]
-     *     ],
-     *     'submitButton'
-     * );
+     * $I->selectOption('Which OS do you use?', array('Windows','Linux'));
+     * ?>
      * ```
-     * Note that "2" will be the submitted value for the "plan" field, as it is
-     * the selected option.
      *
-     * You can also emulate a JavaScript submission by not specifying any
-     * buttons in the third parameter to submitForm.
+     * Or provide an associative array for the second argument to specifically define which selection method should be used:
      *
-     * ```php
+     * ``` php
      * <?php
-     * $I->submitForm(
-     *     '#userForm',
-     *     [
-     *         'user' => [
-     *             'login' => 'Davert',
-     *             'password' => '123456',
-     *             'agree' => true
-     *         ]
-     *     ]
-     * );
-     * ```
-     *
-     * This function works well when paired with `seeInFormFields()`
-     * for quickly testing CRUD interfaces and form validation logic.
-     *
-     * ``` php
-     * <?php
-     * $form = [
-     *      'field1' => 'value',
-     *      'field2' => 'another value',
-     *      'checkbox1' => true,
-     *      // ...
-     * ];
-     * $I->submitForm('#my-form', $form, 'submitButton');
-     * // $I->amOnPage('/path/to/form-page') may be needed
-     * $I->seeInFormFields('#my-form', $form);
-     * ```
-     *
-     * Parameter values can be set to arrays for multiple input fields
-     * of the same name, or multi-select combo boxes.  For checkboxes,
-     * you can use either the string value or boolean `true`/`false` which will
-     * be replaced by the checkbox's value in the DOM.
-     *
-     * ``` php
-     * <?php
-     * $I->submitForm('#my-form', [
-     *      'field1' => 'value',
-     *      'checkbox' => [
-     *          'value of first checkbox',
-     *          'value of second checkbox',
-     *      ],
-     *      'otherCheckboxes' => [
-     *          true,
-     *          false,
-     *          false
-     *      ],
-     *      'multiselect' => [
-     *          'first option value',
-     *          'second option value'
-     *      ]
-     * ]);
-     * ```
-     *
-     * Mixing string and boolean values for a checkbox's value is not supported
-     * and may produce unexpected results.
-     *
-     * Field names ending in `[]` must be passed without the trailing square
-     * bracket characters, and must contain an array for its value.  This allows
-     * submitting multiple values with the same name, consider:
-     *
-     * ```php
-     * <?php
-     * // This will NOT work correctly
-     * $I->submitForm('#my-form', [
-     *     'field[]' => 'value',
-     *     'field[]' => 'another value',  // 'field[]' is already a defined key
-     * ]);
-     * ```
-     *
-     * The solution is to pass an array value:
-     *
-     * ```php
-     * <?php
-     * // This way both values are submitted
-     * $I->submitForm('#my-form', [
-     *     'field' => [
-     *         'value',
-     *         'another value',
-     *     ]
-     * ]);
-     * ```
-     *
-     * @param $selector
-     * @param $params
-     * @param $button
-     * @see \Codeception\Lib\InnerBrowser::submitForm()
-     */
-    public function submitForm($selector, $params, $button = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Fills a text field or textarea with the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->fillField("//input[@type='text']", "Hello World!");
-     * $I->fillField(['name' => 'email'], 'jon@mail.com');
+     * $I->selectOption('Which OS do you use?', array('text' => 'Windows')); // Only search by text 'Windows'
+     * $I->selectOption('Which OS do you use?', array('value' => 'windows')); // Only search by value 'windows'
      * ?>
-     * ```
+     + ```
      *
-     * @param $field
-     * @param $value
-     * @see \Codeception\Lib\InnerBrowser::fillField()
+     * @param $select
+     * @param $option
+     * @see \Codeception\Module\WebDriver::selectOption()
      */
-    public function fillField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('fillField', func_get_args()));
+    public function selectOption($select, $option) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('selectOption', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Selects an option in a select tag or in radio button group.
-     *
-     * ``` php
-     * <?php
-     * $I->selectOption('form select[name=account]', 'Premium');
-     * $I->selectOption('form input[name=payment]', 'Monthly');
-     * $I->selectOption('//form/select[@name=account]', 'Monthly');
-     * ?>
-     * ```
-     *
-     * Provide an array for the second argument to select multiple options:
-     *
-     * ``` php
-     * <?php
-     * $I->selectOption('Which OS do you use?', array('Windows','Linux'));
-     * ?>
-     * ```
-     *
-     * Or provide an associative array for the second argument to specifically define which selection method should be used:
-     *
-     * ``` php
-     * <?php
-     * $I->selectOption('Which OS do you use?', array('text' => 'Windows')); // Only search by text 'Windows'
-     * $I->selectOption('Which OS do you use?', array('value' => 'windows')); // Only search by value 'windows'
-     * ?>
-     + ```
      *
-     * @param $select
-     * @param $option
-     * @see \Codeception\Lib\InnerBrowser::selectOption()
+     * @see \Codeception\Module\WebDriver::unselectOption()
      */
-    public function selectOption($select, $option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('selectOption', func_get_args()));
+    public function unselectOption($select, $option) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('unselectOption', func_get_args()));
     }
 
  
@@ -1461,7 +1415,7 @@ public function selectOption($select, $option) {
      * ```
      *
      * @param $option
-     * @see \Codeception\Lib\InnerBrowser::checkOption()
+     * @see \Codeception\Module\WebDriver::checkOption()
      */
     public function checkOption($option) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('checkOption', func_get_args()));
@@ -1480,7 +1434,7 @@ public function checkOption($option) {
      * ```
      *
      * @param $option
-     * @see \Codeception\Lib\InnerBrowser::uncheckOption()
+     * @see \Codeception\Module\WebDriver::uncheckOption()
      */
     public function uncheckOption($option) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('uncheckOption', func_get_args()));
@@ -1490,92 +1444,55 @@ public function uncheckOption($option) {
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Attaches a file relative to the Codeception data directory to the given file upload field.
+     * Fills a text field or textarea with the given string.
      *
      * ``` php
      * <?php
-     * // file is stored in 'tests/_data/prices.xls'
-     * $I->attachFile('input[@type="file"]', 'prices.xls');
+     * $I->fillField("//input[@type='text']", "Hello World!");
+     * $I->fillField(['name' => 'email'], 'jon@mail.com');
      * ?>
      * ```
      *
      * @param $field
-     * @param $filename
-     * @see \Codeception\Lib\InnerBrowser::attachFile()
-     */
-    public function attachFile($field, $filename) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('attachFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * If your page triggers an ajax request, you can perform it manually.
-     * This action sends a GET ajax request with specified params.
-     *
-     * See ->sendAjaxPostRequest for examples.
-     *
-     * @param $uri
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::sendAjaxGetRequest()
+     * @param $value
+     * @see \Codeception\Module\WebDriver::fillField()
      */
-    public function sendAjaxGetRequest($uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxGetRequest', func_get_args()));
+    public function fillField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('fillField', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * If your page triggers an ajax request, you can perform it manually.
-     * This action sends a POST ajax request with specified params.
-     * Additional params can be passed as array.
-     *
-     * Example:
-     *
-     * Imagine that by clicking checkbox you trigger ajax request which updates user settings.
-     * We emulate that click by running this ajax request manually.
+     * Attaches a file relative to the Codeception data directory to the given file upload field.
      *
      * ``` php
      * <?php
-     * $I->sendAjaxPostRequest('/updateSettings', array('notifications' => true)); // POST
-     * $I->sendAjaxGetRequest('/updateSettings', array('notifications' => true)); // GET
-     *
+     * // file is stored in 'tests/_data/prices.xls'
+     * $I->attachFile('input[@type="file"]', 'prices.xls');
+     * ?>
      * ```
      *
-     * @param $uri
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::sendAjaxPostRequest()
+     * @param $field
+     * @param $filename
+     * @see \Codeception\Module\WebDriver::attachFile()
      */
-    public function sendAjaxPostRequest($uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxPostRequest', func_get_args()));
+    public function attachFile($field, $filename) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('attachFile', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * If your page triggers an ajax request, you can perform it manually.
-     * This action sends an ajax request with specified method and params.
-     *
-     * Example:
-     *
-     * You need to perform an ajax request specifying the HTTP method.
-     *
-     * ``` php
-     * <?php
-     * $I->sendAjaxRequest('PUT', '/posts/7', array('title' => 'new title'));
-     *
-     * ```
+     * Grabs all visible text from the current page.
      *
-     * @param $method
-     * @param $uri
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::sendAjaxRequest()
+     * @return string
+     * @see \Codeception\Module\WebDriver::getVisibleText()
      */
-    public function sendAjaxRequest($method, $uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxRequest', func_get_args()));
+    public function getVisibleText() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('getVisibleText', func_get_args()));
     }
 
  
@@ -1597,7 +1514,7 @@ public function sendAjaxRequest($method, $uri, $params = null) {
      * @param $cssOrXPathOrRegex
      *
      * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabTextFrom()
+     * @see \Codeception\Module\WebDriver::grabTextFrom()
      */
     public function grabTextFrom($cssOrXPathOrRegex) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('grabTextFrom', func_get_args()));
@@ -1621,13 +1538,38 @@ public function grabTextFrom($cssOrXPathOrRegex) {
      * @param $attribute
      *
      * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabAttributeFrom()
+     * @see \Codeception\Module\WebDriver::grabAttributeFrom()
      */
     public function grabAttributeFrom($cssOrXpath, $attribute) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('grabAttributeFrom', func_get_args()));
     }
 
  
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Finds the value for the given form field.
+     * If a fuzzy locator is used, the field is found by field name, CSS, and XPath.
+     *
+     * ``` php
+     * <?php
+     * $name = $I->grabValueFrom('Name');
+     * $name = $I->grabValueFrom('input[name=username]');
+     * $name = $I->grabValueFrom('descendant-or-self::form/descendant::input[@name = 'username']');
+     * $name = $I->grabValueFrom(['name' => 'username']);
+     * ?>
+     * ```
+     *
+     * @param $field
+     *
+     * @return mixed
+     * @see \Codeception\Module\WebDriver::grabValueFrom()
+     */
+    public function grabValueFrom($field) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabValueFrom', func_get_args()));
+    }
+
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
@@ -1653,7 +1595,7 @@ public function grabAttributeFrom($cssOrXpath, $attribute) {
      * @param $cssOrXpath
      * @param $attribute
      * @return string[]
-     * @see \Codeception\Lib\InnerBrowser::grabMultiple()
+     * @see \Codeception\Module\WebDriver::grabMultiple()
      */
     public function grabMultiple($cssOrXpath, $attribute = null) {
         return $this->getScenario()->runStep(new \Codeception\Step\Action('grabMultiple', func_get_args()));
@@ -1663,585 +1605,1216 @@ public function grabMultiple($cssOrXpath, $attribute = null) {
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * @param $field
-     *
-     * @return array|mixed|null|string
-     * @see \Codeception\Lib\InnerBrowser::grabValueFrom()
-     */
-    public function grabValueFrom($field) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabValueFrom', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sets a cookie with the given name and value.
-     * You can set additional cookie params like `domain`, `path`, `expires`, `secure` in array passed as last argument.
+     * Checks that the given element exists on the page and is visible.
+     * You can also specify expected attributes of this element.
      *
      * ``` php
      * <?php
-     * $I->setCookie('PHPSESSID', 'el4ukv0kqbvoirg7nkp4dncpk3');
+     * $I->seeElement('.error');
+     * $I->seeElement('//form/input[1]');
+     * $I->seeElement('input', ['name' => 'login']);
+     * $I->seeElement('input', ['value' => '123456']);
+     *
+     * // strict locator in first arg, attributes in second
+     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
      * ?>
      * ```
      *
-     * @param $name
-     * @param $val
-     * @param array $params
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::setCookie()
+     * @param $selector
+     * @param array $attributes
+     * @return
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\WebDriver::seeElement()
      */
-    public function setCookie($name, $val, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args()));
+    public function canSeeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElement', func_get_args()));
     }
-
- 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Grabs a cookie value.
-     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
+     * Checks that the given element exists on the page and is visible.
+     * You can also specify expected attributes of this element.
      *
-     * @param $cookie
+     * ``` php
+     * <?php
+     * $I->seeElement('.error');
+     * $I->seeElement('//form/input[1]');
+     * $I->seeElement('input', ['name' => 'login']);
+     * $I->seeElement('input', ['value' => '123456']);
      *
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabCookie()
+     * // strict locator in first arg, attributes in second
+     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param array $attributes
+     * @return
+     * @see \Codeception\Module\WebDriver::seeElement()
      */
-    public function grabCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args()));
+    public function seeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElement', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that a cookie with the given name is set.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     * Checks that the given element is invisible or not present on the page.
+     * You can also specify expected attributes of this element.
      *
      * ``` php
      * <?php
-     * $I->seeCookie('PHPSESSID');
+     * $I->dontSeeElement('.error');
+     * $I->dontSeeElement('//form/input[1]');
+     * $I->dontSeeElement('input', ['name' => 'login']);
+     * $I->dontSeeElement('input', ['value' => '123456']);
      * ?>
      * ```
      *
-     * @param $cookie
-     * @param array $params
+     * @param $selector
+     * @param array $attributes
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\WebDriver::dontSeeElement()
+     */
+    public function cantSeeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElement', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element is invisible or not present on the page.
+     * You can also specify expected attributes of this element.
+     *
+     * ``` php
+     * <?php
+     * $I->dontSeeElement('.error');
+     * $I->dontSeeElement('//form/input[1]');
+     * $I->dontSeeElement('input', ['name' => 'login']);
+     * $I->dontSeeElement('input', ['value' => '123456']);
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param array $attributes
+     * @see \Codeception\Module\WebDriver::dontSeeElement()
+     */
+    public function dontSeeElement($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElement', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element exists on the page, even it is invisible.
+     *
+     * ``` php
+     * <?php
+     * $I->seeElementInDOM('//form/input[type=hidden]');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\WebDriver::seeElementInDOM()
+     */
+    public function canSeeElementInDOM($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElementInDOM', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given element exists on the page, even it is invisible.
+     *
+     * ``` php
+     * <?php
+     * $I->seeElementInDOM('//form/input[type=hidden]');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @see \Codeception\Module\WebDriver::seeElementInDOM()
+     */
+    public function seeElementInDOM($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElementInDOM', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Opposite of `seeElementInDOM`.
+     *
+     * @param $selector
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\WebDriver::dontSeeElementInDOM()
+     */
+    public function cantSeeElementInDOM($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElementInDOM', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Opposite of `seeElementInDOM`.
+     *
+     * @param $selector
+     * @see \Codeception\Module\WebDriver::dontSeeElementInDOM()
+     */
+    public function dontSeeElementInDOM($selector, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElementInDOM', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there are a certain number of elements matched by the given locator on the page.
+     *
+     * ``` php
+     * <?php
+     * $I->seeNumberOfElements('tr', 10);
+     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
+     * ?>
+     * ```
+     * @param $selector
+     * @param mixed $expected :
+     * - string: strict number
+     * - array: range of numbers [0,10]
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\WebDriver::seeNumberOfElements()
+     */
+    public function canSeeNumberOfElements($selector, $expected) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElements', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that there are a certain number of elements matched by the given locator on the page.
+     *
+     * ``` php
+     * <?php
+     * $I->seeNumberOfElements('tr', 10);
+     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
+     * ?>
+     * ```
+     * @param $selector
+     * @param mixed $expected :
+     * - string: strict number
+     * - array: range of numbers [0,10]
+     * @see \Codeception\Module\WebDriver::seeNumberOfElements()
+     */
+    public function seeNumberOfElements($selector, $expected) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElements', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     *
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\WebDriver::seeNumberOfElementsInDOM()
+     */
+    public function canSeeNumberOfElementsInDOM($selector, $expected) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElementsInDOM', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     *
+     * @see \Codeception\Module\WebDriver::seeNumberOfElementsInDOM()
+     */
+    public function seeNumberOfElementsInDOM($selector, $expected) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElementsInDOM', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the given option is selected.
+     *
+     * ``` php
+     * <?php
+     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
+     *
      * @return mixed
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCookie()
+     * @see \Codeception\Module\WebDriver::seeOptionIsSelected()
      */
-    public function canSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCookie', func_get_args()));
+    public function canSeeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeOptionIsSelected', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that a cookie with the given name is set.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     * Checks that the given option is selected.
      *
      * ``` php
      * <?php
-     * $I->seeCookie('PHPSESSID');
+     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
      * ?>
      * ```
      *
-     * @param $cookie
-     * @param array $params
+     * @param $selector
+     * @param $optionText
+     *
      * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::seeCookie()
+     * @see \Codeception\Module\WebDriver::seeOptionIsSelected()
      */
-    public function seeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args()));
+    public function seeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeOptionIsSelected', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that there isn't a cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     * Checks that the given option is not selected.
      *
-     * @param $cookie
+     * ``` php
+     * <?php
+     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
      *
-     * @param array $params
      * @return mixed
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
+     * @see \Codeception\Module\WebDriver::dontSeeOptionIsSelected()
      */
-    public function cantSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCookie', func_get_args()));
+    public function cantSeeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeOptionIsSelected', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that there isn't a cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
+     * Checks that the given option is not selected.
      *
-     * @param $cookie
+     * ``` php
+     * <?php
+     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * ?>
+     * ```
+     *
+     * @param $selector
+     * @param $optionText
      *
-     * @param array $params
      * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
+     * @see \Codeception\Module\WebDriver::dontSeeOptionIsSelected()
      */
-    public function dontSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCookie', func_get_args()));
+    public function dontSeeOptionIsSelected($selector, $optionText) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeOptionIsSelected', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Unsets cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
+     * Checks that the page title contains the given string.
      *
-     * @param $cookie
+     * ``` php
+     * <?php
+     * $I->seeInTitle('Blog - Post #1');
+     * ?>
+     * ```
+     *
+     * @param $title
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\WebDriver::seeInTitle()
+     */
+    public function canSeeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInTitle', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title contains the given string.
+     *
+     * ``` php
+     * <?php
+     * $I->seeInTitle('Blog - Post #1');
+     * ?>
+     * ```
+     *
+     * @param $title
+     *
+     * @return mixed
+     * @see \Codeception\Module\WebDriver::seeInTitle()
+     */
+    public function seeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInTitle', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title does not contain the given string.
+     *
+     * @param $title
+     *
+     * @return mixed
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\WebDriver::dontSeeInTitle()
+     */
+    public function cantSeeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInTitle', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the page title does not contain the given string.
+     *
+     * @param $title
      *
-     * @param array $params
      * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::resetCookie()
+     * @see \Codeception\Module\WebDriver::dontSeeInTitle()
+     */
+    public function dontSeeInTitle($title) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInTitle', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Accepts the active JavaScript native popup window, as created by `window.alert`|`window.confirm`|`window.prompt`.
+     * Don't confuse popups with modal windows,
+     * as created by [various libraries](http://jster.net/category/windows-modals-popups).
+     * @see \Codeception\Module\WebDriver::acceptPopup()
+     */
+    public function acceptPopup() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('acceptPopup', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Dismisses the active JavaScript popup, as created by `window.alert`|`window.confirm`|`window.prompt`.
+     * @see \Codeception\Module\WebDriver::cancelPopup()
+     */
+    public function cancelPopup() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('cancelPopup', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the active JavaScript popup,
+     * as created by `window.alert`|`window.confirm`|`window.prompt`, contains the given string.
+     *
+     * @param $text
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\WebDriver::seeInPopup()
+     */
+    public function canSeeInPopup($text) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInPopup', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that the active JavaScript popup,
+     * as created by `window.alert`|`window.confirm`|`window.prompt`, contains the given string.
+     *
+     * @param $text
+     * @see \Codeception\Module\WebDriver::seeInPopup()
+     */
+    public function seeInPopup($text) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInPopup', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Enters text into a native JavaScript prompt popup, as created by `window.prompt`.
+     *
+     * @param $keys
+     * @see \Codeception\Module\WebDriver::typeInPopup()
+     */
+    public function typeInPopup($keys) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('typeInPopup', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Reloads the current page.
+     * @see \Codeception\Module\WebDriver::reloadPage()
+     */
+    public function reloadPage() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('reloadPage', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Moves back in history.
+     * @see \Codeception\Module\WebDriver::moveBack()
+     */
+    public function moveBack() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('moveBack', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Moves forward in history.
+     * @see \Codeception\Module\WebDriver::moveForward()
+     */
+    public function moveForward() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('moveForward', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Submits the given form on the page, optionally with the given form
+     * values.  Give the form fields values as an array. Note that hidden fields
+     * can't be accessed.
+     *
+     * Skipped fields will be filled by their values from the page.
+     * You don't need to click the 'Submit' button afterwards.
+     * This command itself triggers the request to form's action.
+     *
+     * You can optionally specify what button's value to include
+     * in the request with the last parameter as an alternative to
+     * explicitly setting its value in the second parameter, as
+     * button values are not otherwise included in the request.
+     *
+     * Examples:
+     *
+     * ``` php
+     * <?php
+     * $I->submitForm('#login', [
+     *     'login' => 'davert',
+     *     'password' => '123456'
+     * ]);
+     * // or
+     * $I->submitForm('#login', [
+     *     'login' => 'davert',
+     *     'password' => '123456'
+     * ], 'submitButtonName');
+     *
+     * ```
+     *
+     * For example, given this sample "Sign Up" form:
+     *
+     * ``` html
+     * <form action="http://github.com/sign_up">
+     *     Login:
+     *     <input type="text" name="user[login]" /><br/>
+     *     Password:
+     *     <input type="password" name="user[password]" /><br/>
+     *     Do you agree to our terms?
+     *     <input type="checkbox" name="user[agree]" /><br/>
+     *     Select pricing plan:
+     *     <select name="plan">
+     *         <option value="1">Free</option>
+     *         <option value="2" selected="selected">Paid</option>
+     *     </select>
+     *     <input type="submit" name="submitButton" value="Submit" />
+     * </form>
+     * ```
+     *
+     * You could write the following to submit it:
+     *
+     * ``` php
+     * <?php
+     * $I->submitForm(
+     *     '#userForm',
+     *     [
+     *         'user[login]' => 'Davert',
+     *         'user[password]' => '123456',
+     *         'user[agree]' => true
+     *     ],
+     *     'submitButton'
+     * );
+     * ```
+     * Note that "2" will be the submitted value for the "plan" field, as it is
+     * the selected option.
+     *
+     * Also note that this differs from PhpBrowser, in that
+     * ```'user' => [ 'login' => 'Davert' ]``` is not supported at the moment.
+     * Named array keys *must* be included in the name as above.
+     *
+     * Pair this with seeInFormFields for quick testing magic.
+     *
+     * ``` php
+     * <?php
+     * $form = [
+     *      'field1' => 'value',
+     *      'field2' => 'another value',
+     *      'checkbox1' => true,
+     *      // ...
+     * ];
+     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
+     * // $I->amOnPage('/path/to/form-page') may be needed
+     * $I->seeInFormFields('//form[@id=my-form]', $form);
+     * ?>
+     * ```
+     *
+     * Parameter values must be set to arrays for multiple input fields
+     * of the same name, or multi-select combo boxes.  For checkboxes,
+     * either the string value can be used, or boolean values which will
+     * be replaced by the checkbox's value in the DOM.
+     *
+     * ``` php
+     * <?php
+     * $I->submitForm('#my-form', [
+     *      'field1' => 'value',
+     *      'checkbox' => [
+     *          'value of first checkbox',
+     *          'value of second checkbox,
+     *      ],
+     *      'otherCheckboxes' => [
+     *          true,
+     *          false,
+     *          false
+     *      ],
+     *      'multiselect' => [
+     *          'first option value',
+     *          'second option value'
+     *      ]
+     * ]);
+     * ?>
+     * ```
+     *
+     * Mixing string and boolean values for a checkbox's value is not supported
+     * and may produce unexpected results.
+     *
+     * Field names ending in "[]" must be passed without the trailing square
+     * bracket characters, and must contain an array for its value.  This allows
+     * submitting multiple values with the same name, consider:
+     *
+     * ```php
+     * $I->submitForm('#my-form', [
+     *     'field[]' => 'value',
+     *     'field[]' => 'another value', // 'field[]' is already a defined key
+     * ]);
+     * ```
+     *
+     * The solution is to pass an array value:
+     *
+     * ```php
+     * // this way both values are submitted
+     * $I->submitForm('#my-form', [
+     *     'field' => [
+     *         'value',
+     *         'another value',
+     *     ]
+     * ]);
+     * ```
+     * @param $selector
+     * @param $params
+     * @param $button
+     * @see \Codeception\Module\WebDriver::submitForm()
+     */
+    public function submitForm($selector, $params, $button = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Waits up to $timeout seconds for the given element to change.
+     * Element "change" is determined by a callback function which is called repeatedly
+     * until the return value evaluates to true.
+     *
+     * ``` php
+     * <?php
+     * use \Facebook\WebDriver\WebDriverElement
+     * $I->waitForElementChange('#menu', function(WebDriverElement $el) {
+     *     return $el->isDisplayed();
+     * }, 100);
+     * ?>
+     * ```
+     *
+     * @param $element
+     * @param \Closure $callback
+     * @param int $timeout seconds
+     * @throws \Codeception\Exception\ElementNotFound
+     * @see \Codeception\Module\WebDriver::waitForElementChange()
+     */
+    public function waitForElementChange($element, $callback, $timeout = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForElementChange', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Waits up to $timeout seconds for an element to appear on the page.
+     * If the element doesn't appear, a timeout exception is thrown.
+     *
+     * ``` php
+     * <?php
+     * $I->waitForElement('#agree_button', 30); // secs
+     * $I->click('#agree_button');
+     * ?>
+     * ```
+     *
+     * @param $element
+     * @param int $timeout seconds
+     * @throws \Exception
+     * @see \Codeception\Module\WebDriver::waitForElement()
      */
-    public function resetCookie($name, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args()));
+    public function waitForElement($element, $timeout = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForElement', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the given element exists on the page and is visible.
-     * You can also specify expected attributes of this element.
+     * Waits up to $timeout seconds for the given element to be visible on the page.
+     * If element doesn't appear, a timeout exception is thrown.
      *
      * ``` php
      * <?php
-     * $I->seeElement('.error');
-     * $I->seeElement('//form/input[1]');
-     * $I->seeElement('input', ['name' => 'login']);
-     * $I->seeElement('input', ['value' => '123456']);
-     *
-     * // strict locator in first arg, attributes in second
-     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
+     * $I->waitForElementVisible('#agree_button', 30); // secs
+     * $I->click('#agree_button');
      * ?>
      * ```
      *
-     * @param $selector
-     * @param array $attributes
-     * @return
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeElement()
+     * @param $element
+     * @param int $timeout seconds
+     * @throws \Exception
+     * @see \Codeception\Module\WebDriver::waitForElementVisible()
      */
-    public function canSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElement', func_get_args()));
+    public function waitForElementVisible($element, $timeout = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForElementVisible', func_get_args()));
     }
+
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the given element exists on the page and is visible.
-     * You can also specify expected attributes of this element.
+     * Waits up to $timeout seconds for the given element to become invisible.
+     * If element stays visible, a timeout exception is thrown.
      *
      * ``` php
      * <?php
-     * $I->seeElement('.error');
-     * $I->seeElement('//form/input[1]');
-     * $I->seeElement('input', ['name' => 'login']);
-     * $I->seeElement('input', ['value' => '123456']);
-     *
-     * // strict locator in first arg, attributes in second
-     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
+     * $I->waitForElementNotVisible('#agree_button', 30); // secs
      * ?>
      * ```
      *
-     * @param $selector
-     * @param array $attributes
-     * @return
-     * @see \Codeception\Lib\InnerBrowser::seeElement()
+     * @param $element
+     * @param int $timeout seconds
+     * @throws \Exception
+     * @see \Codeception\Module\WebDriver::waitForElementNotVisible()
      */
-    public function seeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElement', func_get_args()));
+    public function waitForElementNotVisible($element, $timeout = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForElementNotVisible', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the given element is invisible or not present on the page.
-     * You can also specify expected attributes of this element.
+     * Waits up to $timeout seconds for the given string to appear on the page.
+     * Can also be passed a selector to search in.
+     * If the given text doesn't appear, a timeout exception is thrown.
      *
      * ``` php
      * <?php
-     * $I->dontSeeElement('.error');
-     * $I->dontSeeElement('//form/input[1]');
-     * $I->dontSeeElement('input', ['name' => 'login']);
-     * $I->dontSeeElement('input', ['value' => '123456']);
+     * $I->waitForText('foo', 30); // secs
+     * $I->waitForText('foo', 30, '.title'); // secs
      * ?>
      * ```
      *
-     * @param $selector
-     * @param array $attributes
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
+     * @param string $text
+     * @param int $timeout seconds
+     * @param null $selector
+     * @throws \Exception
+     * @see \Codeception\Module\WebDriver::waitForText()
      */
-    public function cantSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElement', func_get_args()));
+    public function waitForText($text, $timeout = null, $selector = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForText', func_get_args()));
     }
+
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the given element is invisible or not present on the page.
-     * You can also specify expected attributes of this element.
+     * Wait for $timeout seconds.
+     *
+     * @param int $timeout secs
+     * @throws \Codeception\Exception\TestRuntimeException
+     * @see \Codeception\Module\WebDriver::wait()
+     */
+    public function wait($timeout) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('wait', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Low-level API method.
+     * If Codeception commands are not enough, this allows you to use Selenium WebDriver methods directly:
      *
      * ``` php
-     * <?php
-     * $I->dontSeeElement('.error');
-     * $I->dontSeeElement('//form/input[1]');
-     * $I->dontSeeElement('input', ['name' => 'login']);
-     * $I->dontSeeElement('input', ['value' => '123456']);
-     * ?>
+     * $I->executeInSelenium(function(\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {
+     *   $webdriver->get('http://google.com/');
+     * });
      * ```
      *
-     * @param $selector
-     * @param array $attributes
-     * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
+     * This runs in the context of the
+     * [RemoteWebDriver class](https://github.com/facebook/php-webdriver/blob/master/lib/remote/RemoteWebDriver.php).
+     * Try not to use this command on a regular basis.
+     * If Codeception lacks a feature you need, please implement it and submit a patch.
+     *
+     * @param callable $function
+     * @see \Codeception\Module\WebDriver::executeInSelenium()
      */
-    public function dontSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElement', func_get_args()));
+    public function executeInSelenium($function) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('executeInSelenium', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that there are a certain number of elements matched by the given locator on the page.
+     * Switch to another window identified by name.
+     *
+     * The window can only be identified by name. If the $name parameter is blank, the parent window will be used.
+     *
+     * Example:
+     * ``` html
+     * <input type="button" value="Open window" onclick="window.open('http://example.com/', 'another_window')">
+     * ```
      *
      * ``` php
      * <?php
-     * $I->seeNumberOfElements('tr', 10);
-     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
+     * $I->click("Open window");
+     * # switch to another window
+     * $I->switchToWindow("another_window");
+     * # switch to parent window
+     * $I->switchToWindow();
      * ?>
      * ```
-     * @param $selector
-     * @param mixed $expected :
-     * - string: strict number
-     * - array: range of numbers [0,10]
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
+     *
+     * If the window has no name, the only way to access it is via the `executeInSelenium()` method, like so:
+     *
+     * ``` php
+     * <?php
+     * $I->executeInSelenium(function (\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {
+     *      $handles=$webdriver->getWindowHandles();
+     *      $last_window = end($handles);
+     *      $webdriver->switchTo()->window($last_window);
+     * });
+     * ?>
+     * ```
+     *
+     * @param string|null $name
+     * @see \Codeception\Module\WebDriver::switchToWindow()
      */
-    public function canSeeNumberOfElements($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElements', func_get_args()));
+    public function switchToWindow($name = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('switchToWindow', func_get_args()));
     }
+
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that there are a certain number of elements matched by the given locator on the page.
+     * Switch to another frame on the page.
+     *
+     * Example:
+     * ``` html
+     * <iframe name="another_frame" src="http://example.com/">
+     *
+     * ```
      *
      * ``` php
      * <?php
-     * $I->seeNumberOfElements('tr', 10);
-     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
-     * ?>
+     * # switch to iframe
+     * $I->switchToIFrame("another_frame");
+     * # switch to parent page
+     * $I->switchToIFrame();
+     *
      * ```
-     * @param $selector
-     * @param mixed $expected :
-     * - string: strict number
-     * - array: range of numbers [0,10]
-     * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
+     *
+     * @param string|null $name
+     * @see \Codeception\Module\WebDriver::switchToIFrame()
      */
-    public function seeNumberOfElements($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElements', func_get_args()));
+    public function switchToIFrame($name = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('switchToIFrame', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the given option is selected.
+     * Executes JavaScript and waits up to $timeout seconds for it to return true.
+     *
+     * In this example we will wait up to 60 seconds for all jQuery AJAX requests to finish.
      *
      * ``` php
      * <?php
-     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * $I->waitForJS("return $.active == 0;", 60);
      * ?>
      * ```
      *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
+     * @param string $script
+     * @param int $timeout seconds
+     * @see \Codeception\Module\WebDriver::waitForJS()
      */
-    public function canSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeOptionIsSelected', func_get_args()));
+    public function waitForJS($script, $timeout = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForJS', func_get_args()));
     }
+
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the given option is selected.
+     * Executes custom JavaScript.
      *
-     * ``` php
+     * This example uses jQuery to get a value and assigns that value to a PHP variable:
+     *
+     * ```php
      * <?php
-     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * $myVar = $I->executeJS('return $("#myField").val()');
      * ?>
      * ```
      *
-     * @param $selector
-     * @param $optionText
-     *
+     * @param $script
      * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
+     * @see \Codeception\Module\WebDriver::executeJS()
      */
-    public function seeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeOptionIsSelected', func_get_args()));
+    public function executeJS($script) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('executeJS', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the given option is not selected.
+     * Maximizes the current window.
+     * @see \Codeception\Module\WebDriver::maximizeWindow()
+     */
+    public function maximizeWindow() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('maximizeWindow', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Performs a simple mouse drag-and-drop operation.
      *
      * ``` php
      * <?php
-     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * $I->dragAndDrop('#drag', '#drop');
      * ?>
      * ```
      *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
+     * @param string $source (CSS ID or XPath)
+     * @param string $target (CSS ID or XPath)
+     * @see \Codeception\Module\WebDriver::dragAndDrop()
      */
-    public function cantSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeOptionIsSelected', func_get_args()));
+    public function dragAndDrop($source, $target) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('dragAndDrop', func_get_args()));
     }
+
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the given option is not selected.
+     * Move mouse over the first element matched by the given locator.
+     * If the second and third parameters are given,
+     * then the mouse is moved to an offset of the element's top-left corner.
+     * Otherwise, the mouse is moved to the center of the element.
      *
      * ``` php
      * <?php
-     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
+     * $I->moveMouseOver(['css' => '.checkout'], 20, 50);
      * ?>
      * ```
      *
-     * @param $selector
-     * @param $optionText
+     * @param string $cssOrXPath css or xpath of the web element
+     * @param int $offsetX
+     * @param int $offsetY
      *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
+     * @throws \Codeception\Exception\ElementNotFound
+     * @see \Codeception\Module\WebDriver::moveMouseOver()
      */
-    public function dontSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeOptionIsSelected', func_get_args()));
+    public function moveMouseOver($cssOrXPath, $offsetX = null, $offsetY = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('moveMouseOver', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Asserts that current page has 404 response status code.
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
+     * Performs contextual click with the right mouse button on an element.
+     *
+     * @param $cssOrXPath
+     * @throws \Codeception\Exception\ElementNotFound
+     * @see \Codeception\Module\WebDriver::clickWithRightButton()
      */
-    public function canSeePageNotFound() {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seePageNotFound', func_get_args()));
+    public function clickWithRightButton($cssOrXPath) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('clickWithRightButton', func_get_args()));
     }
+
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Asserts that current page has 404 response status code.
-     * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
+     * Pauses test execution in debug mode.
+     * To proceed test press "ENTER" in console.
+     *
+     * This method is useful while writing tests,
+     * since it allows you to inspect the current page in the middle of a test case.
+     * @see \Codeception\Module\WebDriver::pauseExecution()
      */
-    public function seePageNotFound() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seePageNotFound', func_get_args()));
+    public function pauseExecution() {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('pauseExecution', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that response code is equal to value provided.
-     *
-     * ```php
-     * <?php
-     * $I->seeResponseCodeIs(200);
-     *
-     * // recommended \Codeception\Util\HttpCode
-     * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
-     * ```
+     * Performs a double-click on an element matched by CSS or XPath.
      *
-     * @param $code
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
+     * @param $cssOrXPath
+     * @throws \Codeception\Exception\ElementNotFound
+     * @see \Codeception\Module\WebDriver::doubleClick()
      */
-    public function canSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIs', func_get_args()));
+    public function doubleClick($cssOrXPath) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('doubleClick', func_get_args()));
     }
+
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that response code is equal to value provided.
+     * Presses the given key on the given element.
+     * To specify a character and modifier (e.g. ctrl, alt, shift, meta), pass an array for $char with
+     * the modifier as the first element and the character as the second.
+     * For special keys use key constants from WebDriverKeys class.
      *
-     * ```php
+     * ``` php
      * <?php
-     * $I->seeResponseCodeIs(200);
-     *
-     * // recommended \Codeception\Util\HttpCode
-     * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
+     * // <input id="page" value="old" />
+     * $I->pressKey('#page','a'); // => olda
+     * $I->pressKey('#page',array('ctrl','a'),'new'); //=> new
+     * $I->pressKey('#page',array('shift','111'),'1','x'); //=> old!!!1x
+     * $I->pressKey('descendant-or-self::*[@id='page']','u'); //=> oldu
+     * $I->pressKey('#name', array('ctrl', 'a'), \Facebook\WebDriver\WebDriverKeys::DELETE); //=>''
+     * ?>
      * ```
      *
-     * @param $code
-     * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
+     * @param $element
+     * @param $char Can be char or array with modifier. You can provide several chars.
+     * @throws \Codeception\Exception\ElementNotFound
+     * @see \Codeception\Module\WebDriver::pressKey()
      */
-    public function seeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIs', func_get_args()));
+    public function pressKey($element, $char) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('pressKey', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that response code is equal to value provided.
+     * Append the given text to the given element.
+     * Can also add a selection to a select box.
      *
-     * ```php
+     * ``` php
      * <?php
-     * $I->dontSeeResponseCodeIs(200);
-     *
-     * // recommended \Codeception\Util\HttpCode
-     * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
+     * $I->appendField('#mySelectbox', 'SelectValue');
+     * $I->appendField('#myTextField', 'appended');
+     * ?>
      * ```
-     * @param $code
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
+     *
+     * @param string $field
+     * @param string $value
+     * @throws \Codeception\Exception\ElementNotFound
+     * @see \Codeception\Module\WebDriver::appendField()
      */
-    public function cantSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeResponseCodeIs', func_get_args()));
+    public function appendField($field, $value) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('appendField', func_get_args()));
     }
+
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that response code is equal to value provided.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeResponseCodeIs(200);
+     * @param string $name
+     * @see \Codeception\Module\WebDriver::saveSessionSnapshot()
+     */
+    public function saveSessionSnapshot($name) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('saveSessionSnapshot', func_get_args()));
+    }
+
+ 
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * // recommended \Codeception\Util\HttpCode
-     * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
-     * ```
-     * @param $code
-     * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
+     * @param string $name
+     * @return bool
+     * @see \Codeception\Module\WebDriver::loadSessionSnapshot()
      */
-    public function dontSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeResponseCodeIs', func_get_args()));
+    public function loadSessionSnapshot($name) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('loadSessionSnapshot', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the page title contains the given string.
+     * Move to the middle of the given element matched by the given locator.
+     * Extra shift, calculated from the top-left corner of the element,
+     * can be set by passing $offsetX and $offsetY parameters.
      *
      * ``` php
      * <?php
-     * $I->seeInTitle('Blog - Post #1');
+     * $I->scrollTo(['css' => '.checkout'], 20, 50);
      * ?>
      * ```
      *
-     * @param $title
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInTitle()
+     * @param $selector
+     * @param int $offsetX
+     * @param int $offsetY
+     * @see \Codeception\Module\WebDriver::scrollTo()
      */
-    public function canSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInTitle', func_get_args()));
+    public function scrollTo($selector, $offsetX = null, $offsetY = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('scrollTo', func_get_args()));
     }
+
+ 
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the page title contains the given string.
+     * Inserts record into the database.
      *
      * ``` php
      * <?php
-     * $I->seeInTitle('Blog - Post #1');
+     * $user_id = $I->haveRecord('app\models\User', array('name' => 'Davert'));
      * ?>
      * ```
      *
-     * @param $title
-     *
+     * @param $model
+     * @param array $attributes
      * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::seeInTitle()
+     * @part orm
+     * @see \Codeception\Module\Yii2::haveRecord()
      */
-    public function seeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInTitle', func_get_args()));
+    public function haveRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveRecord', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the page title does not contain the given string.
+     * Checks that record exists in database.
      *
-     * @param $title
+     * ``` php
+     * $I->seeRecord('app\models\User', array('name' => 'davert'));
+     * ```
      *
-     * @return mixed
+     * @param $model
+     * @param array $attributes
+     * @part orm
      * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
+     * @see \Codeception\Module\Yii2::seeRecord()
      */
-    public function cantSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInTitle', func_get_args()));
+    public function canSeeRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeRecord', func_get_args()));
     }
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Checks that the page title does not contain the given string.
+     * Checks that record exists in database.
      *
-     * @param $title
+     * ``` php
+     * $I->seeRecord('app\models\User', array('name' => 'davert'));
+     * ```
      *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
+     * @param $model
+     * @param array $attributes
+     * @part orm
+     * @see \Codeception\Module\Yii2::seeRecord()
      */
-    public function dontSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInTitle', func_get_args()));
+    public function seeRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeRecord', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Switch to iframe or frame on the page.
+     * Checks that record does not exist in database.
      *
-     * Example:
-     * ``` html
-     * <iframe name="another_frame" src="http://example.com/">
+     * ``` php
+     * $I->dontSeeRecord('app\models\User', array('name' => 'davert'));
      * ```
      *
+     * @param $model
+     * @param array $attributes
+     * @part orm
+     * Conditional Assertion: Test won't be stopped on fail
+     * @see \Codeception\Module\Yii2::dontSeeRecord()
+     */
+    public function cantSeeRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeRecord', func_get_args()));
+    }
+    /**
+     * [!] Method is generated. Documentation taken from corresponding module.
+     *
+     * Checks that record does not exist in database.
+     *
      * ``` php
-     * <?php
-     * # switch to iframe
-     * $I->switchToIframe("another_frame");
+     * $I->dontSeeRecord('app\models\User', array('name' => 'davert'));
      * ```
      *
-     * @param string $name
-     * @see \Codeception\Lib\InnerBrowser::switchToIframe()
+     * @param $model
+     * @param array $attributes
+     * @part orm
+     * @see \Codeception\Module\Yii2::dontSeeRecord()
      */
-    public function switchToIframe($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('switchToIframe', func_get_args()));
+    public function dontSeeRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeRecord', func_get_args()));
     }
 
  
     /**
      * [!] Method is generated. Documentation taken from corresponding module.
      *
-     * Moves back in history.
+     * Retrieves record from database
+     *
+     * ``` php
+     * $category = $I->grabRecord('app\models\User', array('name' => 'davert'));
+     * ```
      *
-     * @param int $numberOfSteps (default value 1)
-     * @see \Codeception\Lib\InnerBrowser::moveBack()
+     * @param $model
+     * @param array $attributes
+     * @return mixed
+     * @part orm
+     * @see \Codeception\Module\Yii2::grabRecord()
      */
-    public function moveBack($numberOfSteps = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('moveBack', func_get_args()));
+    public function grabRecord($model, $attributes = null) {
+        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabRecord', func_get_args()));
     }
 }
diff --git a/tests/_support/_generated/FunctionalTesterActions.php b/tests/_support/_generated/FunctionalTesterActions.php
index 9623023e8..8839cbce7 100644
--- a/tests/_support/_generated/FunctionalTesterActions.php
+++ b/tests/_support/_generated/FunctionalTesterActions.php
@@ -1,4 +1,4 @@
-<?php  //[STAMP] 7d7cf724fdb83651f402d30bb414a1e4
+<?php  //[STAMP] 0371e992067f9f6926df379e8e9c6bd6
 namespace _generated;
 
 // This class was automatically generated by build task
diff --git a/tests/_support/_generated/UnitTesterActions.php b/tests/_support/_generated/UnitTesterActions.php
index a07060947..415c30b7e 100644
--- a/tests/_support/_generated/UnitTesterActions.php
+++ b/tests/_support/_generated/UnitTesterActions.php
@@ -1,4 +1,4 @@
-<?php  //[STAMP] 5277d920e2dff79e69b22748b3b5c29b
+<?php  //[STAMP] 511934dbe87dbbd3a10594f1137bfa92
 namespace _generated;
 
 // This class was automatically generated by build task
diff --git a/tests/acceptance.suite.yml.example b/tests/acceptance.suite.yml.example
index d36d7360b..7214034c7 100644
--- a/tests/acceptance.suite.yml.example
+++ b/tests/acceptance.suite.yml.example
@@ -1,27 +1,9 @@
-# Codeception Test Suite Configuration
-
-# suite for acceptance tests.
-# perform tests in browser using the Selenium-like tools.
-# powered by Mink (http://mink.behat.org).
-# (tip: that's what your customer will see).
-# (tip: test your ajax and javascript by one of Mink drivers).
-
-# RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
-
 class_name: AcceptanceTester
 modules:
     enabled:
-        - PhpBrowser
-# you can use WebDriver instead of PhpBrowser to test javascript and ajax.
-# This will require you to install selenium. See http://codeception.com/docs/03-AcceptanceTests#selenium-webdriver
-# "restart" option is used by the WebDriver to start each time per test-file new session and cookies,
-# it is useful if you want to login in your app in each test.
-#        - WebDriver
-    config:
-        PhpBrowser:
-# PLEASE ADJUST IT TO THE ACTUAL ENTRY POINT WITHOUT PATH INFO
-            url: http://localhost:8080
-#        WebDriver:
-#            url: http://localhost:8080
-#            browser: firefox
-#            restart: true
+        - WebDriver:
+            url: http://127.0.0.1:8080/
+            browser: firefox
+        - Yii2:
+            part: orm
+            entryScript: index-test.php
diff --git a/tests/acceptance/AboutCept.php b/tests/acceptance/AboutCept.php
deleted file mode 100644
index 88a550698..000000000
--- a/tests/acceptance/AboutCept.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-use tests\codeception\_pages\AboutPage;
-
-/* @var $scenario Codeception\Scenario */
-
-$I = new AcceptanceTester($scenario);
-$I->wantTo('ensure that about works');
-AboutPage::openBy($I);
-$I->see('About', 'h1');
diff --git a/tests/codeception/acceptance/AboutCest.php b/tests/acceptance/AboutCest.php
similarity index 54%
rename from tests/codeception/acceptance/AboutCest.php
rename to tests/acceptance/AboutCest.php
index a3cbef66b..6f688ec7a 100644
--- a/tests/codeception/acceptance/AboutCest.php
+++ b/tests/acceptance/AboutCest.php
@@ -1,11 +1,12 @@
 <?php
+use yii\helpers\Url as Url;
 
 class AboutCest
 {
     public function ensureThatAboutWorks(AcceptanceTester $I)
     {
-        //$I->amOnPage(['site/about']);
-        $I->amOnPage('index.php?r=site%2Fabout');
+        $I->amOnPage(Url::toRoute('/site/about'));
+        $I->pauseExecution();
         $I->see('About', 'h1');
     }
 }
diff --git a/tests/acceptance/ContactCept.php b/tests/acceptance/ContactCept.php
deleted file mode 100644
index f848443da..000000000
--- a/tests/acceptance/ContactCept.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-use tests\codeception\_pages\ContactPage;
-
-/* @var $scenario Codeception\Scenario */
-
-$I = new AcceptanceTester($scenario);
-$I->wantTo('ensure that contact works');
-
-$contactPage = ContactPage::openBy($I);
-
-$I->see('Contact', 'h1');
-
-$I->amGoingTo('submit contact form with no data');
-$contactPage->submit([]);
-if (method_exists($I, 'wait')) {
-    $I->wait(3); // only for selenium
-}
-$I->expectTo('see validations errors');
-$I->see('Contact', 'h1');
-$I->see('Name cannot be blank');
-$I->see('Email cannot be blank');
-$I->see('Subject cannot be blank');
-$I->see('Body cannot be blank');
-$I->see('The verification code is incorrect');
-
-$I->amGoingTo('submit contact form with not correct email');
-$contactPage->submit([
-    'name' => 'tester',
-    'email' => 'tester.email',
-    'subject' => 'test subject',
-    'body' => 'test content',
-    'verifyCode' => 'testme',
-]);
-if (method_exists($I, 'wait')) {
-    $I->wait(3); // only for selenium
-}
-$I->expectTo('see that email address is wrong');
-$I->dontSee('Name cannot be blank', '.help-inline');
-$I->see('Email is not a valid email address.');
-$I->dontSee('Subject cannot be blank', '.help-inline');
-$I->dontSee('Body cannot be blank', '.help-inline');
-$I->dontSee('The verification code is incorrect', '.help-inline');
-
-$I->amGoingTo('submit contact form with correct data');
-$contactPage->submit([
-    'name' => 'tester',
-    'email' => 'tester@example.com',
-    'subject' => 'test subject',
-    'body' => 'test content',
-    'verifyCode' => 'testme',
-]);
-if (method_exists($I, 'wait')) {
-    $I->wait(3); // only for selenium
-}
-$I->dontSeeElement('#contact-form');
-$I->see('Thank you for contacting us. We will respond to you as soon as possible.');
diff --git a/tests/codeception/acceptance/ContactCest.php b/tests/acceptance/ContactCest.php
similarity index 85%
rename from tests/codeception/acceptance/ContactCest.php
rename to tests/acceptance/ContactCest.php
index 0a317ce50..a27da4507 100644
--- a/tests/codeception/acceptance/ContactCest.php
+++ b/tests/acceptance/ContactCest.php
@@ -1,13 +1,12 @@
 <?php
 
-/**
- * Class ContactCest
- */
+use yii\helpers\Url as Url;
+
 class ContactCest
 {
     public function _before(\AcceptanceTester $I)
     {
-        $I->amOnPage('index-test.php?r=site%2Fcontact');
+        $I->amOnPage(Url::toRoute('/site/contact'));
     }
     
     public function contactPageWorks(AcceptanceTester $I)
@@ -26,6 +25,8 @@ public function contactFormCanBeSubmitted(AcceptanceTester $I)
         $I->fillField('#contactform-verifycode', 'testme');
 
         $I->click('contact-button');
+        
+        $I->wait(2); // wait for button to be clicked
 
         $I->dontSeeElement('#contact-form');
         $I->see('Thank you for contacting us. We will respond to you as soon as possible.');
diff --git a/tests/acceptance/HomeCept.php b/tests/acceptance/HomeCept.php
deleted file mode 100644
index 1f9353595..000000000
--- a/tests/acceptance/HomeCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/* @var $scenario Codeception\Scenario */
-
-$I = new AcceptanceTester($scenario);
-$I->wantTo('ensure that home page works');
-$I->amOnPage(Yii::$app->homeUrl);
-$I->see('My Company');
-$I->seeLink('About');
-$I->click('About');
-$I->see('This is the About page.');
diff --git a/tests/codeception/acceptance/HomeCest.php b/tests/acceptance/HomeCest.php
similarity index 87%
rename from tests/codeception/acceptance/HomeCest.php
rename to tests/acceptance/HomeCest.php
index cd7b22436..c205c2d12 100644
--- a/tests/codeception/acceptance/HomeCest.php
+++ b/tests/acceptance/HomeCest.php
@@ -4,7 +4,6 @@ class HomeCest
 {
     public function ensureThatHomePageWorks(AcceptanceTester $I)
     {
-        //$I->amOnPage(Yii::$app->homeUrl);
         $I->amOnPage('index.php?r=site%2Findex');        
         $I->see('My Company');
         
diff --git a/tests/acceptance/LoginCept.php b/tests/acceptance/LoginCept.php
deleted file mode 100644
index 90d063583..000000000
--- a/tests/acceptance/LoginCept.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-use tests\codeception\_pages\LoginPage;
-
-/* @var $scenario Codeception\Scenario */
-
-$I = new AcceptanceTester($scenario);
-$I->wantTo('ensure that login works');
-
-$loginPage = LoginPage::openBy($I);
-
-$I->see('Login', 'h1');
-
-$I->amGoingTo('try to login with empty credentials');
-$loginPage->login('', '');
-if (method_exists($I, 'wait')) {
-    $I->wait(3); // only for selenium
-}
-$I->expectTo('see validations errors');
-$I->see('Username cannot be blank.');
-$I->see('Password cannot be blank.');
-
-$I->amGoingTo('try to login with wrong credentials');
-$loginPage->login('admin', 'wrong');
-if (method_exists($I, 'wait')) {
-    $I->wait(3); // only for selenium
-}
-$I->expectTo('see validations errors');
-$I->see('Incorrect username or password.');
-
-$I->amGoingTo('try to login with correct credentials');
-$loginPage->login('admin', 'admin');
-if (method_exists($I, 'wait')) {
-    $I->wait(3); // only for selenium
-}
-$I->expectTo('see user info');
-$I->see('Logout (admin)');
diff --git a/tests/codeception/acceptance/LoginCest.php b/tests/acceptance/LoginCest.php
similarity index 71%
rename from tests/codeception/acceptance/LoginCest.php
rename to tests/acceptance/LoginCest.php
index 97f39800a..9ffc395ba 100644
--- a/tests/codeception/acceptance/LoginCest.php
+++ b/tests/acceptance/LoginCest.php
@@ -1,19 +1,20 @@
 <?php
+use yii\helpers\Url as Url;
 
 class LoginCest
 {
     public function ensureThatLoginWorks(AcceptanceTester $I)
     {
-        //$I->amOnPage(['site/login']);
-        $I->amOnPage('index.php?r=site%2Flogin');
+        $I->amOnPage(Url::toRoute('/site/login'));
         $I->see('Login', 'h1');
 
         $I->amGoingTo('try to login with correct credentials');
         $I->fillField('input[name="LoginForm[username]"]', 'admin');
         $I->fillField('input[name="LoginForm[password]"]', 'admin');
         $I->click('login-button');
+        $I->wait(2); // wait for button to be clicked
 
         $I->expectTo('see user info');
-        $I->see('Logout (admin)');
+        $I->see('Logout');
     }
 }
diff --git a/tests/acceptance/_bootstrap.php b/tests/acceptance/_bootstrap.php
index 36f9f1d11..b3d9bbc7f 100644
--- a/tests/acceptance/_bootstrap.php
+++ b/tests/acceptance/_bootstrap.php
@@ -1,2 +1 @@
 <?php
-new yii\web\Application(require(dirname(__DIR__) . '/config/acceptance.php'));
diff --git a/tests/bin/_bootstrap.php b/tests/bin/_bootstrap.php
deleted file mode 100644
index bbadc36ef..000000000
--- a/tests/bin/_bootstrap.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_ENV') or define('YII_ENV', 'test');
-
-defined('YII_APP_BASE_PATH') or define('YII_APP_BASE_PATH', dirname(dirname(dirname(__DIR__))));
-
-require(YII_APP_BASE_PATH . '/vendor/autoload.php');
-require(YII_APP_BASE_PATH . '/vendor/yiisoft/yii2/Yii.php');
-
-Yii::setAlias('@tests', dirname(dirname(__DIR__)));
diff --git a/tests/bin/yii b/tests/bin/yii
old mode 100644
new mode 100755
index c6df160d8..d01f526e9
--- a/tests/bin/yii
+++ b/tests/bin/yii
@@ -8,13 +8,22 @@
  * @license http://www.yiiframework.com/license/
  */
 
-require_once __DIR__ . '/_bootstrap.php';
+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');
 
 $config = yii\helpers\ArrayHelper::merge(
-    require(YII_APP_BASE_PATH . '/config/console.php'),
-    require(__DIR__ . '/../config/config.php')
+    require(__DIR__ . '/config/console.php'),
+    [
+        'components' => [
+            'db' => require(__DIR__ . '/config/test_db.php')
+        ]
+    ]
 );
 
+
 $application = new yii\console\Application($config);
 $exitCode = $application->run();
-exit($exitCode);
+exit($exitCode);
\ No newline at end of file
diff --git a/tests/codeception/.gitignore b/tests/codeception/.gitignore
deleted file mode 100644
index 985dbb423..000000000
--- a/tests/codeception/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# these files are auto generated by codeception build
-/unit/UnitTester.php
-/functional/FunctionalTester.php
-/acceptance/AcceptanceTester.php
diff --git a/tests/codeception/_support/AcceptanceTester.php b/tests/codeception/_support/AcceptanceTester.php
deleted file mode 100644
index 4c7dcbb6d..000000000
--- a/tests/codeception/_support/AcceptanceTester.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class AcceptanceTester extends \Codeception\Actor
-{
-    use _generated\AcceptanceTesterActions;
-
-   /**
-    * Define custom actions here
-    */
-}
diff --git a/tests/codeception/_support/FunctionalTester.php b/tests/codeception/_support/FunctionalTester.php
deleted file mode 100644
index 7e888f8b2..000000000
--- a/tests/codeception/_support/FunctionalTester.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class FunctionalTester extends \Codeception\Actor
-{
-    use _generated\FunctionalTesterActions;
-
-   /**
-    * Define custom actions here
-    */
-}
diff --git a/tests/codeception/_support/UnitTester.php b/tests/codeception/_support/UnitTester.php
deleted file mode 100644
index 28353572c..000000000
--- a/tests/codeception/_support/UnitTester.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-
-/**
- * Inherited Methods
- * @method void wantToTest($text)
- * @method void wantTo($text)
- * @method void execute($callable)
- * @method void expectTo($prediction)
- * @method void expect($prediction)
- * @method void amGoingTo($argumentation)
- * @method void am($role)
- * @method void lookForwardTo($achieveValue)
- * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
- *
- * @SuppressWarnings(PHPMD)
-*/
-class UnitTester extends \Codeception\Actor
-{
-    use _generated\UnitTesterActions;
-
-   /**
-    * Define custom actions here
-    */
-}
diff --git a/tests/codeception/_support/_generated/.gitignore b/tests/codeception/_support/_generated/.gitignore
deleted file mode 100644
index c96a04f00..000000000
--- a/tests/codeception/_support/_generated/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/tests/codeception/acceptance.suite.yml b/tests/codeception/acceptance.suite.yml
deleted file mode 100644
index ee88ebd3e..000000000
--- a/tests/codeception/acceptance.suite.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-# Codeception Test Suite Configuration
-
-# suite for acceptance tests.
-# perform tests in browser using the Selenium-like tools.
-# powered by Mink (http://mink.behat.org).
-# (tip: that's what your customer will see).
-# (tip: test your ajax and javascript by one of Mink drivers).
-
-# RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
-
-class_name: AcceptanceTester
-modules:
-    enabled:
-        - PhpBrowser
-#        - Yii2:
-#           configFile: '/codeception/config/acceptance.php'
-# you can use WebDriver instead of PhpBrowser to test javascript and ajax.
-# This will require you to install selenium. See http://codeception.com/docs/03-AcceptanceTests#selenium-webdriver
-# "restart" option is used by the WebDriver to start each time per test-file new session and cookies,
-# it is useful if you want to login in your app in each test.
-#        - WebDriver
-    config:
-        PhpBrowser:
-# PLEASE ADJUST IT TO THE ACTUAL ENTRY POINT WITHOUT PATH INFO
-            url: http://localhost:8080
-#        WebDriver:
-#            url: http://localhost:8080
-#            browser: firefox
-#            restart: true
diff --git a/tests/config/acceptance.php b/tests/config/acceptance.php
deleted file mode 100644
index 1c893d43a..000000000
--- a/tests/config/acceptance.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Application configuration for acceptance tests
- */
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/web.php'),
-    require(__DIR__ . '/config.php'),
-    [
-
-    ]
-);
diff --git a/tests/config/functional.php b/tests/config/functional.php
deleted file mode 100644
index 15d9797a0..000000000
--- a/tests/config/functional.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Application configuration for functional tests
- */
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/web.php'),
-    require(__DIR__ . '/config.php'),
-    [
-        'components' => [
-            'request' => [
-                // it's not recommended to run functional tests with CSRF validation enabled
-                'enableCsrfValidation' => false,
-                // but if you absolutely need it set cookie domain to localhost
-                /*
-                'csrfCookie' => [
-                    'domain' => 'localhost',
-                ],
-                */
-            ],
-        ],
-    ]
-);
diff --git a/tests/config/unit.php b/tests/config/unit.php
deleted file mode 100644
index 455a9e9e0..000000000
--- a/tests/config/unit.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Application configuration for unit tests
- */
-return yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/web.php'),
-    require(__DIR__ . '/config.php'),
-    [
-
-    ]
-);
diff --git a/tests/fixtures/.gitignore b/tests/fixtures/.gitignore
deleted file mode 100644
index c96a04f00..000000000
--- a/tests/fixtures/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/tests/functional.suite.yml b/tests/functional.suite.yml
index 027ece093..374c6df45 100644
--- a/tests/functional.suite.yml
+++ b/tests/functional.suite.yml
@@ -10,5 +10,4 @@ class_name: FunctionalTester
 modules:
     enabled:
       - Filesystem
-      - Yii2:
-            configFile: 'config/test.php'
+      - Yii2
diff --git a/tests/functional/AboutCept.php b/tests/functional/AboutCept.php
deleted file mode 100644
index 09260612f..000000000
--- a/tests/functional/AboutCept.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-use tests\codeception\_pages\AboutPage;
-
-/* @var $scenario Codeception\Scenario */
-
-$I = new FunctionalTester($scenario);
-$I->wantTo('ensure that about works');
-AboutPage::openBy($I);
-$I->see('About', 'h1');
diff --git a/tests/functional/ContactCept.php b/tests/functional/ContactCept.php
deleted file mode 100644
index b17a7576d..000000000
--- a/tests/functional/ContactCept.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-use tests\codeception\_pages\ContactPage;
-
-/* @var $scenario Codeception\Scenario */
-
-$I = new FunctionalTester($scenario);
-$I->wantTo('ensure that contact works');
-
-$contactPage = ContactPage::openBy($I);
-
-$I->see('Contact', 'h1');
-
-$I->amGoingTo('submit contact form with no data');
-$contactPage->submit([]);
-$I->expectTo('see validations errors');
-$I->see('Contact', 'h1');
-$I->see('Name cannot be blank');
-$I->see('Email cannot be blank');
-$I->see('Subject cannot be blank');
-$I->see('Body cannot be blank');
-$I->see('The verification code is incorrect');
-
-$I->amGoingTo('submit contact form with not correct email');
-$contactPage->submit([
-    'name'			=>	'tester',
-    'email'			=>	'tester.email',
-    'subject'		=>	'test subject',
-    'body'			=>	'test content',
-    'verifyCode'	=>	'testme',
-]);
-$I->expectTo('see that email address is wrong');
-$I->dontSee('Name cannot be blank', '.help-inline');
-$I->see('Email is not a valid email address.');
-$I->dontSee('Subject cannot be blank', '.help-inline');
-$I->dontSee('Body cannot be blank', '.help-inline');
-$I->dontSee('The verification code is incorrect', '.help-inline');
-
-$I->amGoingTo('submit contact form with correct data');
-$contactPage->submit([
-    'name'			=>	'tester',
-    'email'			=>	'tester@example.com',
-    'subject'		=>	'test subject',
-    'body'			=>	'test content',
-    'verifyCode'	=>	'testme',
-]);
-$I->dontSeeElement('#contact-form');
-$I->see('Thank you for contacting us. We will respond to you as soon as possible.');
diff --git a/tests/functional/ContactFormCest.php b/tests/functional/ContactFormCest.php
new file mode 100644
index 000000000..07ab50390
--- /dev/null
+++ b/tests/functional/ContactFormCest.php
@@ -0,0 +1,55 @@
+<?php
+class ContactFormCest 
+{
+    public function _before(\FunctionalTester $I)
+    {
+        $I->amOnPage(['site/contact']);
+    }
+
+    public function openContactPage(\FunctionalTester $I)
+    {
+        $I->see('Contact', 'h1');        
+    }
+
+    public function submitEmptyForm(\FunctionalTester $I)
+    {
+        $I->submitForm('#contact-form', []);
+        $I->expectTo('see validations errors');
+        $I->see('Contact', 'h1');
+        $I->see('Name cannot be blank');
+        $I->see('Email cannot be blank');
+        $I->see('Subject cannot be blank');
+        $I->see('Body cannot be blank');
+        $I->see('The verification code is incorrect');
+    }
+
+    public function submitFormWithIncorrectEmail(\FunctionalTester $I)
+    {
+        $I->submitForm('#contact-form', [
+            'ContactForm[name]'			=>	'tester',
+            'ContactForm[email]'	    =>	'tester.email',
+            'ContactForm[subject]'		=>	'test subject',
+            'ContactForm[body]'			=>	'test content',
+            'ContactForm[verifyCode]'	=>	'testme',
+        ]);
+        $I->expectTo('see that email address is wrong');
+        $I->dontSee('Name cannot be blank', '.help-inline');
+        $I->see('Email is not a valid email address.');
+        $I->dontSee('Subject cannot be blank', '.help-inline');
+        $I->dontSee('Body cannot be blank', '.help-inline');
+        $I->dontSee('The verification code is incorrect', '.help-inline');        
+    }
+
+    public function submitFormSuccessfully(\FunctionalTester $I)
+    {
+        $I->submitForm('#contact-form', [
+            'ContactForm[name]'			=>	'tester',
+            'ContactForm[email]'	    =>	'tester@example.com',
+            'ContactForm[subject]'		=>	'test subject',
+            'ContactForm[body]'			=>	'test content',
+            'ContactForm[verifyCode]'	=>	'testme',
+        ]);
+        $I->dontSeeElement('#contact-form');
+        $I->see('Thank you for contacting us. We will respond to you as soon as possible.');        
+    }
+}
diff --git a/tests/functional/HomeCept.php b/tests/functional/HomeCept.php
deleted file mode 100644
index 94efb09cd..000000000
--- a/tests/functional/HomeCept.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-/* @var $scenario Codeception\Scenario */
-
-$I = new FunctionalTester($scenario);
-$I->wantTo('ensure that home page works');
-$I->amOnPage(Yii::$app->homeUrl);
-$I->see('My Company');
-$I->seeLink('About');
-$I->click('About');
-$I->see('This is the About page.');
diff --git a/tests/functional/LoginCept.php b/tests/functional/LoginCept.php
deleted file mode 100644
index 66e760989..000000000
--- a/tests/functional/LoginCept.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-use tests\codeception\_pages\LoginPage;
-
-/* @var $scenario Codeception\Scenario */
-
-$I = new FunctionalTester($scenario);
-$I->wantTo('ensure that login works');
-
-$loginPage = LoginPage::openBy($I);
-
-$I->see('Login', 'h1');
-
-$I->amGoingTo('try to login with empty credentials');
-$loginPage->login('', '');
-$I->expectTo('see validations errors');
-$I->see('Username cannot be blank.');
-$I->see('Password cannot be blank.');
-
-$I->amGoingTo('try to login with wrong credentials');
-$loginPage->login('admin', 'wrong');
-$I->expectTo('see validations errors');
-$I->see('Incorrect username or password.');
-
-$I->amGoingTo('try to login with correct credentials');
-$loginPage->login('admin', 'admin');
-$I->expectTo('see user info');
-$I->see('Logout (admin)');
diff --git a/tests/functional/LoginFormCest.php b/tests/functional/LoginFormCest.php
new file mode 100644
index 000000000..869925ea4
--- /dev/null
+++ b/tests/functional/LoginFormCest.php
@@ -0,0 +1,41 @@
+<?php
+class LoginFormCest
+{
+    public function _before(\FunctionalTester $I)
+    {
+        $I->amOnPage(['site/login']);
+    }
+
+    public function openLoginPage(\FunctionalTester $I)
+    {
+        $I->see('Login', 'h1');
+    }
+
+    public function loginWithEmptyCredentials(\FunctionalTester $I)
+    {
+        $I->submitForm('#login-form', []);
+        $I->expectTo('see validations errors');
+        $I->see('Username cannot be blank.');
+        $I->see('Password cannot be blank.');
+    }
+
+    public function loginWithWringCredentials(\FunctionalTester $I)
+    {
+        $I->submitForm('#login-form', [
+            'LoginForm[username]' => 'admin',
+            'LoginForm[password]' => 'wrong',
+        ]);
+        $I->expectTo('see validations errors');
+        $I->see('Incorrect username or password.');
+    }
+
+    public function loginSuccessfully(\FunctionalTester $I)
+    {
+        $I->submitForm('#login-form', [
+            'LoginForm[username]' => 'admin',
+            'LoginForm[password]' => 'admin',
+        ]);
+        $I->see('Logout (admin)');
+        $I->dontSeeElement('form#login-form');              
+    }
+}
\ No newline at end of file
diff --git a/tests/templates/.gitignore b/tests/templates/.gitignore
deleted file mode 100644
index c96a04f00..000000000
--- a/tests/templates/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/tests/unit.suite.yml b/tests/unit.suite.yml
index c0a304899..b944d5c66 100644
--- a/tests/unit.suite.yml
+++ b/tests/unit.suite.yml
@@ -8,5 +8,4 @@ modules:
     enabled:
       - Asserts
       - Yii2:
-            configFile: 'config/test.php'
             part: orm
\ No newline at end of file
diff --git a/tests/unit/fixtures/.gitkeep b/tests/unit/fixtures/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/unit/fixtures/data/.gitkeep b/tests/unit/fixtures/data/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/unit/models/ContactFormTest.php b/tests/unit/models/ContactFormTest.php
index 7dc4fe433..445b4422a 100644
--- a/tests/unit/models/ContactFormTest.php
+++ b/tests/unit/models/ContactFormTest.php
@@ -1,63 +1,56 @@
 <?php
 
-namespace tests\codeception\unit\models;
+namespace tests\models;
 
 use app\models\ContactForm;
-use Yii;
-use yii\codeception\TestCase;
-use Codeception\Specify;
 
-class ContactFormTest extends TestCase
+class ContactFormTest extends \Codeception\Test\Unit
 {
-    use Specify;
+    private $model;
 
-    protected function setUp()
+    protected function _before()
     {
-        parent::setUp();
-        Yii::$app->mailer->fileTransportCallback = function ($mailer, $message) {
+        \Yii::$app->mailer->fileTransportCallback = function () {
             return 'testing_message.eml';
         };
     }
 
-    protected function tearDown()
+    protected function _after()
     {
         unlink($this->getMessageFile());
-        parent::tearDown();
     }
 
-    public function testContact()
+    public function testEmailIsSentOnContact()
     {
         /** @var ContactForm $model */
-        $model = $this->getMockBuilder('app\models\ContactForm')
+        $this->model = $this->getMockBuilder('app\models\ContactForm')
             ->setMethods(['validate'])
             ->getMock();
-        $model->expects($this->once())->method('validate')->will($this->returnValue(true));
 
-        $model->attributes = [
+        $this->model->expects($this->once())
+            ->method('validate')
+            ->will($this->returnValue(true));
+
+        $this->model->attributes = [
             'name' => 'Tester',
             'email' => 'tester@example.com',
             'subject' => 'very important letter subject',
             'body' => 'body of current message',
         ];
 
-        $this->specify('email should be send', function () use ($model) {
-            expect('ContactForm::contact() should return true', $model->contact('admin@example.com'))->true();
-            expect('email file should exist', file_exists($this->getMessageFile()))->true();
-        });
+        expect_that($this->model->contact('admin@example.com'));
+        expect_that(file_exists($this->getMessageFile()));
 
-        $this->specify('message should contain correct data', function () use ($model) {
-            $emailMessage = file_get_contents($this->getMessageFile());
+        $emailMessage = file_get_contents($this->getMessageFile());
 
-            expect('email should contain user name', $emailMessage)->contains($model->name);
-            expect('email should contain sender email', $emailMessage)->contains($model->email);
-            expect('email should contain subject', $emailMessage)->contains($model->subject);
-            expect('email should contain body', $emailMessage)->contains($model->body);
-        });
+        expect($emailMessage)->contains($this->model->name);
+        expect($emailMessage)->contains($this->model->email);
+        expect($emailMessage)->contains($this->model->subject);
+        expect($emailMessage)->contains($this->model->body);
     }
 
     private function getMessageFile()
     {
-        return Yii::getAlias(Yii::$app->mailer->fileTransportPath) . '/testing_message.eml';
+        return \Yii::getAlias(\Yii::$app->mailer->fileTransportPath) . '/testing_message.eml';
     }
-
 }
diff --git a/tests/unit/models/LoginFormTest.php b/tests/unit/models/LoginFormTest.php
index c7f971a06..46190cd05 100644
--- a/tests/unit/models/LoginFormTest.php
+++ b/tests/unit/models/LoginFormTest.php
@@ -1,61 +1,52 @@
 <?php
 
-namespace tests\codeception\unit\models;
+namespace tests\models;
 
-use Yii;
-use yii\codeception\TestCase;
 use app\models\LoginForm;
 use Codeception\Specify;
 
-class LoginFormTest extends TestCase
+class LoginFormTest extends \Codeception\Test\Unit
 {
-    use Specify;
+    private $model;
 
-    protected function tearDown()
+    protected function _after()
     {
-        Yii::$app->user->logout();
-        parent::tearDown();
+        \Yii::$app->user->logout();
     }
 
     public function testLoginNoUser()
     {
-        $model = new LoginForm([
+        $this->model = new LoginForm([
             'username' => 'not_existing_username',
             'password' => 'not_existing_password',
         ]);
 
-        $this->specify('user should not be able to login, when there is no identity', function () use ($model) {
-            expect('model should not login user', $model->login())->false();
-            expect('user should not be logged in', Yii::$app->user->isGuest)->true();
-        });
+        expect_not($this->model->login());
+        expect_that(\Yii::$app->user->isGuest);
     }
 
     public function testLoginWrongPassword()
     {
-        $model = new LoginForm([
+        $this->model = new LoginForm([
             'username' => 'demo',
             'password' => 'wrong_password',
         ]);
 
-        $this->specify('user should not be able to login with wrong password', function () use ($model) {
-            expect('model should not login user', $model->login())->false();
-            expect('error message should be set', $model->errors)->hasKey('password');
-            expect('user should not be logged in', Yii::$app->user->isGuest)->true();
-        });
+        expect_not($this->model->login());
+        expect_that(\Yii::$app->user->isGuest);
+        expect($this->model->errors)->hasKey('password');
     }
 
     public function testLoginCorrect()
     {
-        $model = new LoginForm([
+        $this->model = new LoginForm([
             'username' => 'demo',
             'password' => 'demo',
         ]);
 
-        $this->specify('user should be able to login with correct credentials', function () use ($model) {
-            expect('model should login user', $model->login())->true();
-            expect('error message should not be set', $model->errors)->hasntKey('password');
-            expect('user should be logged in', Yii::$app->user->isGuest)->false();
-        });
+        expect_that($this->model->login());
+        expect_not(\Yii::$app->user->isGuest);
+        expect($this->model->errors)->hasntKey('password');
     }
 
 }
diff --git a/tests/unit/models/UserTest.php b/tests/unit/models/UserTest.php
index f4f4f4bb9..46dbb44d1 100644
--- a/tests/unit/models/UserTest.php
+++ b/tests/unit/models/UserTest.php
@@ -1,17 +1,43 @@
 <?php
+namespace tests\models;
+use app\models\User;
 
-namespace tests\codeception\unit\models;
+class UserTest extends \Codeception\Test\Unit
+{
+    public function testFindUserById()
+    {
+        expect_that($user = User::findIdentity(100));
+        expect($user->username)->equals('admin');
+
+        expect_not(User::findIdentity(999));
+    }
 
-use yii\codeception\TestCase;
+    public function testFindUserByAccessToken()
+    {
+        expect_that($user = User::findIdentityByAccessToken('100-token'));
+        expect($user->username)->equals('admin');
 
-class UserTest extends TestCase
-{
-    protected function setUp()
+        expect_not(User::findIdentityByAccessToken('non-existing'));        
+    }
+
+    public function testFindUserByUsername()
+    {
+        expect_that($user = User::findByUsername('admin'));
+        expect_not(User::findByUsername('not-admin'));
+    }
+
+    /**
+     * @depends testFindUserByUsername
+     */
+    public function testValidateUser($user)
     {
-        parent::setUp();
-        // uncomment the following to load fixtures for user table
-        //$this->loadFixtures(['user']);
+        $user = User::findByUsername('admin');
+        expect_that($user->validateAuthKey('test100key'));
+        expect_not($user->validateAuthKey('test102key'));
+
+        expect_that($user->validatePassword('admin'));
+        expect_not($user->validatePassword('123456'));
+        
     }
 
-    // TODO add test methods here
 }
diff --git a/tests/unit/templates/fixtures/.gitkeep b/tests/unit/templates/fixtures/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/index-test.php b/web/index-test.php
index 32b4ce3e1..7ecf9d5d5 100644
--- a/web/index-test.php
+++ b/web/index-test.php
@@ -11,6 +11,6 @@
 require(__DIR__ . '/../vendor/autoload.php');
 require(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
 
-$config = require(__DIR__ . '/../tests/codeception/config/acceptance.php');
+$config = require(__DIR__ . '/../config/test.php');
 
 (new yii\web\Application($config))->run();

From 37c9dfcfd8d1ccb3900c2f72f11837bc31666c15 Mon Sep 17 00:00:00 2001
From: Davert <davert.php@resend.cc>
Date: Sat, 16 Jul 2016 04:30:11 +0300
Subject: [PATCH 174/390] removed test key from config, removed generated
 actions traits

---
 config/web.php                                |    2 +-
 .../_generated/AcceptanceTesterActions.php    | 2820 -----------------
 .../_generated/FunctionalTesterActions.php    | 2691 ----------------
 .../_support/_generated/UnitTesterActions.php |  576 ----
 4 files changed, 1 insertion(+), 6088 deletions(-)
 delete mode 100644 tests/_support/_generated/AcceptanceTesterActions.php
 delete mode 100644 tests/_support/_generated/FunctionalTesterActions.php
 delete mode 100644 tests/_support/_generated/UnitTesterActions.php

diff --git a/config/web.php b/config/web.php
index a45b77cd8..90a82876b 100644
--- a/config/web.php
+++ b/config/web.php
@@ -9,7 +9,7 @@
     'components' => [
         'request' => [
             // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation
-            'cookieValidationKey' => '12334543543',
+            'cookieValidationKey' => '',
         ],
         'cache' => [
             'class' => 'yii\caching\FileCache',
diff --git a/tests/_support/_generated/AcceptanceTesterActions.php b/tests/_support/_generated/AcceptanceTesterActions.php
deleted file mode 100644
index 62eb177c9..000000000
--- a/tests/_support/_generated/AcceptanceTesterActions.php
+++ /dev/null
@@ -1,2820 +0,0 @@
-<?php  //[STAMP] 4d43a2a57cc18889c8a0e42fb9175d5b
-namespace _generated;
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-use Codeception\Module\WebDriver;
-use Codeception\Module\Yii2;
-
-trait AcceptanceTesterActions
-{
-    /**
-     * @return \Codeception\Scenario
-     */
-    abstract protected function getScenario();
-
-    
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Print out latest Selenium Logs in debug mode
-     * @see \Codeception\Module\WebDriver::debugWebDriverLogs()
-     */
-    public function debugWebDriverLogs() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('debugWebDriverLogs', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Changes the subdomain for the 'url' configuration parameter.
-     * Does not open a page; use `amOnPage` for that.
-     *
-     * ``` php
-     * <?php
-     * // If config is: 'http://mysite.com/'
-     * // or config is: 'http://www.mysite.com/'
-     * // or config is: 'http://company.mysite.com/'
-     *
-     * $I->amOnSubdomain('user');
-     * $I->amOnPage('/');
-     * // moves to http://user.mysite.com/
-     * ?>
-     * ```
-     *
-     * @param $subdomain
-     *
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::amOnSubdomain()
-     */
-    public function amOnSubdomain($subdomain) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnSubdomain', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Takes a screenshot of the current window and saves it to `tests/_output/debug`.
-     *
-     * ``` php
-     * <?php
-     * $I->amOnPage('/user/edit');
-     * $I->makeScreenshot('edit_page');
-     * // saved to: tests/_output/debug/edit_page.png
-     * ?>
-     * ```
-     *
-     * @param $name
-     * @see \Codeception\Module\WebDriver::makeScreenshot()
-     */
-    public function makeScreenshot($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('makeScreenshot', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Resize the current window.
-     *
-     * ``` php
-     * <?php
-     * $I->resizeWindow(800, 600);
-     *
-     * ```
-     *
-     * @param int $width
-     * @param int $height
-     * @see \Codeception\Module\WebDriver::resizeWindow()
-     */
-    public function resizeWindow($width, $height) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('resizeWindow', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that a cookie with the given name is set.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCookie('PHPSESSID');
-     * ?>
-     * ```
-     *
-     * @param $cookie
-     * @param array $params
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeCookie()
-     */
-    public function canSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCookie', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that a cookie with the given name is set.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCookie('PHPSESSID');
-     * ?>
-     * ```
-     *
-     * @param $cookie
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::seeCookie()
-     */
-    public function seeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there isn't a cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSeeCookie()
-     */
-    public function cantSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCookie', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there isn't a cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::dontSeeCookie()
-     */
-    public function dontSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sets a cookie with the given name and value.
-     * You can set additional cookie params like `domain`, `path`, `expires`, `secure` in array passed as last argument.
-     *
-     * ``` php
-     * <?php
-     * $I->setCookie('PHPSESSID', 'el4ukv0kqbvoirg7nkp4dncpk3');
-     * ?>
-     * ```
-     *
-     * @param $name
-     * @param $val
-     * @param array $params
-     *
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::setCookie()
-     */
-    public function setCookie($cookie, $value, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Unsets cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::resetCookie()
-     */
-    public function resetCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Grabs a cookie value.
-     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::grabCookie()
-     */
-    public function grabCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Open web page at the given absolute URL and sets its hostname as the base host.
-     *
-     * ``` php
-     * <?php
-     * $I->amOnUrl('http://codeception.com/');
-     * $I->amOnPage('/quickstart'); // moves to http://codeception.com/quickstart
-     * ?>
-     * ```
-     * @see \Codeception\Module\WebDriver::amOnUrl()
-     */
-    public function amOnUrl($url) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Opens the page for the given relative URI.
-     *
-     * ``` php
-     * <?php
-     * // opens front page
-     * $I->amOnPage('/');
-     * // opens /register page
-     * $I->amOnPage('/register');
-     * ```
-     *
-     * @param $page
-     * @see \Codeception\Module\WebDriver::amOnPage()
-     */
-    public function amOnPage($page) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnPage', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string (case insensitive).
-     *
-     * You can specify a specific HTML element (via CSS or XPath) as the second
-     * parameter to only search within that element.
-     *
-     * ``` php
-     * <?php
-     * $I->see('Logout');                 // I can suppose user is logged in
-     * $I->see('Sign Up', 'h1');          // I can suppose it's a signup page
-     * $I->see('Sign Up', '//body/h1');   // with XPath
-     * ```
-     *
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->see('strong')` will return true for strings like:
-     *
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     *
-     * But will *not* be true for strings like:
-     *
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     *
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::see()
-     */
-    public function canSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('see', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string (case insensitive).
-     *
-     * You can specify a specific HTML element (via CSS or XPath) as the second
-     * parameter to only search within that element.
-     *
-     * ``` php
-     * <?php
-     * $I->see('Logout');                 // I can suppose user is logged in
-     * $I->see('Sign Up', 'h1');          // I can suppose it's a signup page
-     * $I->see('Sign Up', '//body/h1');   // with XPath
-     * ```
-     *
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->see('strong')` will return true for strings like:
-     *
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     *
-     * But will *not* be true for strings like:
-     *
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     *
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * @see \Codeception\Module\WebDriver::see()
-     */
-    public function see($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('see', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page doesn't contain the text specified (case insensitive).
-     * Give a locator as the second parameter to match a specific region.
-     *
-     * ```php
-     * <?php
-     * $I->dontSee('Login');                    // I can suppose user is already logged in
-     * $I->dontSee('Sign Up','h1');             // I can suppose it's not a signup page
-     * $I->dontSee('Sign Up','//body/h1');      // with XPath
-     * ```
-     *
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->dontSee('strong')` will fail on strings like:
-     *
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     *
-     * But will ignore strings like:
-     *
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     *
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSee()
-     */
-    public function cantSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSee', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page doesn't contain the text specified (case insensitive).
-     * Give a locator as the second parameter to match a specific region.
-     *
-     * ```php
-     * <?php
-     * $I->dontSee('Login');                    // I can suppose user is already logged in
-     * $I->dontSee('Sign Up','h1');             // I can suppose it's not a signup page
-     * $I->dontSee('Sign Up','//body/h1');      // with XPath
-     * ```
-     *
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->dontSee('strong')` will fail on strings like:
-     *
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     *
-     * But will ignore strings like:
-     *
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     *
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * @see \Codeception\Module\WebDriver::dontSee()
-     */
-    public function dontSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSee', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeInSource()
-     */
-    public function canSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInSource', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * @see \Codeception\Module\WebDriver::seeInSource()
-     */
-    public function seeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInSource', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSeeInSource()
-     */
-    public function cantSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInSource', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * @see \Codeception\Module\WebDriver::dontSeeInSource()
-     */
-    public function dontSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInSource', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page source contains the given string.
-     *
-     * ```php
-     * <?php
-     * $I->seeInPageSource('<link rel="apple-touch-icon"');
-     * ```
-     *
-     * @param $text
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeInPageSource()
-     */
-    public function canSeeInPageSource($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInPageSource', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page source contains the given string.
-     *
-     * ```php
-     * <?php
-     * $I->seeInPageSource('<link rel="apple-touch-icon"');
-     * ```
-     *
-     * @param $text
-     * @see \Codeception\Module\WebDriver::seeInPageSource()
-     */
-    public function seeInPageSource($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInPageSource', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page source doesn't contain the given string.
-     *
-     * @param $text
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSeeInPageSource()
-     */
-    public function cantSeeInPageSource($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInPageSource', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page source doesn't contain the given string.
-     *
-     * @param $text
-     * @see \Codeception\Module\WebDriver::dontSeeInPageSource()
-     */
-    public function dontSeeInPageSource($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInPageSource', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Perform a click on a link or a button, given by a locator.
-     * If a fuzzy locator is given, the page will be searched for a button, link, or image matching the locator string.
-     * For buttons, the "value" attribute, "name" attribute, and inner text are searched.
-     * For links, the link text is searched.
-     * For images, the "alt" attribute and inner text of any parent links are searched.
-     *
-     * The second parameter is a context (CSS or XPath locator) to narrow the search.
-     *
-     * Note that if the locator matches a button of type `submit`, the form will be submitted.
-     *
-     * ``` php
-     * <?php
-     * // simple link
-     * $I->click('Logout');
-     * // button of form
-     * $I->click('Submit');
-     * // CSS button
-     * $I->click('#form input[type=submit]');
-     * // XPath
-     * $I->click('//form/*[@type=submit]');
-     * // link in context
-     * $I->click('Logout', '#nav');
-     * // using strict locator
-     * $I->click(['link' => 'Login']);
-     * ?>
-     * ```
-     *
-     * @param $link
-     * @param $context
-     * @see \Codeception\Module\WebDriver::click()
-     */
-    public function click($link, $context = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('click', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there's a link with the specified text.
-     * Give a full URL as the second parameter to match links with that exact URL.
-     *
-     * ``` php
-     * <?php
-     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
-     * $I->seeLink('Logout','/logout'); // matches <a href="http://github.com/logout">Logout</a>
-     * ?>
-     * ```
-     *
-     * @param      $text
-     * @param null $url
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeLink()
-     */
-    public function canSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeLink', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there's a link with the specified text.
-     * Give a full URL as the second parameter to match links with that exact URL.
-     *
-     * ``` php
-     * <?php
-     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
-     * $I->seeLink('Logout','/logout'); // matches <a href="http://github.com/logout">Logout</a>
-     * ?>
-     * ```
-     *
-     * @param      $text
-     * @param null $url
-     * @see \Codeception\Module\WebDriver::seeLink()
-     */
-    public function seeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeLink', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page doesn't contain a link with the given string.
-     * If the second parameter is given, only links with a matching "href" attribute will be checked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
-     * $I->dontSeeLink('Checkout now', '/store/cart.php');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * @param null $url
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSeeLink()
-     */
-    public function cantSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeLink', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page doesn't contain a link with the given string.
-     * If the second parameter is given, only links with a matching "href" attribute will be checked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
-     * $I->dontSeeLink('Checkout now', '/store/cart.php');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * @param null $url
-     * @see \Codeception\Module\WebDriver::dontSeeLink()
-     */
-    public function dontSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeLink', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current URI contains the given string.
-     *
-     * ``` php
-     * <?php
-     * // to match: /home/dashboard
-     * $I->seeInCurrentUrl('home');
-     * // to match: /users/1
-     * $I->seeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeInCurrentUrl()
-     */
-    public function canSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInCurrentUrl', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current URI contains the given string.
-     *
-     * ``` php
-     * <?php
-     * // to match: /home/dashboard
-     * $I->seeInCurrentUrl('home');
-     * // to match: /users/1
-     * $I->seeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Module\WebDriver::seeInCurrentUrl()
-     */
-    public function seeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInCurrentUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL is equal to the given string.
-     * Unlike `seeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeCurrentUrlEquals()
-     */
-    public function canSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlEquals', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL is equal to the given string.
-     * Unlike `seeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Module\WebDriver::seeCurrentUrlEquals()
-     */
-    public function seeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL matches the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeCurrentUrlMatches()
-     */
-    public function canSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlMatches', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL matches the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Module\WebDriver::seeCurrentUrlMatches()
-     */
-    public function seeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlMatches', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URI doesn't contain the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSeeInCurrentUrl()
-     */
-    public function cantSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInCurrentUrl', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URI doesn't contain the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Module\WebDriver::dontSeeInCurrentUrl()
-     */
-    public function dontSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInCurrentUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL doesn't equal the given string.
-     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // current url is not root
-     * $I->dontSeeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSeeCurrentUrlEquals()
-     */
-    public function cantSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL doesn't equal the given string.
-     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // current url is not root
-     * $I->dontSeeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Module\WebDriver::dontSeeCurrentUrlEquals()
-     */
-    public function dontSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current url doesn't match the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->dontSeeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSeeCurrentUrlMatches()
-     */
-    public function cantSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current url doesn't match the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->dontSeeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Module\WebDriver::dontSeeCurrentUrlMatches()
-     */
-    public function dontSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlMatches', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Executes the given regular expression against the current URI and returns the first match.
-     * If no parameters are provided, the full URI is returned.
-     *
-     * ``` php
-     * <?php
-     * $user_id = $I->grabFromCurrentUrl('~$/user/(\d+)/~');
-     * $uri = $I->grabFromCurrentUrl();
-     * ?>
-     * ```
-     *
-     * @param null $uri
-     *
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::grabFromCurrentUrl()
-     */
-    public function grabFromCurrentUrl($uri = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromCurrentUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the specified checkbox is checked.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form.
-     * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]');
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeCheckboxIsChecked()
-     */
-    public function canSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCheckboxIsChecked', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the specified checkbox is checked.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form.
-     * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]');
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * @see \Codeception\Module\WebDriver::seeCheckboxIsChecked()
-     */
-    public function seeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCheckboxIsChecked', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Check that the specified checkbox is unchecked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form.
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSeeCheckboxIsChecked()
-     */
-    public function cantSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Check that the specified checkbox is unchecked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form.
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * @see \Codeception\Module\WebDriver::dontSeeCheckboxIsChecked()
-     */
-    public function dontSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCheckboxIsChecked', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given input field or textarea contains the given value.
-     * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInField('Body','Type your comment here');
-     * $I->seeInField('form textarea[name=body]','Type your comment here');
-     * $I->seeInField('form input[type=hidden]','hidden_value');
-     * $I->seeInField('#searchform input','Search');
-     * $I->seeInField('//form/*[@name=search]','Search');
-     * $I->seeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeInField()
-     */
-    public function canSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInField', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given input field or textarea contains the given value.
-     * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInField('Body','Type your comment here');
-     * $I->seeInField('form textarea[name=body]','Type your comment here');
-     * $I->seeInField('form input[type=hidden]','hidden_value');
-     * $I->seeInField('#searchform input','Search');
-     * $I->seeInField('//form/*[@name=search]','Search');
-     * $I->seeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * @see \Codeception\Module\WebDriver::seeInField()
-     */
-    public function seeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInField', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that an input field or textarea doesn't contain the given value.
-     * For fuzzy locators, the field is matched by label text, CSS and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInField('Body','Type your comment here');
-     * $I->dontSeeInField('form textarea[name=body]','Type your comment here');
-     * $I->dontSeeInField('form input[type=hidden]','hidden_value');
-     * $I->dontSeeInField('#searchform input','Search');
-     * $I->dontSeeInField('//form/*[@name=search]','Search');
-     * $I->dontSeeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSeeInField()
-     */
-    public function cantSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInField', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that an input field or textarea doesn't contain the given value.
-     * For fuzzy locators, the field is matched by label text, CSS and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInField('Body','Type your comment here');
-     * $I->dontSeeInField('form textarea[name=body]','Type your comment here');
-     * $I->dontSeeInField('form input[type=hidden]','hidden_value');
-     * $I->dontSeeInField('#searchform input','Search');
-     * $I->dontSeeInField('//form/*[@name=search]','Search');
-     * $I->dontSeeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * @see \Codeception\Module\WebDriver::dontSeeInField()
-     */
-    public function dontSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInField', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are set on the form matched with the
-     * passed selector.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('form[name=myform]', [
-     *      'input1' => 'value',
-     *      'input2' => 'other value',
-     * ]);
-     * ?>
-     * ```
-     *
-     * For multi-select elements, or to check values of multiple elements with the same name, an
-     * array may be passed:
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('.form-class', [
-     *      'multiselect' => [
-     *          'value1',
-     *          'value2',
-     *      ],
-     *      'checkbox[]' => [
-     *          'a checked value',
-     *          'another checked value',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // passes if checked
-     *      'checkbox2' => false,       // passes if unchecked
-     * ]);
-     * ?>
-     * ```
-     *
-     * Pair this with submitForm for quick testing magic.
-     *
-     * ``` php
-     * <?php
-     * $form = [
-     *      'field1' => 'value',
-     *      'field2' => 'another value',
-     *      'checkbox1' => true,
-     *      // ...
-     * ];
-     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
-     * // $I->amOnPage('/path/to/form-page') may be needed
-     * $I->seeInFormFields('//form[@id=my-form]', $form);
-     * ?>
-     * ```
-     *
-     * @param $formSelector
-     * @param $params
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeInFormFields()
-     */
-    public function canSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInFormFields', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are set on the form matched with the
-     * passed selector.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('form[name=myform]', [
-     *      'input1' => 'value',
-     *      'input2' => 'other value',
-     * ]);
-     * ?>
-     * ```
-     *
-     * For multi-select elements, or to check values of multiple elements with the same name, an
-     * array may be passed:
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('.form-class', [
-     *      'multiselect' => [
-     *          'value1',
-     *          'value2',
-     *      ],
-     *      'checkbox[]' => [
-     *          'a checked value',
-     *          'another checked value',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // passes if checked
-     *      'checkbox2' => false,       // passes if unchecked
-     * ]);
-     * ?>
-     * ```
-     *
-     * Pair this with submitForm for quick testing magic.
-     *
-     * ``` php
-     * <?php
-     * $form = [
-     *      'field1' => 'value',
-     *      'field2' => 'another value',
-     *      'checkbox1' => true,
-     *      // ...
-     * ];
-     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
-     * // $I->amOnPage('/path/to/form-page') may be needed
-     * $I->seeInFormFields('//form[@id=my-form]', $form);
-     * ?>
-     * ```
-     *
-     * @param $formSelector
-     * @param $params
-     * @see \Codeception\Module\WebDriver::seeInFormFields()
-     */
-    public function seeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInFormFields', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are not set on the form matched with
-     * the passed selector.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('form[name=myform]', [
-     *      'input1' => 'non-existent value',
-     *      'input2' => 'other non-existent value',
-     * ]);
-     * ?>
-     * ```
-     *
-     * To check that an element hasn't been assigned any one of many values, an array can be passed
-     * as the value:
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('.form-class', [
-     *      'fieldName' => [
-     *          'This value shouldn\'t be set',
-     *          'And this value shouldn\'t be set',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // fails if checked
-     *      'checkbox2' => false,       // fails if unchecked
-     * ]);
-     * ?>
-     * ```
-     *
-     * @param $formSelector
-     * @param $params
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSeeInFormFields()
-     */
-    public function cantSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInFormFields', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are not set on the form matched with
-     * the passed selector.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('form[name=myform]', [
-     *      'input1' => 'non-existent value',
-     *      'input2' => 'other non-existent value',
-     * ]);
-     * ?>
-     * ```
-     *
-     * To check that an element hasn't been assigned any one of many values, an array can be passed
-     * as the value:
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('.form-class', [
-     *      'fieldName' => [
-     *          'This value shouldn\'t be set',
-     *          'And this value shouldn\'t be set',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // fails if checked
-     *      'checkbox2' => false,       // fails if unchecked
-     * ]);
-     * ?>
-     * ```
-     *
-     * @param $formSelector
-     * @param $params
-     * @see \Codeception\Module\WebDriver::dontSeeInFormFields()
-     */
-    public function dontSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInFormFields', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Selects an option in a select tag or in radio button group.
-     *
-     * ``` php
-     * <?php
-     * $I->selectOption('form select[name=account]', 'Premium');
-     * $I->selectOption('form input[name=payment]', 'Monthly');
-     * $I->selectOption('//form/select[@name=account]', 'Monthly');
-     * ?>
-     * ```
-     *
-     * Provide an array for the second argument to select multiple options:
-     *
-     * ``` php
-     * <?php
-     * $I->selectOption('Which OS do you use?', array('Windows','Linux'));
-     * ?>
-     * ```
-     *
-     * Or provide an associative array for the second argument to specifically define which selection method should be used:
-     *
-     * ``` php
-     * <?php
-     * $I->selectOption('Which OS do you use?', array('text' => 'Windows')); // Only search by text 'Windows'
-     * $I->selectOption('Which OS do you use?', array('value' => 'windows')); // Only search by value 'windows'
-     * ?>
-     + ```
-     *
-     * @param $select
-     * @param $option
-     * @see \Codeception\Module\WebDriver::selectOption()
-     */
-    public function selectOption($select, $option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('selectOption', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     *
-     * @see \Codeception\Module\WebDriver::unselectOption()
-     */
-    public function unselectOption($select, $option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('unselectOption', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Ticks a checkbox. For radio buttons, use the `selectOption` method instead.
-     *
-     * ``` php
-     * <?php
-     * $I->checkOption('#agree');
-     * ?>
-     * ```
-     *
-     * @param $option
-     * @see \Codeception\Module\WebDriver::checkOption()
-     */
-    public function checkOption($option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('checkOption', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Unticks a checkbox.
-     *
-     * ``` php
-     * <?php
-     * $I->uncheckOption('#notify');
-     * ?>
-     * ```
-     *
-     * @param $option
-     * @see \Codeception\Module\WebDriver::uncheckOption()
-     */
-    public function uncheckOption($option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('uncheckOption', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Fills a text field or textarea with the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->fillField("//input[@type='text']", "Hello World!");
-     * $I->fillField(['name' => 'email'], 'jon@mail.com');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * @see \Codeception\Module\WebDriver::fillField()
-     */
-    public function fillField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('fillField', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Attaches a file relative to the Codeception data directory to the given file upload field.
-     *
-     * ``` php
-     * <?php
-     * // file is stored in 'tests/_data/prices.xls'
-     * $I->attachFile('input[@type="file"]', 'prices.xls');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $filename
-     * @see \Codeception\Module\WebDriver::attachFile()
-     */
-    public function attachFile($field, $filename) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('attachFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Grabs all visible text from the current page.
-     *
-     * @return string
-     * @see \Codeception\Module\WebDriver::getVisibleText()
-     */
-    public function getVisibleText() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('getVisibleText', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Finds and returns the text contents of the given element.
-     * If a fuzzy locator is used, the element is found using CSS, XPath,
-     * and by matching the full page source by regular expression.
-     *
-     * ``` php
-     * <?php
-     * $heading = $I->grabTextFrom('h1');
-     * $heading = $I->grabTextFrom('descendant-or-self::h1');
-     * $value = $I->grabTextFrom('~<input value=(.*?)]~sgi'); // match with a regex
-     * ?>
-     * ```
-     *
-     * @param $cssOrXPathOrRegex
-     *
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::grabTextFrom()
-     */
-    public function grabTextFrom($cssOrXPathOrRegex) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabTextFrom', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Grabs the value of the given attribute value from the given element.
-     * Fails if element is not found.
-     *
-     * ``` php
-     * <?php
-     * $I->grabAttributeFrom('#tooltip', 'title');
-     * ?>
-     * ```
-     *
-     *
-     * @param $cssOrXpath
-     * @param $attribute
-     *
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::grabAttributeFrom()
-     */
-    public function grabAttributeFrom($cssOrXpath, $attribute) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabAttributeFrom', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Finds the value for the given form field.
-     * If a fuzzy locator is used, the field is found by field name, CSS, and XPath.
-     *
-     * ``` php
-     * <?php
-     * $name = $I->grabValueFrom('Name');
-     * $name = $I->grabValueFrom('input[name=username]');
-     * $name = $I->grabValueFrom('descendant-or-self::form/descendant::input[@name = 'username']');
-     * $name = $I->grabValueFrom(['name' => 'username']);
-     * ?>
-     * ```
-     *
-     * @param $field
-     *
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::grabValueFrom()
-     */
-    public function grabValueFrom($field) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabValueFrom', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Grabs either the text content, or attribute values, of nodes
-     * matched by $cssOrXpath and returns them as an array.
-     *
-     * ```html
-     * <a href="#first">First</a>
-     * <a href="#second">Second</a>
-     * <a href="#third">Third</a>
-     * ```
-     *
-     * ```php
-     * <?php
-     * // would return ['First', 'Second', 'Third']
-     * $aLinkText = $I->grabMultiple('a');
-     *
-     * // would return ['#first', '#second', '#third']
-     * $aLinks = $I->grabMultiple('a', 'href');
-     * ?>
-     * ```
-     *
-     * @param $cssOrXpath
-     * @param $attribute
-     * @return string[]
-     * @see \Codeception\Module\WebDriver::grabMultiple()
-     */
-    public function grabMultiple($cssOrXpath, $attribute = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabMultiple', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element exists on the page and is visible.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->seeElement('.error');
-     * $I->seeElement('//form/input[1]');
-     * $I->seeElement('input', ['name' => 'login']);
-     * $I->seeElement('input', ['value' => '123456']);
-     *
-     * // strict locator in first arg, attributes in second
-     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * @return
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeElement()
-     */
-    public function canSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElement', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element exists on the page and is visible.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->seeElement('.error');
-     * $I->seeElement('//form/input[1]');
-     * $I->seeElement('input', ['name' => 'login']);
-     * $I->seeElement('input', ['value' => '123456']);
-     *
-     * // strict locator in first arg, attributes in second
-     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * @return
-     * @see \Codeception\Module\WebDriver::seeElement()
-     */
-    public function seeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElement', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element is invisible or not present on the page.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeElement('.error');
-     * $I->dontSeeElement('//form/input[1]');
-     * $I->dontSeeElement('input', ['name' => 'login']);
-     * $I->dontSeeElement('input', ['value' => '123456']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSeeElement()
-     */
-    public function cantSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElement', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element is invisible or not present on the page.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeElement('.error');
-     * $I->dontSeeElement('//form/input[1]');
-     * $I->dontSeeElement('input', ['name' => 'login']);
-     * $I->dontSeeElement('input', ['value' => '123456']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * @see \Codeception\Module\WebDriver::dontSeeElement()
-     */
-    public function dontSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElement', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element exists on the page, even it is invisible.
-     *
-     * ``` php
-     * <?php
-     * $I->seeElementInDOM('//form/input[type=hidden]');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeElementInDOM()
-     */
-    public function canSeeElementInDOM($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElementInDOM', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element exists on the page, even it is invisible.
-     *
-     * ``` php
-     * <?php
-     * $I->seeElementInDOM('//form/input[type=hidden]');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @see \Codeception\Module\WebDriver::seeElementInDOM()
-     */
-    public function seeElementInDOM($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElementInDOM', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Opposite of `seeElementInDOM`.
-     *
-     * @param $selector
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSeeElementInDOM()
-     */
-    public function cantSeeElementInDOM($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElementInDOM', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Opposite of `seeElementInDOM`.
-     *
-     * @param $selector
-     * @see \Codeception\Module\WebDriver::dontSeeElementInDOM()
-     */
-    public function dontSeeElementInDOM($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElementInDOM', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there are a certain number of elements matched by the given locator on the page.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumberOfElements('tr', 10);
-     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
-     * ?>
-     * ```
-     * @param $selector
-     * @param mixed $expected :
-     * - string: strict number
-     * - array: range of numbers [0,10]
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeNumberOfElements()
-     */
-    public function canSeeNumberOfElements($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElements', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there are a certain number of elements matched by the given locator on the page.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumberOfElements('tr', 10);
-     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
-     * ?>
-     * ```
-     * @param $selector
-     * @param mixed $expected :
-     * - string: strict number
-     * - array: range of numbers [0,10]
-     * @see \Codeception\Module\WebDriver::seeNumberOfElements()
-     */
-    public function seeNumberOfElements($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElements', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     *
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeNumberOfElementsInDOM()
-     */
-    public function canSeeNumberOfElementsInDOM($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElementsInDOM', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     *
-     * @see \Codeception\Module\WebDriver::seeNumberOfElementsInDOM()
-     */
-    public function seeNumberOfElementsInDOM($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElementsInDOM', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is selected.
-     *
-     * ``` php
-     * <?php
-     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeOptionIsSelected()
-     */
-    public function canSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeOptionIsSelected', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is selected.
-     *
-     * ``` php
-     * <?php
-     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::seeOptionIsSelected()
-     */
-    public function seeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeOptionIsSelected', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is not selected.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSeeOptionIsSelected()
-     */
-    public function cantSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeOptionIsSelected', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is not selected.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::dontSeeOptionIsSelected()
-     */
-    public function dontSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeOptionIsSelected', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title contains the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInTitle('Blog - Post #1');
-     * ?>
-     * ```
-     *
-     * @param $title
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeInTitle()
-     */
-    public function canSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInTitle', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title contains the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInTitle('Blog - Post #1');
-     * ?>
-     * ```
-     *
-     * @param $title
-     *
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::seeInTitle()
-     */
-    public function seeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInTitle', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title does not contain the given string.
-     *
-     * @param $title
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::dontSeeInTitle()
-     */
-    public function cantSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInTitle', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title does not contain the given string.
-     *
-     * @param $title
-     *
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::dontSeeInTitle()
-     */
-    public function dontSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInTitle', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Accepts the active JavaScript native popup window, as created by `window.alert`|`window.confirm`|`window.prompt`.
-     * Don't confuse popups with modal windows,
-     * as created by [various libraries](http://jster.net/category/windows-modals-popups).
-     * @see \Codeception\Module\WebDriver::acceptPopup()
-     */
-    public function acceptPopup() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('acceptPopup', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Dismisses the active JavaScript popup, as created by `window.alert`|`window.confirm`|`window.prompt`.
-     * @see \Codeception\Module\WebDriver::cancelPopup()
-     */
-    public function cancelPopup() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('cancelPopup', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the active JavaScript popup,
-     * as created by `window.alert`|`window.confirm`|`window.prompt`, contains the given string.
-     *
-     * @param $text
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\WebDriver::seeInPopup()
-     */
-    public function canSeeInPopup($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInPopup', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the active JavaScript popup,
-     * as created by `window.alert`|`window.confirm`|`window.prompt`, contains the given string.
-     *
-     * @param $text
-     * @see \Codeception\Module\WebDriver::seeInPopup()
-     */
-    public function seeInPopup($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInPopup', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Enters text into a native JavaScript prompt popup, as created by `window.prompt`.
-     *
-     * @param $keys
-     * @see \Codeception\Module\WebDriver::typeInPopup()
-     */
-    public function typeInPopup($keys) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('typeInPopup', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Reloads the current page.
-     * @see \Codeception\Module\WebDriver::reloadPage()
-     */
-    public function reloadPage() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('reloadPage', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Moves back in history.
-     * @see \Codeception\Module\WebDriver::moveBack()
-     */
-    public function moveBack() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('moveBack', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Moves forward in history.
-     * @see \Codeception\Module\WebDriver::moveForward()
-     */
-    public function moveForward() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('moveForward', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Submits the given form on the page, optionally with the given form
-     * values.  Give the form fields values as an array. Note that hidden fields
-     * can't be accessed.
-     *
-     * Skipped fields will be filled by their values from the page.
-     * You don't need to click the 'Submit' button afterwards.
-     * This command itself triggers the request to form's action.
-     *
-     * You can optionally specify what button's value to include
-     * in the request with the last parameter as an alternative to
-     * explicitly setting its value in the second parameter, as
-     * button values are not otherwise included in the request.
-     *
-     * Examples:
-     *
-     * ``` php
-     * <?php
-     * $I->submitForm('#login', [
-     *     'login' => 'davert',
-     *     'password' => '123456'
-     * ]);
-     * // or
-     * $I->submitForm('#login', [
-     *     'login' => 'davert',
-     *     'password' => '123456'
-     * ], 'submitButtonName');
-     *
-     * ```
-     *
-     * For example, given this sample "Sign Up" form:
-     *
-     * ``` html
-     * <form action="http://github.com/sign_up">
-     *     Login:
-     *     <input type="text" name="user[login]" /><br/>
-     *     Password:
-     *     <input type="password" name="user[password]" /><br/>
-     *     Do you agree to our terms?
-     *     <input type="checkbox" name="user[agree]" /><br/>
-     *     Select pricing plan:
-     *     <select name="plan">
-     *         <option value="1">Free</option>
-     *         <option value="2" selected="selected">Paid</option>
-     *     </select>
-     *     <input type="submit" name="submitButton" value="Submit" />
-     * </form>
-     * ```
-     *
-     * You could write the following to submit it:
-     *
-     * ``` php
-     * <?php
-     * $I->submitForm(
-     *     '#userForm',
-     *     [
-     *         'user[login]' => 'Davert',
-     *         'user[password]' => '123456',
-     *         'user[agree]' => true
-     *     ],
-     *     'submitButton'
-     * );
-     * ```
-     * Note that "2" will be the submitted value for the "plan" field, as it is
-     * the selected option.
-     *
-     * Also note that this differs from PhpBrowser, in that
-     * ```'user' => [ 'login' => 'Davert' ]``` is not supported at the moment.
-     * Named array keys *must* be included in the name as above.
-     *
-     * Pair this with seeInFormFields for quick testing magic.
-     *
-     * ``` php
-     * <?php
-     * $form = [
-     *      'field1' => 'value',
-     *      'field2' => 'another value',
-     *      'checkbox1' => true,
-     *      // ...
-     * ];
-     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
-     * // $I->amOnPage('/path/to/form-page') may be needed
-     * $I->seeInFormFields('//form[@id=my-form]', $form);
-     * ?>
-     * ```
-     *
-     * Parameter values must be set to arrays for multiple input fields
-     * of the same name, or multi-select combo boxes.  For checkboxes,
-     * either the string value can be used, or boolean values which will
-     * be replaced by the checkbox's value in the DOM.
-     *
-     * ``` php
-     * <?php
-     * $I->submitForm('#my-form', [
-     *      'field1' => 'value',
-     *      'checkbox' => [
-     *          'value of first checkbox',
-     *          'value of second checkbox,
-     *      ],
-     *      'otherCheckboxes' => [
-     *          true,
-     *          false,
-     *          false
-     *      ],
-     *      'multiselect' => [
-     *          'first option value',
-     *          'second option value'
-     *      ]
-     * ]);
-     * ?>
-     * ```
-     *
-     * Mixing string and boolean values for a checkbox's value is not supported
-     * and may produce unexpected results.
-     *
-     * Field names ending in "[]" must be passed without the trailing square
-     * bracket characters, and must contain an array for its value.  This allows
-     * submitting multiple values with the same name, consider:
-     *
-     * ```php
-     * $I->submitForm('#my-form', [
-     *     'field[]' => 'value',
-     *     'field[]' => 'another value', // 'field[]' is already a defined key
-     * ]);
-     * ```
-     *
-     * The solution is to pass an array value:
-     *
-     * ```php
-     * // this way both values are submitted
-     * $I->submitForm('#my-form', [
-     *     'field' => [
-     *         'value',
-     *         'another value',
-     *     ]
-     * ]);
-     * ```
-     * @param $selector
-     * @param $params
-     * @param $button
-     * @see \Codeception\Module\WebDriver::submitForm()
-     */
-    public function submitForm($selector, $params, $button = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Waits up to $timeout seconds for the given element to change.
-     * Element "change" is determined by a callback function which is called repeatedly
-     * until the return value evaluates to true.
-     *
-     * ``` php
-     * <?php
-     * use \Facebook\WebDriver\WebDriverElement
-     * $I->waitForElementChange('#menu', function(WebDriverElement $el) {
-     *     return $el->isDisplayed();
-     * }, 100);
-     * ?>
-     * ```
-     *
-     * @param $element
-     * @param \Closure $callback
-     * @param int $timeout seconds
-     * @throws \Codeception\Exception\ElementNotFound
-     * @see \Codeception\Module\WebDriver::waitForElementChange()
-     */
-    public function waitForElementChange($element, $callback, $timeout = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForElementChange', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Waits up to $timeout seconds for an element to appear on the page.
-     * If the element doesn't appear, a timeout exception is thrown.
-     *
-     * ``` php
-     * <?php
-     * $I->waitForElement('#agree_button', 30); // secs
-     * $I->click('#agree_button');
-     * ?>
-     * ```
-     *
-     * @param $element
-     * @param int $timeout seconds
-     * @throws \Exception
-     * @see \Codeception\Module\WebDriver::waitForElement()
-     */
-    public function waitForElement($element, $timeout = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForElement', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Waits up to $timeout seconds for the given element to be visible on the page.
-     * If element doesn't appear, a timeout exception is thrown.
-     *
-     * ``` php
-     * <?php
-     * $I->waitForElementVisible('#agree_button', 30); // secs
-     * $I->click('#agree_button');
-     * ?>
-     * ```
-     *
-     * @param $element
-     * @param int $timeout seconds
-     * @throws \Exception
-     * @see \Codeception\Module\WebDriver::waitForElementVisible()
-     */
-    public function waitForElementVisible($element, $timeout = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForElementVisible', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Waits up to $timeout seconds for the given element to become invisible.
-     * If element stays visible, a timeout exception is thrown.
-     *
-     * ``` php
-     * <?php
-     * $I->waitForElementNotVisible('#agree_button', 30); // secs
-     * ?>
-     * ```
-     *
-     * @param $element
-     * @param int $timeout seconds
-     * @throws \Exception
-     * @see \Codeception\Module\WebDriver::waitForElementNotVisible()
-     */
-    public function waitForElementNotVisible($element, $timeout = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForElementNotVisible', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Waits up to $timeout seconds for the given string to appear on the page.
-     * Can also be passed a selector to search in.
-     * If the given text doesn't appear, a timeout exception is thrown.
-     *
-     * ``` php
-     * <?php
-     * $I->waitForText('foo', 30); // secs
-     * $I->waitForText('foo', 30, '.title'); // secs
-     * ?>
-     * ```
-     *
-     * @param string $text
-     * @param int $timeout seconds
-     * @param null $selector
-     * @throws \Exception
-     * @see \Codeception\Module\WebDriver::waitForText()
-     */
-    public function waitForText($text, $timeout = null, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForText', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Wait for $timeout seconds.
-     *
-     * @param int $timeout secs
-     * @throws \Codeception\Exception\TestRuntimeException
-     * @see \Codeception\Module\WebDriver::wait()
-     */
-    public function wait($timeout) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('wait', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Low-level API method.
-     * If Codeception commands are not enough, this allows you to use Selenium WebDriver methods directly:
-     *
-     * ``` php
-     * $I->executeInSelenium(function(\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {
-     *   $webdriver->get('http://google.com/');
-     * });
-     * ```
-     *
-     * This runs in the context of the
-     * [RemoteWebDriver class](https://github.com/facebook/php-webdriver/blob/master/lib/remote/RemoteWebDriver.php).
-     * Try not to use this command on a regular basis.
-     * If Codeception lacks a feature you need, please implement it and submit a patch.
-     *
-     * @param callable $function
-     * @see \Codeception\Module\WebDriver::executeInSelenium()
-     */
-    public function executeInSelenium($function) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('executeInSelenium', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Switch to another window identified by name.
-     *
-     * The window can only be identified by name. If the $name parameter is blank, the parent window will be used.
-     *
-     * Example:
-     * ``` html
-     * <input type="button" value="Open window" onclick="window.open('http://example.com/', 'another_window')">
-     * ```
-     *
-     * ``` php
-     * <?php
-     * $I->click("Open window");
-     * # switch to another window
-     * $I->switchToWindow("another_window");
-     * # switch to parent window
-     * $I->switchToWindow();
-     * ?>
-     * ```
-     *
-     * If the window has no name, the only way to access it is via the `executeInSelenium()` method, like so:
-     *
-     * ``` php
-     * <?php
-     * $I->executeInSelenium(function (\Facebook\WebDriver\Remote\RemoteWebDriver $webdriver) {
-     *      $handles=$webdriver->getWindowHandles();
-     *      $last_window = end($handles);
-     *      $webdriver->switchTo()->window($last_window);
-     * });
-     * ?>
-     * ```
-     *
-     * @param string|null $name
-     * @see \Codeception\Module\WebDriver::switchToWindow()
-     */
-    public function switchToWindow($name = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('switchToWindow', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Switch to another frame on the page.
-     *
-     * Example:
-     * ``` html
-     * <iframe name="another_frame" src="http://example.com/">
-     *
-     * ```
-     *
-     * ``` php
-     * <?php
-     * # switch to iframe
-     * $I->switchToIFrame("another_frame");
-     * # switch to parent page
-     * $I->switchToIFrame();
-     *
-     * ```
-     *
-     * @param string|null $name
-     * @see \Codeception\Module\WebDriver::switchToIFrame()
-     */
-    public function switchToIFrame($name = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('switchToIFrame', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Executes JavaScript and waits up to $timeout seconds for it to return true.
-     *
-     * In this example we will wait up to 60 seconds for all jQuery AJAX requests to finish.
-     *
-     * ``` php
-     * <?php
-     * $I->waitForJS("return $.active == 0;", 60);
-     * ?>
-     * ```
-     *
-     * @param string $script
-     * @param int $timeout seconds
-     * @see \Codeception\Module\WebDriver::waitForJS()
-     */
-    public function waitForJS($script, $timeout = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('waitForJS', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Executes custom JavaScript.
-     *
-     * This example uses jQuery to get a value and assigns that value to a PHP variable:
-     *
-     * ```php
-     * <?php
-     * $myVar = $I->executeJS('return $("#myField").val()');
-     * ?>
-     * ```
-     *
-     * @param $script
-     * @return mixed
-     * @see \Codeception\Module\WebDriver::executeJS()
-     */
-    public function executeJS($script) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('executeJS', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Maximizes the current window.
-     * @see \Codeception\Module\WebDriver::maximizeWindow()
-     */
-    public function maximizeWindow() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('maximizeWindow', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Performs a simple mouse drag-and-drop operation.
-     *
-     * ``` php
-     * <?php
-     * $I->dragAndDrop('#drag', '#drop');
-     * ?>
-     * ```
-     *
-     * @param string $source (CSS ID or XPath)
-     * @param string $target (CSS ID or XPath)
-     * @see \Codeception\Module\WebDriver::dragAndDrop()
-     */
-    public function dragAndDrop($source, $target) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('dragAndDrop', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Move mouse over the first element matched by the given locator.
-     * If the second and third parameters are given,
-     * then the mouse is moved to an offset of the element's top-left corner.
-     * Otherwise, the mouse is moved to the center of the element.
-     *
-     * ``` php
-     * <?php
-     * $I->moveMouseOver(['css' => '.checkout'], 20, 50);
-     * ?>
-     * ```
-     *
-     * @param string $cssOrXPath css or xpath of the web element
-     * @param int $offsetX
-     * @param int $offsetY
-     *
-     * @throws \Codeception\Exception\ElementNotFound
-     * @see \Codeception\Module\WebDriver::moveMouseOver()
-     */
-    public function moveMouseOver($cssOrXPath, $offsetX = null, $offsetY = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('moveMouseOver', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Performs contextual click with the right mouse button on an element.
-     *
-     * @param $cssOrXPath
-     * @throws \Codeception\Exception\ElementNotFound
-     * @see \Codeception\Module\WebDriver::clickWithRightButton()
-     */
-    public function clickWithRightButton($cssOrXPath) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('clickWithRightButton', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Pauses test execution in debug mode.
-     * To proceed test press "ENTER" in console.
-     *
-     * This method is useful while writing tests,
-     * since it allows you to inspect the current page in the middle of a test case.
-     * @see \Codeception\Module\WebDriver::pauseExecution()
-     */
-    public function pauseExecution() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('pauseExecution', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Performs a double-click on an element matched by CSS or XPath.
-     *
-     * @param $cssOrXPath
-     * @throws \Codeception\Exception\ElementNotFound
-     * @see \Codeception\Module\WebDriver::doubleClick()
-     */
-    public function doubleClick($cssOrXPath) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('doubleClick', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Presses the given key on the given element.
-     * To specify a character and modifier (e.g. ctrl, alt, shift, meta), pass an array for $char with
-     * the modifier as the first element and the character as the second.
-     * For special keys use key constants from WebDriverKeys class.
-     *
-     * ``` php
-     * <?php
-     * // <input id="page" value="old" />
-     * $I->pressKey('#page','a'); // => olda
-     * $I->pressKey('#page',array('ctrl','a'),'new'); //=> new
-     * $I->pressKey('#page',array('shift','111'),'1','x'); //=> old!!!1x
-     * $I->pressKey('descendant-or-self::*[@id='page']','u'); //=> oldu
-     * $I->pressKey('#name', array('ctrl', 'a'), \Facebook\WebDriver\WebDriverKeys::DELETE); //=>''
-     * ?>
-     * ```
-     *
-     * @param $element
-     * @param $char Can be char or array with modifier. You can provide several chars.
-     * @throws \Codeception\Exception\ElementNotFound
-     * @see \Codeception\Module\WebDriver::pressKey()
-     */
-    public function pressKey($element, $char) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('pressKey', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Append the given text to the given element.
-     * Can also add a selection to a select box.
-     *
-     * ``` php
-     * <?php
-     * $I->appendField('#mySelectbox', 'SelectValue');
-     * $I->appendField('#myTextField', 'appended');
-     * ?>
-     * ```
-     *
-     * @param string $field
-     * @param string $value
-     * @throws \Codeception\Exception\ElementNotFound
-     * @see \Codeception\Module\WebDriver::appendField()
-     */
-    public function appendField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('appendField', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param string $name
-     * @see \Codeception\Module\WebDriver::saveSessionSnapshot()
-     */
-    public function saveSessionSnapshot($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('saveSessionSnapshot', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param string $name
-     * @return bool
-     * @see \Codeception\Module\WebDriver::loadSessionSnapshot()
-     */
-    public function loadSessionSnapshot($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('loadSessionSnapshot', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Move to the middle of the given element matched by the given locator.
-     * Extra shift, calculated from the top-left corner of the element,
-     * can be set by passing $offsetX and $offsetY parameters.
-     *
-     * ``` php
-     * <?php
-     * $I->scrollTo(['css' => '.checkout'], 20, 50);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param int $offsetX
-     * @param int $offsetY
-     * @see \Codeception\Module\WebDriver::scrollTo()
-     */
-    public function scrollTo($selector, $offsetX = null, $offsetY = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('scrollTo', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Inserts record into the database.
-     *
-     * ``` php
-     * <?php
-     * $user_id = $I->haveRecord('app\models\User', array('name' => 'Davert'));
-     * ?>
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @return mixed
-     * @part orm
-     * @see \Codeception\Module\Yii2::haveRecord()
-     */
-    public function haveRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveRecord', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that record exists in database.
-     *
-     * ``` php
-     * $I->seeRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @part orm
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Yii2::seeRecord()
-     */
-    public function canSeeRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeRecord', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that record exists in database.
-     *
-     * ``` php
-     * $I->seeRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @part orm
-     * @see \Codeception\Module\Yii2::seeRecord()
-     */
-    public function seeRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeRecord', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that record does not exist in database.
-     *
-     * ``` php
-     * $I->dontSeeRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @part orm
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Yii2::dontSeeRecord()
-     */
-    public function cantSeeRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeRecord', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that record does not exist in database.
-     *
-     * ``` php
-     * $I->dontSeeRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @part orm
-     * @see \Codeception\Module\Yii2::dontSeeRecord()
-     */
-    public function dontSeeRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeRecord', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Retrieves record from database
-     *
-     * ``` php
-     * $category = $I->grabRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @return mixed
-     * @part orm
-     * @see \Codeception\Module\Yii2::grabRecord()
-     */
-    public function grabRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabRecord', func_get_args()));
-    }
-}
diff --git a/tests/_support/_generated/FunctionalTesterActions.php b/tests/_support/_generated/FunctionalTesterActions.php
deleted file mode 100644
index 8839cbce7..000000000
--- a/tests/_support/_generated/FunctionalTesterActions.php
+++ /dev/null
@@ -1,2691 +0,0 @@
-<?php  //[STAMP] 0371e992067f9f6926df379e8e9c6bd6
-namespace _generated;
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-use Codeception\Module\Filesystem;
-use Codeception\Module\Yii2;
-
-trait FunctionalTesterActions
-{
-    /**
-     * @return \Codeception\Scenario
-     */
-    abstract protected function getScenario();
-
-    
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Enters a directory In local filesystem.
-     * Project root directory is used by default
-     *
-     * @param $path
-     * @see \Codeception\Module\Filesystem::amInPath()
-     */
-    public function amInPath($path) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amInPath', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Opens a file and stores it's content.
-     *
-     * Usage:
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('composer.json');
-     * $I->seeInThisFile('codeception/codeception');
-     * ?>
-     * ```
-     *
-     * @param $filename
-     * @see \Codeception\Module\Filesystem::openFile()
-     */
-    public function openFile($filename) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('openFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Deletes a file
-     *
-     * ``` php
-     * <?php
-     * $I->deleteFile('composer.lock');
-     * ?>
-     * ```
-     *
-     * @param $filename
-     * @see \Codeception\Module\Filesystem::deleteFile()
-     */
-    public function deleteFile($filename) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Deletes directory with all subdirectories
-     *
-     * ``` php
-     * <?php
-     * $I->deleteDir('vendor');
-     * ?>
-     * ```
-     *
-     * @param $dirname
-     * @see \Codeception\Module\Filesystem::deleteDir()
-     */
-    public function deleteDir($dirname) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteDir', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Copies directory with all contents
-     *
-     * ``` php
-     * <?php
-     * $I->copyDir('vendor','old_vendor');
-     * ?>
-     * ```
-     *
-     * @param $src
-     * @param $dst
-     * @see \Codeception\Module\Filesystem::copyDir()
-     */
-    public function copyDir($src, $dst) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('copyDir', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks If opened file has `text` in it.
-     *
-     * Usage:
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('composer.json');
-     * $I->seeInThisFile('codeception/codeception');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Filesystem::seeInThisFile()
-     */
-    public function canSeeInThisFile($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInThisFile', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks If opened file has `text` in it.
-     *
-     * Usage:
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('composer.json');
-     * $I->seeInThisFile('codeception/codeception');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * @see \Codeception\Module\Filesystem::seeInThisFile()
-     */
-    public function seeInThisFile($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInThisFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks If opened file has the `number` of new lines.
-     *
-     * Usage:
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('composer.json');
-     * $I->seeNumberNewLines(5);
-     * ?>
-     * ```
-     *
-     * @param int $number New lines
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Filesystem::seeNumberNewLines()
-     */
-    public function canSeeNumberNewLines($number) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberNewLines', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks If opened file has the `number` of new lines.
-     *
-     * Usage:
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('composer.json');
-     * $I->seeNumberNewLines(5);
-     * ?>
-     * ```
-     *
-     * @param int $number New lines
-     * @see \Codeception\Module\Filesystem::seeNumberNewLines()
-     */
-    public function seeNumberNewLines($number) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberNewLines', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that contents of currently opened file matches $regex
-     *
-     * @param $regex
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Filesystem::seeThisFileMatches()
-     */
-    public function canSeeThisFileMatches($regex) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeThisFileMatches', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that contents of currently opened file matches $regex
-     *
-     * @param $regex
-     * @see \Codeception\Module\Filesystem::seeThisFileMatches()
-     */
-    public function seeThisFileMatches($regex) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeThisFileMatches', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks the strict matching of file contents.
-     * Unlike `seeInThisFile` will fail if file has something more than expected lines.
-     * Better to use with HEREDOC strings.
-     * Matching is done after removing "\r" chars from file content.
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('process.pid');
-     * $I->seeFileContentsEqual('3192');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Filesystem::seeFileContentsEqual()
-     */
-    public function canSeeFileContentsEqual($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeFileContentsEqual', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks the strict matching of file contents.
-     * Unlike `seeInThisFile` will fail if file has something more than expected lines.
-     * Better to use with HEREDOC strings.
-     * Matching is done after removing "\r" chars from file content.
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('process.pid');
-     * $I->seeFileContentsEqual('3192');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * @see \Codeception\Module\Filesystem::seeFileContentsEqual()
-     */
-    public function seeFileContentsEqual($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeFileContentsEqual', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks If opened file doesn't contain `text` in it
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('composer.json');
-     * $I->dontSeeInThisFile('codeception/codeception');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Filesystem::dontSeeInThisFile()
-     */
-    public function cantSeeInThisFile($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInThisFile', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks If opened file doesn't contain `text` in it
-     *
-     * ``` php
-     * <?php
-     * $I->openFile('composer.json');
-     * $I->dontSeeInThisFile('codeception/codeception');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * @see \Codeception\Module\Filesystem::dontSeeInThisFile()
-     */
-    public function dontSeeInThisFile($text) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInThisFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Deletes a file
-     * @see \Codeception\Module\Filesystem::deleteThisFile()
-     */
-    public function deleteThisFile() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteThisFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if file exists in path.
-     * Opens a file when it's exists
-     *
-     * ``` php
-     * <?php
-     * $I->seeFileFound('UserModel.php','app/models');
-     * ?>
-     * ```
-     *
-     * @param $filename
-     * @param string $path
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Filesystem::seeFileFound()
-     */
-    public function canSeeFileFound($filename, $path = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeFileFound', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if file exists in path.
-     * Opens a file when it's exists
-     *
-     * ``` php
-     * <?php
-     * $I->seeFileFound('UserModel.php','app/models');
-     * ?>
-     * ```
-     *
-     * @param $filename
-     * @param string $path
-     * @see \Codeception\Module\Filesystem::seeFileFound()
-     */
-    public function seeFileFound($filename, $path = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeFileFound', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if file does not exist in path
-     *
-     * @param $filename
-     * @param string $path
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Filesystem::dontSeeFileFound()
-     */
-    public function cantSeeFileFound($filename, $path = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeFileFound', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if file does not exist in path
-     *
-     * @param $filename
-     * @param string $path
-     * @see \Codeception\Module\Filesystem::dontSeeFileFound()
-     */
-    public function dontSeeFileFound($filename, $path = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeFileFound', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Erases directory contents
-     *
-     * ``` php
-     * <?php
-     * $I->cleanDir('logs');
-     * ?>
-     * ```
-     *
-     * @param $dirname
-     * @see \Codeception\Module\Filesystem::cleanDir()
-     */
-    public function cleanDir($dirname) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('cleanDir', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Saves contents to file
-     *
-     * @param $filename
-     * @param $contents
-     * @see \Codeception\Module\Filesystem::writeToFile()
-     */
-    public function writeToFile($filename, $contents) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('writeToFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Inserts record into the database.
-     *
-     * ``` php
-     * <?php
-     * $user_id = $I->haveRecord('app\models\User', array('name' => 'Davert'));
-     * ?>
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @return mixed
-     * @part orm
-     * @see \Codeception\Module\Yii2::haveRecord()
-     */
-    public function haveRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveRecord', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that record exists in database.
-     *
-     * ``` php
-     * $I->seeRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @part orm
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Yii2::seeRecord()
-     */
-    public function canSeeRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeRecord', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that record exists in database.
-     *
-     * ``` php
-     * $I->seeRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @part orm
-     * @see \Codeception\Module\Yii2::seeRecord()
-     */
-    public function seeRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeRecord', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that record does not exist in database.
-     *
-     * ``` php
-     * $I->dontSeeRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @part orm
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Yii2::dontSeeRecord()
-     */
-    public function cantSeeRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeRecord', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that record does not exist in database.
-     *
-     * ``` php
-     * $I->dontSeeRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @part orm
-     * @see \Codeception\Module\Yii2::dontSeeRecord()
-     */
-    public function dontSeeRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeRecord', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Retrieves record from database
-     *
-     * ``` php
-     * $category = $I->grabRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @return mixed
-     * @part orm
-     * @see \Codeception\Module\Yii2::grabRecord()
-     */
-    public function grabRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabRecord', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Converting $page to valid Yii 2 URL
-     *
-     * Allows input like:
-     *
-     * ```php
-     * $I->amOnPage(['site/view','page'=>'about']);
-     * $I->amOnPage('index-test.php?site/index');
-     * $I->amOnPage('http://localhost/index-test.php?site/index');
-     * ```
-     *
-     * @param $page string|array parameter for \yii\web\UrlManager::createUrl()
-     * @see \Codeception\Module\Yii2::amOnPage()
-     */
-    public function amOnPage($page) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amOnPage', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Returns a list of regex patterns for recognized domain names
-     *
-     * @return array
-     * @see \Codeception\Module\Yii2::getInternalDomains()
-     */
-    public function getInternalDomains() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('getInternalDomains', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Authenticates user for HTTP_AUTH
-     *
-     * @param $username
-     * @param $password
-     * @see \Codeception\Lib\InnerBrowser::amHttpAuthenticated()
-     */
-    public function amHttpAuthenticated($username, $password) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Condition('amHttpAuthenticated', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sets the HTTP header to the passed value - which is used on
-     * subsequent HTTP requests through PhpBrowser.
-     *
-     * Example:
-     * ```php
-     * <?php
-     * $I->setHeader('X-Requested-With', 'Codeception');
-     * $I->amOnPage('test-headers.php');
-     * ?>
-     * ```
-     *
-     * @param string $name the name of the request header
-     * @param string $value the value to set it to for subsequent
-     *        requests
-     * @see \Codeception\Lib\InnerBrowser::haveHttpHeader()
-     */
-    public function haveHttpHeader($name, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveHttpHeader', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Deletes the header with the passed name.  Subsequent requests
-     * will not have the deleted header in its request.
-     *
-     * Example:
-     * ```php
-     * <?php
-     * $I->haveHttpHeader('X-Requested-With', 'Codeception');
-     * $I->amOnPage('test-headers.php');
-     * // ...
-     * $I->deleteHeader('X-Requested-With');
-     * $I->amOnPage('some-other-page.php');
-     * ?>
-     * ```
-     *
-     * @param string $name the name of the header to delete.
-     * @see \Codeception\Lib\InnerBrowser::deleteHeader()
-     */
-    public function deleteHeader($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('deleteHeader', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Perform a click on a link or a button, given by a locator.
-     * If a fuzzy locator is given, the page will be searched for a button, link, or image matching the locator string.
-     * For buttons, the "value" attribute, "name" attribute, and inner text are searched.
-     * For links, the link text is searched.
-     * For images, the "alt" attribute and inner text of any parent links are searched.
-     *
-     * The second parameter is a context (CSS or XPath locator) to narrow the search.
-     *
-     * Note that if the locator matches a button of type `submit`, the form will be submitted.
-     *
-     * ``` php
-     * <?php
-     * // simple link
-     * $I->click('Logout');
-     * // button of form
-     * $I->click('Submit');
-     * // CSS button
-     * $I->click('#form input[type=submit]');
-     * // XPath
-     * $I->click('//form/*[@type=submit]');
-     * // link in context
-     * $I->click('Logout', '#nav');
-     * // using strict locator
-     * $I->click(['link' => 'Login']);
-     * ?>
-     * ```
-     *
-     * @param $link
-     * @param $context
-     * @see \Codeception\Lib\InnerBrowser::click()
-     */
-    public function click($link, $context = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('click', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string (case insensitive).
-     *
-     * You can specify a specific HTML element (via CSS or XPath) as the second
-     * parameter to only search within that element.
-     *
-     * ``` php
-     * <?php
-     * $I->see('Logout');                 // I can suppose user is logged in
-     * $I->see('Sign Up', 'h1');          // I can suppose it's a signup page
-     * $I->see('Sign Up', '//body/h1');   // with XPath
-     * ```
-     *
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->see('strong')` will return true for strings like:
-     *
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     *
-     * But will *not* be true for strings like:
-     *
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     *
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::see()
-     */
-    public function canSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('see', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string (case insensitive).
-     *
-     * You can specify a specific HTML element (via CSS or XPath) as the second
-     * parameter to only search within that element.
-     *
-     * ``` php
-     * <?php
-     * $I->see('Logout');                 // I can suppose user is logged in
-     * $I->see('Sign Up', 'h1');          // I can suppose it's a signup page
-     * $I->see('Sign Up', '//body/h1');   // with XPath
-     * ```
-     *
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->see('strong')` will return true for strings like:
-     *
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     *
-     * But will *not* be true for strings like:
-     *
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     *
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * @see \Codeception\Lib\InnerBrowser::see()
-     */
-    public function see($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('see', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page doesn't contain the text specified (case insensitive).
-     * Give a locator as the second parameter to match a specific region.
-     *
-     * ```php
-     * <?php
-     * $I->dontSee('Login');                    // I can suppose user is already logged in
-     * $I->dontSee('Sign Up','h1');             // I can suppose it's not a signup page
-     * $I->dontSee('Sign Up','//body/h1');      // with XPath
-     * ```
-     *
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->dontSee('strong')` will fail on strings like:
-     *
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     *
-     * But will ignore strings like:
-     *
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     *
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSee()
-     */
-    public function cantSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSee', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page doesn't contain the text specified (case insensitive).
-     * Give a locator as the second parameter to match a specific region.
-     *
-     * ```php
-     * <?php
-     * $I->dontSee('Login');                    // I can suppose user is already logged in
-     * $I->dontSee('Sign Up','h1');             // I can suppose it's not a signup page
-     * $I->dontSee('Sign Up','//body/h1');      // with XPath
-     * ```
-     *
-     * Note that the search is done after stripping all HTML tags from the body,
-     * so `$I->dontSee('strong')` will fail on strings like:
-     *
-     *   - `<p>I am Stronger than thou</p>`
-     *   - `<script>document.createElement('strong');</script>`
-     *
-     * But will ignore strings like:
-     *
-     *   - `<strong>Home</strong>`
-     *   - `<div class="strong">Home</strong>`
-     *   - `<!-- strong -->`
-     *
-     * For checking the raw source code, use `seeInSource()`.
-     *
-     * @param      $text
-     * @param null $selector
-     * @see \Codeception\Lib\InnerBrowser::dontSee()
-     */
-    public function dontSee($text, $selector = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSee', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInSource()
-     */
-    public function canSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInSource', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * @see \Codeception\Lib\InnerBrowser::seeInSource()
-     */
-    public function seeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInSource', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
-     */
-    public function cantSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInSource', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current page contains the given string in its
-     * raw source code.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeInSource('<h1>Green eggs &amp; ham</h1>');
-     * ```
-     *
-     * @param      $raw
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInSource()
-     */
-    public function dontSeeInSource($raw) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInSource', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there's a link with the specified text.
-     * Give a full URL as the second parameter to match links with that exact URL.
-     *
-     * ``` php
-     * <?php
-     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
-     * $I->seeLink('Logout','/logout'); // matches <a href="http://github.com/logout">Logout</a>
-     * ?>
-     * ```
-     *
-     * @param      $text
-     * @param null $url
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeLink()
-     */
-    public function canSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeLink', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there's a link with the specified text.
-     * Give a full URL as the second parameter to match links with that exact URL.
-     *
-     * ``` php
-     * <?php
-     * $I->seeLink('Logout'); // matches <a href="#">Logout</a>
-     * $I->seeLink('Logout','/logout'); // matches <a href="http://github.com/logout">Logout</a>
-     * ?>
-     * ```
-     *
-     * @param      $text
-     * @param null $url
-     * @see \Codeception\Lib\InnerBrowser::seeLink()
-     */
-    public function seeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeLink', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page doesn't contain a link with the given string.
-     * If the second parameter is given, only links with a matching "href" attribute will be checked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
-     * $I->dontSeeLink('Checkout now', '/store/cart.php');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * @param null $url
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
-     */
-    public function cantSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeLink', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page doesn't contain a link with the given string.
-     * If the second parameter is given, only links with a matching "href" attribute will be checked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeLink('Logout'); // I suppose user is not logged in
-     * $I->dontSeeLink('Checkout now', '/store/cart.php');
-     * ?>
-     * ```
-     *
-     * @param $text
-     * @param null $url
-     * @see \Codeception\Lib\InnerBrowser::dontSeeLink()
-     */
-    public function dontSeeLink($text, $url = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeLink', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current URI contains the given string.
-     *
-     * ``` php
-     * <?php
-     * // to match: /home/dashboard
-     * $I->seeInCurrentUrl('home');
-     * // to match: /users/1
-     * $I->seeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
-     */
-    public function canSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInCurrentUrl', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current URI contains the given string.
-     *
-     * ``` php
-     * <?php
-     * // to match: /home/dashboard
-     * $I->seeInCurrentUrl('home');
-     * // to match: /users/1
-     * $I->seeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::seeInCurrentUrl()
-     */
-    public function seeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInCurrentUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URI doesn't contain the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
-     */
-    public function cantSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInCurrentUrl', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URI doesn't contain the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInCurrentUrl('/users/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInCurrentUrl()
-     */
-    public function dontSeeInCurrentUrl($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInCurrentUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL is equal to the given string.
-     * Unlike `seeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
-     */
-    public function canSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlEquals', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL is equal to the given string.
-     * Unlike `seeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlEquals()
-     */
-    public function seeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL doesn't equal the given string.
-     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // current url is not root
-     * $I->dontSeeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
-     */
-    public function cantSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlEquals', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL doesn't equal the given string.
-     * Unlike `dontSeeInCurrentUrl`, this only matches the full URL.
-     *
-     * ``` php
-     * <?php
-     * // current url is not root
-     * $I->dontSeeCurrentUrlEquals('/');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlEquals()
-     */
-    public function dontSeeCurrentUrlEquals($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL matches the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
-     */
-    public function canSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCurrentUrlMatches', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the current URL matches the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->seeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::seeCurrentUrlMatches()
-     */
-    public function seeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCurrentUrlMatches', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current url doesn't match the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->dontSeeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
-     */
-    public function cantSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCurrentUrlMatches', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that current url doesn't match the given regular expression.
-     *
-     * ``` php
-     * <?php
-     * // to match root url
-     * $I->dontSeeCurrentUrlMatches('~$/users/(\d+)~');
-     * ?>
-     * ```
-     *
-     * @param $uri
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCurrentUrlMatches()
-     */
-    public function dontSeeCurrentUrlMatches($uri) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCurrentUrlMatches', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Executes the given regular expression against the current URI and returns the first match.
-     * If no parameters are provided, the full URI is returned.
-     *
-     * ``` php
-     * <?php
-     * $user_id = $I->grabFromCurrentUrl('~$/user/(\d+)/~');
-     * $uri = $I->grabFromCurrentUrl();
-     * ?>
-     * ```
-     *
-     * @param null $uri
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabFromCurrentUrl()
-     */
-    public function grabFromCurrentUrl($uri = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabFromCurrentUrl', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the specified checkbox is checked.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form.
-     * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]');
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
-     */
-    public function canSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCheckboxIsChecked', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the specified checkbox is checked.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCheckboxIsChecked('#agree'); // I suppose user agreed to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user agreed to terms, If there is only one checkbox in form.
-     * $I->seeCheckboxIsChecked('//form/input[@type=checkbox and @name=agree]');
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * @see \Codeception\Lib\InnerBrowser::seeCheckboxIsChecked()
-     */
-    public function seeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCheckboxIsChecked', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Check that the specified checkbox is unchecked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form.
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
-     */
-    public function cantSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCheckboxIsChecked', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Check that the specified checkbox is unchecked.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeCheckboxIsChecked('#agree'); // I suppose user didn't agree to terms
-     * $I->seeCheckboxIsChecked('#signup_form input[type=checkbox]'); // I suppose user didn't check the first checkbox in form.
-     * ?>
-     * ```
-     *
-     * @param $checkbox
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCheckboxIsChecked()
-     */
-    public function dontSeeCheckboxIsChecked($checkbox) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCheckboxIsChecked', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given input field or textarea contains the given value.
-     * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInField('Body','Type your comment here');
-     * $I->seeInField('form textarea[name=body]','Type your comment here');
-     * $I->seeInField('form input[type=hidden]','hidden_value');
-     * $I->seeInField('#searchform input','Search');
-     * $I->seeInField('//form/*[@name=search]','Search');
-     * $I->seeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInField()
-     */
-    public function canSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInField', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given input field or textarea contains the given value.
-     * For fuzzy locators, fields are matched by label text, the "name" attribute, CSS, and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInField('Body','Type your comment here');
-     * $I->seeInField('form textarea[name=body]','Type your comment here');
-     * $I->seeInField('form input[type=hidden]','hidden_value');
-     * $I->seeInField('#searchform input','Search');
-     * $I->seeInField('//form/*[@name=search]','Search');
-     * $I->seeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * @see \Codeception\Lib\InnerBrowser::seeInField()
-     */
-    public function seeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInField', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that an input field or textarea doesn't contain the given value.
-     * For fuzzy locators, the field is matched by label text, CSS and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInField('Body','Type your comment here');
-     * $I->dontSeeInField('form textarea[name=body]','Type your comment here');
-     * $I->dontSeeInField('form input[type=hidden]','hidden_value');
-     * $I->dontSeeInField('#searchform input','Search');
-     * $I->dontSeeInField('//form/*[@name=search]','Search');
-     * $I->dontSeeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
-     */
-    public function cantSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInField', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that an input field or textarea doesn't contain the given value.
-     * For fuzzy locators, the field is matched by label text, CSS and XPath.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInField('Body','Type your comment here');
-     * $I->dontSeeInField('form textarea[name=body]','Type your comment here');
-     * $I->dontSeeInField('form input[type=hidden]','hidden_value');
-     * $I->dontSeeInField('#searchform input','Search');
-     * $I->dontSeeInField('//form/*[@name=search]','Search');
-     * $I->dontSeeInField(['name' => 'search'], 'Search');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInField()
-     */
-    public function dontSeeInField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInField', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are set on the form matched with the
-     * passed selector.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('form[name=myform]', [
-     *      'input1' => 'value',
-     *      'input2' => 'other value',
-     * ]);
-     * ?>
-     * ```
-     *
-     * For multi-select elements, or to check values of multiple elements with the same name, an
-     * array may be passed:
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('.form-class', [
-     *      'multiselect' => [
-     *          'value1',
-     *          'value2',
-     *      ],
-     *      'checkbox[]' => [
-     *          'a checked value',
-     *          'another checked value',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // passes if checked
-     *      'checkbox2' => false,       // passes if unchecked
-     * ]);
-     * ?>
-     * ```
-     *
-     * Pair this with submitForm for quick testing magic.
-     *
-     * ``` php
-     * <?php
-     * $form = [
-     *      'field1' => 'value',
-     *      'field2' => 'another value',
-     *      'checkbox1' => true,
-     *      // ...
-     * ];
-     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
-     * // $I->amOnPage('/path/to/form-page') may be needed
-     * $I->seeInFormFields('//form[@id=my-form]', $form);
-     * ?>
-     * ```
-     *
-     * @param $formSelector
-     * @param $params
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
-     */
-    public function canSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInFormFields', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are set on the form matched with the
-     * passed selector.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('form[name=myform]', [
-     *      'input1' => 'value',
-     *      'input2' => 'other value',
-     * ]);
-     * ?>
-     * ```
-     *
-     * For multi-select elements, or to check values of multiple elements with the same name, an
-     * array may be passed:
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('.form-class', [
-     *      'multiselect' => [
-     *          'value1',
-     *          'value2',
-     *      ],
-     *      'checkbox[]' => [
-     *          'a checked value',
-     *          'another checked value',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // passes if checked
-     *      'checkbox2' => false,       // passes if unchecked
-     * ]);
-     * ?>
-     * ```
-     *
-     * Pair this with submitForm for quick testing magic.
-     *
-     * ``` php
-     * <?php
-     * $form = [
-     *      'field1' => 'value',
-     *      'field2' => 'another value',
-     *      'checkbox1' => true,
-     *      // ...
-     * ];
-     * $I->submitForm('//form[@id=my-form]', $form, 'submitButton');
-     * // $I->amOnPage('/path/to/form-page') may be needed
-     * $I->seeInFormFields('//form[@id=my-form]', $form);
-     * ?>
-     * ```
-     *
-     * @param $formSelector
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::seeInFormFields()
-     */
-    public function seeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInFormFields', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are not set on the form matched with
-     * the passed selector.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('form[name=myform]', [
-     *      'input1' => 'non-existent value',
-     *      'input2' => 'other non-existent value',
-     * ]);
-     * ?>
-     * ```
-     *
-     * To check that an element hasn't been assigned any one of many values, an array can be passed
-     * as the value:
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('.form-class', [
-     *      'fieldName' => [
-     *          'This value shouldn\'t be set',
-     *          'And this value shouldn\'t be set',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // fails if checked
-     *      'checkbox2' => false,       // fails if unchecked
-     * ]);
-     * ?>
-     * ```
-     *
-     * @param $formSelector
-     * @param $params
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
-     */
-    public function cantSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInFormFields', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if the array of form parameters (name => value) are not set on the form matched with
-     * the passed selector.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('form[name=myform]', [
-     *      'input1' => 'non-existent value',
-     *      'input2' => 'other non-existent value',
-     * ]);
-     * ?>
-     * ```
-     *
-     * To check that an element hasn't been assigned any one of many values, an array can be passed
-     * as the value:
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('.form-class', [
-     *      'fieldName' => [
-     *          'This value shouldn\'t be set',
-     *          'And this value shouldn\'t be set',
-     *      ],
-     * ]);
-     * ?>
-     * ```
-     *
-     * Additionally, checkbox values can be checked with a boolean.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeInFormFields('#form-id', [
-     *      'checkbox1' => true,        // fails if checked
-     *      'checkbox2' => false,       // fails if unchecked
-     * ]);
-     * ?>
-     * ```
-     *
-     * @param $formSelector
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInFormFields()
-     */
-    public function dontSeeInFormFields($formSelector, $params) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInFormFields', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Submits the given form on the page, optionally with the given form
-     * values.  Pass the form field's values as an array in the second
-     * parameter.
-     *
-     * Although this function can be used as a short-hand version of
-     * `fillField()`, `selectOption()`, `click()` etc. it has some important
-     * differences:
-     *
-     *  * Only field *names* may be used, not CSS/XPath selectors nor field labels
-     *  * If a field is sent to this function that does *not* exist on the page,
-     *    it will silently be added to the HTTP request.  This is helpful for testing
-     *    some types of forms, but be aware that you will *not* get an exception
-     *    like you would if you called `fillField()` or `selectOption()` with
-     *    a missing field.
-     *
-     * Fields that are not provided will be filled by their values from the page,
-     * or from any previous calls to `fillField()`, `selectOption()` etc.
-     * You don't need to click the 'Submit' button afterwards.
-     * This command itself triggers the request to form's action.
-     *
-     * You can optionally specify which button's value to include
-     * in the request with the last parameter (as an alternative to
-     * explicitly setting its value in the second parameter), as
-     * button values are not otherwise included in the request.
-     *
-     * Examples:
-     *
-     * ``` php
-     * <?php
-     * $I->submitForm('#login', [
-     *     'login' => 'davert',
-     *     'password' => '123456'
-     * ]);
-     * // or
-     * $I->submitForm('#login', [
-     *     'login' => 'davert',
-     *     'password' => '123456'
-     * ], 'submitButtonName');
-     *
-     * ```
-     *
-     * For example, given this sample "Sign Up" form:
-     *
-     * ``` html
-     * <form action="http://github.com/sign_up">
-     *     Login:
-     *     <input type="text" name="user[login]" /><br/>
-     *     Password:
-     *     <input type="password" name="user[password]" /><br/>
-     *     Do you agree to our terms?
-     *     <input type="checkbox" name="user[agree]" /><br/>
-     *     Select pricing plan:
-     *     <select name="plan">
-     *         <option value="1">Free</option>
-     *         <option value="2" selected="selected">Paid</option>
-     *     </select>
-     *     <input type="submit" name="submitButton" value="Submit" />
-     * </form>
-     * ```
-     *
-     * You could write the following to submit it:
-     *
-     * ``` php
-     * <?php
-     * $I->submitForm(
-     *     '#userForm',
-     *     [
-     *         'user' => [
-     *             'login' => 'Davert',
-     *             'password' => '123456',
-     *             'agree' => true
-     *         ]
-     *     ],
-     *     'submitButton'
-     * );
-     * ```
-     * Note that "2" will be the submitted value for the "plan" field, as it is
-     * the selected option.
-     *
-     * You can also emulate a JavaScript submission by not specifying any
-     * buttons in the third parameter to submitForm.
-     *
-     * ```php
-     * <?php
-     * $I->submitForm(
-     *     '#userForm',
-     *     [
-     *         'user' => [
-     *             'login' => 'Davert',
-     *             'password' => '123456',
-     *             'agree' => true
-     *         ]
-     *     ]
-     * );
-     * ```
-     *
-     * This function works well when paired with `seeInFormFields()`
-     * for quickly testing CRUD interfaces and form validation logic.
-     *
-     * ``` php
-     * <?php
-     * $form = [
-     *      'field1' => 'value',
-     *      'field2' => 'another value',
-     *      'checkbox1' => true,
-     *      // ...
-     * ];
-     * $I->submitForm('#my-form', $form, 'submitButton');
-     * // $I->amOnPage('/path/to/form-page') may be needed
-     * $I->seeInFormFields('#my-form', $form);
-     * ```
-     *
-     * Parameter values can be set to arrays for multiple input fields
-     * of the same name, or multi-select combo boxes.  For checkboxes,
-     * you can use either the string value or boolean `true`/`false` which will
-     * be replaced by the checkbox's value in the DOM.
-     *
-     * ``` php
-     * <?php
-     * $I->submitForm('#my-form', [
-     *      'field1' => 'value',
-     *      'checkbox' => [
-     *          'value of first checkbox',
-     *          'value of second checkbox',
-     *      ],
-     *      'otherCheckboxes' => [
-     *          true,
-     *          false,
-     *          false
-     *      ],
-     *      'multiselect' => [
-     *          'first option value',
-     *          'second option value'
-     *      ]
-     * ]);
-     * ```
-     *
-     * Mixing string and boolean values for a checkbox's value is not supported
-     * and may produce unexpected results.
-     *
-     * Field names ending in `[]` must be passed without the trailing square
-     * bracket characters, and must contain an array for its value.  This allows
-     * submitting multiple values with the same name, consider:
-     *
-     * ```php
-     * <?php
-     * // This will NOT work correctly
-     * $I->submitForm('#my-form', [
-     *     'field[]' => 'value',
-     *     'field[]' => 'another value',  // 'field[]' is already a defined key
-     * ]);
-     * ```
-     *
-     * The solution is to pass an array value:
-     *
-     * ```php
-     * <?php
-     * // This way both values are submitted
-     * $I->submitForm('#my-form', [
-     *     'field' => [
-     *         'value',
-     *         'another value',
-     *     ]
-     * ]);
-     * ```
-     *
-     * @param $selector
-     * @param $params
-     * @param $button
-     * @see \Codeception\Lib\InnerBrowser::submitForm()
-     */
-    public function submitForm($selector, $params, $button = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('submitForm', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Fills a text field or textarea with the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->fillField("//input[@type='text']", "Hello World!");
-     * $I->fillField(['name' => 'email'], 'jon@mail.com');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $value
-     * @see \Codeception\Lib\InnerBrowser::fillField()
-     */
-    public function fillField($field, $value) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('fillField', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Selects an option in a select tag or in radio button group.
-     *
-     * ``` php
-     * <?php
-     * $I->selectOption('form select[name=account]', 'Premium');
-     * $I->selectOption('form input[name=payment]', 'Monthly');
-     * $I->selectOption('//form/select[@name=account]', 'Monthly');
-     * ?>
-     * ```
-     *
-     * Provide an array for the second argument to select multiple options:
-     *
-     * ``` php
-     * <?php
-     * $I->selectOption('Which OS do you use?', array('Windows','Linux'));
-     * ?>
-     * ```
-     *
-     * Or provide an associative array for the second argument to specifically define which selection method should be used:
-     *
-     * ``` php
-     * <?php
-     * $I->selectOption('Which OS do you use?', array('text' => 'Windows')); // Only search by text 'Windows'
-     * $I->selectOption('Which OS do you use?', array('value' => 'windows')); // Only search by value 'windows'
-     * ?>
-     + ```
-     *
-     * @param $select
-     * @param $option
-     * @see \Codeception\Lib\InnerBrowser::selectOption()
-     */
-    public function selectOption($select, $option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('selectOption', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Ticks a checkbox. For radio buttons, use the `selectOption` method instead.
-     *
-     * ``` php
-     * <?php
-     * $I->checkOption('#agree');
-     * ?>
-     * ```
-     *
-     * @param $option
-     * @see \Codeception\Lib\InnerBrowser::checkOption()
-     */
-    public function checkOption($option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('checkOption', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Unticks a checkbox.
-     *
-     * ``` php
-     * <?php
-     * $I->uncheckOption('#notify');
-     * ?>
-     * ```
-     *
-     * @param $option
-     * @see \Codeception\Lib\InnerBrowser::uncheckOption()
-     */
-    public function uncheckOption($option) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('uncheckOption', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Attaches a file relative to the Codeception data directory to the given file upload field.
-     *
-     * ``` php
-     * <?php
-     * // file is stored in 'tests/_data/prices.xls'
-     * $I->attachFile('input[@type="file"]', 'prices.xls');
-     * ?>
-     * ```
-     *
-     * @param $field
-     * @param $filename
-     * @see \Codeception\Lib\InnerBrowser::attachFile()
-     */
-    public function attachFile($field, $filename) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('attachFile', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * If your page triggers an ajax request, you can perform it manually.
-     * This action sends a GET ajax request with specified params.
-     *
-     * See ->sendAjaxPostRequest for examples.
-     *
-     * @param $uri
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::sendAjaxGetRequest()
-     */
-    public function sendAjaxGetRequest($uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxGetRequest', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * If your page triggers an ajax request, you can perform it manually.
-     * This action sends a POST ajax request with specified params.
-     * Additional params can be passed as array.
-     *
-     * Example:
-     *
-     * Imagine that by clicking checkbox you trigger ajax request which updates user settings.
-     * We emulate that click by running this ajax request manually.
-     *
-     * ``` php
-     * <?php
-     * $I->sendAjaxPostRequest('/updateSettings', array('notifications' => true)); // POST
-     * $I->sendAjaxGetRequest('/updateSettings', array('notifications' => true)); // GET
-     *
-     * ```
-     *
-     * @param $uri
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::sendAjaxPostRequest()
-     */
-    public function sendAjaxPostRequest($uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxPostRequest', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * If your page triggers an ajax request, you can perform it manually.
-     * This action sends an ajax request with specified method and params.
-     *
-     * Example:
-     *
-     * You need to perform an ajax request specifying the HTTP method.
-     *
-     * ``` php
-     * <?php
-     * $I->sendAjaxRequest('PUT', '/posts/7', array('title' => 'new title'));
-     *
-     * ```
-     *
-     * @param $method
-     * @param $uri
-     * @param $params
-     * @see \Codeception\Lib\InnerBrowser::sendAjaxRequest()
-     */
-    public function sendAjaxRequest($method, $uri, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('sendAjaxRequest', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Finds and returns the text contents of the given element.
-     * If a fuzzy locator is used, the element is found using CSS, XPath,
-     * and by matching the full page source by regular expression.
-     *
-     * ``` php
-     * <?php
-     * $heading = $I->grabTextFrom('h1');
-     * $heading = $I->grabTextFrom('descendant-or-self::h1');
-     * $value = $I->grabTextFrom('~<input value=(.*?)]~sgi'); // match with a regex
-     * ?>
-     * ```
-     *
-     * @param $cssOrXPathOrRegex
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabTextFrom()
-     */
-    public function grabTextFrom($cssOrXPathOrRegex) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabTextFrom', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Grabs the value of the given attribute value from the given element.
-     * Fails if element is not found.
-     *
-     * ``` php
-     * <?php
-     * $I->grabAttributeFrom('#tooltip', 'title');
-     * ?>
-     * ```
-     *
-     *
-     * @param $cssOrXpath
-     * @param $attribute
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabAttributeFrom()
-     */
-    public function grabAttributeFrom($cssOrXpath, $attribute) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabAttributeFrom', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Grabs either the text content, or attribute values, of nodes
-     * matched by $cssOrXpath and returns them as an array.
-     *
-     * ```html
-     * <a href="#first">First</a>
-     * <a href="#second">Second</a>
-     * <a href="#third">Third</a>
-     * ```
-     *
-     * ```php
-     * <?php
-     * // would return ['First', 'Second', 'Third']
-     * $aLinkText = $I->grabMultiple('a');
-     *
-     * // would return ['#first', '#second', '#third']
-     * $aLinks = $I->grabMultiple('a', 'href');
-     * ?>
-     * ```
-     *
-     * @param $cssOrXpath
-     * @param $attribute
-     * @return string[]
-     * @see \Codeception\Lib\InnerBrowser::grabMultiple()
-     */
-    public function grabMultiple($cssOrXpath, $attribute = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabMultiple', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $field
-     *
-     * @return array|mixed|null|string
-     * @see \Codeception\Lib\InnerBrowser::grabValueFrom()
-     */
-    public function grabValueFrom($field) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabValueFrom', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Sets a cookie with the given name and value.
-     * You can set additional cookie params like `domain`, `path`, `expires`, `secure` in array passed as last argument.
-     *
-     * ``` php
-     * <?php
-     * $I->setCookie('PHPSESSID', 'el4ukv0kqbvoirg7nkp4dncpk3');
-     * ?>
-     * ```
-     *
-     * @param $name
-     * @param $val
-     * @param array $params
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::setCookie()
-     */
-    public function setCookie($name, $val, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('setCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Grabs a cookie value.
-     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::grabCookie()
-     */
-    public function grabCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that a cookie with the given name is set.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCookie('PHPSESSID');
-     * ?>
-     * ```
-     *
-     * @param $cookie
-     * @param array $params
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeCookie()
-     */
-    public function canSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeCookie', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that a cookie with the given name is set.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * ``` php
-     * <?php
-     * $I->seeCookie('PHPSESSID');
-     * ?>
-     * ```
-     *
-     * @param $cookie
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::seeCookie()
-     */
-    public function seeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there isn't a cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
-     */
-    public function cantSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeCookie', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there isn't a cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` as array passed in last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::dontSeeCookie()
-     */
-    public function dontSeeCookie($cookie, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Unsets cookie with the given name.
-     * You can set additional cookie params like `domain`, `path` in array passed as last argument.
-     *
-     * @param $cookie
-     *
-     * @param array $params
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::resetCookie()
-     */
-    public function resetCookie($name, $params = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('resetCookie', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element exists on the page and is visible.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->seeElement('.error');
-     * $I->seeElement('//form/input[1]');
-     * $I->seeElement('input', ['name' => 'login']);
-     * $I->seeElement('input', ['value' => '123456']);
-     *
-     * // strict locator in first arg, attributes in second
-     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * @return
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeElement()
-     */
-    public function canSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeElement', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element exists on the page and is visible.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->seeElement('.error');
-     * $I->seeElement('//form/input[1]');
-     * $I->seeElement('input', ['name' => 'login']);
-     * $I->seeElement('input', ['value' => '123456']);
-     *
-     * // strict locator in first arg, attributes in second
-     * $I->seeElement(['css' => 'form input'], ['name' => 'login']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * @return
-     * @see \Codeception\Lib\InnerBrowser::seeElement()
-     */
-    public function seeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeElement', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element is invisible or not present on the page.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeElement('.error');
-     * $I->dontSeeElement('//form/input[1]');
-     * $I->dontSeeElement('input', ['name' => 'login']);
-     * $I->dontSeeElement('input', ['value' => '123456']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
-     */
-    public function cantSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeElement', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given element is invisible or not present on the page.
-     * You can also specify expected attributes of this element.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeElement('.error');
-     * $I->dontSeeElement('//form/input[1]');
-     * $I->dontSeeElement('input', ['name' => 'login']);
-     * $I->dontSeeElement('input', ['value' => '123456']);
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param array $attributes
-     * @see \Codeception\Lib\InnerBrowser::dontSeeElement()
-     */
-    public function dontSeeElement($selector, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeElement', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there are a certain number of elements matched by the given locator on the page.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumberOfElements('tr', 10);
-     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
-     * ?>
-     * ```
-     * @param $selector
-     * @param mixed $expected :
-     * - string: strict number
-     * - array: range of numbers [0,10]
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
-     */
-    public function canSeeNumberOfElements($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeNumberOfElements', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that there are a certain number of elements matched by the given locator on the page.
-     *
-     * ``` php
-     * <?php
-     * $I->seeNumberOfElements('tr', 10);
-     * $I->seeNumberOfElements('tr', [0,10]); //between 0 and 10 elements
-     * ?>
-     * ```
-     * @param $selector
-     * @param mixed $expected :
-     * - string: strict number
-     * - array: range of numbers [0,10]
-     * @see \Codeception\Lib\InnerBrowser::seeNumberOfElements()
-     */
-    public function seeNumberOfElements($selector, $expected) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeNumberOfElements', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is selected.
-     *
-     * ``` php
-     * <?php
-     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
-     */
-    public function canSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeOptionIsSelected', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is selected.
-     *
-     * ``` php
-     * <?php
-     * $I->seeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::seeOptionIsSelected()
-     */
-    public function seeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeOptionIsSelected', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is not selected.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
-     */
-    public function cantSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeOptionIsSelected', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the given option is not selected.
-     *
-     * ``` php
-     * <?php
-     * $I->dontSeeOptionIsSelected('#form input[name=payment]', 'Visa');
-     * ?>
-     * ```
-     *
-     * @param $selector
-     * @param $optionText
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::dontSeeOptionIsSelected()
-     */
-    public function dontSeeOptionIsSelected($selector, $optionText) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeOptionIsSelected', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that current page has 404 response status code.
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
-     */
-    public function canSeePageNotFound() {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seePageNotFound', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Asserts that current page has 404 response status code.
-     * @see \Codeception\Lib\InnerBrowser::seePageNotFound()
-     */
-    public function seePageNotFound() {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seePageNotFound', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that response code is equal to value provided.
-     *
-     * ```php
-     * <?php
-     * $I->seeResponseCodeIs(200);
-     *
-     * // recommended \Codeception\Util\HttpCode
-     * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
-     * ```
-     *
-     * @param $code
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
-     */
-    public function canSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeResponseCodeIs', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that response code is equal to value provided.
-     *
-     * ```php
-     * <?php
-     * $I->seeResponseCodeIs(200);
-     *
-     * // recommended \Codeception\Util\HttpCode
-     * $I->seeResponseCodeIs(\Codeception\Util\HttpCode::OK);
-     * ```
-     *
-     * @param $code
-     * @see \Codeception\Lib\InnerBrowser::seeResponseCodeIs()
-     */
-    public function seeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeResponseCodeIs', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that response code is equal to value provided.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeResponseCodeIs(200);
-     *
-     * // recommended \Codeception\Util\HttpCode
-     * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
-     * ```
-     * @param $code
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
-     */
-    public function cantSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeResponseCodeIs', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that response code is equal to value provided.
-     *
-     * ```php
-     * <?php
-     * $I->dontSeeResponseCodeIs(200);
-     *
-     * // recommended \Codeception\Util\HttpCode
-     * $I->dontSeeResponseCodeIs(\Codeception\Util\HttpCode::OK);
-     * ```
-     * @param $code
-     * @see \Codeception\Lib\InnerBrowser::dontSeeResponseCodeIs()
-     */
-    public function dontSeeResponseCodeIs($code) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeResponseCodeIs', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title contains the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInTitle('Blog - Post #1');
-     * ?>
-     * ```
-     *
-     * @param $title
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::seeInTitle()
-     */
-    public function canSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeInTitle', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title contains the given string.
-     *
-     * ``` php
-     * <?php
-     * $I->seeInTitle('Blog - Post #1');
-     * ?>
-     * ```
-     *
-     * @param $title
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::seeInTitle()
-     */
-    public function seeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeInTitle', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title does not contain the given string.
-     *
-     * @param $title
-     *
-     * @return mixed
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
-     */
-    public function cantSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeInTitle', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that the page title does not contain the given string.
-     *
-     * @param $title
-     *
-     * @return mixed
-     * @see \Codeception\Lib\InnerBrowser::dontSeeInTitle()
-     */
-    public function dontSeeInTitle($title) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeInTitle', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Switch to iframe or frame on the page.
-     *
-     * Example:
-     * ``` html
-     * <iframe name="another_frame" src="http://example.com/">
-     * ```
-     *
-     * ``` php
-     * <?php
-     * # switch to iframe
-     * $I->switchToIframe("another_frame");
-     * ```
-     *
-     * @param string $name
-     * @see \Codeception\Lib\InnerBrowser::switchToIframe()
-     */
-    public function switchToIframe($name) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('switchToIframe', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Moves back in history.
-     *
-     * @param int $numberOfSteps (default value 1)
-     * @see \Codeception\Lib\InnerBrowser::moveBack()
-     */
-    public function moveBack($numberOfSteps = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('moveBack', func_get_args()));
-    }
-}
diff --git a/tests/_support/_generated/UnitTesterActions.php b/tests/_support/_generated/UnitTesterActions.php
deleted file mode 100644
index 415c30b7e..000000000
--- a/tests/_support/_generated/UnitTesterActions.php
+++ /dev/null
@@ -1,576 +0,0 @@
-<?php  //[STAMP] 511934dbe87dbbd3a10594f1137bfa92
-namespace _generated;
-
-// This class was automatically generated by build task
-// You should not change it manually as it will be overwritten on next build
-// @codingStandardsIgnoreFile
-
-use Codeception\Module\Asserts;
-use Codeception\Module\Yii2;
-
-trait UnitTesterActions
-{
-    /**
-     * @return \Codeception\Scenario
-     */
-    abstract protected function getScenario();
-
-    
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that two variables are equal.
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertEquals()
-     */
-    public function assertEquals($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that two variables are not equal
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotEquals()
-     */
-    public function assertNotEquals($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that two variables are same
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @return mixed|void
-     * @see \Codeception\Module\Asserts::assertSame()
-     */
-    public function assertSame($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertSame', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that two variables are not same
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotSame()
-     */
-    public function assertNotSame($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotSame', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that actual is greater than expected
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertGreaterThan()
-     */
-    public function assertGreaterThan($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThan', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that actual is greater or equal than expected
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertGreaterThanOrEqual()
-     */
-    public function assertGreaterThanOrEqual($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterThanOrEqual', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that actual is less than expected
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertLessThan()
-     */
-    public function assertLessThan($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThan', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that actual is less or equal than expected
-     *
-     * @param        $expected
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertLessThanOrEqual()
-     */
-    public function assertLessThanOrEqual($expected, $actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessThanOrEqual', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that haystack contains needle
-     *
-     * @param        $needle
-     * @param        $haystack
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertContains()
-     */
-    public function assertContains($needle, $haystack, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertContains', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that haystack doesn't contain needle.
-     *
-     * @param        $needle
-     * @param        $haystack
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotContains()
-     */
-    public function assertNotContains($needle, $haystack, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotContains', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that string match with pattern
-     *
-     * @param string $pattern
-     * @param string $string
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertRegExp()
-     */
-    public function assertRegExp($pattern, $string, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertRegExp', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that string not match with pattern
-     *
-     * @param string $pattern
-     * @param string $string
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotRegExp()
-     */
-    public function assertNotRegExp($pattern, $string, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotRegExp', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is empty.
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertEmpty()
-     */
-    public function assertEmpty($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertEmpty', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is not empty.
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotEmpty()
-     */
-    public function assertNotEmpty($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotEmpty', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is NULL
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNull()
-     */
-    public function assertNull($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNull', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that variable is not NULL
-     *
-     * @param        $actual
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertNotNull()
-     */
-    public function assertNotNull($actual, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotNull', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that condition is positive.
-     *
-     * @param        $condition
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertTrue()
-     */
-    public function assertTrue($condition, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertTrue', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that condition is negative.
-     *
-     * @param        $condition
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertFalse()
-     */
-    public function assertFalse($condition, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFalse', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if file exists
-     *
-     * @param string $filename
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertFileExists()
-     */
-    public function assertFileExists($filename, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileExists', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks if file doesn't exist
-     *
-     * @param string $filename
-     * @param string $message
-     * @see \Codeception\Module\Asserts::assertFileNotExists()
-     */
-    public function assertFileNotExists($filename, $message = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertFileNotExists', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $expected
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertGreaterOrEquals()
-     */
-    public function assertGreaterOrEquals($expected, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertGreaterOrEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $expected
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertLessOrEquals()
-     */
-    public function assertLessOrEquals($expected, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertLessOrEquals', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertIsEmpty()
-     */
-    public function assertIsEmpty($actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertIsEmpty', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $key
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertArrayHasKey()
-     */
-    public function assertArrayHasKey($key, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayHasKey', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $key
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertArrayNotHasKey()
-     */
-    public function assertArrayNotHasKey($key, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertArrayNotHasKey', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $class
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertInstanceOf()
-     */
-    public function assertInstanceOf($class, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInstanceOf', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $class
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertNotInstanceOf()
-     */
-    public function assertNotInstanceOf($class, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertNotInstanceOf', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * @param $type
-     * @param $actual
-     * @param $description
-     * @see \Codeception\Module\Asserts::assertInternalType()
-     */
-    public function assertInternalType($type, $actual, $description = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('assertInternalType', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Fails the test with message.
-     *
-     * @param $message
-     * @see \Codeception\Module\Asserts::fail()
-     */
-    public function fail($message) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('fail', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Handles and checks exception called inside callback function.
-     * Either exception class name or exception instance should be provided.
-     *
-     * ```php
-     * <?php
-     * $I->expectException(MyException::class, function() {
-     *     $this->doSomethingBad();
-     * });
-     *
-     * $I->expectException(new MyException(), function() {
-     *     $this->doSomethingBad();
-     * });
-     * ```
-     * If you want to check message or exception code, you can pass them with exception instance:
-     * ```php
-     * <?php
-     * // will check that exception MyException is thrown with "Don't do bad things" message
-     * $I->expectException(new MyException("Don't do bad things"), function() {
-     *     $this->doSomethingBad();
-     * });
-     * ```
-     *
-     * @param $exception string or \Exception
-     * @param $callback
-     * @see \Codeception\Module\Asserts::expectException()
-     */
-    public function expectException($exception, $callback) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('expectException', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Inserts record into the database.
-     *
-     * ``` php
-     * <?php
-     * $user_id = $I->haveRecord('app\models\User', array('name' => 'Davert'));
-     * ?>
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @return mixed
-     * @part orm
-     * @see \Codeception\Module\Yii2::haveRecord()
-     */
-    public function haveRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('haveRecord', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that record exists in database.
-     *
-     * ``` php
-     * $I->seeRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @part orm
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Yii2::seeRecord()
-     */
-    public function canSeeRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('seeRecord', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that record exists in database.
-     *
-     * ``` php
-     * $I->seeRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @part orm
-     * @see \Codeception\Module\Yii2::seeRecord()
-     */
-    public function seeRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('seeRecord', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that record does not exist in database.
-     *
-     * ``` php
-     * $I->dontSeeRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @part orm
-     * Conditional Assertion: Test won't be stopped on fail
-     * @see \Codeception\Module\Yii2::dontSeeRecord()
-     */
-    public function cantSeeRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\ConditionalAssertion('dontSeeRecord', func_get_args()));
-    }
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Checks that record does not exist in database.
-     *
-     * ``` php
-     * $I->dontSeeRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @part orm
-     * @see \Codeception\Module\Yii2::dontSeeRecord()
-     */
-    public function dontSeeRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Assertion('dontSeeRecord', func_get_args()));
-    }
-
- 
-    /**
-     * [!] Method is generated. Documentation taken from corresponding module.
-     *
-     * Retrieves record from database
-     *
-     * ``` php
-     * $category = $I->grabRecord('app\models\User', array('name' => 'davert'));
-     * ```
-     *
-     * @param $model
-     * @param array $attributes
-     * @return mixed
-     * @part orm
-     * @see \Codeception\Module\Yii2::grabRecord()
-     */
-    public function grabRecord($model, $attributes = null) {
-        return $this->getScenario()->runStep(new \Codeception\Step\Action('grabRecord', func_get_args()));
-    }
-}

From 3214a14ebfbf2e1ca6305d44df824d52df10caa3 Mon Sep 17 00:00:00 2001
From: Gintautas Miselis <naktibalda@gmail.com>
Date: Sun, 17 Jul 2016 22:31:32 +0300
Subject: [PATCH 175/390] Added codeception/specify to require-dev (#72)

It was an indirect dependency and #57 made Codeception builds with --prefer-lowest fail: https://travis-ci.org/Codeception/Codeception/jobs/145152589#L1653
---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 4ad378784..3ff332590 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,8 @@
         "yiisoft/yii2-codeception": "*",
         "yiisoft/yii2-debug": "*",
         "yiisoft/yii2-gii": "*",
-        "yiisoft/yii2-faker": "*"
+        "yiisoft/yii2-faker": "*",
+        "codeception/specify": "*"
     },
     "config": {
         "process-timeout": 1800

From 95bd8f4409e4275dbd7e2265d2bf29ea2dc52cad Mon Sep 17 00:00:00 2001
From: Davert <davert.php@resend.cc>
Date: Mon, 18 Jul 2016 20:33:45 +0300
Subject: [PATCH 176/390] added tests for amLoggedIn method

---
 composer.json                      |   1 -
 composer.lock                      | 128 +----------------------------
 tests/_bootstrap.php               |   4 +-
 tests/functional/LoginFormCest.php |  17 ++++
 tests/unit/models/UserTest.php     |   3 +-
 5 files changed, 21 insertions(+), 132 deletions(-)

diff --git a/composer.json b/composer.json
index b97bcd97b..5849d0487 100644
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,6 @@
         "yiisoft/yii2-swiftmailer": "*"
     },
     "require-dev": {
-        "codeception/base": "^2.2.3",
         "codeception/verify": "*",
         "yiisoft/yii2-debug": "*",
         "yiisoft/yii2-gii": "*",
diff --git a/composer.lock b/composer.lock
index ce0248cb8..c0d86f47a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "93894a180950d67c2b9edc7a95038f87",
-    "content-hash": "c8959aaf297f5e79479a01ef1dd73b02",
+    "hash": "5a52c83f9793fadbf22499b59bdb56f9",
+    "content-hash": "865dca284280bd582c54b70ef5cf23a6",
     "packages": [
         {
             "name": "bower-asset/bootstrap",
@@ -622,43 +622,6 @@
                 "bower-asset-main": "dist/typeahead.bundle.js"
             }
         },
-        {
-            "name": "codeception/specify",
-            "version": "0.4.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/Specify.git",
-                "reference": "8efcd017687ebdae9c4d95bcbc1dc22a28561874"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Specify/zipball/8efcd017687ebdae9c4d95bcbc1dc22a28561874",
-                "reference": "8efcd017687ebdae9c4d95bcbc1dc22a28561874",
-                "shasum": ""
-            },
-            "require": {
-                "myclabs/deep-copy": "~1.1",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "Codeception\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "authors": [
-                {
-                    "name": "Michael Bodnarchuk",
-                    "email": "davert.php@mailican.com"
-                }
-            ],
-            "description": "BDD code blocks for PHPUnit and Codeception",
-            "time": "2015-11-26 23:35:52"
-        },
         {
             "name": "codeception/verify",
             "version": "0.3.0",
@@ -740,48 +703,6 @@
             ],
             "time": "2016-04-29 12:21:54"
         },
-        {
-            "name": "myclabs/deep-copy",
-            "version": "1.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "a8773992b362b58498eed24bf85005f363c34771"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/a8773992b362b58498eed24bf85005f363c34771",
-                "reference": "a8773992b362b58498eed24bf85005f363c34771",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "doctrine/collections": "1.*",
-                "phpunit/phpunit": "~4.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Create deep copies (clones) of your objects",
-            "homepage": "https://github.com/myclabs/DeepCopy",
-            "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
-            ],
-            "time": "2015-11-20 12:04:31"
-        },
         {
             "name": "phpspec/php-diff",
             "version": "v1.1.0",
@@ -820,51 +741,6 @@
             "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).",
             "time": "2016-04-07 12:29:16"
         },
-        {
-            "name": "yiisoft/yii2-codeception",
-            "version": "2.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/yiisoft/yii2-codeception.git",
-                "reference": "c916a36d09fc128b05a374e7922bc56854334d56"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-codeception/zipball/c916a36d09fc128b05a374e7922bc56854334d56",
-                "reference": "c916a36d09fc128b05a374e7922bc56854334d56",
-                "shasum": ""
-            },
-            "require": {
-                "yiisoft/yii2": ">=2.0.4"
-            },
-            "type": "yii2-extension",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "yii\\codeception\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Mark Jebri",
-                    "email": "mark.github@yandex.ru"
-                }
-            ],
-            "description": "The Codeception integration for the Yii framework",
-            "keywords": [
-                "codeception",
-                "yii2"
-            ],
-            "time": "2016-03-17 03:41:26"
-        },
         {
             "name": "yiisoft/yii2-debug",
             "version": "2.0.6",
diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index 6a865905c..969c089b9 100644
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -3,6 +3,4 @@
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 require_once(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
-require __DIR__ .'/../vendor/autoload.php';
-
-\Codeception\Specify\Config::setDeepClone(false);
\ No newline at end of file
+require __DIR__ .'/../vendor/autoload.php';
\ No newline at end of file
diff --git a/tests/functional/LoginFormCest.php b/tests/functional/LoginFormCest.php
index 869925ea4..47b1b0d34 100644
--- a/tests/functional/LoginFormCest.php
+++ b/tests/functional/LoginFormCest.php
@@ -9,6 +9,23 @@ public function _before(\FunctionalTester $I)
     public function openLoginPage(\FunctionalTester $I)
     {
         $I->see('Login', 'h1');
+
+    }
+
+    // demonstrates `amLoggedAs` method
+    public function internalLoginById(\FunctionalTester $I)
+    {
+        $I->amLoggedAs(100);
+        $I->amOnPage('/');
+        $I->see('Logout (admin)');
+    }
+
+    // demonstrates `amLoggedAs` method
+    public function internalLoginBy(\FunctionalTester $I)
+    {
+        $I->amLoggedAs(\app\models\User::findByUsername('admin'));
+        $I->amOnPage('/');
+        $I->see('Logout (admin)');
     }
 
     public function loginWithEmptyCredentials(\FunctionalTester $I)
diff --git a/tests/unit/models/UserTest.php b/tests/unit/models/UserTest.php
index 46dbb44d1..2187ab8ca 100644
--- a/tests/unit/models/UserTest.php
+++ b/tests/unit/models/UserTest.php
@@ -36,8 +36,7 @@ public function testValidateUser($user)
         expect_not($user->validateAuthKey('test102key'));
 
         expect_that($user->validatePassword('admin'));
-        expect_not($user->validatePassword('123456'));
-        
+        expect_not($user->validatePassword('123456'));        
     }
 
 }

From a25a953f8d3cecc0cd9451b628e7a166cf9848bf Mon Sep 17 00:00:00 2001
From: Alexandr <258428@mail.ru>
Date: Tue, 19 Jul 2016 04:54:42 +0700
Subject: [PATCH 177/390] Update contact.php (#74)

---
 views/site/contact.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/site/contact.php b/views/site/contact.php
index b98840918..f4c1e74a2 100644
--- a/views/site/contact.php
+++ b/views/site/contact.php
@@ -49,7 +49,7 @@
 
                     <?= $form->field($model, 'subject') ?>
 
-                    <?= $form->field($model, 'body')->textArea(['rows' => 6]) ?>
+                    <?= $form->field($model, 'body')->textarea(['rows' => 6]) ?>
 
                     <?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [
                         'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',

From b7526436aa29887e66bd690fdcbffbf5ae0fd804 Mon Sep 17 00:00:00 2001
From: Davert <davert.php@resend.cc>
Date: Tue, 19 Jul 2016 03:43:26 +0300
Subject: [PATCH 178/390] added email verification for unit and functional
 tests

---
 tests/acceptance.suite.yml.example    |  1 +
 tests/functional/ContactFormCest.php  |  1 +
 tests/functional/LoginFormCest.php    | 14 +++++------
 tests/unit.suite.yml                  |  2 +-
 tests/unit/models/ContactFormTest.php | 35 +++++++++------------------
 5 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/tests/acceptance.suite.yml.example b/tests/acceptance.suite.yml.example
index 7214034c7..7bb4986fd 100644
--- a/tests/acceptance.suite.yml.example
+++ b/tests/acceptance.suite.yml.example
@@ -7,3 +7,4 @@ modules:
         - Yii2:
             part: orm
             entryScript: index-test.php
+            cleanup: false
diff --git a/tests/functional/ContactFormCest.php b/tests/functional/ContactFormCest.php
index 07ab50390..a87431781 100644
--- a/tests/functional/ContactFormCest.php
+++ b/tests/functional/ContactFormCest.php
@@ -49,6 +49,7 @@ public function submitFormSuccessfully(\FunctionalTester $I)
             'ContactForm[body]'			=>	'test content',
             'ContactForm[verifyCode]'	=>	'testme',
         ]);
+        $I->seeEmailIsSent();
         $I->dontSeeElement('#contact-form');
         $I->see('Thank you for contacting us. We will respond to you as soon as possible.');        
     }
diff --git a/tests/functional/LoginFormCest.php b/tests/functional/LoginFormCest.php
index 47b1b0d34..9ed74b113 100644
--- a/tests/functional/LoginFormCest.php
+++ b/tests/functional/LoginFormCest.php
@@ -3,7 +3,7 @@ class LoginFormCest
 {
     public function _before(\FunctionalTester $I)
     {
-        $I->amOnPage(['site/login']);
+        $I->amOnRoute('site/login');
     }
 
     public function openLoginPage(\FunctionalTester $I)
@@ -12,18 +12,18 @@ public function openLoginPage(\FunctionalTester $I)
 
     }
 
-    // demonstrates `amLoggedAs` method
+    // demonstrates `amLoggedInAs` method
     public function internalLoginById(\FunctionalTester $I)
     {
-        $I->amLoggedAs(100);
+        $I->amLoggedInAs(100);
         $I->amOnPage('/');
         $I->see('Logout (admin)');
     }
 
-    // demonstrates `amLoggedAs` method
-    public function internalLoginBy(\FunctionalTester $I)
+    // demonstrates `amLoggedInAs` method
+    public function internalLoginByInstance(\FunctionalTester $I)
     {
-        $I->amLoggedAs(\app\models\User::findByUsername('admin'));
+        $I->amLoggedInAs(\app\models\User::findByUsername('admin'));
         $I->amOnPage('/');
         $I->see('Logout (admin)');
     }
@@ -36,7 +36,7 @@ public function loginWithEmptyCredentials(\FunctionalTester $I)
         $I->see('Password cannot be blank.');
     }
 
-    public function loginWithWringCredentials(\FunctionalTester $I)
+    public function loginWithWrongCredentials(\FunctionalTester $I)
     {
         $I->submitForm('#login-form', [
             'LoginForm[username]' => 'admin',
diff --git a/tests/unit.suite.yml b/tests/unit.suite.yml
index b944d5c66..b1efaba99 100644
--- a/tests/unit.suite.yml
+++ b/tests/unit.suite.yml
@@ -8,4 +8,4 @@ modules:
     enabled:
       - Asserts
       - Yii2:
-            part: orm
\ No newline at end of file
+            part: [orm, email]
\ No newline at end of file
diff --git a/tests/unit/models/ContactFormTest.php b/tests/unit/models/ContactFormTest.php
index 445b4422a..81a67e9cc 100644
--- a/tests/unit/models/ContactFormTest.php
+++ b/tests/unit/models/ContactFormTest.php
@@ -7,18 +7,10 @@
 class ContactFormTest extends \Codeception\Test\Unit
 {
     private $model;
-
-    protected function _before()
-    {
-        \Yii::$app->mailer->fileTransportCallback = function () {
-            return 'testing_message.eml';
-        };
-    }
-
-    protected function _after()
-    {
-        unlink($this->getMessageFile());
-    }
+    /**
+     * @var \UnitTester
+     */
+    public $tester;
 
     public function testEmailIsSentOnContact()
     {
@@ -39,18 +31,15 @@ public function testEmailIsSentOnContact()
         ];
 
         expect_that($this->model->contact('admin@example.com'));
-        expect_that(file_exists($this->getMessageFile()));
-
-        $emailMessage = file_get_contents($this->getMessageFile());
 
-        expect($emailMessage)->contains($this->model->name);
-        expect($emailMessage)->contains($this->model->email);
-        expect($emailMessage)->contains($this->model->subject);
-        expect($emailMessage)->contains($this->model->body);
-    }
+        // using Yii2 module actions to check email was sent
+        $this->tester->seeEmailIsSent();
 
-    private function getMessageFile()
-    {
-        return \Yii::getAlias(\Yii::$app->mailer->fileTransportPath) . '/testing_message.eml';
+        $emailMessage = $this->tester->grabLastSentEmail();
+        expect('valid email is sent', $emailMessage)->isInstanceOf('yii\mail\MessageInterface');
+        expect($emailMessage->getTo())->hasKey('admin@example.com');
+        expect($emailMessage->getFrom())->hasKey('tester@example.com');
+        expect($emailMessage->getSubject())->equals('very important letter subject');
+        expect($emailMessage->toString())->contains('body of current message');
     }
 }

From 7154b917fdbb0180a0b0dd9b716908a8d3a6087d Mon Sep 17 00:00:00 2001
From: Davert <davert.php@resend.cc>
Date: Mon, 25 Jul 2016 02:20:45 +0300
Subject: [PATCH 179/390] fixed travis config

---
 .travis.yml                    |  6 ------
 composer.lock                  | 20 ++++++++++----------
 tests/acceptance/AboutCest.php |  1 -
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 24b5d54ae..d6f0e673c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,18 +20,12 @@ install:
   - travis_retry composer global require "fxp/composer-asset-plugin:~1.1.1"
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - travis_retry composer install --dev --prefer-dist --no-interaction
-# codeception
-  - travis_retry composer global require "codeception/codeception=2.0.*" "codeception/specify=*" "codeception/verify=*"
 # setup application:
   - |
     sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web.php
-    cd tests
-    codecept build
-    cd ..
 
 script:
   - |
     cd web
     php -S localhost:8080 > /dev/null 2>&1 &
-    cd ../tests
     codecept run
diff --git a/composer.lock b/composer.lock
index c0d86f47a..b79ff2ed9 100644
--- a/composer.lock
+++ b/composer.lock
@@ -257,16 +257,16 @@
         },
         {
             "name": "ezyang/htmlpurifier",
-            "version": "v4.7.0",
+            "version": "v4.8.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "ae1828d955112356f7677c465f94f7deb7d27a40"
+                "reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/ae1828d955112356f7677c465f94f7deb7d27a40",
-                "reference": "ae1828d955112356f7677c465f94f7deb7d27a40",
+                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2",
+                "reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2",
                 "shasum": ""
             },
             "require": {
@@ -297,7 +297,7 @@
             "keywords": [
                 "html"
             ],
-            "time": "2015-08-05 01:03:42"
+            "time": "2016-07-16 12:58:58"
         },
         {
             "name": "swiftmailer/swiftmailer",
@@ -624,16 +624,16 @@
         },
         {
             "name": "codeception/verify",
-            "version": "0.3.0",
+            "version": "0.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Codeception/Verify.git",
-                "reference": "d3721cfc668d96b41acbda3ecd01d3499381db64"
+                "reference": "dc19c8722f3756341e5b0ce0590f09fda1d63719"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Verify/zipball/d3721cfc668d96b41acbda3ecd01d3499381db64",
-                "reference": "d3721cfc668d96b41acbda3ecd01d3499381db64",
+                "url": "https://api.github.com/repos/Codeception/Verify/zipball/dc19c8722f3756341e5b0ce0590f09fda1d63719",
+                "reference": "dc19c8722f3756341e5b0ce0590f09fda1d63719",
                 "shasum": ""
             },
             "require-dev": {
@@ -653,7 +653,7 @@
                 }
             ],
             "description": "BDD assertion library for PHPUnit",
-            "time": "2015-11-26 23:23:25"
+            "time": "2016-07-13 09:34:15"
         },
         {
             "name": "fzaninotto/faker",
diff --git a/tests/acceptance/AboutCest.php b/tests/acceptance/AboutCest.php
index 6f688ec7a..8c1276e27 100644
--- a/tests/acceptance/AboutCest.php
+++ b/tests/acceptance/AboutCest.php
@@ -6,7 +6,6 @@ class AboutCest
     public function ensureThatAboutWorks(AcceptanceTester $I)
     {
         $I->amOnPage(Url::toRoute('/site/about'));
-        $I->pauseExecution();
         $I->see('About', 'h1');
     }
 }

From 3be9b8507dc10cdec5f02eeff10042adeb21ed46 Mon Sep 17 00:00:00 2001
From: Davert <davert.php@resend.cc>
Date: Mon, 25 Jul 2016 02:25:42 +0300
Subject: [PATCH 180/390] added codeception to deps

---
 composer.json |    1 +
 composer.lock | 1948 ++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 1947 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 5849d0487..b97bcd97b 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,7 @@
         "yiisoft/yii2-swiftmailer": "*"
     },
     "require-dev": {
+        "codeception/base": "^2.2.3",
         "codeception/verify": "*",
         "yiisoft/yii2-debug": "*",
         "yiisoft/yii2-gii": "*",
diff --git a/composer.lock b/composer.lock
index b79ff2ed9..234775cad 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "5a52c83f9793fadbf22499b59bdb56f9",
-    "content-hash": "865dca284280bd582c54b70ef5cf23a6",
+    "hash": "7644bd2b505d89d74d1cd66eeb7e3eae",
+    "content-hash": "5c697ff591d2ceab8f7e8b9c72468c54",
     "packages": [
         {
             "name": "bower-asset/bootstrap",
@@ -595,6 +595,64 @@
         }
     ],
     "packages-dev": [
+        {
+            "name": "behat/gherkin",
+            "version": "v4.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Behat/Gherkin.git",
+                "reference": "1576b485c0f92ef6d27da9c4bbfc57ee30cf6911"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/1576b485c0f92ef6d27da9c4bbfc57ee30cf6911",
+                "reference": "1576b485c0f92ef6d27da9c4bbfc57ee30cf6911",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0",
+                "symfony/yaml": "~2.1"
+            },
+            "suggest": {
+                "symfony/yaml": "If you want to parse features, represented in YAML files"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Behat\\Gherkin": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com/"
+                }
+            ],
+            "description": "Gherkin DSL parser for PHP 5.3",
+            "homepage": "http://behat.org/",
+            "keywords": [
+                "BDD",
+                "Behat",
+                "Cucumber",
+                "DSL",
+                "gherkin",
+                "parser"
+            ],
+            "time": "2015-12-30 14:47:00"
+        },
         {
             "name": "bower-asset/typeahead.js",
             "version": "v0.11.1",
@@ -622,6 +680,95 @@
                 "bower-asset-main": "dist/typeahead.bundle.js"
             }
         },
+        {
+            "name": "codeception/base",
+            "version": "2.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Codeception/base.git",
+                "reference": "dd0a5e286b4080f2c5f3db3971e32f26c8ca555d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Codeception/base/zipball/dd0a5e286b4080f2c5f3db3971e32f26c8ca555d",
+                "reference": "dd0a5e286b4080f2c5f3db3971e32f26c8ca555d",
+                "shasum": ""
+            },
+            "require": {
+                "behat/gherkin": "~4.4.0",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "guzzlehttp/psr7": "~1.0",
+                "php": ">=5.4.0 <8.0",
+                "phpunit/php-code-coverage": ">=2.1.3",
+                "phpunit/phpunit": ">4.8.20 <5.5",
+                "sebastian/comparator": "~1.1",
+                "sebastian/diff": "^1.4",
+                "symfony/browser-kit": ">=2.7 <4.0",
+                "symfony/console": ">=2.7 <4.0",
+                "symfony/css-selector": ">=2.7 <4.0",
+                "symfony/dom-crawler": ">=2.7 <4.0",
+                "symfony/event-dispatcher": ">=2.7 <4.0",
+                "symfony/finder": ">=2.7 <4.0",
+                "symfony/yaml": ">=2.7 <4.0"
+            },
+            "require-dev": {
+                "codeception/specify": "~0.3",
+                "facebook/php-sdk-v4": "~5.0",
+                "flow/jsonpath": "~0.2",
+                "league/factory-muffin": "^3.0",
+                "league/factory-muffin-faker": "^1.0",
+                "mongodb/mongodb": "^1.0",
+                "monolog/monolog": "~1.8",
+                "pda/pheanstalk": "~3.0",
+                "php-amqplib/php-amqplib": "~2.4",
+                "predis/predis": "^1.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "suggest": {
+                "codeception/specify": "BDD-style code blocks",
+                "codeception/verify": "BDD-style assertions",
+                "flow/jsonpath": "For using JSONPath in REST module",
+                "league/factory-muffin": "For DataFactory module",
+                "league/factory-muffin-faker": "For Faker support in DataFactory module",
+                "phpseclib/phpseclib": "for SFTP option in FTP Module",
+                "symfony/phpunit-bridge": "For phpunit-bridge support"
+            },
+            "bin": [
+                "codecept"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": []
+            },
+            "autoload": {
+                "psr-4": {
+                    "Codeception\\": "src\\Codeception",
+                    "Codeception\\Extension\\": "ext"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Bodnarchuk",
+                    "email": "davert@mail.ua",
+                    "homepage": "http://codegyre.com/"
+                }
+            ],
+            "description": "BDD-style testing framework",
+            "homepage": "http://codeception.com/",
+            "keywords": [
+                "BDD",
+                "TDD",
+                "acceptance testing",
+                "functional testing",
+                "unit testing"
+            ],
+            "time": "2016-07-24 21:49:39"
+        },
         {
             "name": "codeception/verify",
             "version": "0.3.1",
@@ -655,6 +802,60 @@
             "description": "BDD assertion library for PHPUnit",
             "time": "2016-07-13 09:34:15"
         },
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14 21:17:01"
+        },
         {
             "name": "fzaninotto/faker",
             "version": "v1.6.0",
@@ -703,6 +904,252 @@
             ],
             "time": "2016-04-29 12:21:54"
         },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
+                "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0",
+                "psr/http-message": "~1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                },
+                "files": [
+                    "src/functions_include.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                }
+            ],
+            "description": "PSR-7 message implementation",
+            "keywords": [
+                "http",
+                "message",
+                "stream",
+                "uri"
+            ],
+            "time": "2016-06-24 23:00:38"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.5.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "a8773992b362b58498eed24bf85005f363c34771"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/a8773992b362b58498eed24bf85005f363c34771",
+                "reference": "a8773992b362b58498eed24bf85005f363c34771",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.4.0"
+            },
+            "require-dev": {
+                "doctrine/collections": "1.*",
+                "phpunit/phpunit": "~4.1"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "homepage": "https://github.com/myclabs/DeepCopy",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "time": "2015-11-20 12:04:31"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org/",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2015-12-27 11:43:31"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "9270140b940ff02e58ec577c237274e92cd40cdd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
+                "reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0@dev",
+                "phpdocumentor/type-resolver": "^0.2.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2016-06-10 09:48:41"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443",
+                "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2016-06-10 07:14:17"
+        },
         {
             "name": "phpspec/php-diff",
             "version": "v1.1.0",
@@ -741,6 +1188,1503 @@
             "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).",
             "time": "2016-04-07 12:29:16"
         },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "58a8137754bc24b25740d4281399a4a3596058e0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
+                "reference": "58a8137754bc24b25740d4281399a4a3596058e0",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1",
+                "sebastian/recursion-context": "^1.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com/"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2016-06-07 08:13:47"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "4.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "900370c81280cc0d942ffbc5912d80464eaee7e9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/900370c81280cc0d942ffbc5912d80464eaee7e9",
+                "reference": "900370c81280cc0d942ffbc5912d80464eaee7e9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "^1.4.2",
+                "sebastian/code-unit-reverse-lookup": "~1.0",
+                "sebastian/environment": "^1.3.2",
+                "sebastian/version": "~1.0|~2.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "^5.4"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.4.0",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2016-06-03 05:03:56"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2015-06-21 13:08:43"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21 13:50:34"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4|~5"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2016-05-12 18:03:57"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2015-09-15 10:49:45"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "5.4.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "6c8a756c17a1a92a066c99860eb57922e8b723da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6c8a756c17a1a92a066c99860eb57922e8b723da",
+                "reference": "6c8a756c17a1a92a066c99860eb57922e8b723da",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "myclabs/deep-copy": "~1.3",
+                "php": "^5.6 || ^7.0",
+                "phpspec/prophecy": "^1.3.1",
+                "phpunit/php-code-coverage": "^4.0",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "^1.0.6",
+                "phpunit/phpunit-mock-objects": "^3.2",
+                "sebastian/comparator": "~1.1",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "^1.3 || ^2.0",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/object-enumerator": "~1.0",
+                "sebastian/resource-operations": "~1.0",
+                "sebastian/version": "~1.0|~2.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "conflict": {
+                "phpdocumentor/reflection-docblock": "3.0.2"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2016-07-21 06:55:27"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "3.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "b13d0d9426ced06958bd32104653526a6c998a52"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/b13d0d9426ced06958bd32104653526a6c998a52",
+                "reference": "b13d0d9426ced06958bd32104653526a6c998a52",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.6 || ^7.0",
+                "phpunit/php-text-template": "^1.2",
+                "sebastian/exporter": "^1.2"
+            },
+            "conflict": {
+                "phpunit/phpunit": "<5.4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^5.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2016-06-12 07:37:26"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "time": "2015-05-04 20:22:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
+                "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "time": "2016-02-13 06:45:14"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2015-07-26 15:48:44"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-12-08 07:14:41"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.3.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
+                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-05-17 03:18:57"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2016-06-17 09:04:28"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12 03:26:01"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "d4ca2fb70344987502567bc50081c03e6192fb26"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/d4ca2fb70344987502567bc50081c03e6192fb26",
+                "reference": "d4ca2fb70344987502567bc50081c03e6192fb26",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "time": "2016-01-28 13:25:10"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
+                "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2015-11-11 19:50:13"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "time": "2015-07-28 20:34:47"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5",
+                "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2016-02-04 12:56:52"
+        },
+        {
+            "name": "symfony/browser-kit",
+            "version": "v3.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/browser-kit.git",
+                "reference": "dcf41ed026b0499254385b5c88f03247b2ba010b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/dcf41ed026b0499254385b5c88f03247b2ba010b",
+                "reference": "dcf41ed026b0499254385b5c88f03247b2ba010b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "symfony/dom-crawler": "~2.8|~3.0"
+            },
+            "require-dev": {
+                "symfony/css-selector": "~2.8|~3.0",
+                "symfony/process": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\BrowserKit\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony BrowserKit Component",
+            "homepage": "https://symfony.com/",
+            "time": "2016-06-29 05:41:56"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v3.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "747154aa69b0f83cd02fc9aa554836dee417631a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/747154aa69b0f83cd02fc9aa554836dee417631a",
+                "reference": "747154aa69b0f83cd02fc9aa554836dee417631a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/event-dispatcher": "~2.8|~3.0",
+                "symfony/process": "~2.8|~3.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "https://symfony.com/",
+            "time": "2016-06-29 07:02:31"
+        },
+        {
+            "name": "symfony/css-selector",
+            "version": "v3.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/css-selector.git",
+                "reference": "2851e1932d77ce727776154d659b232d061e816a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/2851e1932d77ce727776154d659b232d061e816a",
+                "reference": "2851e1932d77ce727776154d659b232d061e816a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\CssSelector\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jean-François Simon",
+                    "email": "jeanfrancois.simon@sensiolabs.com"
+                },
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony CssSelector Component",
+            "homepage": "https://symfony.com/",
+            "time": "2016-06-29 05:41:56"
+        },
+        {
+            "name": "symfony/dom-crawler",
+            "version": "v3.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/dom-crawler.git",
+                "reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0",
+                "reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "require-dev": {
+                "symfony/css-selector": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/css-selector": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\DomCrawler\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony DomCrawler Component",
+            "homepage": "https://symfony.com/",
+            "time": "2016-06-29 05:41:56"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v3.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7f9839ede2070f53e7e2f0849b9bd14748c434c5",
+                "reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/config": "~2.8|~3.0",
+                "symfony/dependency-injection": "~2.8|~3.0",
+                "symfony/expression-language": "~2.8|~3.0",
+                "symfony/stopwatch": "~2.8|~3.0"
+            },
+            "suggest": {
+                "symfony/dependency-injection": "",
+                "symfony/http-kernel": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony EventDispatcher Component",
+            "homepage": "https://symfony.com/",
+            "time": "2016-06-29 05:41:56"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v3.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "8201978de88a9fa0923e18601bb17f1df9c721e7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/8201978de88a9fa0923e18601bb17f1df9c721e7",
+                "reference": "8201978de88a9fa0923e18601bb17f1df9c721e7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "https://symfony.com/",
+            "time": "2016-06-29 05:41:56"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "dff51f72b0706335131b00a7f49606168c582594"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
+                "reference": "dff51f72b0706335131b00a7f49606168c582594",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com/",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-05-18 14:26:46"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v3.1.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/2884c26ce4c1d61aebf423a8b912950fe7c764de",
+                "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com/",
+            "time": "2016-06-29 05:41:56"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
+                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2015-08-24 13:29:44"
+        },
         {
             "name": "yiisoft/yii2-debug",
             "version": "2.0.6",

From ec184a572ee60d4c9808391c7fcf4e71e4575696 Mon Sep 17 00:00:00 2001
From: Davert <davert.php@resend.cc>
Date: Mon, 25 Jul 2016 02:38:25 +0300
Subject: [PATCH 181/390] updated travis config

---
 .travis.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d6f0e673c..03f4b5d18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,14 +18,12 @@ cache:
 install:
   - travis_retry composer self-update && composer --version
   - travis_retry composer global require "fxp/composer-asset-plugin:~1.1.1"
-  - export PATH="$HOME/.composer/vendor/bin:$PATH"
-  - travis_retry composer install --dev --prefer-dist --no-interaction
+  - travis_retry composer update --dev --prefer-dist --no-interaction
 # setup application:
   - |
     sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web.php
 
 script:
   - |
-    cd web
-    php -S localhost:8080 > /dev/null 2>&1 &
-    codecept run
+    php -S localhost:8080 -t web > /dev/null 2>&1 &
+    composer exec codecept run
\ No newline at end of file

From d7df546502eb04141b1d32d1e4cb705766da296d Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Mon, 25 Jul 2016 23:41:30 +0300
Subject: [PATCH 182/390] Fixed version constraints, adjusted readme, fixed
 formatting

---
 README.md                            | 32 ++++++++++++++++++----------
 composer.json                        |  6 +++---
 tests/functional/ContactFormCest.php | 20 ++++++++---------
 3 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index 543d87f48..7f813f8ac 100644
--- a/README.md
+++ b/README.md
@@ -106,21 +106,32 @@ return [
 TESTING
 -------
 
-Tests are located in `tests` directory, developed with [Codeception PHP Testing Framework](http://codeception.com/).
-By default there are 3 test suites: `unit`, `functional` and `acceptance`. Tests can be executed by running
+Tests are located in `tests` directory. They are developed with [Codeception PHP Testing Framework](http://codeception.com/).
+By default there are 3 test suites:
+
+- `unit`
+- `functional`
+- `acceptance`
+
+Tests can be executed by running
+
+```
+composer exec codecept run
+``` 
+
+The command above will execute unit and functional tests. Unit tests are testing the system components, while functional
+tests are for testing user interaction. Acceptance tests are disabled by default as they require additional setup since
+they perform testing in real browser. 
 
-   ```
-   composer exec codecept run
-   ``` 
 
-This will execute unit and functional tests. Unit tests are testing the system components, while functional tests are for testing user interaction.
-Acceptance tests are disabled by default as they require additional setup as they perform testing in real browser. 
+### Running  acceptance tests
 
 To execute acceptance tests do the following:  
 
 1. Rename `tests/acceptance.suite.yml.example` to `tests/acceptance.suite.yml` to enable suite configuration
 
-2. Replace `codeception/base` package in `composer.json` with `codeception/codeception` to install full featured version of Codeception.
+2. Replace `codeception/base` package in `composer.json` with `codeception/codeception` to install full featured
+   version of Codeception
 
 3. Update dependencies with Composer 
 
@@ -162,8 +173,7 @@ To execute acceptance tests do the following:
    composer exec codecept run unit,functional
    ```
 
-Code coverage support
----------------------
+### Code coverage support
 
 By default, code coverage is disabled in `codeception.yml` configuration file, you should uncomment needed rows to be able
 to collect code coverage. You can run your tests and collect coverage with the following command:
@@ -179,4 +189,4 @@ composer exec codecept run unit --coverage-html --coverage-xml
 composer exec codecept run functional,unit --coverage-html --coverage-xml
 ```
 
-You can see code coverage output under the `tests/_output` directory.
\ No newline at end of file
+You can see code coverage output under the `tests/_output` directory.
diff --git a/composer.json b/composer.json
index ec9bcb40d..d459e63bb 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": ">=2.0.5",
@@ -21,11 +21,11 @@
     },
     "require-dev": {
         "codeception/base": "^2.2.3",
-        "codeception/verify": "*",
+        "codeception/verify": "~0.3.1",
         "yiisoft/yii2-debug": "*",
         "yiisoft/yii2-gii": "*",
         "yiisoft/yii2-faker": "*",
-        "codeception/specify": "*"
+        "codeception/specify": "~0.4.3"
     },
     "config": {
         "process-timeout": 1800
diff --git a/tests/functional/ContactFormCest.php b/tests/functional/ContactFormCest.php
index a87431781..7f198bf6d 100644
--- a/tests/functional/ContactFormCest.php
+++ b/tests/functional/ContactFormCest.php
@@ -26,11 +26,11 @@ public function submitEmptyForm(\FunctionalTester $I)
     public function submitFormWithIncorrectEmail(\FunctionalTester $I)
     {
         $I->submitForm('#contact-form', [
-            'ContactForm[name]'			=>	'tester',
-            'ContactForm[email]'	    =>	'tester.email',
-            'ContactForm[subject]'		=>	'test subject',
-            'ContactForm[body]'			=>	'test content',
-            'ContactForm[verifyCode]'	=>	'testme',
+            'ContactForm[name]' => 'tester',
+            'ContactForm[email]' => 'tester.email',
+            'ContactForm[subject]' => 'test subject',
+            'ContactForm[body]' => 'test content',
+            'ContactForm[verifyCode]' => 'testme',
         ]);
         $I->expectTo('see that email address is wrong');
         $I->dontSee('Name cannot be blank', '.help-inline');
@@ -43,11 +43,11 @@ public function submitFormWithIncorrectEmail(\FunctionalTester $I)
     public function submitFormSuccessfully(\FunctionalTester $I)
     {
         $I->submitForm('#contact-form', [
-            'ContactForm[name]'			=>	'tester',
-            'ContactForm[email]'	    =>	'tester@example.com',
-            'ContactForm[subject]'		=>	'test subject',
-            'ContactForm[body]'			=>	'test content',
-            'ContactForm[verifyCode]'	=>	'testme',
+            'ContactForm[name]' => 'tester',
+            'ContactForm[email]' => 'tester@example.com',
+            'ContactForm[subject]' => 'test subject',
+            'ContactForm[body]' => 'test content',
+            'ContactForm[verifyCode]' => 'testme',
         ]);
         $I->seeEmailIsSent();
         $I->dontSeeElement('#contact-form');

From 67713f562d344b68f2037695ce082d4178d6e38f Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 26 Jul 2016 16:02:09 +0300
Subject: [PATCH 183/390] Removed composer.lock

---
 composer.lock | 2845 -------------------------------------------------
 1 file changed, 2845 deletions(-)
 delete mode 100644 composer.lock

diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index 234775cad..000000000
--- a/composer.lock
+++ /dev/null
@@ -1,2845 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "hash": "7644bd2b505d89d74d1cd66eeb7e3eae",
-    "content-hash": "5c697ff591d2ceab8f7e8b9c72468c54",
-    "packages": [
-        {
-            "name": "bower-asset/bootstrap",
-            "version": "v3.3.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/twbs/bootstrap.git",
-                "reference": "16b48259a62f576e52c903c476bd42b90ab22482"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/twbs/bootstrap/zipball/16b48259a62f576e52c903c476bd42b90ab22482",
-                "reference": "16b48259a62f576e52c903c476bd42b90ab22482",
-                "shasum": ""
-            },
-            "require": {
-                "bower-asset/jquery": ">=1.9.1"
-            },
-            "type": "bower-asset-library",
-            "extra": {
-                "bower-asset-main": [
-                    "less/bootstrap.less",
-                    "dist/js/bootstrap.js"
-                ],
-                "bower-asset-ignore": [
-                    "/.*",
-                    "_config.yml",
-                    "CNAME",
-                    "composer.json",
-                    "CONTRIBUTING.md",
-                    "docs",
-                    "js/tests",
-                    "test-infra"
-                ]
-            },
-            "license": [
-                "MIT"
-            ],
-            "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
-            "keywords": [
-                "css",
-                "framework",
-                "front-end",
-                "js",
-                "less",
-                "mobile-first",
-                "responsive",
-                "web"
-            ]
-        },
-        {
-            "name": "bower-asset/jquery",
-            "version": "2.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/jquery/jquery-dist.git",
-                "reference": "c0185ab7c75aab88762c5aae780b9d83b80eda72"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/c0185ab7c75aab88762c5aae780b9d83b80eda72",
-                "reference": "c0185ab7c75aab88762c5aae780b9d83b80eda72",
-                "shasum": ""
-            },
-            "type": "bower-asset-library",
-            "extra": {
-                "bower-asset-main": "dist/jquery.js",
-                "bower-asset-ignore": [
-                    "package.json"
-                ]
-            },
-            "license": [
-                "MIT"
-            ],
-            "keywords": [
-                "browser",
-                "javascript",
-                "jquery",
-                "library"
-            ]
-        },
-        {
-            "name": "bower-asset/jquery.inputmask",
-            "version": "3.2.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/RobinHerbots/jquery.inputmask.git",
-                "reference": "5a72c563b502b8e05958a524cdfffafe9987be38"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/RobinHerbots/jquery.inputmask/zipball/5a72c563b502b8e05958a524cdfffafe9987be38",
-                "reference": "5a72c563b502b8e05958a524cdfffafe9987be38",
-                "shasum": ""
-            },
-            "require": {
-                "bower-asset/jquery": ">=1.7"
-            },
-            "type": "bower-asset-library",
-            "extra": {
-                "bower-asset-main": [
-                    "./dist/inputmask/inputmask.js"
-                ],
-                "bower-asset-ignore": [
-                    "**/*",
-                    "!dist/*",
-                    "!dist/inputmask/*",
-                    "!dist/min/*",
-                    "!dist/min/inputmask/*",
-                    "!extra/bindings/*",
-                    "!extra/dependencyLibs/*",
-                    "!extra/phone-codes/*"
-                ]
-            },
-            "license": [
-                "http://opensource.org/licenses/mit-license.php"
-            ],
-            "description": "jquery.inputmask is a jquery plugin which create an input mask.",
-            "keywords": [
-                "form",
-                "input",
-                "inputmask",
-                "jquery",
-                "mask",
-                "plugins"
-            ]
-        },
-        {
-            "name": "bower-asset/punycode",
-            "version": "v1.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/bestiejs/punycode.js.git",
-                "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/bestiejs/punycode.js/zipball/38c8d3131a82567bfef18da09f7f4db68c84f8a3",
-                "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3",
-                "shasum": ""
-            },
-            "type": "bower-asset-library",
-            "extra": {
-                "bower-asset-main": "punycode.js",
-                "bower-asset-ignore": [
-                    "coverage",
-                    "tests",
-                    ".*",
-                    "component.json",
-                    "Gruntfile.js",
-                    "node_modules",
-                    "package.json"
-                ]
-            }
-        },
-        {
-            "name": "bower-asset/yii2-pjax",
-            "version": "v2.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/yiisoft/jquery-pjax.git",
-                "reference": "60728da6ade5879e807a49ce59ef9a72039b8978"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/jquery-pjax/zipball/60728da6ade5879e807a49ce59ef9a72039b8978",
-                "reference": "60728da6ade5879e807a49ce59ef9a72039b8978",
-                "shasum": ""
-            },
-            "require": {
-                "bower-asset/jquery": ">=1.8"
-            },
-            "type": "bower-asset-library",
-            "extra": {
-                "bower-asset-main": "./jquery.pjax.js",
-                "bower-asset-ignore": [
-                    ".travis.yml",
-                    "Gemfile",
-                    "Gemfile.lock",
-                    "CONTRIBUTING.md",
-                    "vendor/",
-                    "script/",
-                    "test/"
-                ]
-            },
-            "license": [
-                "MIT"
-            ]
-        },
-        {
-            "name": "cebe/markdown",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/cebe/markdown.git",
-                "reference": "54a2c49de31cc44e864ebf0500a35ef21d0010b2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/cebe/markdown/zipball/54a2c49de31cc44e864ebf0500a35ef21d0010b2",
-                "reference": "54a2c49de31cc44e864ebf0500a35ef21d0010b2",
-                "shasum": ""
-            },
-            "require": {
-                "lib-pcre": "*",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "cebe/indent": "*",
-                "facebook/xhprof": "*@dev",
-                "phpunit/phpunit": "4.1.*"
-            },
-            "bin": [
-                "bin/markdown"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "cebe\\markdown\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Carsten Brandt",
-                    "email": "mail@cebe.cc",
-                    "homepage": "http://cebe.cc/",
-                    "role": "Creator"
-                }
-            ],
-            "description": "A super fast, highly extensible markdown parser for PHP",
-            "homepage": "https://github.com/cebe/markdown#readme",
-            "keywords": [
-                "extensible",
-                "fast",
-                "gfm",
-                "markdown",
-                "markdown-extra"
-            ],
-            "time": "2015-03-06 05:28:07"
-        },
-        {
-            "name": "ezyang/htmlpurifier",
-            "version": "v4.8.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ezyang/htmlpurifier.git",
-                "reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ezyang/htmlpurifier/zipball/d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2",
-                "reference": "d0c392f77d2f2a3dcf7fcb79e2a1e2b8804e75b2",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-0": {
-                    "HTMLPurifier": "library/"
-                },
-                "files": [
-                    "library/HTMLPurifier.composer.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL"
-            ],
-            "authors": [
-                {
-                    "name": "Edward Z. Yang",
-                    "email": "admin@htmlpurifier.org",
-                    "homepage": "http://ezyang.com/"
-                }
-            ],
-            "description": "Standards compliant HTML filter written in PHP",
-            "homepage": "http://htmlpurifier.org/",
-            "keywords": [
-                "html"
-            ],
-            "time": "2016-07-16 12:58:58"
-        },
-        {
-            "name": "swiftmailer/swiftmailer",
-            "version": "v5.4.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
-                "reference": "4cc92842069c2bbc1f28daaaf1d2576ec4dfe153",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "mockery/mockery": "~0.9.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.4-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "lib/swift_required.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Chris Corbyn"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Swiftmailer, free feature-rich PHP mailer",
-            "homepage": "http://swiftmailer.org/",
-            "keywords": [
-                "email",
-                "mail",
-                "mailer"
-            ],
-            "time": "2016-07-08 11:51:25"
-        },
-        {
-            "name": "yiisoft/yii2",
-            "version": "2.0.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/yiisoft/yii2-framework.git",
-                "reference": "2b75151ea60e1fd820046416eee2e89c3dda1133"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/2b75151ea60e1fd820046416eee2e89c3dda1133",
-                "reference": "2b75151ea60e1fd820046416eee2e89c3dda1133",
-                "shasum": ""
-            },
-            "require": {
-                "bower-asset/jquery": "2.2.*@stable | 2.1.*@stable | 1.11.*@stable | 1.12.*@stable",
-                "bower-asset/jquery.inputmask": "~3.2.2",
-                "bower-asset/punycode": "1.3.*",
-                "bower-asset/yii2-pjax": "~2.0.1",
-                "cebe/markdown": "~1.0.0 | ~1.1.0",
-                "ext-ctype": "*",
-                "ext-mbstring": "*",
-                "ezyang/htmlpurifier": "~4.6",
-                "lib-pcre": "*",
-                "php": ">=5.4.0",
-                "yiisoft/yii2-composer": "~2.0.4"
-            },
-            "bin": [
-                "yii"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "yii\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Qiang Xue",
-                    "email": "qiang.xue@gmail.com",
-                    "homepage": "http://www.yiiframework.com/",
-                    "role": "Founder and project lead"
-                },
-                {
-                    "name": "Alexander Makarov",
-                    "email": "sam@rmcreative.ru",
-                    "homepage": "http://rmcreative.ru/",
-                    "role": "Core framework development"
-                },
-                {
-                    "name": "Maurizio Domba",
-                    "homepage": "http://mdomba.info/",
-                    "role": "Core framework development"
-                },
-                {
-                    "name": "Carsten Brandt",
-                    "email": "mail@cebe.cc",
-                    "homepage": "http://cebe.cc/",
-                    "role": "Core framework development"
-                },
-                {
-                    "name": "Timur Ruziev",
-                    "email": "resurtm@gmail.com",
-                    "homepage": "http://resurtm.com/",
-                    "role": "Core framework development"
-                },
-                {
-                    "name": "Paul Klimov",
-                    "email": "klimov.paul@gmail.com",
-                    "role": "Core framework development"
-                },
-                {
-                    "name": "Dmitry Naumenko",
-                    "email": "d.naumenko.a@gmail.com",
-                    "role": "Core framework development"
-                }
-            ],
-            "description": "Yii PHP Framework Version 2",
-            "homepage": "http://www.yiiframework.com/",
-            "keywords": [
-                "framework",
-                "yii2"
-            ],
-            "time": "2016-07-11 13:36:42"
-        },
-        {
-            "name": "yiisoft/yii2-bootstrap",
-            "version": "2.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/yiisoft/yii2-bootstrap.git",
-                "reference": "3fd2b8c950cce79d60e9702d6bcb24eb3c80f6c5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/3fd2b8c950cce79d60e9702d6bcb24eb3c80f6c5",
-                "reference": "3fd2b8c950cce79d60e9702d6bcb24eb3c80f6c5",
-                "shasum": ""
-            },
-            "require": {
-                "bower-asset/bootstrap": "3.3.* | 3.2.* | 3.1.*",
-                "yiisoft/yii2": ">=2.0.6"
-            },
-            "type": "yii2-extension",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                },
-                "asset-installer-paths": {
-                    "npm-asset-library": "vendor/npm",
-                    "bower-asset-library": "vendor/bower"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "yii\\bootstrap\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Qiang Xue",
-                    "email": "qiang.xue@gmail.com"
-                }
-            ],
-            "description": "The Twitter Bootstrap extension for the Yii framework",
-            "keywords": [
-                "bootstrap",
-                "yii2"
-            ],
-            "time": "2016-03-17 03:29:28"
-        },
-        {
-            "name": "yiisoft/yii2-composer",
-            "version": "2.0.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/yiisoft/yii2-composer.git",
-                "reference": "7452fd908a5023b8bb5ea1b123a174ca080de464"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/7452fd908a5023b8bb5ea1b123a174ca080de464",
-                "reference": "7452fd908a5023b8bb5ea1b123a174ca080de464",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "class": "yii\\composer\\Plugin",
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "yii\\composer\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Qiang Xue",
-                    "email": "qiang.xue@gmail.com"
-                }
-            ],
-            "description": "The composer plugin for Yii extension installer",
-            "keywords": [
-                "composer",
-                "extension installer",
-                "yii2"
-            ],
-            "time": "2016-02-06 00:49:24"
-        },
-        {
-            "name": "yiisoft/yii2-swiftmailer",
-            "version": "2.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/yiisoft/yii2-swiftmailer.git",
-                "reference": "e2c6315caff30a9271a7afad4d684627721dc69a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/e2c6315caff30a9271a7afad4d684627721dc69a",
-                "reference": "e2c6315caff30a9271a7afad4d684627721dc69a",
-                "shasum": ""
-            },
-            "require": {
-                "swiftmailer/swiftmailer": "~5.0",
-                "yiisoft/yii2": ">=2.0.4"
-            },
-            "type": "yii2-extension",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "yii\\swiftmailer\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Paul Klimov",
-                    "email": "klimov.paul@gmail.com"
-                }
-            ],
-            "description": "The SwiftMailer integration for the Yii framework",
-            "keywords": [
-                "email",
-                "mail",
-                "mailer",
-                "swift",
-                "swiftmailer",
-                "yii2"
-            ],
-            "time": "2016-03-17 03:58:49"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "behat/gherkin",
-            "version": "v4.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Behat/Gherkin.git",
-                "reference": "1576b485c0f92ef6d27da9c4bbfc57ee30cf6911"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Behat/Gherkin/zipball/1576b485c0f92ef6d27da9c4bbfc57ee30cf6911",
-                "reference": "1576b485c0f92ef6d27da9c4bbfc57ee30cf6911",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0",
-                "symfony/yaml": "~2.1"
-            },
-            "suggest": {
-                "symfony/yaml": "If you want to parse features, represented in YAML files"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Behat\\Gherkin": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com/"
-                }
-            ],
-            "description": "Gherkin DSL parser for PHP 5.3",
-            "homepage": "http://behat.org/",
-            "keywords": [
-                "BDD",
-                "Behat",
-                "Cucumber",
-                "DSL",
-                "gherkin",
-                "parser"
-            ],
-            "time": "2015-12-30 14:47:00"
-        },
-        {
-            "name": "bower-asset/typeahead.js",
-            "version": "v0.11.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/twitter/typeahead.js.git",
-                "reference": "588440f66559714280628a4f9799f0c4eb880a4a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/twitter/typeahead.js/zipball/588440f66559714280628a4f9799f0c4eb880a4a",
-                "reference": "588440f66559714280628a4f9799f0c4eb880a4a",
-                "shasum": ""
-            },
-            "require": {
-                "bower-asset/jquery": ">=1.7"
-            },
-            "require-dev": {
-                "bower-asset/jasmine-ajax": "~1.3.1",
-                "bower-asset/jasmine-jquery": "~1.5.2",
-                "bower-asset/jquery": "~1.7"
-            },
-            "type": "bower-asset-library",
-            "extra": {
-                "bower-asset-main": "dist/typeahead.bundle.js"
-            }
-        },
-        {
-            "name": "codeception/base",
-            "version": "2.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/base.git",
-                "reference": "dd0a5e286b4080f2c5f3db3971e32f26c8ca555d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/base/zipball/dd0a5e286b4080f2c5f3db3971e32f26c8ca555d",
-                "reference": "dd0a5e286b4080f2c5f3db3971e32f26c8ca555d",
-                "shasum": ""
-            },
-            "require": {
-                "behat/gherkin": "~4.4.0",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "guzzlehttp/psr7": "~1.0",
-                "php": ">=5.4.0 <8.0",
-                "phpunit/php-code-coverage": ">=2.1.3",
-                "phpunit/phpunit": ">4.8.20 <5.5",
-                "sebastian/comparator": "~1.1",
-                "sebastian/diff": "^1.4",
-                "symfony/browser-kit": ">=2.7 <4.0",
-                "symfony/console": ">=2.7 <4.0",
-                "symfony/css-selector": ">=2.7 <4.0",
-                "symfony/dom-crawler": ">=2.7 <4.0",
-                "symfony/event-dispatcher": ">=2.7 <4.0",
-                "symfony/finder": ">=2.7 <4.0",
-                "symfony/yaml": ">=2.7 <4.0"
-            },
-            "require-dev": {
-                "codeception/specify": "~0.3",
-                "facebook/php-sdk-v4": "~5.0",
-                "flow/jsonpath": "~0.2",
-                "league/factory-muffin": "^3.0",
-                "league/factory-muffin-faker": "^1.0",
-                "mongodb/mongodb": "^1.0",
-                "monolog/monolog": "~1.8",
-                "pda/pheanstalk": "~3.0",
-                "php-amqplib/php-amqplib": "~2.4",
-                "predis/predis": "^1.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "suggest": {
-                "codeception/specify": "BDD-style code blocks",
-                "codeception/verify": "BDD-style assertions",
-                "flow/jsonpath": "For using JSONPath in REST module",
-                "league/factory-muffin": "For DataFactory module",
-                "league/factory-muffin-faker": "For Faker support in DataFactory module",
-                "phpseclib/phpseclib": "for SFTP option in FTP Module",
-                "symfony/phpunit-bridge": "For phpunit-bridge support"
-            },
-            "bin": [
-                "codecept"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": []
-            },
-            "autoload": {
-                "psr-4": {
-                    "Codeception\\": "src\\Codeception",
-                    "Codeception\\Extension\\": "ext"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Bodnarchuk",
-                    "email": "davert@mail.ua",
-                    "homepage": "http://codegyre.com/"
-                }
-            ],
-            "description": "BDD-style testing framework",
-            "homepage": "http://codeception.com/",
-            "keywords": [
-                "BDD",
-                "TDD",
-                "acceptance testing",
-                "functional testing",
-                "unit testing"
-            ],
-            "time": "2016-07-24 21:49:39"
-        },
-        {
-            "name": "codeception/verify",
-            "version": "0.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Codeception/Verify.git",
-                "reference": "dc19c8722f3756341e5b0ce0590f09fda1d63719"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Codeception/Verify/zipball/dc19c8722f3756341e5b0ce0590f09fda1d63719",
-                "reference": "dc19c8722f3756341e5b0ce0590f09fda1d63719",
-                "shasum": ""
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/Codeception/function.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "authors": [
-                {
-                    "name": "Michael Bodnarchuk",
-                    "email": "davert.php@mailican.com"
-                }
-            ],
-            "description": "BDD assertion library for PHPUnit",
-            "time": "2016-07-13 09:34:15"
-        },
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2015-06-14 21:17:01"
-        },
-        {
-            "name": "fzaninotto/faker",
-            "version": "v1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/44f9a286a04b80c76a4e5fb7aad8bb539b920123",
-                "reference": "44f9a286a04b80c76a4e5fb7aad8bb539b920123",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3|^7.0"
-            },
-            "require-dev": {
-                "ext-intl": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~1.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": []
-            },
-            "autoload": {
-                "psr-4": {
-                    "Faker\\": "src/Faker/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "François Zaninotto"
-                }
-            ],
-            "description": "Faker is a PHP library that generates fake data for you.",
-            "keywords": [
-                "data",
-                "faker",
-                "fixtures"
-            ],
-            "time": "2016-04-29 12:21:54"
-        },
-        {
-            "name": "guzzlehttp/psr7",
-            "version": "1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/guzzle/psr7.git",
-                "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/psr7/zipball/5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
-                "reference": "5c6447c9df362e8f8093bda8f5d8873fe5c7f65b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0",
-                "psr/http-message": "~1.0"
-            },
-            "provide": {
-                "psr/http-message-implementation": "1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "GuzzleHttp\\Psr7\\": "src/"
-                },
-                "files": [
-                    "src/functions_include.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Dowling",
-                    "email": "mtdowling@gmail.com",
-                    "homepage": "https://github.com/mtdowling"
-                }
-            ],
-            "description": "PSR-7 message implementation",
-            "keywords": [
-                "http",
-                "message",
-                "stream",
-                "uri"
-            ],
-            "time": "2016-06-24 23:00:38"
-        },
-        {
-            "name": "myclabs/deep-copy",
-            "version": "1.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "a8773992b362b58498eed24bf85005f363c34771"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/a8773992b362b58498eed24bf85005f363c34771",
-                "reference": "a8773992b362b58498eed24bf85005f363c34771",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "doctrine/collections": "1.*",
-                "phpunit/phpunit": "~4.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Create deep copies (clones) of your objects",
-            "homepage": "https://github.com/myclabs/DeepCopy",
-            "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
-            ],
-            "time": "2015-11-20 12:04:31"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org/",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2015-12-27 11:43:31"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "9270140b940ff02e58ec577c237274e92cd40cdd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
-                "reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5",
-                "phpdocumentor/reflection-common": "^1.0@dev",
-                "phpdocumentor/type-resolver": "^0.2.0",
-                "webmozart/assert": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^4.4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2016-06-10 09:48:41"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443",
-                "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5",
-                "phpdocumentor/reflection-common": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "time": "2016-06-10 07:14:17"
-        },
-        {
-            "name": "phpspec/php-diff",
-            "version": "v1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/php-diff.git",
-                "reference": "0464787bfa7cd13576c5a1e318709768798bec6a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/php-diff/zipball/0464787bfa7cd13576c5a1e318709768798bec6a",
-                "reference": "0464787bfa7cd13576c5a1e318709768798bec6a",
-                "shasum": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Diff": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Chris Boulton",
-                    "homepage": "http://github.com/chrisboulton"
-                }
-            ],
-            "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).",
-            "time": "2016-04-07 12:29:16"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "58a8137754bc24b25740d4281399a4a3596058e0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
-                "reference": "58a8137754bc24b25740d4281399a4a3596058e0",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
-                "sebastian/comparator": "^1.1",
-                "sebastian/recursion-context": "^1.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com/"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2016-06-07 08:13:47"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "4.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "900370c81280cc0d942ffbc5912d80464eaee7e9"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/900370c81280cc0d942ffbc5912d80464eaee7e9",
-                "reference": "900370c81280cc0d942ffbc5912d80464eaee7e9",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "^1.4.2",
-                "sebastian/code-unit-reverse-lookup": "~1.0",
-                "sebastian/environment": "^1.3.2",
-                "sebastian/version": "~1.0|~2.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "^5.4"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.4.0",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2016-06-03 05:03:56"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
-                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2015-06-21 13:08:43"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21 13:50:34"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4|~5"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2016-05-12 18:03:57"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.4.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
-                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2015-09-15 10:49:45"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "5.4.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "6c8a756c17a1a92a066c99860eb57922e8b723da"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6c8a756c17a1a92a066c99860eb57922e8b723da",
-                "reference": "6c8a756c17a1a92a066c99860eb57922e8b723da",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "myclabs/deep-copy": "~1.3",
-                "php": "^5.6 || ^7.0",
-                "phpspec/prophecy": "^1.3.1",
-                "phpunit/php-code-coverage": "^4.0",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "^3.2",
-                "sebastian/comparator": "~1.1",
-                "sebastian/diff": "~1.2",
-                "sebastian/environment": "^1.3 || ^2.0",
-                "sebastian/exporter": "~1.2",
-                "sebastian/global-state": "~1.0",
-                "sebastian/object-enumerator": "~1.0",
-                "sebastian/resource-operations": "~1.0",
-                "sebastian/version": "~1.0|~2.0",
-                "symfony/yaml": "~2.1|~3.0"
-            },
-            "conflict": {
-                "phpdocumentor/reflection-docblock": "3.0.2"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2016-07-21 06:55:27"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "3.2.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "b13d0d9426ced06958bd32104653526a6c998a52"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/b13d0d9426ced06958bd32104653526a6c998a52",
-                "reference": "b13d0d9426ced06958bd32104653526a6c998a52",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.6 || ^7.0",
-                "phpunit/php-text-template": "^1.2",
-                "sebastian/exporter": "^1.2"
-            },
-            "conflict": {
-                "phpunit/phpunit": "<5.4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2016-06-12 07:37:26"
-        },
-        {
-            "name": "psr/http-message",
-            "version": "1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
-                "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP messages",
-            "keywords": [
-                "http",
-                "http-message",
-                "psr",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "time": "2015-05-04 20:22:00"
-        },
-        {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
-                "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2016-02-13 06:45:14"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
-                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2015-07-26 15:48:44"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.4.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2015-12-08 07:14:41"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "1.3.7",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
-                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2016-05-17 03:18:57"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2016-06-17 09:04:28"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2015-10-12 03:26:01"
-        },
-        {
-            "name": "sebastian/object-enumerator",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "d4ca2fb70344987502567bc50081c03e6192fb26"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/d4ca2fb70344987502567bc50081c03e6192fb26",
-                "reference": "d4ca2fb70344987502567bc50081c03e6192fb26",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2016-01-28 13:25:10"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
-                "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-11-11 19:50:13"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2015-07-28 20:34:47"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5",
-                "reference": "c829badbd8fdf16a0bad8aa7fa7971c029f1b9c5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-02-04 12:56:52"
-        },
-        {
-            "name": "symfony/browser-kit",
-            "version": "v3.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/browser-kit.git",
-                "reference": "dcf41ed026b0499254385b5c88f03247b2ba010b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/browser-kit/zipball/dcf41ed026b0499254385b5c88f03247b2ba010b",
-                "reference": "dcf41ed026b0499254385b5c88f03247b2ba010b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "symfony/dom-crawler": "~2.8|~3.0"
-            },
-            "require-dev": {
-                "symfony/css-selector": "~2.8|~3.0",
-                "symfony/process": "~2.8|~3.0"
-            },
-            "suggest": {
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\BrowserKit\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony BrowserKit Component",
-            "homepage": "https://symfony.com/",
-            "time": "2016-06-29 05:41:56"
-        },
-        {
-            "name": "symfony/console",
-            "version": "v3.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/console.git",
-                "reference": "747154aa69b0f83cd02fc9aa554836dee417631a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/747154aa69b0f83cd02fc9aa554836dee417631a",
-                "reference": "747154aa69b0f83cd02fc9aa554836dee417631a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/event-dispatcher": "~2.8|~3.0",
-                "symfony/process": "~2.8|~3.0"
-            },
-            "suggest": {
-                "psr/log": "For using the console logger",
-                "symfony/event-dispatcher": "",
-                "symfony/process": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Console\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Console Component",
-            "homepage": "https://symfony.com/",
-            "time": "2016-06-29 07:02:31"
-        },
-        {
-            "name": "symfony/css-selector",
-            "version": "v3.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/css-selector.git",
-                "reference": "2851e1932d77ce727776154d659b232d061e816a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/2851e1932d77ce727776154d659b232d061e816a",
-                "reference": "2851e1932d77ce727776154d659b232d061e816a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\CssSelector\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jean-François Simon",
-                    "email": "jeanfrancois.simon@sensiolabs.com"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony CssSelector Component",
-            "homepage": "https://symfony.com/",
-            "time": "2016-06-29 05:41:56"
-        },
-        {
-            "name": "symfony/dom-crawler",
-            "version": "v3.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/dom-crawler.git",
-                "reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0",
-                "reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "symfony/css-selector": "~2.8|~3.0"
-            },
-            "suggest": {
-                "symfony/css-selector": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\DomCrawler\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony DomCrawler Component",
-            "homepage": "https://symfony.com/",
-            "time": "2016-06-29 05:41:56"
-        },
-        {
-            "name": "symfony/event-dispatcher",
-            "version": "v3.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7f9839ede2070f53e7e2f0849b9bd14748c434c5",
-                "reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "require-dev": {
-                "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/dependency-injection": "~2.8|~3.0",
-                "symfony/expression-language": "~2.8|~3.0",
-                "symfony/stopwatch": "~2.8|~3.0"
-            },
-            "suggest": {
-                "symfony/dependency-injection": "",
-                "symfony/http-kernel": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\EventDispatcher\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony EventDispatcher Component",
-            "homepage": "https://symfony.com/",
-            "time": "2016-06-29 05:41:56"
-        },
-        {
-            "name": "symfony/finder",
-            "version": "v3.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/finder.git",
-                "reference": "8201978de88a9fa0923e18601bb17f1df9c721e7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/8201978de88a9fa0923e18601bb17f1df9c721e7",
-                "reference": "8201978de88a9fa0923e18601bb17f1df9c721e7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Finder\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Finder Component",
-            "homepage": "https://symfony.com/",
-            "time": "2016-06-29 05:41:56"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "dff51f72b0706335131b00a7f49606168c582594"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
-                "reference": "dff51f72b0706335131b00a7f49606168c582594",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com/",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2016-05-18 14:26:46"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v3.1.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/2884c26ce4c1d61aebf423a8b912950fe7c764de",
-                "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com/",
-            "time": "2016-06-29 05:41:56"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
-                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "time": "2015-08-24 13:29:44"
-        },
-        {
-            "name": "yiisoft/yii2-debug",
-            "version": "2.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/yiisoft/yii2-debug.git",
-                "reference": "55ed2e853ed8050a34415f63a4da84f88a56f895"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/55ed2e853ed8050a34415f63a4da84f88a56f895",
-                "reference": "55ed2e853ed8050a34415f63a4da84f88a56f895",
-                "shasum": ""
-            },
-            "require": {
-                "yiisoft/yii2": ">=2.0.4",
-                "yiisoft/yii2-bootstrap": "*"
-            },
-            "type": "yii2-extension",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "yii\\debug\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Qiang Xue",
-                    "email": "qiang.xue@gmail.com"
-                }
-            ],
-            "description": "The debugger extension for the Yii framework",
-            "keywords": [
-                "debug",
-                "debugger",
-                "yii2"
-            ],
-            "time": "2016-03-17 03:50:19"
-        },
-        {
-            "name": "yiisoft/yii2-faker",
-            "version": "2.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/yiisoft/yii2-faker.git",
-                "reference": "b88ca69ee226a3610b2c26c026c3203d7ac50f6c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/b88ca69ee226a3610b2c26c026c3203d7ac50f6c",
-                "reference": "b88ca69ee226a3610b2c26c026c3203d7ac50f6c",
-                "shasum": ""
-            },
-            "require": {
-                "fzaninotto/faker": "*",
-                "yiisoft/yii2": "*"
-            },
-            "type": "yii2-extension",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "yii\\faker\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Mark Jebri",
-                    "email": "mark.github@yandex.ru"
-                }
-            ],
-            "description": "Fixture generator. The Faker integration for the Yii framework.",
-            "keywords": [
-                "Fixture",
-                "faker",
-                "yii2"
-            ],
-            "time": "2015-03-01 06:22:44"
-        },
-        {
-            "name": "yiisoft/yii2-gii",
-            "version": "2.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/yiisoft/yii2-gii.git",
-                "reference": "1bd6df6804ca077ec022587905a0d43eb286f507"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/1bd6df6804ca077ec022587905a0d43eb286f507",
-                "reference": "1bd6df6804ca077ec022587905a0d43eb286f507",
-                "shasum": ""
-            },
-            "require": {
-                "bower-asset/typeahead.js": "0.10.* | ~0.11.0",
-                "phpspec/php-diff": ">=1.0.2",
-                "yiisoft/yii2": ">=2.0.4",
-                "yiisoft/yii2-bootstrap": "~2.0"
-            },
-            "type": "yii2-extension",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                },
-                "asset-installer-paths": {
-                    "npm-asset-library": "vendor/npm",
-                    "bower-asset-library": "vendor/bower"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "yii\\gii\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Qiang Xue",
-                    "email": "qiang.xue@gmail.com"
-                }
-            ],
-            "description": "The Gii extension for the Yii framework",
-            "keywords": [
-                "code generator",
-                "gii",
-                "yii2"
-            ],
-            "time": "2016-03-18 14:09:46"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.4.0"
-    },
-    "platform-dev": []
-}

From c0ec50d6a53ba3ed91311438bf306db23dd8dd4a Mon Sep 17 00:00:00 2001
From: Dmitry Kulikov <kulikovdn@gmail.com>
Date: Wed, 27 Jul 2016 09:05:48 +0000
Subject: [PATCH 184/390] Fixed paths in tests/bin/yii. Fixed typo in docs.
 (#76)

---
 README.md     | 2 +-
 tests/bin/yii | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 7f813f8ac..6d1d9ae64 100644
--- a/README.md
+++ b/README.md
@@ -142,7 +142,7 @@ To execute acceptance tests do the following:
 4. Download [Selenium Server](http://www.seleniumhq.org/download/) and launch it:
 
     ```
-    java -jar java -jar ~/selenium-server-standalone-x.xx.x.jar
+    java -jar ~/selenium-server-standalone-x.xx.x.jar
     ``` 
 
 5. (Optional) Create `yii2_basic_tests` database and update it by applying migrations if you have them.
diff --git a/tests/bin/yii b/tests/bin/yii
index d01f526e9..1e4f2cc1d 100755
--- a/tests/bin/yii
+++ b/tests/bin/yii
@@ -11,14 +11,14 @@
 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');
+require(__DIR__ . '/../../vendor/autoload.php');
+require(__DIR__ . '/../../vendor/yiisoft/yii2/Yii.php');
 
 $config = yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/config/console.php'),
+    require(__DIR__ . '/../../config/console.php'),
     [
         'components' => [
-            'db' => require(__DIR__ . '/config/test_db.php')
+            'db' => require(__DIR__ . '/../../config/test_db.php')
         ]
     ]
 );

From 74361f1d718050805c54c2c72ac483611f622d9b Mon Sep 17 00:00:00 2001
From: Igor Romanov <rkit.ru@gmail.com>
Date: Thu, 4 Aug 2016 14:51:06 +0700
Subject: [PATCH 185/390] Fixed command to run coverage in README.md (#79)

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 6d1d9ae64..7c63a81cb 100644
--- a/README.md
+++ b/README.md
@@ -180,13 +180,13 @@ to collect code coverage. You can run your tests and collect coverage with the f
 
 ```
 #collect coverage for all tests
-composer exec codecept run --coverage-html --coverage-xml
+composer exec codecept run -- --coverage-html --coverage-xml
 
 #collect coverage only for unit tests
-composer exec codecept run unit --coverage-html --coverage-xml
+composer exec codecept run unit -- --coverage-html --coverage-xml
 
 #collect coverage for unit and functional tests
-composer exec codecept run functional,unit --coverage-html --coverage-xml
+composer exec codecept run functional,unit -- --coverage-html --coverage-xml
 ```
 
 You can see code coverage output under the `tests/_output` directory.

From a322cdb0a568ab66100abc63dc9d57fa5c17402d Mon Sep 17 00:00:00 2001
From: Michael Bodnarchuk <DavertMik@users.noreply.github.com>
Date: Thu, 4 Aug 2016 14:32:04 +0300
Subject: [PATCH 186/390] Use URL helper in acceptance tests (#80)

Routing should be handled by URL helper
---
 tests/acceptance/HomeCest.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/acceptance/HomeCest.php b/tests/acceptance/HomeCest.php
index c205c2d12..eb7e9fa81 100644
--- a/tests/acceptance/HomeCest.php
+++ b/tests/acceptance/HomeCest.php
@@ -1,10 +1,11 @@
 <?php
+use yii\helpers\Url as Url;
 
 class HomeCest
 {
     public function ensureThatHomePageWorks(AcceptanceTester $I)
     {
-        $I->amOnPage('index.php?r=site%2Findex');        
+        $I->amOnPage(Url::toRoute('/site/index'));        
         $I->see('My Company');
         
         $I->seeLink('About');

From ebfe2aec0ca05aa3e27c85c10f6bb6e7f8c83253 Mon Sep 17 00:00:00 2001
From: Mihai-P <mihai@2ezweb.com.au>
Date: Wed, 10 Aug 2016 08:45:16 +1000
Subject: [PATCH 187/390] Putting the proper paths for codeception code
 coverage (#82)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The tests folder was changed some time ago, however the paths have not been updated. After running the tests with coverage

$ vendor/codeception/base/codecept run functional --coverage-html
Codeception PHP Testing Framework v2.2.3
Powered by PHPUnit 4.8.27 by Sebastian Bergmann and contributors.

Functional Tests (10) -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
✔ ContactFormCest: Open contact page (0.40s)
✔ ContactFormCest: Submit empty form (0.13s)
✔ ContactFormCest: Submit form with incorrect email (0.09s)
✔ ContactFormCest: Submit form successfully (0.30s)
✔ LoginFormCest: Open login page (0.03s)
✔ LoginFormCest: Internal login by id (0.06s)
✔ LoginFormCest: Internal login by instance (0.05s)
✔ LoginFormCest: Login with empty credentials (0.07s)
✔ LoginFormCest: Login with wrong credentials (0.07s)
✔ LoginFormCest: Login successfully (0.07s)
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------


Time: 6.46 seconds, Memory: 34.25MB
OK (10 tests, 23 assertions)

Code Coverage Report:
  2016-08-09 22:21:18

 Summary:
  Classes:        (0/0)
  Methods:        (0/0)
  Lines:          (0/0)

Remote CodeCoverage reports are not printed to console

HTML report generated in coverage.
-----------------------------------------------------------
After putting in the proper path you get
Code Coverage Report:
  2016-08-09 22:26:05

 Summary:
  Classes: 40.00% (2/5)
  Methods: 63.64% (14/22)
  Lines:   76.04% (73/96)

\app\controllers::SiteController
  Methods:  57.14% ( 4/ 7)   Lines:  89.47% ( 34/ 38)
\app\models::ContactForm
  Methods: 100.00% ( 3/ 3)   Lines: 100.00% ( 15/ 15)
\app\models::LoginForm
  Methods: 100.00% ( 4/ 4)   Lines: 100.00% ( 18/ 18)
\app\models::User
  Methods:  42.86% ( 3/ 7)   Lines:  40.00% (  6/ 15)
Remote CodeCoverage reports are not printed to console
---
 codeception.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/codeception.yml b/codeception.yml
index 5ca5f35f9..ccfaeef1b 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -21,16 +21,16 @@ modules:
 #    #remote_config: '../tests/codeception.yml'
 #    whitelist:
 #        include:
-#            - ../models/*
-#            - ../controllers/*
-#            - ../commands/*
-#            - ../mail/*
+#            - models/*
+#            - controllers/*
+#            - commands/*
+#            - mail/*
 #    blacklist:
 #        include:
-#            - ../assets/*
-#            - ../config/*
-#            - ../runtime/*
-#            - ../vendor/*
-#            - ../views/*
-#            - ../web/*
-#            - ../tests/*
+#            - assets/*
+#            - config/*
+#            - runtime/*
+#            - vendor/*
+#            - views/*
+#            - web/*
+#            - tests/*

From 6cdf2bc5a0e5cee14d2407c5853a16268b9d4271 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Mon, 5 Sep 2016 14:47:44 +0200
Subject: [PATCH 188/390] updated version constraint in extension template

avoid unbound constraints

yiisoft/yii2#12154
---
 composer.json | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index d459e63bb..e31abe055 100644
--- a/composer.json
+++ b/composer.json
@@ -15,16 +15,17 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
-        "yiisoft/yii2": ">=2.0.5",
-        "yiisoft/yii2-bootstrap": "*",
-        "yiisoft/yii2-swiftmailer": "*"
+        "yiisoft/yii2": "~2.0.5",
+        "yiisoft/yii2-bootstrap": "~2.0.0",
+        "yiisoft/yii2-swiftmailer": "~2.0.0"
     },
     "require-dev": {
+        "yiisoft/yii2-debug": "~2.0.0",
+        "yiisoft/yii2-gii": "~2.0.0",
+        "yiisoft/yii2-faker": "~2.0.0",
+
         "codeception/base": "^2.2.3",
         "codeception/verify": "~0.3.1",
-        "yiisoft/yii2-debug": "*",
-        "yiisoft/yii2-gii": "*",
-        "yiisoft/yii2-faker": "*",
         "codeception/specify": "~0.4.3"
     },
     "config": {

From 81700ad2b38a2738379a1cb62962ed8ad49ebf1f Mon Sep 17 00:00:00 2001
From: SilverFire - Dmitry Naumenko <d.naumenko.a@gmail.com>
Date: Wed, 7 Sep 2016 12:46:48 +0300
Subject: [PATCH 189/390] Updated fxp/ require version

---
 README.md | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 7c63a81cb..c398b58ff 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,26 @@ The minimum requirement by this project template that your Web server supports P
 INSTALLATION
 ------------
 
+### Install via Composer
+
+If you do not have [Composer](http://getcomposer.org/), you may install it by following the instructions
+at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
+
+You can then install this project template using the following command:
+
+~~~
+php composer.phar global require "fxp/composer-asset-plugin:^1.2.0"
+php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
+~~~
+
+Now you should be able to access the application through the following URL, assuming `basic` is the directory
+directly under the Web root.
+
+~~~
+http://localhost/basic/web/
+~~~
+
+
 ### Install from an Archive File
 
 Extract the archive file downloaded from [yiiframework.com](http://www.yiiframework.com/download/) to
@@ -59,26 +79,6 @@ http://localhost/basic/web/
 ~~~
 
 
-### Install via Composer
-
-If you do not have [Composer](http://getcomposer.org/), you may install it by following the instructions
-at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
-
-You can then install this project template using the following command:
-
-~~~
-php composer.phar global require "fxp/composer-asset-plugin:~1.1.1"
-php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
-~~~
-
-Now you should be able to access the application through the following URL, assuming `basic` is the directory
-directly under the Web root.
-
-~~~
-http://localhost/basic/web/
-~~~
-
-
 CONFIGURATION
 -------------
 

From 2ce52fbcd3cc77b7afe5f9dc41b0e1e81549d4e2 Mon Sep 17 00:00:00 2001
From: Mikhail <mixartemev@gmail.com>
Date: Wed, 28 Sep 2016 18:26:32 +0300
Subject: [PATCH 190/390] Update login.php (#87)

It's more consistent definition
---
 views/site/login.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/site/login.php b/views/site/login.php
index 498f46fce..0944d37e4 100644
--- a/views/site/login.php
+++ b/views/site/login.php
@@ -17,7 +17,7 @@
 
     <?php $form = ActiveForm::begin([
         'id' => 'login-form',
-        'options' => ['class' => 'form-horizontal'],
+        'layout' => 'horizontal',
         'fieldConfig' => [
             'template' => "{label}\n<div class=\"col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
             'labelOptions' => ['class' => 'col-lg-1 control-label'],

From a43b2ff94fce452d1d28f38fd6976ced053d4a27 Mon Sep 17 00:00:00 2001
From: Joel Waldock <joel.c.waldock@gmail.com>
Date: Fri, 14 Oct 2016 11:13:07 +1300
Subject: [PATCH 191/390] Increase logout button size (#89)

---
 views/layouts/main.php |  4 ++--
 web/css/site.css       | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/views/layouts/main.php b/views/layouts/main.php
index 2974d6d89..4d256e45b 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -43,10 +43,10 @@
                 ['label' => 'Login', 'url' => ['/site/login']]
             ) : (
                 '<li>'
-                . Html::beginForm(['/site/logout'], 'post', ['class' => 'navbar-form'])
+                . Html::beginForm(['/site/logout'], 'post')
                 . Html::submitButton(
                     'Logout (' . Yii::$app->user->identity->username . ')',
-                    ['class' => 'btn btn-link']
+                    ['class' => 'btn btn-link logout']
                 )
                 . Html::endForm()
                 . '</li>'
diff --git a/web/css/site.css b/web/css/site.css
index 698be709c..2bfebd275 100644
--- a/web/css/site.css
+++ b/web/css/site.css
@@ -89,3 +89,27 @@ a.desc:after {
     padding: 10px 20px;
     margin: 0 0 15px 0;
 }
+
+/* align the logout "link" (button in form) of the navbar */
+.nav li > form > button.logout {
+    padding: 15px;
+    border: none;
+}
+
+@media(max-width:767px) {
+    .nav li > form > button.logout {
+        display:block;
+        text-align: left;
+        width: 100%;
+        padding: 10px 15px;
+    }
+}
+
+.nav > li > form > button.logout:focus,
+.nav > li > form > button.logout:hover {
+    text-decoration: none;
+}
+
+.nav > li > form > button.logout:focus {
+    outline: none;
+}

From 3971d0bb3a562dcdd3484f542ff42a9faaf9593b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=BB=D0=B8=D1=81=D0=B5=D0=B5=D0=B2=20=D0=94=D0=BC?=
 =?UTF-8?q?=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= <mail@elisdn.ru>
Date: Wed, 19 Oct 2016 16:42:29 +0300
Subject: [PATCH 192/390] Fixed acceptance HomeCest (#91)

---
 tests/acceptance/HomeCest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/acceptance/HomeCest.php b/tests/acceptance/HomeCest.php
index eb7e9fa81..cb8faea71 100644
--- a/tests/acceptance/HomeCest.php
+++ b/tests/acceptance/HomeCest.php
@@ -10,6 +10,7 @@ public function ensureThatHomePageWorks(AcceptanceTester $I)
         
         $I->seeLink('About');
         $I->click('About');
+        $I->wait(2); // wait for page to be opened
         
         $I->see('This is the About page.');
     }

From fd3391bbcdcd59d41de3dabf2aef6926046a0b81 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 20 Oct 2016 14:10:38 +0200
Subject: [PATCH 193/390] release version 2.0.10

---
 composer.json          | 2 +-
 models/ContactForm.php | 2 +-
 models/LoginForm.php   | 2 +-
 models/User.php        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index e31abe055..373673405 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.5",
diff --git a/models/ContactForm.php b/models/ContactForm.php
index 37f48b312..0b13cb05d 100644
--- a/models/ContactForm.php
+++ b/models/ContactForm.php
@@ -45,7 +45,7 @@ public function attributeLabels()
     /**
      * Sends an email to the specified email address using the information collected by this model.
      * @param string $email the target email address
-     * @return boolean whether the model passes validation
+     * @return bool whether the model passes validation
      */
     public function contact($email)
     {
diff --git a/models/LoginForm.php b/models/LoginForm.php
index 7ef5c99b3..cc6af264c 100644
--- a/models/LoginForm.php
+++ b/models/LoginForm.php
@@ -55,7 +55,7 @@ public function validatePassword($attribute, $params)
 
     /**
      * Logs in a user using the provided username and password.
-     * @return boolean whether the user is logged in successfully
+     * @return bool whether the user is logged in successfully
      */
     public function login()
     {
diff --git a/models/User.php b/models/User.php
index 163a64fcd..250fb3962 100644
--- a/models/User.php
+++ b/models/User.php
@@ -95,7 +95,7 @@ public function validateAuthKey($authKey)
      * Validates password
      *
      * @param string $password password to validate
-     * @return boolean if password provided is valid for current user
+     * @return bool if password provided is valid for current user
      */
     public function validatePassword($password)
     {

From 15851900c6768f6b75e5bf333d0e6e2a92a41164 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 20 Oct 2016 14:10:54 +0200
Subject: [PATCH 194/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 373673405..e31abe055 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.5",

From fbb43d45bd474f659598fec8159d1e4f4d984146 Mon Sep 17 00:00:00 2001
From: Gintautas Miselis <naktibalda@gmail.com>
Date: Tue, 1 Nov 2016 17:16:18 +0000
Subject: [PATCH 195/390] Disable Yii2 cleanup in functional test suite (#93)

Because it is on by default since Codeception 2.2.6 and it breaks builds of Codeception
---
 tests/functional.suite.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/functional.suite.yml b/tests/functional.suite.yml
index 374c6df45..976020722 100644
--- a/tests/functional.suite.yml
+++ b/tests/functional.suite.yml
@@ -11,3 +11,4 @@ modules:
     enabled:
       - Filesystem
       - Yii2
+          cleanup: false

From 71b41b80bb25998fec9d976e2ea4b42f7ddbfe58 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 1 Nov 2016 20:38:25 +0300
Subject: [PATCH 196/390] Fixed yaml

---
 tests/functional.suite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/functional.suite.yml b/tests/functional.suite.yml
index 976020722..e3a486701 100644
--- a/tests/functional.suite.yml
+++ b/tests/functional.suite.yml
@@ -10,5 +10,5 @@ class_name: FunctionalTester
 modules:
     enabled:
       - Filesystem
-      - Yii2
+      - Yii2:
           cleanup: false

From 2e12823e83699d8e49c09b3d9dcc44e888b5d2d3 Mon Sep 17 00:00:00 2001
From: Robert Korulczyk <robert@korulczyk.pl>
Date: Tue, 1 Nov 2016 21:03:33 +0100
Subject: [PATCH 197/390] Fix codeception tests (#94)

---
 codeception.yml            | 1 +
 tests/functional.suite.yml | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/codeception.yml b/codeception.yml
index ccfaeef1b..2513bee79 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -12,6 +12,7 @@ modules:
     config:
         Yii2:
             configFile: 'config/test.php'
+            cleanup: false
 
 # To enable code coverage:
 #coverage:
diff --git a/tests/functional.suite.yml b/tests/functional.suite.yml
index e3a486701..374c6df45 100644
--- a/tests/functional.suite.yml
+++ b/tests/functional.suite.yml
@@ -10,5 +10,4 @@ class_name: FunctionalTester
 modules:
     enabled:
       - Filesystem
-      - Yii2:
-          cleanup: false
+      - Yii2

From 679887a98870130084a596b1c5539225b927b5f5 Mon Sep 17 00:00:00 2001
From: Evgeniy Tkachenko <et.coder@gmail.com>
Date: Sat, 12 Nov 2016 16:05:30 +0400
Subject: [PATCH 198/390] To fix create @webroot (#95)

https://github.com/Codeception/Codeception/issues/3706
---
 config/test.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/test.php b/config/test.php
index a23616ee6..a92c2fcde 100644
--- a/config/test.php
+++ b/config/test.php
@@ -14,6 +14,9 @@
         'mailer' => [
             'useFileTransport' => true,
         ],
+        'assetManager' => [            
+            'basePath' => __DIR__ . '/../web/assets',
+        ],
         'urlManager' => [
             'showScriptName' => true,
         ],

From 0527d9edccf09344f9d59e4692a7ead29febcd32 Mon Sep 17 00:00:00 2001
From: MaximAL <almaximal@ya.ru>
Date: Wed, 23 Nov 2016 12:57:10 +0300
Subject: [PATCH 199/390] Fix error in Linux `ln` command: parameters
 rearranged (#97)

---
 requirements.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.php b/requirements.php
index ee3184f72..5d1973268 100644
--- a/requirements.php
+++ b/requirements.php
@@ -7,7 +7,7 @@
  *
  * In order to run this script from the web, you should copy it to the web root.
  * If you are using Linux you can create a hard link instead, using the following command:
- * ln requirements.php ../requirements.php
+ * ln ../requirements.php requirements.php
  */
 
 // you may need to adjust this path to the correct Yii framework path

From b3e97d79406ae1b74dc66acbbf76d516fb8d81a2 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 23 Nov 2016 13:58:17 +0100
Subject: [PATCH 200/390] Update web.php

to include example of 'allowedIps' for gii and debug module.

fixes https://github.com/yiisoft/yii2-debug/pull/30
---
 config/web.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/web.php b/config/web.php
index 90a82876b..2bc8561fb 100644
--- a/config/web.php
+++ b/config/web.php
@@ -55,11 +55,15 @@
     $config['bootstrap'][] = 'debug';
     $config['modules']['debug'] = [
         'class' => 'yii\debug\Module',
+        // uncomment the following to add your IP if you are not connecting from localhost.
+        //'allowedIPs' => ['127.0.0.1', '::1'],
     ];
 
     $config['bootstrap'][] = 'gii';
     $config['modules']['gii'] = [
         'class' => 'yii\gii\Module',
+        // uncomment the following to add your IP if you are not connecting from localhost.
+        //'allowedIPs' => ['127.0.0.1', '::1'],
     ];
 }
 

From 9035c63988b13812abcb5920d986041e361ddf8e Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 1 Feb 2017 11:29:32 +0100
Subject: [PATCH 201/390] do not use `composer exec` for running codeception

it produces weird behavior.

fixes #104
---
 .travis.yml |  2 +-
 README.md   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 03f4b5d18..e7e847ee5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,4 +26,4 @@ install:
 script:
   - |
     php -S localhost:8080 -t web > /dev/null 2>&1 &
-    composer exec codecept run
\ No newline at end of file
+    vendor/bin/codecept run
\ No newline at end of file
diff --git a/README.md b/README.md
index c398b58ff..6f6d0a1da 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,7 @@ By default there are 3 test suites:
 Tests can be executed by running
 
 ```
-composer exec codecept run
+vendor/bin/codecept run
 ``` 
 
 The command above will execute unit and functional tests. Unit tests are testing the system components, while functional
@@ -164,13 +164,13 @@ To execute acceptance tests do the following:
 
    ```
    # run all available tests
-   composer exec codecept run
+   vendor/bin/codecept run
 
    # run acceptance tests
-   composer exec codecept run acceptance
+   vendor/bin/codecept run acceptance
 
    # run only unit and functional tests
-   composer exec codecept run unit,functional
+   vendor/bin/codecept run unit,functional
    ```
 
 ### Code coverage support
@@ -180,13 +180,13 @@ to collect code coverage. You can run your tests and collect coverage with the f
 
 ```
 #collect coverage for all tests
-composer exec codecept run -- --coverage-html --coverage-xml
+vendor/bin/codecept run -- --coverage-html --coverage-xml
 
 #collect coverage only for unit tests
-composer exec codecept run unit -- --coverage-html --coverage-xml
+vendor/bin/codecept run unit -- --coverage-html --coverage-xml
 
 #collect coverage for unit and functional tests
-composer exec codecept run functional,unit -- --coverage-html --coverage-xml
+vendor/bin/codecept run functional,unit -- --coverage-html --coverage-xml
 ```
 
 You can see code coverage output under the `tests/_output` directory.

From 5bb6386a5e421152a16f6afc8e254a5cd7423dee Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 1 Feb 2017 17:55:52 +0100
Subject: [PATCH 202/390] release version 2.0.11

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

diff --git a/composer.json b/composer.json
index e31abe055..373673405 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.5",

From 0453b5afb11b31d91e63341978dafd7183c98c6d Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 1 Feb 2017 17:56:30 +0100
Subject: [PATCH 203/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 373673405..e31abe055 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.5",

From bd7403c65e86ee9f5c59ab6f5ff579464ce22f2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=BB=D0=B8=D1=81=D0=B5=D0=B5=D0=B2=20=D0=94=D0=BC?=
 =?UTF-8?q?=D0=B8=D1=82=D1=80=D0=B8=D0=B9?= <mail@elisdn.ru>
Date: Fri, 3 Feb 2017 01:03:05 +0300
Subject: [PATCH 204/390] Added notes about running tests with Selenium Server
 3.0 [skip ci]

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 6f6d0a1da..3bc44a785 100644
--- a/README.md
+++ b/README.md
@@ -143,7 +143,23 @@ To execute acceptance tests do the following:
 
     ```
     java -jar ~/selenium-server-standalone-x.xx.x.jar
+    ```
+
+    In case of using Selenium Server 3.0 with Firefox browser since v48 or Google Chrome since v53 you must download [GeckoDriver](https://github.com/mozilla/geckodriver/releases) or [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/downloads) and launch Selenium with it:
+
+    ```
+    # for Firefox
+    java -jar -Dwebdriver.gecko.driver=~/geckodriver ~/selenium-server-standalone-3.xx.x.jar
+    
+    # for Google Chrome
+    java -jar -Dwebdriver.chrome.driver=~/chromedriver ~/selenium-server-standalone-3.xx.x.jar
     ``` 
+    
+    As an alternative way you can use already configured Docker container with older versions of Selenium and Firefox:
+    
+    ```
+    docker run --net=host selenium/standalone-firefox:2.53.0
+    ```
 
 5. (Optional) Create `yii2_basic_tests` database and update it by applying migrations if you have them.
 

From 9178b80ab5cf4b5fe9d42b0564183f72d8d82f75 Mon Sep 17 00:00:00 2001
From: Craig London <craig@orlandowebdev.com>
Date: Wed, 8 Mar 2017 18:19:05 -0500
Subject: [PATCH 205/390] Add meta tag for X-UA-Compatible (#111)

---
 views/layouts/main.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/views/layouts/main.php b/views/layouts/main.php
index 4d256e45b..d0e3b0eb0 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -16,6 +16,7 @@
 <html lang="<?= Yii::$app->language ?>">
 <head>
     <meta charset="<?= Yii::$app->charset ?>">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <?= Html::csrfMetaTags() ?>
     <title><?= Html::encode($this->title) ?></title>

From 435508328b3b35df38014b79b53278afdba8de5d Mon Sep 17 00:00:00 2001
From: Nikolay Oleynikov <oleynikovny@mail.ru>
Date: Sat, 25 Mar 2017 17:18:11 +0300
Subject: [PATCH 206/390] Create a .gitkeep file in the test data directory
 (#113)

---
 tests/_data/.gitignore | 2 --
 tests/_data/.gitkeep   | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 tests/_data/.gitignore
 create mode 100644 tests/_data/.gitkeep

diff --git a/tests/_data/.gitignore b/tests/_data/.gitignore
deleted file mode 100644
index c96a04f00..000000000
--- a/tests/_data/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file
diff --git a/tests/_data/.gitkeep b/tests/_data/.gitkeep
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/tests/_data/.gitkeep
@@ -0,0 +1 @@
+

From 4f8ae448fe77dd5813f675a712a6bf0983d0b095 Mon Sep 17 00:00:00 2001
From: Alexander Kozhevnikov <b37hr3z3n@gmail.com>
Date: Mon, 27 Mar 2017 18:08:01 +0300
Subject: [PATCH 207/390] Fix remote_config path in codeception.yml (#114)

`../tests/codeception.yml` does not exist, using `../codeception.yml` works
---
 codeception.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/codeception.yml b/codeception.yml
index 2513bee79..3537e68b1 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -19,7 +19,7 @@ modules:
 #    #c3_url: http://localhost:8080/index-test.php/
 #    enabled: true
 #    #remote: true
-#    #remote_config: '../tests/codeception.yml'
+#    #remote_config: '../codeception.yml'
 #    whitelist:
 #        include:
 #            - models/*

From 2ac711fa20668aa825bb9e671cef698e753e0e9b Mon Sep 17 00:00:00 2001
From: Nikolay Oleynikov <oleynikovny@mail.ru>
Date: Tue, 11 Apr 2017 15:47:45 +0300
Subject: [PATCH 208/390] Fix incorrect type hints (#115) [skip ci]

---
 controllers/SiteController.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/controllers/SiteController.php b/controllers/SiteController.php
index 36dc9591b..63ae7fe40 100644
--- a/controllers/SiteController.php
+++ b/controllers/SiteController.php
@@ -5,6 +5,7 @@
 use Yii;
 use yii\filters\AccessControl;
 use yii\web\Controller;
+use yii\web\Response;
 use yii\filters\VerbFilter;
 use app\models\LoginForm;
 use app\models\ContactForm;
@@ -66,7 +67,7 @@ public function actionIndex()
     /**
      * Login action.
      *
-     * @return string
+     * @return Response|string
      */
     public function actionLogin()
     {
@@ -86,7 +87,7 @@ public function actionLogin()
     /**
      * Logout action.
      *
-     * @return string
+     * @return Response
      */
     public function actionLogout()
     {
@@ -98,7 +99,7 @@ public function actionLogout()
     /**
      * Displays contact page.
      *
-     * @return string
+     * @return Response|string
      */
     public function actionContact()
     {

From 19b6143f051b404c8d73f4b1328d51064aa19e98 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 19 Apr 2017 02:56:34 +0300
Subject: [PATCH 209/390] Update fxp plugin version

---
 .travis.yml | 2 +-
 README.md   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e7e847ee5..c7e45906b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ cache:
 
 install:
   - travis_retry composer self-update && composer --version
-  - travis_retry composer global require "fxp/composer-asset-plugin:~1.1.1"
+  - travis_retry composer global require "fxp/composer-asset-plugin:~1.3.1"
   - travis_retry composer update --dev --prefer-dist --no-interaction
 # setup application:
   - |
diff --git a/README.md b/README.md
index 3bc44a785..80e084a2e 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this project template using the following command:
 
 ~~~
-php composer.phar global require "fxp/composer-asset-plugin:^1.2.0"
+php composer.phar global require "fxp/composer-asset-plugin:^1.3.1"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 

From 465c00a8eac7251ca2ae521c682ab6467ce1fe9e Mon Sep 17 00:00:00 2001
From: Andrey Subbota <subbota@gmail.com>
Date: Sun, 28 May 2017 02:21:16 +0400
Subject: [PATCH 210/390] Fixed consistency of db-variable name in config files
 (#120)

---
 config/test.php | 4 ++--
 config/web.php  | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config/test.php b/config/test.php
index a92c2fcde..75201e545 100644
--- a/config/test.php
+++ b/config/test.php
@@ -1,6 +1,6 @@
 <?php
 $params = require(__DIR__ . '/params.php');
-$dbParams = require(__DIR__ . '/test_db.php');
+$db = require(__DIR__ . '/test_db.php');
 
 /**
  * Application configuration shared by all test types
@@ -10,7 +10,7 @@
     'basePath' => dirname(__DIR__),    
     'language' => 'en-US',
     'components' => [
-        'db' => $dbParams,
+        'db' => $db,
         'mailer' => [
             'useFileTransport' => true,
         ],
diff --git a/config/web.php b/config/web.php
index 2bc8561fb..e03d406c7 100644
--- a/config/web.php
+++ b/config/web.php
@@ -1,6 +1,7 @@
 <?php
 
 $params = require(__DIR__ . '/params.php');
+$db = require(__DIR__ . '/db.php');
 
 $config = [
     'id' => 'basic',
@@ -37,7 +38,7 @@
                 ],
             ],
         ],
-        'db' => require(__DIR__ . '/db.php'),
+        'db' => $db,
         /*
         'urlManager' => [
             'enablePrettyUrl' => true,

From 56ea7f969978d75150061886c3d3f8a555a98557 Mon Sep 17 00:00:00 2001
From: Andrey Subbota <subbota@gmail.com>
Date: Sun, 28 May 2017 19:17:09 +0400
Subject: [PATCH 211/390] Fix The "extra.asset-installer-paths" option is
 deprecated (#121)

---
 composer.json | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index e31abe055..0d1eec927 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,13 @@
         "codeception/specify": "~0.4.3"
     },
     "config": {
-        "process-timeout": 1800
+        "process-timeout": 1800,
+        "fxp-asset":{
+            "installer-paths": {
+                "npm-asset-library": "vendor/npm",
+                "bower-asset-library": "vendor/bower"
+            }
+        }
     },
     "scripts": {
         "post-create-project-cmd": [
@@ -48,10 +54,6 @@
             "generateCookieValidationKey": [
                 "config/web.php"
             ]
-        },
-        "asset-installer-paths": {
-            "npm-asset-library": "vendor/npm",
-            "bower-asset-library": "vendor/bower"
         }
     }
 }

From 591a3ca78caffc9e381f714da99a093a618d4169 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Mon, 5 Jun 2017 20:32:14 +0200
Subject: [PATCH 212/390] release version 2.0.12

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

diff --git a/composer.json b/composer.json
index 0d1eec927..11e8221d0 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.5",

From 927398596b3e1f5415255c5d3b0d56c62259079e Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Mon, 5 Jun 2017 20:32:36 +0200
Subject: [PATCH 213/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 11e8221d0..0d1eec927 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.5",

From fc2ec7dfee9313288171e2fe8a5b80e22c1e1509 Mon Sep 17 00:00:00 2001
From: SilverFire - Dmitry Naumenko <d.naumenko.a@gmail.com>
Date: Sat, 17 Jun 2017 17:23:21 +0300
Subject: [PATCH 214/390] Switched to asset-packagist.org

---
 .travis.yml    | 4 ++--
 README.md      | 3 +--
 composer.json  | 6 ++++++
 config/web.php | 4 ++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c7e45906b..e51dde1fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,7 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
 #  - hhvm
 
 # faster builds on new travis setup not using sudo
@@ -17,7 +18,6 @@ cache:
 
 install:
   - travis_retry composer self-update && composer --version
-  - travis_retry composer global require "fxp/composer-asset-plugin:~1.3.1"
   - travis_retry composer update --dev --prefer-dist --no-interaction
 # setup application:
   - |
@@ -26,4 +26,4 @@ install:
 script:
   - |
     php -S localhost:8080 -t web > /dev/null 2>&1 &
-    vendor/bin/codecept run
\ No newline at end of file
+    vendor/bin/codecept run
diff --git a/README.md b/README.md
index 80e084a2e..12790ad10 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,6 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this project template using the following command:
 
 ~~~
-php composer.phar global require "fxp/composer-asset-plugin:^1.3.1"
 php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
 ~~~
 
@@ -117,7 +116,7 @@ Tests can be executed by running
 
 ```
 vendor/bin/codecept run
-``` 
+```
 
 The command above will execute unit and functional tests. Unit tests are testing the system components, while functional
 tests are for testing user interaction. Acceptance tests are disabled by default as they require additional setup since
diff --git a/composer.json b/composer.json
index 0d1eec927..2358a3578 100644
--- a/composer.json
+++ b/composer.json
@@ -42,6 +42,12 @@
             "yii\\composer\\Installer::postCreateProject"
         ]
     },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org/"
+        }
+    ],
     "extra": {
         "yii\\composer\\Installer::postCreateProject": {
             "setPermission": [
diff --git a/config/web.php b/config/web.php
index e03d406c7..22cf8fdaa 100644
--- a/config/web.php
+++ b/config/web.php
@@ -7,6 +7,10 @@
     'id' => 'basic',
     'basePath' => dirname(__DIR__),
     'bootstrap' => ['log'],
+    'aliases' => [
+        '@bower' => '@vendor/bower-asset',
+        '@npm'   => '@vendor/npm-asset',
+    ],
     'components' => [
         'request' => [
             // !!! insert a secret key in the following (if it is empty) - this is required by cookie validation

From 90b51ff06a8f01347a9a45a0d39583037af7d461 Mon Sep 17 00:00:00 2001
From: MaximAL <almaximal@ya.ru>
Date: Fri, 30 Jun 2017 18:00:32 +0300
Subject: [PATCH 215/390] Schema cache options (for production environment)
 (#129) [skip ci]

---
 config/db.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/config/db.php b/config/db.php
index c4c12529c..bc75e616f 100644
--- a/config/db.php
+++ b/config/db.php
@@ -6,4 +6,9 @@
     'username' => 'root',
     'password' => '',
     'charset' => 'utf8',
+
+    // Schema cache options (for production environment)
+    //'enableSchemaCache' => true,
+    //'schemaCacheDuration' => 60,
+    //'schemaCache' => 'cache',
 ];

From 7d0275973457bb49bae235084926f11308d202bb Mon Sep 17 00:00:00 2001
From: Matviy <mshkotnyar@yandex.ru>
Date: Wed, 19 Jul 2017 14:56:26 +0300
Subject: [PATCH 216/390] Added 'aliases' section to test config file fix #130
 (#131)

---
 config/test.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/config/test.php b/config/test.php
index 75201e545..e025a9c44 100644
--- a/config/test.php
+++ b/config/test.php
@@ -7,7 +7,11 @@
  */
 return [
     'id' => 'basic-tests',
-    'basePath' => dirname(__DIR__),    
+    'basePath' => dirname(__DIR__),  
+    'aliases' => [
+        '@bower' => '@vendor/bower-asset',
+        '@npm'   => '@vendor/npm-asset',
+    ],  
     'language' => 'en-US',
     'components' => [
         'db' => $db,

From 02cf920ff943279204453b8b5598471542232a15 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 2 Aug 2017 16:05:10 +0300
Subject: [PATCH 217/390] Added logo to readme [skip ci]

---
 README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 12790ad10..4e852c8b5 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,10 @@
-Yii 2 Basic Project Template
-============================
+<p align="center">
+    <a href="https://github.com/yiisoft" target="_blank">
+        <img src="https://avatars0.githubusercontent.com/u/993323" height="100px">
+    </a>
+    <h1 align="center">Yii 2 Basic Project Template</h1>
+    <br>
+</p>
 
 Yii 2 Basic Project Template is a skeleton [Yii 2](http://www.yiiframework.com/) application best for
 rapidly creating small projects.

From 4dc90946e9a652b9bb7fc381c53afc548e7ac5d5 Mon Sep 17 00:00:00 2001
From: SilverFire - Dmitry Naumenko <d.naumenko.a@gmail.com>
Date: Mon, 7 Aug 2017 23:46:37 +0300
Subject: [PATCH 218/390] Call `require` as statment. Closes #123

---
 config/console.php |  4 ++--
 config/test.php    |  4 ++--
 config/test_db.php |  4 ++--
 config/web.php     |  4 ++--
 tests/bin/yii      | 10 +++++-----
 yii                |  6 +++---
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/config/console.php b/config/console.php
index 3945d9eb2..6660dd407 100644
--- a/config/console.php
+++ b/config/console.php
@@ -1,7 +1,7 @@
 <?php
 
-$params = require(__DIR__ . '/params.php');
-$db = require(__DIR__ . '/db.php');
+$params = require __DIR__ . '/params.php';
+$db = require __DIR__ . '/db.php';
 
 $config = [
     'id' => 'basic-console',
diff --git a/config/test.php b/config/test.php
index e025a9c44..ff9fc6c57 100644
--- a/config/test.php
+++ b/config/test.php
@@ -1,6 +1,6 @@
 <?php
-$params = require(__DIR__ . '/params.php');
-$db = require(__DIR__ . '/test_db.php');
+$params = require __DIR__ . '/params.php';
+$db = require __DIR__ . '/test_db.php';
 
 /**
  * Application configuration shared by all test types
diff --git a/config/test_db.php b/config/test_db.php
index c951052e3..5d213e135 100644
--- a/config/test_db.php
+++ b/config/test_db.php
@@ -1,6 +1,6 @@
 <?php
-$db = require(__DIR__ . '/db.php');
+$db = require __DIR__ . '/db.php';
 // test database! Important not to run tests on production or development databases
 $db['dsn'] = 'mysql:host=localhost;dbname=yii2_basic_tests';
 
-return $db;
\ No newline at end of file
+return $db;
diff --git a/config/web.php b/config/web.php
index 22cf8fdaa..3c03de8c5 100644
--- a/config/web.php
+++ b/config/web.php
@@ -1,7 +1,7 @@
 <?php
 
-$params = require(__DIR__ . '/params.php');
-$db = require(__DIR__ . '/db.php');
+$params = require __DIR__ . '/params.php';
+$db = require __DIR__ . '/db.php';
 
 $config = [
     'id' => 'basic',
diff --git a/tests/bin/yii b/tests/bin/yii
index 1e4f2cc1d..4923537fb 100755
--- a/tests/bin/yii
+++ b/tests/bin/yii
@@ -11,14 +11,14 @@
 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');
+require __DIR__ . '/../../vendor/autoload.php';
+require __DIR__ . '/../../vendor/yiisoft/yii2/Yii.php';
 
 $config = yii\helpers\ArrayHelper::merge(
-    require(__DIR__ . '/../../config/console.php'),
+    require __DIR__ . '/../../config/console.php',
     [
         'components' => [
-            'db' => require(__DIR__ . '/../../config/test_db.php')
+            'db' => require __DIR__ . '/../../config/test_db.php'
         ]
     ]
 );
@@ -26,4 +26,4 @@ $config = yii\helpers\ArrayHelper::merge(
 
 $application = new yii\console\Application($config);
 $exitCode = $application->run();
-exit($exitCode);
\ No newline at end of file
+exit($exitCode);
diff --git a/yii b/yii
index fc7090f77..2a2e8ede7 100755
--- a/yii
+++ b/yii
@@ -11,10 +11,10 @@
 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');
+require __DIR__ . '/vendor/autoload.php';
+require __DIR__ . '/vendor/yiisoft/yii2/Yii.php';
 
-$config = require(__DIR__ . '/config/console.php');
+$config = require __DIR__ . '/config/console.php';
 
 $application = new yii\console\Application($config);
 $exitCode = $application->run();

From 1d51cb3790644fb47b2f87a9ed395a2043a73a12 Mon Sep 17 00:00:00 2001
From: nicdnepr <nicdnepr@gmail.com>
Date: Tue, 8 Aug 2017 13:02:19 +0300
Subject: [PATCH 219/390] Added Alert widget (#134)

---
 views/layouts/main.php |  2 ++
 widgets/Alert.php      | 75 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 widgets/Alert.php

diff --git a/views/layouts/main.php b/views/layouts/main.php
index d0e3b0eb0..920e60d58 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -3,6 +3,7 @@
 /* @var $this \yii\web\View */
 /* @var $content string */
 
+use app\widgets\Alert;
 use yii\helpers\Html;
 use yii\bootstrap\Nav;
 use yii\bootstrap\NavBar;
@@ -61,6 +62,7 @@
         <?= Breadcrumbs::widget([
             'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
         ]) ?>
+        <?= Alert::widget() ?>
         <?= $content ?>
     </div>
 </div>
diff --git a/widgets/Alert.php b/widgets/Alert.php
new file mode 100644
index 000000000..b19d04061
--- /dev/null
+++ b/widgets/Alert.php
@@ -0,0 +1,75 @@
+<?php
+namespace app\widgets;
+
+use Yii;
+
+/**
+ * Alert widget renders a message from session flash. All flash messages are displayed
+ * in the sequence they were assigned using setFlash. You can set message as following:
+ *
+ * ```php
+ * Yii::$app->session->setFlash('error', 'This is the message');
+ * Yii::$app->session->setFlash('success', 'This is the message');
+ * Yii::$app->session->setFlash('info', 'This is the message');
+ * ```
+ *
+ * Multiple messages could be set as follows:
+ *
+ * ```php
+ * Yii::$app->session->setFlash('error', ['Error 1', 'Error 2']);
+ * ```
+ *
+ * @author Kartik Visweswaran <kartikv2@gmail.com>
+ * @author Alexander Makarov <sam@rmcreative.ru>
+ */
+class Alert extends \yii\bootstrap\Widget
+{
+    /**
+     * @var array the alert types configuration for the flash messages.
+     * This array is setup as $key => $value, where:
+     * - $key is the name of the session flash variable
+     * - $value is the bootstrap alert type (i.e. danger, success, info, warning)
+     */
+    public $alertTypes = [
+        'error'   => 'alert-danger',
+        'danger'  => 'alert-danger',
+        'success' => 'alert-success',
+        'info'    => 'alert-info',
+        'warning' => 'alert-warning'
+    ];
+    /**
+     * @var array the options for rendering the close button tag.
+     */
+    public $closeButton = [];
+
+
+    public function init()
+    {
+        parent::init();
+
+        $session = Yii::$app->session;
+        $flashes = $session->getAllFlashes();
+        $appendCss = isset($this->options['class']) ? ' ' . $this->options['class'] : '';
+
+        foreach ($flashes as $type => $data) {
+            if (isset($this->alertTypes[$type])) {
+                $data = (array) $data;
+                foreach ($data as $i => $message) {
+                    /* initialize css class for each alert box */
+                    $this->options['class'] = $this->alertTypes[$type] . $appendCss;
+
+                    /* assign unique id to each alert box */
+                    $this->options['id'] = $this->getId() . '-' . $type . '-' . $i;
+
+                    echo \yii\bootstrap\Alert::widget([
+                        'body' => $message,
+                        'closeButton' => $this->closeButton,
+                        'options' => $this->options,
+                    ]);
+                }
+
+                $session->removeFlash($type);
+            }
+        }
+    }
+}

From a4e8114f60990b1f4cb4e6c1f8f0774ec52ce1b0 Mon Sep 17 00:00:00 2001
From: SilverFire - Dmitry Naumenko <d.naumenko.a@gmail.com>
Date: Wed, 9 Aug 2017 20:58:58 +0300
Subject: [PATCH 220/390] Fixed Alert widget

---
 widgets/Alert.php | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/widgets/Alert.php b/widgets/Alert.php
index b19d04061..cd85bd5ad 100644
--- a/widgets/Alert.php
+++ b/widgets/Alert.php
@@ -27,8 +27,8 @@ class Alert extends \yii\bootstrap\Widget
     /**
      * @var array the alert types configuration for the flash messages.
      * This array is setup as $key => $value, where:
-     * - $key is the name of the session flash variable
-     * - $value is the bootstrap alert type (i.e. danger, success, info, warning)
+     * - key: the name of the session flash variable
+     * - value: the bootstrap alert type (i.e. danger, success, info, warning)
      */
     public $alertTypes = [
         'error'   => 'alert-danger',
@@ -39,37 +39,36 @@ class Alert extends \yii\bootstrap\Widget
     ];
     /**
      * @var array the options for rendering the close button tag.
+     * Array will be passed to [[\yii\bootstrap\Alert::closeButton]].
      */
     public $closeButton = [];
 
-
-    public function init()
+    /**
+     * {@inheritdoc}
+     */
+    public function run()
     {
-        parent::init();
-
         $session = Yii::$app->session;
         $flashes = $session->getAllFlashes();
-        $appendCss = isset($this->options['class']) ? ' ' . $this->options['class'] : '';
+        $appendClass = isset($this->options['class']) ? ' ' . $this->options['class'] : '';
 
-        foreach ($flashes as $type => $data) {
-            if (isset($this->alertTypes[$type])) {
-                $data = (array) $data;
-                foreach ($data as $i => $message) {
-                    /* initialize css class for each alert box */
-                    $this->options['class'] = $this->alertTypes[$type] . $appendCss;
-
-                    /* assign unique id to each alert box */
-                    $this->options['id'] = $this->getId() . '-' . $type . '-' . $i;
-
-                    echo \yii\bootstrap\Alert::widget([
-                        'body' => $message,
-                        'closeButton' => $this->closeButton,
-                        'options' => $this->options,
-                    ]);
-                }
+        foreach ($flashes as $type => $flash) {
+            if (!isset($this->alertTypes[$type])) {
+                continue;
+            }
 
-                $session->removeFlash($type);
+            foreach ((array) $flash as $i => $message) {
+                echo \yii\bootstrap\Alert::widget([
+                    'body' => $message,
+                    'closeButton' => $this->closeButton,
+                    'options' => array_merge($this->options, [
+                        'id' => $this->getId() . '-' . $type . '-' . $i,
+                        'class' => $this->alertTypes[$type] . $appendClass,
+                    ]),
+                ]);
             }
+
+            $session->removeFlash($type);
         }
     }
 }

From 1fd8921fbf4c593188d1fad3c40ef17f9e044513 Mon Sep 17 00:00:00 2001
From: SilverFire - Dmitry Naumenko <d.naumenko.a@gmail.com>
Date: Wed, 9 Aug 2017 22:07:23 +0300
Subject: [PATCH 221/390] Fixed generateCookieValidationKey

---
 composer.json | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 2358a3578..7967c5255 100644
--- a/composer.json
+++ b/composer.json
@@ -38,16 +38,13 @@
         }
     },
     "scripts": {
+        "post-install-cmd": [
+            "yii\\composer\\Installer::postInstall"
+        ],
         "post-create-project-cmd": [
             "yii\\composer\\Installer::postCreateProject"
         ]
     },
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://asset-packagist.org/"
-        }
-    ],
     "extra": {
         "yii\\composer\\Installer::postCreateProject": {
             "setPermission": [
@@ -56,10 +53,22 @@
                     "web/assets": "0777",
                     "yii": "0755"
                 }
-            ],
+            ]
+        },
+        "yii\\composer\\Installer::postInstall": {
             "generateCookieValidationKey": [
                 "config/web.php"
             ]
+        },
+        "asset-installer-paths": {
+            "npm-asset-library": "vendor/npm",
+            "bower-asset-library": "vendor/bower"
+        }
+    },
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "https://asset-packagist.org/"
         }
-    }
+    ]
 }

From 8e05ff8651212c0e0a68b2b4f6dc3864627190e4 Mon Sep 17 00:00:00 2001
From: SilverFire - Dmitry Naumenko <d.naumenko.a@gmail.com>
Date: Wed, 9 Aug 2017 22:14:58 +0300
Subject: [PATCH 222/390] minor

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

diff --git a/composer.json b/composer.json
index 7967c5255..deef5a246 100644
--- a/composer.json
+++ b/composer.json
@@ -42,7 +42,8 @@
             "yii\\composer\\Installer::postInstall"
         ],
         "post-create-project-cmd": [
-            "yii\\composer\\Installer::postCreateProject"
+            "yii\\composer\\Installer::postCreateProject",
+            "yii\\composer\\Installer::postInstall"
         ]
     },
     "extra": {

From 2f2e2506c68080a60dc3f7d488ba30938aefbbc3 Mon Sep 17 00:00:00 2001
From: SilverFire - Dmitry Naumenko <d.naumenko.a@gmail.com>
Date: Wed, 16 Aug 2017 15:17:30 +0300
Subject: [PATCH 223/390] Bump to 2.0.13


From d965cf55ac85eb4372412b1ae65bec723bb3f7ce Mon Sep 17 00:00:00 2001
From: Bulat Damdinov <dbulats88@gmail.com>
Date: Tue, 12 Sep 2017 17:16:50 +0800
Subject: [PATCH 224/390] Using require as a statement (#140)

---
 tests/_bootstrap.php | 2 +-
 web/index-test.php   | 6 +++---
 web/index.php        | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index 969c089b9..131da42af 100644
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -2,5 +2,5 @@
 define('YII_ENV', 'test');
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
-require_once(__DIR__ . '/../vendor/yiisoft/yii2/Yii.php');
+require_once __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
 require __DIR__ .'/../vendor/autoload.php';
\ No newline at end of file
diff --git a/web/index-test.php b/web/index-test.php
index 7ecf9d5d5..1ec192f22 100644
--- a/web/index-test.php
+++ b/web/index-test.php
@@ -8,9 +8,9 @@
 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');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
 
-$config = require(__DIR__ . '/../config/test.php');
+$config = require __DIR__ . '/../config/test.php';
 
 (new yii\web\Application($config))->run();
diff --git a/web/index.php b/web/index.php
index d1e070a39..02d5e1da9 100644
--- a/web/index.php
+++ b/web/index.php
@@ -4,9 +4,9 @@
 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');
+require __DIR__ . '/../vendor/autoload.php';
+require __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
 
-$config = require(__DIR__ . '/../config/web.php');
+$config = require __DIR__ . '/../config/web.php';
 
 (new yii\web\Application($config))->run();

From c49a8554e868ba5c875e976bf711a3ced0b28e76 Mon Sep 17 00:00:00 2001
From: Bulat Damdinov <dbulats88@gmail.com>
Date: Tue, 12 Sep 2017 17:29:58 +0800
Subject: [PATCH 225/390] Minor fixes of test files (#139) [skip ci]

---
 tests/acceptance/AboutCest.php       | 3 ++-
 tests/acceptance/ContactCest.php     | 2 +-
 tests/acceptance/HomeCest.php        | 3 ++-
 tests/acceptance/LoginCest.php       | 3 ++-
 tests/functional/ContactFormCest.php | 1 +
 tests/functional/LoginFormCest.php   | 1 +
 tests/unit/models/UserTest.php       | 2 ++
 7 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/acceptance/AboutCest.php b/tests/acceptance/AboutCest.php
index 8c1276e27..8a7be5af1 100644
--- a/tests/acceptance/AboutCest.php
+++ b/tests/acceptance/AboutCest.php
@@ -1,5 +1,6 @@
 <?php
-use yii\helpers\Url as Url;
+
+use yii\helpers\Url;
 
 class AboutCest
 {
diff --git a/tests/acceptance/ContactCest.php b/tests/acceptance/ContactCest.php
index a27da4507..90f98482e 100644
--- a/tests/acceptance/ContactCest.php
+++ b/tests/acceptance/ContactCest.php
@@ -1,6 +1,6 @@
 <?php
 
-use yii\helpers\Url as Url;
+use yii\helpers\Url;
 
 class ContactCest
 {
diff --git a/tests/acceptance/HomeCest.php b/tests/acceptance/HomeCest.php
index cb8faea71..e65df16ae 100644
--- a/tests/acceptance/HomeCest.php
+++ b/tests/acceptance/HomeCest.php
@@ -1,5 +1,6 @@
 <?php
-use yii\helpers\Url as Url;
+
+use yii\helpers\Url;
 
 class HomeCest
 {
diff --git a/tests/acceptance/LoginCest.php b/tests/acceptance/LoginCest.php
index 9ffc395ba..6f5cb2f38 100644
--- a/tests/acceptance/LoginCest.php
+++ b/tests/acceptance/LoginCest.php
@@ -1,5 +1,6 @@
 <?php
-use yii\helpers\Url as Url;
+
+use yii\helpers\Url;
 
 class LoginCest
 {
diff --git a/tests/functional/ContactFormCest.php b/tests/functional/ContactFormCest.php
index 7f198bf6d..ad8167865 100644
--- a/tests/functional/ContactFormCest.php
+++ b/tests/functional/ContactFormCest.php
@@ -1,4 +1,5 @@
 <?php
+
 class ContactFormCest 
 {
     public function _before(\FunctionalTester $I)
diff --git a/tests/functional/LoginFormCest.php b/tests/functional/LoginFormCest.php
index 9ed74b113..7a83a27d6 100644
--- a/tests/functional/LoginFormCest.php
+++ b/tests/functional/LoginFormCest.php
@@ -1,4 +1,5 @@
 <?php
+
 class LoginFormCest
 {
     public function _before(\FunctionalTester $I)
diff --git a/tests/unit/models/UserTest.php b/tests/unit/models/UserTest.php
index 2187ab8ca..fc26450bf 100644
--- a/tests/unit/models/UserTest.php
+++ b/tests/unit/models/UserTest.php
@@ -1,5 +1,7 @@
 <?php
+
 namespace tests\models;
+
 use app\models\User;
 
 class UserTest extends \Codeception\Test\Unit

From 0c87fab0c3c9d0ada04a85f4982aeffc08b76cc7 Mon Sep 17 00:00:00 2001
From: MaximAL <almaximal@ya.ru>
Date: Thu, 21 Sep 2017 19:01:41 +0300
Subject: [PATCH 226/390] Used application name instead of string literal in
 the navbar

---
 views/layouts/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/layouts/main.php b/views/layouts/main.php
index 920e60d58..34649cf54 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -29,7 +29,7 @@
 <div class="wrap">
     <?php
     NavBar::begin([
-        'brandLabel' => 'My Company',
+        'brandLabel' => Yii::$app->name,
         'brandUrl' => Yii::$app->homeUrl,
         'options' => [
             'class' => 'navbar-inverse navbar-fixed-top',

From 6bb488de6bac9904d1310cd5e45bc8a0d0df0c95 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Mon, 30 Oct 2017 09:33:22 +0100
Subject: [PATCH 227/390] search for framework path in requirements.php

fixes https://github.com/yiisoft/yii2/issues/15041
---
 requirements.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/requirements.php b/requirements.php
index 5d1973268..356773a3c 100644
--- a/requirements.php
+++ b/requirements.php
@@ -11,7 +11,22 @@
  */
 
 // you may need to adjust this path to the correct Yii framework path
-$frameworkPath = dirname(__FILE__) . '/vendor/yiisoft/yii2';
+// uncomment and adjust the following line if Yii is not located at the default path
+//$frameworkPath = dirname(__FILE__) . '/vendor/yiisoft/yii2';
+
+
+if (!isset($frameworkPath)) {
+    $searchPaths = [
+        dirname(__FILE__) . '/vendor/yiisoft/yii2',
+        dirname(__FILE__) . '/../vendor/yiisoft/yii2',
+    ];
+    foreach($searchPaths as $path) {
+        if (is_dir($path)) {
+            $frameworkPath = $path;
+            break;
+        }
+    }
+}
 
 if (!is_dir($frameworkPath)) {
     echo '<h1>Error</h1>';

From 1c4072499f3d38e9ee2fbeb8702ad57ab596a604 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Mon, 30 Oct 2017 09:42:15 +0100
Subject: [PATCH 228/390] improved requirements checker error message about
 framework

---
 requirements.php | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/requirements.php b/requirements.php
index 356773a3c..91a0fb097 100644
--- a/requirements.php
+++ b/requirements.php
@@ -28,11 +28,19 @@
     }
 }
 
-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>';
+if (!isset($frameworkPath) || !is_dir($frameworkPath)) {
+    $message = "<h1>Error</h1>\n\n"
+        . "<p><strong>The path to yii framework seems to be incorrect.</strong></p>\n"
+        . '<p>You need to install Yii framework via composer or adjust the framework path in file <abbr title="' . __FILE__ . '">' . basename(__FILE__) . "</abbr>.</p>\n"
+        . '<p>Please refer to the <abbr title="' . dirname(__FILE__) . "/README.md\">README</abbr> on how to install Yii.</p>\n";
+
+    if (!empty($_SERVER['argv'])) {
+        // do not print HTML when used in console mode
+        echo strip_tags($message);
+    } else {
+        echo $message;
+    }
+    exit(1);
 }
 
 require_once($frameworkPath . '/requirements/YiiRequirementChecker.php');

From e68b4a8f45cd49f779036657ca1ef41c634aff75 Mon Sep 17 00:00:00 2001
From: Bulat Damdinov <dbulats88@gmail.com>
Date: Mon, 30 Oct 2017 20:27:54 +0800
Subject: [PATCH 229/390] Fix .bowerrc

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

diff --git a/.bowerrc b/.bowerrc
index 1669168f2..a39b5b0fb 100644
--- a/.bowerrc
+++ b/.bowerrc
@@ -1,3 +1,3 @@
 {
-    "directory" : "vendor/bower"
+    "directory" : "vendor/bower-asset"
 }

From 120d35506e411e575ee07aac900d7394b5b7386c Mon Sep 17 00:00:00 2001
From: Tobias Munk <schmunk@usrbin.de>
Date: Wed, 1 Nov 2017 00:47:09 +0100
Subject: [PATCH 230/390] Updated asset-plugin options (#145)

---
 README.md     | 5 ++++-
 composer.json | 7 ++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4e852c8b5..aec7cfc5e 100644
--- a/README.md
+++ b/README.md
@@ -62,6 +62,10 @@ http://localhost/basic/web/
 ~~~
 
 
+**NOTES:**
+- If you don not have `git` available on your machine, you can run composer commands with `FXP_ASSET__VCS_DRIVER_OPTIONS='{}' composer [...]` to use the GitHub API instead.
+
+
 ### Install from an Archive File
 
 Extract the archive file downloaded from [yiiframework.com](http://www.yiiframework.com/download/) to
@@ -106,7 +110,6 @@ return [
 - Refer to the README in the `tests` directory for information specific to basic application tests.
 
 
-
 TESTING
 -------
 
diff --git a/composer.json b/composer.json
index deef5a246..1b98eb0bc 100644
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,12 @@
             "installer-paths": {
                 "npm-asset-library": "vendor/npm",
                 "bower-asset-library": "vendor/bower"
-            }
+            },
+            "vcs-driver-options": {
+                "github-no-api": true
+            },
+            "git-skip-update": "2 days",
+            "pattern-skip-version": "(-build|-patch)"
         }
     },
     "scripts": {

From 395e9c7faeba1094084d2308e00b519e9f0f1fd4 Mon Sep 17 00:00:00 2001
From: SilverFire - Dmitry Naumenko <d.naumenko.a@gmail.com>
Date: Thu, 2 Nov 2017 21:33:35 +0200
Subject: [PATCH 231/390] Removed fxp/cap as default package installation
 method

---
 README.md     |  5 -----
 composer.json | 17 +----------------
 2 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/README.md b/README.md
index aec7cfc5e..1caaca9af 100644
--- a/README.md
+++ b/README.md
@@ -61,11 +61,6 @@ directly under the Web root.
 http://localhost/basic/web/
 ~~~
 
-
-**NOTES:**
-- If you don not have `git` available on your machine, you can run composer commands with `FXP_ASSET__VCS_DRIVER_OPTIONS='{}' composer [...]` to use the GitHub API instead.
-
-
 ### Install from an Archive File
 
 Extract the archive file downloaded from [yiiframework.com](http://www.yiiframework.com/download/) to
diff --git a/composer.json b/composer.json
index 1b98eb0bc..39af5d6f6 100644
--- a/composer.json
+++ b/composer.json
@@ -29,18 +29,7 @@
         "codeception/specify": "~0.4.3"
     },
     "config": {
-        "process-timeout": 1800,
-        "fxp-asset":{
-            "installer-paths": {
-                "npm-asset-library": "vendor/npm",
-                "bower-asset-library": "vendor/bower"
-            },
-            "vcs-driver-options": {
-                "github-no-api": true
-            },
-            "git-skip-update": "2 days",
-            "pattern-skip-version": "(-build|-patch)"
-        }
+        "process-timeout": 1800
     },
     "scripts": {
         "post-install-cmd": [
@@ -65,10 +54,6 @@
             "generateCookieValidationKey": [
                 "config/web.php"
             ]
-        },
-        "asset-installer-paths": {
-            "npm-asset-library": "vendor/npm",
-            "bower-asset-library": "vendor/bower"
         }
     },
     "repositories": [

From 92688ab18a56108bfcf32c3d9d4f692c43f72b65 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 3 Nov 2017 01:36:10 +0300
Subject: [PATCH 232/390] Fixed travis tests on PHP 5.5 by installing imagick
 manually (#148)

---
 .travis.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e51dde1fb..1b996428c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,16 @@ cache:
 install:
   - travis_retry composer self-update && composer --version
   - travis_retry composer update --dev --prefer-dist --no-interaction
+  # install php extensions
+  - |
+    if (php --version | grep -i HipHop > /dev/null); then
+      echo "Skipping imagick and gmagick tests on HHVM"
+    else
+      pear config-set preferred_state beta
+      printf "\n" | pecl install imagick
+      # gmagick is not installed on travis currently
+      #printf "\n" | pecl install gmagick
+    fi
 # setup application:
   - |
     sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web.php

From 6699ce788aca3d678dae4857788cd34e16f05de0 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 3 Nov 2017 01:38:39 +0300
Subject: [PATCH 233/390] release version 2.0.13

---
 assets/AppAsset.php | 2 ++
 composer.json       | 2 +-
 widgets/Alert.php   | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/assets/AppAsset.php b/assets/AppAsset.php
index 0e495a8f8..47932b165 100644
--- a/assets/AppAsset.php
+++ b/assets/AppAsset.php
@@ -10,6 +10,8 @@
 use yii\web\AssetBundle;
 
 /**
+ * Main application asset bundle.
+ *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @since 2.0
  */
diff --git a/composer.json b/composer.json
index 39af5d6f6..ea0991a2f 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.5",
diff --git a/widgets/Alert.php b/widgets/Alert.php
index cd85bd5ad..ae6c1d85c 100644
--- a/widgets/Alert.php
+++ b/widgets/Alert.php
@@ -43,6 +43,7 @@ class Alert extends \yii\bootstrap\Widget
      */
     public $closeButton = [];
 
+
     /**
      * {@inheritdoc}
      */

From 217f9230d86580af1cd932caf1d0bc003295a96e Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 3 Nov 2017 01:39:17 +0300
Subject: [PATCH 234/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index ea0991a2f..39af5d6f6 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.5",

From 525f988d68c37ef6b04f7083727358183c3baea3 Mon Sep 17 00:00:00 2001
From: Milen Hristov <milen.schmasterz@gmail.com>
Date: Mon, 6 Nov 2017 10:54:35 +0200
Subject: [PATCH 235/390] since 2.0.13, the class name `Object` is invalid
 since PHP 7.2, use [[BaseObject]] instead. (#151)

---
 models/User.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/models/User.php b/models/User.php
index 250fb3962..768bddd62 100644
--- a/models/User.php
+++ b/models/User.php
@@ -2,7 +2,7 @@
 
 namespace app\models;
 
-class User extends \yii\base\Object implements \yii\web\IdentityInterface
+class User extends \yii\base\BaseObject implements \yii\web\IdentityInterface
 {
     public $id;
     public $username;

From 812d8d5178b5edae6084d8e762dc3bff906e76b6 Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Mon, 6 Nov 2017 15:10:58 +0100
Subject: [PATCH 236/390] Update composer.json

updated yii2 constraint for #151
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 39af5d6f6..4d3b8db7a 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
-        "yiisoft/yii2": "~2.0.5",
+        "yiisoft/yii2": "~2.0.13",
         "yiisoft/yii2-bootstrap": "~2.0.0",
         "yiisoft/yii2-swiftmailer": "~2.0.0"
     },

From 8882b2b7d8c4dfcfa21fcd2da47937d08923c6de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20P=C3=A9rez?= <ricpelo@gmail.com>
Date: Mon, 6 Nov 2017 16:36:24 +0100
Subject: [PATCH 237/390] Remove trailing whitespaces in config/test.php (#150)

---
 config/test.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/test.php b/config/test.php
index ff9fc6c57..f95bc031e 100644
--- a/config/test.php
+++ b/config/test.php
@@ -7,18 +7,18 @@
  */
 return [
     'id' => 'basic-tests',
-    'basePath' => dirname(__DIR__),  
+    'basePath' => dirname(__DIR__),
     'aliases' => [
         '@bower' => '@vendor/bower-asset',
         '@npm'   => '@vendor/npm-asset',
-    ],  
+    ],
     'language' => 'en-US',
     'components' => [
         'db' => $db,
         'mailer' => [
             'useFileTransport' => true,
         ],
-        'assetManager' => [            
+        'assetManager' => [
             'basePath' => __DIR__ . '/../web/assets',
         ],
         'urlManager' => [
@@ -26,7 +26,7 @@
         ],
         'user' => [
             'identityClass' => 'app\models\User',
-        ],        
+        ],
         'request' => [
             'cookieValidationKey' => 'test',
             'enableCsrfValidation' => false,
@@ -36,7 +36,7 @@
                 'domain' => 'localhost',
             ],
             */
-        ],        
+        ],
     ],
     'params' => $params,
 ];

From 8d04158f16fce4224d9a394594b306037cd5bfb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20P=C3=A9rez?= <ricpelo@gmail.com>
Date: Tue, 7 Nov 2017 13:29:58 +0100
Subject: [PATCH 238/390] Add @bower and @npm aliases in config/console.php

You need them if you add the `yii\apidoc\commands\ApiController` and `GuideController` to your console application command map and you run them inside of your applications console app, as said in the yiisoft/yii2-apidoc 's README.md:

https://github.com/yiisoft/yii2-apidoc/blob/master/README.md
---
 config/console.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/config/console.php b/config/console.php
index 6660dd407..1b8d9475b 100644
--- a/config/console.php
+++ b/config/console.php
@@ -8,6 +8,10 @@
     'basePath' => dirname(__DIR__),
     'bootstrap' => ['log'],
     'controllerNamespace' => 'app\commands',
+    'aliases' => [
+        '@bower' => '@vendor/bower-asset',
+        '@npm'   => '@vendor/npm-asset',
+    ],
     'components' => [
         'cache' => [
             'class' => 'yii\caching\FileCache',

From c769bd1b0a5cff76457c3ba0a4f244710e0e261a Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Wed, 8 Nov 2017 09:58:56 +0100
Subject: [PATCH 239/390] make use of 2.0.13 ExitCode class in console command

---
 commands/HelloController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/commands/HelloController.php b/commands/HelloController.php
index 86ab8b853..7f019cced 100644
--- a/commands/HelloController.php
+++ b/commands/HelloController.php
@@ -8,6 +8,7 @@
 namespace app\commands;
 
 use yii\console\Controller;
+use yii\console\ExitCode;
 
 /**
  * This command echoes the first argument that you have entered.
@@ -26,5 +27,7 @@ class HelloController extends Controller
     public function actionIndex($message = 'hello world')
     {
         echo $message . "\n";
+
+        return ExitCode::OK;
     }
 }

From a6bc6e9c8791421abb7f812c26bec4d807dfd1d6 Mon Sep 17 00:00:00 2001
From: Nikola Kovacs <nikola.kovacs@gmail.com>
Date: Thu, 9 Nov 2017 11:09:30 +0100
Subject: [PATCH 240/390] Disable composer-asset-plugin if it's installed

Refs #149
---
 composer.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 4d3b8db7a..3a5fe7e15 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,10 @@
         "codeception/specify": "~0.4.3"
     },
     "config": {
-        "process-timeout": 1800
+        "process-timeout": 1800,
+        "fxp-asset": {
+            "enabled": false
+        }
     },
     "scripts": {
         "post-install-cmd": [

From fc82ba48d0469aab2fac515020fb308551fa9cce Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Thu, 16 Nov 2017 14:33:46 +0530
Subject: [PATCH 241/390] Set password to empty string when reloading login
 form (#158)

---
 controllers/SiteController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/controllers/SiteController.php b/controllers/SiteController.php
index 63ae7fe40..1a84f9cfb 100644
--- a/controllers/SiteController.php
+++ b/controllers/SiteController.php
@@ -79,6 +79,8 @@ public function actionLogin()
         if ($model->load(Yii::$app->request->post()) && $model->login()) {
             return $this->goBack();
         }
+
+        $model->password = '';
         return $this->render('login', [
             'model' => $model,
         ]);

From 33882b152b0738aa519f39f7800ee116a65ea8a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?carlos=20gonz=C3=A1lez?= <cgrs@users.noreply.github.com>
Date: Tue, 5 Dec 2017 00:06:25 +0100
Subject: [PATCH 242/390] Adapted `yii2-app-advanced` Vagrant setup to basic
 app (#161)

---
 .gitignore                               |  5 +-
 Vagrantfile                              | 79 ++++++++++++++++++++++++
 vagrant/config/.gitignore                |  2 +
 vagrant/config/vagrant-local-example.yml | 22 +++++++
 vagrant/nginx/app.conf                   | 38 ++++++++++++
 vagrant/nginx/log/.gitignore             |  3 +
 vagrant/provision/always-as-root.sh      | 18 ++++++
 vagrant/provision/once-as-root.sh        | 71 +++++++++++++++++++++
 vagrant/provision/once-as-vagrant.sh     | 31 ++++++++++
 9 files changed, 268 insertions(+), 1 deletion(-)
 create mode 100644 Vagrantfile
 create mode 100644 vagrant/config/.gitignore
 create mode 100644 vagrant/config/vagrant-local-example.yml
 create mode 100644 vagrant/nginx/app.conf
 create mode 100644 vagrant/nginx/log/.gitignore
 create mode 100644 vagrant/provision/always-as-root.sh
 create mode 100644 vagrant/provision/once-as-root.sh
 create mode 100644 vagrant/provision/once-as-vagrant.sh

diff --git a/.gitignore b/.gitignore
index 6084c1da5..5bd9be80b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,7 @@ phpunit.phar
 /phpunit.xml
 
 tests/_output/*
-tests/_support/_generated
\ No newline at end of file
+tests/_support/_generated
+
+#vagrant folder
+/.vagrant
\ No newline at end of file
diff --git a/Vagrantfile b/Vagrantfile
new file mode 100644
index 000000000..163b5c256
--- /dev/null
+++ b/Vagrantfile
@@ -0,0 +1,79 @@
+require 'yaml'
+require 'fileutils'
+
+required_plugins = %w( vagrant-hostmanager vagrant-vbguest )
+required_plugins.each do |plugin|
+    exec "vagrant plugin install #{plugin}" unless Vagrant.has_plugin? plugin
+end
+
+domains = {
+  app: 'yii2basic.dev'
+}
+
+config = {
+  local: './vagrant/config/vagrant-local.yml',
+  example: './vagrant/config/vagrant-local.example.yml'
+}
+
+# copy config from example if local config not exists
+FileUtils.cp config[:example], config[:local] unless File.exist?(config[:local])
+# read config
+options = YAML.load_file config[:local]
+
+# check github token
+if options['github_token'].nil? || options['github_token'].to_s.length != 40
+  puts "You must place REAL GitHub token into configuration:\n/yii2-app-basic/vagrant/config/vagrant-local.yml"
+  exit
+end
+
+# vagrant configurate
+Vagrant.configure(2) do |config|
+  # select the box
+  config.vm.box = 'bento/ubuntu-16.04'
+
+  # should we ask about box updates?
+  config.vm.box_check_update = options['box_check_update']
+
+  config.vm.provider 'virtualbox' do |vb|
+    # machine cpus count
+    vb.cpus = options['cpus']
+    # machine memory size
+    vb.memory = options['memory']
+    # machine name (for VirtualBox UI)
+    vb.name = options['machine_name']
+  end
+
+  # machine name (for vagrant console)
+  config.vm.define options['machine_name']
+
+  # machine name (for guest machine console)
+  config.vm.hostname = options['machine_name']
+
+  # network settings
+  config.vm.network 'private_network', ip: options['ip']
+
+  # sync: folder 'yii2-app-advanced' (host machine) -> folder '/app' (guest machine)
+  config.vm.synced_folder './', '/app', owner: 'vagrant', group: 'vagrant'
+
+  # disable folder '/vagrant' (guest machine)
+  config.vm.synced_folder '.', '/vagrant', disabled: true
+
+  # hosts settings (host machine)
+  config.vm.provision :hostmanager
+  config.hostmanager.enabled            = true
+  config.hostmanager.manage_host        = true
+  config.hostmanager.ignore_private_ip  = false
+  config.hostmanager.include_offline    = true
+  config.hostmanager.aliases            = domains.values
+
+  # quick fix for failed guest additions installations
+  # config.vbguest.auto_update = false
+
+  # provisioners
+  config.vm.provision 'shell', path: './vagrant/provision/once-as-root.sh', args: [options['timezone']]
+  config.vm.provision 'shell', path: './vagrant/provision/once-as-vagrant.sh', args: [options['github_token']], privileged: false
+  config.vm.provision 'shell', path: './vagrant/provision/always-as-root.sh', run: 'always'
+
+  # post-install message (vagrant console)
+  config.vm.post_up_message = "App URL: http://#{domains[:app]}"
+end
diff --git a/vagrant/config/.gitignore b/vagrant/config/.gitignore
new file mode 100644
index 000000000..0685a56ca
--- /dev/null
+++ b/vagrant/config/.gitignore
@@ -0,0 +1,2 @@
+# local configuration
+vagrant-local.yml
\ No newline at end of file
diff --git a/vagrant/config/vagrant-local-example.yml b/vagrant/config/vagrant-local-example.yml
new file mode 100644
index 000000000..919aec0e8
--- /dev/null
+++ b/vagrant/config/vagrant-local-example.yml
@@ -0,0 +1,22 @@
+# Your personal GitHub token
+github_token: <your-personal-github-token>
+# Read more: https://github.com/blog/1509-personal-api-tokens
+# You can generate it here: https://github.com/settings/tokens
+
+# Guest OS timezone
+timezone: Europe/London
+
+# Are we need check box updates for every 'vagrant up'?
+box_check_update: false
+
+# Virtual machine name
+machine_name: yii2basic
+
+# Virtual machine IP
+ip: 192.168.83.137
+
+# Virtual machine CPU cores number
+cpus: 1
+
+# Virtual machine RAM
+memory: 1024
diff --git a/vagrant/nginx/app.conf b/vagrant/nginx/app.conf
new file mode 100644
index 000000000..08ec5bb35
--- /dev/null
+++ b/vagrant/nginx/app.conf
@@ -0,0 +1,38 @@
+server {
+   charset utf-8;
+   client_max_body_size 128M;
+   sendfile off;
+
+   listen 80; ## listen for ipv4
+   #listen [::]:80 default_server ipv6only=on; ## listen for ipv6
+
+   server_name yii2basic.dev;
+   root        /app/web/;
+   index       index.php;
+
+   access_log  /app/vagrant/nginx/log/yii2basic.access.log;
+   error_log   /app/vagrant/nginx/log/yii2basic.error.log;
+
+   location / {
+       # Redirect everything that isn't a real file to index.php
+       try_files $uri $uri/ /index.php$is_args$args;
+   }
+
+   # uncomment to avoid processing of calls to non-existing static files by Yii
+   #location ~ \.(js|css|png|jpg|gif|swf|ico|pdf|mov|fla|zip|rar)$ {
+   #    try_files $uri =404;
+   #}
+   #error_page 404 /404.html;
+
+   location ~ \.php$ {
+       include fastcgi_params;
+       fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+       #fastcgi_pass   127.0.0.1:9000;
+       fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
+       try_files $uri =404;
+   }
+
+   location ~ /\.(ht|svn|git) {
+       deny all;
+   }
+}
diff --git a/vagrant/nginx/log/.gitignore b/vagrant/nginx/log/.gitignore
new file mode 100644
index 000000000..c0fbfdd8d
--- /dev/null
+++ b/vagrant/nginx/log/.gitignore
@@ -0,0 +1,3 @@
+#nginx logs
+yii2basic.access.log
+yii2basic.error.log
\ No newline at end of file
diff --git a/vagrant/provision/always-as-root.sh b/vagrant/provision/always-as-root.sh
new file mode 100644
index 000000000..e5d8e33e1
--- /dev/null
+++ b/vagrant/provision/always-as-root.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+#== Bash helpers ==
+
+function info {
+  echo " "
+  echo "--> $1"
+  echo " "
+}
+
+#== Provision script ==
+
+info "Provision-script user: `whoami`"
+
+info "Restart web-stack"
+service php7.0-fpm restart
+service nginx restart
+service mysql restart
\ No newline at end of file
diff --git a/vagrant/provision/once-as-root.sh b/vagrant/provision/once-as-root.sh
new file mode 100644
index 000000000..12165b1c0
--- /dev/null
+++ b/vagrant/provision/once-as-root.sh
@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+
+#== Import script args ==
+
+timezone=$(echo "$1")
+
+#== Bash helpers ==
+
+function info {
+  echo " "
+  echo "--> $1"
+  echo " "
+}
+
+#== Provision script ==
+
+info "Provision-script user: `whoami`"
+
+export DEBIAN_FRONTEND=noninteractive
+
+info "Configure timezone"
+timedatectl set-timezone ${timezone} --no-ask-password
+
+info "Prepare root password for MySQL"
+debconf-set-selections <<< "mariadb-server-10.0 mysql-server/root_password password \"''\""
+debconf-set-selections <<< "mariadb-server-10.0 mysql-server/root_password_again password \"''\""
+echo "Done!"
+
+info "Update OS software"
+apt-get update
+apt-get upgrade -y
+
+info "Install additional software"
+apt-get install -y php7.0-curl php7.0-cli php7.0-intl php7.0-mysqlnd php7.0-gd php7.0-fpm php7.0-mbstring php7.0-xml unzip nginx mariadb-server-10.0 php.xdebug
+
+info "Configure MySQL"
+sed -i "s/.*bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/mariadb.conf.d/50-server.cnf
+mysql -uroot <<< "CREATE USER 'root'@'%' IDENTIFIED BY ''"
+mysql -uroot <<< "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%'"
+mysql -uroot <<< "DROP USER 'root'@'localhost'"
+mysql -uroot <<< "FLUSH PRIVILEGES"
+echo "Done!"
+
+info "Configure PHP-FPM"
+sed -i 's/user = www-data/user = vagrant/g' /etc/php/7.0/fpm/pool.d/www.conf
+sed -i 's/group = www-data/group = vagrant/g' /etc/php/7.0/fpm/pool.d/www.conf
+sed -i 's/owner = www-data/owner = vagrant/g' /etc/php/7.0/fpm/pool.d/www.conf
+cat << EOF > /etc/php/7.0/mods-available/xdebug.ini
+zend_extension=xdebug.so
+xdebug.remote_enable=1
+xdebug.remote_connect_back=1
+xdebug.remote_port=9000
+xdebug.remote_autostart=1
+EOF
+echo "Done!"
+
+info "Configure NGINX"
+sed -i 's/user www-data/user vagrant/g' /etc/nginx/nginx.conf
+echo "Done!"
+
+info "Enabling site configuration"
+ln -s /app/vagrant/nginx/app.conf /etc/nginx/sites-enabled/app.conf
+echo "Done!"
+
+info "Initailize databases for MySQL"
+mysql -uroot <<< "CREATE DATABASE yii2basic"
+mysql -uroot <<< "CREATE DATABASE yii2basic_test"
+echo "Done!"
+
+info "Install composer"
+curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
\ No newline at end of file
diff --git a/vagrant/provision/once-as-vagrant.sh b/vagrant/provision/once-as-vagrant.sh
new file mode 100644
index 000000000..8da47217c
--- /dev/null
+++ b/vagrant/provision/once-as-vagrant.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+
+#== Import script args ==
+
+github_token=$(echo "$1")
+
+#== Bash helpers ==
+
+function info {
+  echo " "
+  echo "--> $1"
+  echo " "
+}
+
+#== Provision script ==
+
+info "Provision-script user: `whoami`"
+
+info "Configure composer"
+composer config --global github-oauth.github.com ${github_token}
+echo "Done!"
+
+info "Install project dependencies"
+cd /app
+composer --no-progress --prefer-dist install
+
+info "Create bash-alias 'app' for vagrant user"
+echo 'alias app="cd /app"' | tee /home/vagrant/.bash_aliases
+
+info "Enabling colorized prompt for guest console"
+sed -i "s/#force_color_prompt=yes/force_color_prompt=yes/" /home/vagrant/.bashrc

From a31ee4418a396d259dd6429091aa604a6b9ffc18 Mon Sep 17 00:00:00 2001
From: Aleksandar Belic <aleks.belic@gmail.com>
Date: Mon, 11 Dec 2017 16:59:34 +0100
Subject: [PATCH 243/390] Removing unused classes from unit test models. (#162)

---
 tests/unit/models/ContactFormTest.php | 2 --
 tests/unit/models/LoginFormTest.php   | 1 -
 2 files changed, 3 deletions(-)

diff --git a/tests/unit/models/ContactFormTest.php b/tests/unit/models/ContactFormTest.php
index 81a67e9cc..384889762 100644
--- a/tests/unit/models/ContactFormTest.php
+++ b/tests/unit/models/ContactFormTest.php
@@ -2,8 +2,6 @@
 
 namespace tests\models;
 
-use app\models\ContactForm;
-
 class ContactFormTest extends \Codeception\Test\Unit
 {
     private $model;
diff --git a/tests/unit/models/LoginFormTest.php b/tests/unit/models/LoginFormTest.php
index 46190cd05..4a15dc9c5 100644
--- a/tests/unit/models/LoginFormTest.php
+++ b/tests/unit/models/LoginFormTest.php
@@ -3,7 +3,6 @@
 namespace tests\models;
 
 use app\models\LoginForm;
-use Codeception\Specify;
 
 class LoginFormTest extends \Codeception\Test\Unit
 {

From 32939e2b27106fc5ee787101fbec3cb527a42b92 Mon Sep 17 00:00:00 2001
From: MaximAL <almaximal@ya.ru>
Date: Tue, 6 Feb 2018 12:26:06 +0300
Subject: [PATCH 244/390] Exit code in PhpDoc (#167) [skip ci]

---
 commands/HelloController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/commands/HelloController.php b/commands/HelloController.php
index 7f019cced..20066c40c 100644
--- a/commands/HelloController.php
+++ b/commands/HelloController.php
@@ -23,6 +23,7 @@ class HelloController extends Controller
     /**
      * This command echoes what you have entered as the message.
      * @param string $message the message to be echoed.
+     * @return int Exit code
      */
     public function actionIndex($message = 'hello world')
     {

From 7942ecffeef0d5f74ddd0857a5587af93dfcf552 Mon Sep 17 00:00:00 2001
From: Vladimir Jelovac <jelovac@users.noreply.github.com>
Date: Tue, 6 Feb 2018 22:05:52 +0100
Subject: [PATCH 245/390] Changes to run vagrant from project root dir (#163)

Introduced a variable which represents current vagrantfile directory path. This way we can run vagrant directly from the Yii2 project root and do not need to store vagrant configurations separately.
---
 Vagrantfile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 163b5c256..5c9e12363 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -10,9 +10,11 @@ domains = {
   app: 'yii2basic.dev'
 }
 
+vagrantfile_dir_path = File.dirname(__FILE__)
+
 config = {
-  local: './vagrant/config/vagrant-local.yml',
-  example: './vagrant/config/vagrant-local.example.yml'
+  local: vagrantfile_dir_path + '/vagrant/config/vagrant-local.yml',
+  example: vagrantfile_dir_path + '/vagrant/config/vagrant-local.example.yml'
 }
 
 # copy config from example if local config not exists

From cfe16a52d7d1cb71f95d093802e6797099126f41 Mon Sep 17 00:00:00 2001
From: Tobias Munk <schmunk@usrbin.de>
Date: Tue, 6 Feb 2018 22:07:24 +0100
Subject: [PATCH 246/390] Feature/docker support (#157)

* added Docker support

* updated Docker docs
---
 README.md          | 23 +++++++++++++++++++++++
 docker-compose.yml |  9 +++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 docker-compose.yml

diff --git a/README.md b/README.md
index 1caaca9af..d3dc4b70c 100644
--- a/README.md
+++ b/README.md
@@ -82,6 +82,29 @@ http://localhost/basic/web/
 ~~~
 
 
+### Install with Docker
+
+Update your vendor packages
+
+    docker-compose run --rm php composer update --prefer-dist
+    
+Run the installation triggers (creating cookie validation code)
+
+    docker-compose run --rm php composer install    
+    
+Start the container
+
+    docker-compose up -d
+    
+You can then access the application through the following URL:
+
+    http://127.0.0.1:8000
+
+**NOTES:** 
+- Minimum required Docker engine version `17.04` for development (see [Performance tuning for volume mounts](https://docs.docker.com/docker-for-mac/osxfs-caching/))
+- The default configuration uses a host-volume in your home directory `.docker-composer` for composer caches
+
+
 CONFIGURATION
 -------------
 
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..c3800ff53
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,9 @@
+version: '2'
+services:
+  php:
+    image: yiisoftware/yii2-php:7.1-apache
+    volumes:
+      - ~/.composer-docker/cache:/root/.composer/cache:delegated
+      - ./:/app:delegated
+    ports:
+      - '8000:80'
\ No newline at end of file

From cb49ebde2ab353d8cdc83943bf54488bed51a903 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 17 Feb 2018 22:15:06 +0300
Subject: [PATCH 247/390] Fixes #165: Fixed example file name

---
 .../{vagrant-local-example.yml => vagrant-local.example.yml}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename vagrant/config/{vagrant-local-example.yml => vagrant-local.example.yml} (100%)

diff --git a/vagrant/config/vagrant-local-example.yml b/vagrant/config/vagrant-local.example.yml
similarity index 100%
rename from vagrant/config/vagrant-local-example.yml
rename to vagrant/config/vagrant-local.example.yml

From b5fb6dc7bc7ffa9778c8e166cd2ebe4e96b4649a Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sun, 18 Feb 2018 23:48:18 +0300
Subject: [PATCH 248/390] Updated badges

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d3dc4b70c..6acc916b2 100644
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@ The template contains the basic features including user login/logout and a conta
 It includes all commonly used configurations that would allow you to focus on adding new
 features to your application.
 
-[![Latest Stable Version](https://poser.pugx.org/yiisoft/yii2-app-basic/v/stable.png)](https://packagist.org/packages/yiisoft/yii2-app-basic)
-[![Total Downloads](https://poser.pugx.org/yiisoft/yii2-app-basic/downloads.png)](https://packagist.org/packages/yiisoft/yii2-app-basic)
+[![Latest Stable Version](https://img.shields.io/packagist/v/yiisoft/yii2-app-basic.svg)](https://packagist.org/packages/yiisoft/yii2-app-basic)
+[![Total Downloads](https://img.shields.io/packagist/dt/yiisoft/yii2-app-basic.svg)](https://packagist.org/packages/yiisoft/yii2-app-basic)
 [![Build Status](https://travis-ci.org/yiisoft/yii2-app-basic.svg?branch=master)](https://travis-ci.org/yiisoft/yii2-app-basic)
 
 DIRECTORY STRUCTURE

From 24ed409e71a87733af2e6db05f24ea6cdfbbdecb Mon Sep 17 00:00:00 2001
From: SilverFire - Dmitry Naumenko <d.naumenko.a@gmail.com>
Date: Mon, 19 Feb 2018 00:29:21 +0200
Subject: [PATCH 249/390] Minor

---
 controllers/SiteController.php |  4 ++--
 models/User.php                | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/controllers/SiteController.php b/controllers/SiteController.php
index 1a84f9cfb..6e8a85d10 100644
--- a/controllers/SiteController.php
+++ b/controllers/SiteController.php
@@ -13,7 +13,7 @@
 class SiteController extends Controller
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function behaviors()
     {
@@ -39,7 +39,7 @@ public function behaviors()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function actions()
     {
diff --git a/models/User.php b/models/User.php
index 768bddd62..2e3fb25ed 100644
--- a/models/User.php
+++ b/models/User.php
@@ -29,7 +29,7 @@ class User extends \yii\base\BaseObject implements \yii\web\IdentityInterface
 
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public static function findIdentity($id)
     {
@@ -37,7 +37,7 @@ public static function findIdentity($id)
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public static function findIdentityByAccessToken($token, $type = null)
     {
@@ -68,7 +68,7 @@ public static function findByUsername($username)
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function getId()
     {
@@ -76,7 +76,7 @@ public function getId()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function getAuthKey()
     {
@@ -84,7 +84,7 @@ public function getAuthKey()
     }
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public function validateAuthKey($authKey)
     {

From dfd0a02b50e0dd96051051bde9251258bda3fd68 Mon Sep 17 00:00:00 2001
From: SilverFire - Dmitry Naumenko <d.naumenko.a@gmail.com>
Date: Mon, 19 Feb 2018 00:35:59 +0200
Subject: [PATCH 250/390] release version 2.0.14

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 3a5fe7e15..e4a915c7d 100644
--- a/composer.json
+++ b/composer.json
@@ -12,10 +12,10 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
-        "yiisoft/yii2": "~2.0.13",
+        "yiisoft/yii2": "~2.0.14",
         "yiisoft/yii2-bootstrap": "~2.0.0",
         "yiisoft/yii2-swiftmailer": "~2.0.0"
     },

From 9245d033e4c1cc41aa1beabcd4564af497535ad0 Mon Sep 17 00:00:00 2001
From: SilverFire - Dmitry Naumenko <d.naumenko.a@gmail.com>
Date: Mon, 19 Feb 2018 00:36:21 +0200
Subject: [PATCH 251/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index e4a915c7d..119d8d594 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From dafe5f6afff00ca4990c1aeda6a1d78512f565eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20P=C3=A9rez?= <ricpelo@gmail.com>
Date: Fri, 23 Feb 2018 18:57:48 +0100
Subject: [PATCH 252/390] Set `@tests` alias by default (#169)

---
 config/console.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/console.php b/config/console.php
index 1b8d9475b..299656afc 100644
--- a/config/console.php
+++ b/config/console.php
@@ -11,6 +11,7 @@
     'aliases' => [
         '@bower' => '@vendor/bower-asset',
         '@npm'   => '@vendor/npm-asset',
+        '@tests' => '@app/tests',
     ],
     'components' => [
         'cache' => [

From 561b98a03943d61efece28a648142e3ac3d9596c Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 15 Mar 2018 01:17:30 +0300
Subject: [PATCH 253/390] Register meta tags with a method that works well with
 page cache

---
 views/layouts/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/layouts/main.php b/views/layouts/main.php
index 34649cf54..87dfdcbc9 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -19,7 +19,7 @@
     <meta charset="<?= Yii::$app->charset ?>">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <?= Html::csrfMetaTags() ?>
+    <?php $this->registerCsrfMetaTags() ?>
     <title><?= Html::encode($this->title) ?></title>
     <?php $this->head() ?>
 </head>

From 0b94c3142b5070b44fa389be74ff2191a783af10 Mon Sep 17 00:00:00 2001
From: Chris Smith <chris@cgsmith.net>
Date: Sun, 1 Apr 2018 04:54:23 -0500
Subject: [PATCH 254/390] Partially Fixes #177 Nginx default config interferes
 with dev domain. Still causes an issue with SSL redirect. (#178)

---
 vagrant/provision/once-as-root.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/vagrant/provision/once-as-root.sh b/vagrant/provision/once-as-root.sh
index 12165b1c0..311d77b4c 100644
--- a/vagrant/provision/once-as-root.sh
+++ b/vagrant/provision/once-as-root.sh
@@ -62,6 +62,10 @@ info "Enabling site configuration"
 ln -s /app/vagrant/nginx/app.conf /etc/nginx/sites-enabled/app.conf
 echo "Done!"
 
+info "Removing default site configuration"
+rm /etc/nginx/sites-enabled/default
+echo "Done!"
+
 info "Initailize databases for MySQL"
 mysql -uroot <<< "CREATE DATABASE yii2basic"
 mysql -uroot <<< "CREATE DATABASE yii2basic_test"

From e3ab8489a59a017b2fced952063415e26995b80d Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 26 Apr 2018 21:08:54 +0300
Subject: [PATCH 255/390] Removed redundant line from license [skip ci]

---
 LICENSE.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/LICENSE.md b/LICENSE.md
index e98f03df8..ee872b9ab 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,3 @@
-The Yii framework is free software. It is released under the terms of
-the following BSD License.
-
 Copyright © 2008 by Yii Software LLC (http://www.yiisoft.com)
 All rights reserved.
 

From 56bac0cffdfd7a17d30eed94c4053baa1b8ffa42 Mon Sep 17 00:00:00 2001
From: Maarten van Middelaar <mahkali@gmail.com>
Date: Wed, 23 May 2018 23:53:00 +0200
Subject: [PATCH 256/390] Add fixtures in Yii2 module (#182)

To be able to follow the instruction on https://www.yiiframework.com/doc/guide/2.0/en/test-fixtures `$I->grabFixture()` we need to enable the fixtures feature of the Yii2. Methinks this would be a good thing to enable by default.
---
 tests/unit.suite.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit.suite.yml b/tests/unit.suite.yml
index b1efaba99..d2e6622f8 100644
--- a/tests/unit.suite.yml
+++ b/tests/unit.suite.yml
@@ -8,4 +8,4 @@ modules:
     enabled:
       - Asserts
       - Yii2:
-            part: [orm, email]
\ No newline at end of file
+            part: [orm, email, fixtures]

From d355029d028708218757d3f239072af261d407c2 Mon Sep 17 00:00:00 2001
From: Maarten van Middelaar <mahkali@gmail.com>
Date: Thu, 14 Jun 2018 01:11:36 +0200
Subject: [PATCH 257/390] Remove setting cleanup false (#183)

It is not clear why cleanup is set to false in the template. ActiveFixture fixture data is not loaded when a previous test had fixtures.
---
 codeception.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/codeception.yml b/codeception.yml
index 3537e68b1..a95affe04 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -12,7 +12,6 @@ modules:
     config:
         Yii2:
             configFile: 'config/test.php'
-            cleanup: false
 
 # To enable code coverage:
 #coverage:

From a0095a0bee542763c4c39fb273c407b03595d466 Mon Sep 17 00:00:00 2001
From: Nils <nilsvdburg@gmail.com>
Date: Wed, 10 Oct 2018 20:06:02 +0200
Subject: [PATCH 258/390] changed vagrant top-level domain to .test (#188)

---
 Vagrantfile            | 2 +-
 vagrant/nginx/app.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 5c9e12363..44fd76c6d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -7,7 +7,7 @@ required_plugins.each do |plugin|
 end
 
 domains = {
-  app: 'yii2basic.dev'
+  app: 'yii2basic.test'
 }
 
 vagrantfile_dir_path = File.dirname(__FILE__)
diff --git a/vagrant/nginx/app.conf b/vagrant/nginx/app.conf
index 08ec5bb35..b22e66106 100644
--- a/vagrant/nginx/app.conf
+++ b/vagrant/nginx/app.conf
@@ -6,7 +6,7 @@ server {
    listen 80; ## listen for ipv4
    #listen [::]:80 default_server ipv6only=on; ## listen for ipv6
 
-   server_name yii2basic.dev;
+   server_name yii2basic.test;
    root        /app/web/;
    index       index.php;
 

From cfe07e705d3271bf1c30fcfdad35719fa8e44c0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20P=C3=A9rez?= <ricpelo@gmail.com>
Date: Tue, 4 Dec 2018 20:05:40 +0100
Subject: [PATCH 259/390] Bump codeception/specify, codeception/verify versions
 (#173)

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 119d8d594..aca991929 100644
--- a/composer.json
+++ b/composer.json
@@ -24,9 +24,9 @@
         "yiisoft/yii2-gii": "~2.0.0",
         "yiisoft/yii2-faker": "~2.0.0",
 
-        "codeception/base": "^2.2.3",
-        "codeception/verify": "~0.3.1",
-        "codeception/specify": "~0.4.3"
+        "codeception/base": "~2.3.0",
+        "codeception/verify": "~0.4.0",
+        "codeception/specify": "~0.4.6"
     },
     "config": {
         "process-timeout": 1800,

From 72af82e3e17232fd2ccda2ceb6ce35315bd1963c Mon Sep 17 00:00:00 2001
From: Matteo Giaccone <matteo.giaccone@acmos.net>
Date: Wed, 5 Dec 2018 18:15:52 +0100
Subject: [PATCH 260/390] Add MySQL to Travis (#190)

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 1b996428c..18e63d91a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,12 @@ cache:
   directories:
     - $HOME/.composer/cache
 
+services:
+  - mysql
+
+before_install:
+  - mysql -e 'CREATE DATABASE IF NOT EXISTS yii2_basic_tests;'
+
 install:
   - travis_retry composer self-update && composer --version
   - travis_retry composer update --dev --prefer-dist --no-interaction

From 069ec1f6d04635303b161c95084353d33873a503 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ricardo=20P=C3=A9rez?= <ricpelo@gmail.com>
Date: Sun, 27 Jan 2019 21:30:35 +0100
Subject: [PATCH 261/390] Fix namespaces in unit tests (#171)

---
 tests/unit/models/ContactFormTest.php | 2 +-
 tests/unit/models/LoginFormTest.php   | 2 +-
 tests/unit/models/UserTest.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/unit/models/ContactFormTest.php b/tests/unit/models/ContactFormTest.php
index 384889762..86bbc2c68 100644
--- a/tests/unit/models/ContactFormTest.php
+++ b/tests/unit/models/ContactFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\models;
+namespace tests\unit\models;
 
 class ContactFormTest extends \Codeception\Test\Unit
 {
diff --git a/tests/unit/models/LoginFormTest.php b/tests/unit/models/LoginFormTest.php
index 4a15dc9c5..ecdb14512 100644
--- a/tests/unit/models/LoginFormTest.php
+++ b/tests/unit/models/LoginFormTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\models;
+namespace tests\unit\models;
 
 use app\models\LoginForm;
 
diff --git a/tests/unit/models/UserTest.php b/tests/unit/models/UserTest.php
index fc26450bf..cb612785f 100644
--- a/tests/unit/models/UserTest.php
+++ b/tests/unit/models/UserTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace tests\models;
+namespace tests\unit\models;
 
 use app\models\User;
 

From ceb7d420134052b740432af70fd92b4249018dbf Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 31 Jan 2019 01:00:58 +0100
Subject: [PATCH 262/390] release version 2.0.16

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

diff --git a/composer.json b/composer.json
index aca991929..01a92280d 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From 603f13964b875ac98406845467fc0ecfc592d11b Mon Sep 17 00:00:00 2001
From: Carsten Brandt <mail@cebe.cc>
Date: Thu, 31 Jan 2019 01:01:20 +0100
Subject: [PATCH 263/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 01a92280d..aca991929 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From 36365e5aa7e80f01634ddba3b56c2db3f76680f3 Mon Sep 17 00:00:00 2001
From: MaximAL <almaximal@ya.ru>
Date: Wed, 6 Mar 2019 20:01:30 +0300
Subject: [PATCH 264/390] Make requirements checker return error if there were
 failed checks (#196)

---
 requirements.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/requirements.php b/requirements.php
index 91a0fb097..ac16b8b59 100644
--- a/requirements.php
+++ b/requirements.php
@@ -157,4 +157,6 @@
     );
 }
 
-$requirementsChecker->checkYii()->check($requirements)->render();
+$result = $requirementsChecker->checkYii()->check($requirements)->getResult();
+$requirementsChecker->render();
+exit($result['summary']['errors'] === 0 ? 0 : 1);

From 3479193c9bdc65fd9b5f885f25c58501568ae43b Mon Sep 17 00:00:00 2001
From: Craig London <craig@orlandowebdev.com>
Date: Fri, 22 Mar 2019 11:23:34 -0400
Subject: [PATCH 265/390] master: Update composer.json to use Yii2 Debug & Gii
 v2.1.0 (#199)

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index aca991929..f44680cb0 100644
--- a/composer.json
+++ b/composer.json
@@ -20,8 +20,8 @@
         "yiisoft/yii2-swiftmailer": "~2.0.0"
     },
     "require-dev": {
-        "yiisoft/yii2-debug": "~2.0.0",
-        "yiisoft/yii2-gii": "~2.0.0",
+        "yiisoft/yii2-debug": "~2.1.0",
+        "yiisoft/yii2-gii": "~2.1.0",
         "yiisoft/yii2-faker": "~2.0.0",
 
         "codeception/base": "~2.3.0",

From 8dc97321341ea33b41a42a5ec5223adf6d42c5bd Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 22 Mar 2019 23:44:48 +0300
Subject: [PATCH 266/390] Fixes #198: Updated dependencies to make sure
 codeception tests pass right after install

---
 composer.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index f44680cb0..14137230e 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",
         "yiisoft/yii2-bootstrap": "~2.0.0",
-        "yiisoft/yii2-swiftmailer": "~2.0.0"
+        "yiisoft/yii2-swiftmailer": "~2.1.0"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.1.0",
@@ -26,7 +26,8 @@
 
         "codeception/base": "~2.3.0",
         "codeception/verify": "~0.4.0",
-        "codeception/specify": "~0.4.6"
+        "codeception/specify": "~0.4.6",
+        "symfony/browser-kit": ">=2.7 <=4.2.4"
     },
     "config": {
         "process-timeout": 1800,

From e063a26253dd7b52c82260c230596df6ddecea32 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 23 Mar 2019 00:40:51 +0300
Subject: [PATCH 267/390] release version 2.0.17

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

diff --git a/composer.json b/composer.json
index 14137230e..8a49bc6e1 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From 87ef32903582796859df324f3b432b9f05d768f8 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 23 Mar 2019 00:41:15 +0300
Subject: [PATCH 268/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 8a49bc6e1..14137230e 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From cb46def3bfd2a1f9afce67d403fb8255d388cd9d Mon Sep 17 00:00:00 2001
From: MaximAL <almaximal@ya.ru>
Date: Sun, 24 Mar 2019 16:32:05 +0300
Subject: [PATCH 269/390] Old array syntax in requirement checker (could be run
 in PHP prior to 5.4) (#201)

---
 requirements.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.php b/requirements.php
index ac16b8b59..73e04dd0b 100644
--- a/requirements.php
+++ b/requirements.php
@@ -16,10 +16,10 @@
 
 
 if (!isset($frameworkPath)) {
-    $searchPaths = [
+    $searchPaths = array(
         dirname(__FILE__) . '/vendor/yiisoft/yii2',
         dirname(__FILE__) . '/../vendor/yiisoft/yii2',
-    ];
+    );
     foreach($searchPaths as $path) {
         if (is_dir($path)) {
             $frameworkPath = $path;

From 6dd4e00ce73d573481c1e0eed96afca7b6fb5834 Mon Sep 17 00:00:00 2001
From: MaximAL <almaximal@ya.ru>
Date: Sun, 24 Mar 2019 16:33:18 +0300
Subject: [PATCH 270/390] Codestyle: space after `foreach` keyword (#200)

---
 requirements.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.php b/requirements.php
index 73e04dd0b..6cf322eb0 100644
--- a/requirements.php
+++ b/requirements.php
@@ -20,7 +20,7 @@
         dirname(__FILE__) . '/vendor/yiisoft/yii2',
         dirname(__FILE__) . '/../vendor/yiisoft/yii2',
     );
-    foreach($searchPaths as $path) {
+    foreach ($searchPaths as $path) {
         if (is_dir($path)) {
             $frameworkPath = $path;
             break;

From 4a41e3f53da8639a6814fab1b1d098f2e388b2fa Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 23 Apr 2019 15:02:20 +0300
Subject: [PATCH 271/390] Fixes #204: Allow using older swiftmailer dependency

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

diff --git a/composer.json b/composer.json
index 14137230e..c67bc93af 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",
         "yiisoft/yii2-bootstrap": "~2.0.0",
-        "yiisoft/yii2-swiftmailer": "~2.1.0"
+        "yiisoft/yii2-swiftmailer": "~2.1.0|~2.0.7"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.1.0",

From b4b51a3fb9325bdcc8aadeeba21577a7b40043e0 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 23 Apr 2019 15:06:04 +0300
Subject: [PATCH 272/390] Fixed composer.json syntax

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

diff --git a/composer.json b/composer.json
index c67bc93af..8ffc76db4 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,7 @@
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",
         "yiisoft/yii2-bootstrap": "~2.0.0",
-        "yiisoft/yii2-swiftmailer": "~2.1.0|~2.0.7"
+        "yiisoft/yii2-swiftmailer": "~2.0.0 || ~2.1.0"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.1.0",

From e38c34a9357c56fe8b83d1ef33578c06e556e14f Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 23 Apr 2019 15:11:10 +0300
Subject: [PATCH 273/390] Adjusted email headers in contact form

See https://github.com/yiisoft/yii2-app-advanced/issues/426
---
 config/params.php      | 2 ++
 models/ContactForm.php | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/params.php b/config/params.php
index 6ebf2792b..981c621ac 100644
--- a/config/params.php
+++ b/config/params.php
@@ -2,4 +2,6 @@
 
 return [
     'adminEmail' => 'admin@example.com',
+    'senderEmail' => 'noreply@example.com',
+    'senderName' => 'Example.com mailer',
 ];
diff --git a/models/ContactForm.php b/models/ContactForm.php
index 0b13cb05d..f001d2192 100644
--- a/models/ContactForm.php
+++ b/models/ContactForm.php
@@ -52,7 +52,8 @@ public function contact($email)
         if ($this->validate()) {
             Yii::$app->mailer->compose()
                 ->setTo($email)
-                ->setFrom([$this->email => $this->name])
+                ->setFrom([Yii::$app->params['senderEmail'] => Yii::$app->params['senderName']])
+                ->setReplyTo([$this->email => $this->name])
                 ->setSubject($this->subject)
                 ->setTextBody($this->body)
                 ->send();

From 3076318d059157b3d8656235c43d95b65c61444e Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 23 Apr 2019 15:31:43 +0300
Subject: [PATCH 274/390] Fixed contact form tests

---
 tests/unit/models/ContactFormTest.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tests/unit/models/ContactFormTest.php b/tests/unit/models/ContactFormTest.php
index 86bbc2c68..031d2bd4f 100644
--- a/tests/unit/models/ContactFormTest.php
+++ b/tests/unit/models/ContactFormTest.php
@@ -2,6 +2,9 @@
 
 namespace tests\unit\models;
 
+use app\models\ContactForm;
+use yii\mail\MessageInterface;
+
 class ContactFormTest extends \Codeception\Test\Unit
 {
     private $model;
@@ -19,7 +22,7 @@ public function testEmailIsSentOnContact()
 
         $this->model->expects($this->once())
             ->method('validate')
-            ->will($this->returnValue(true));
+            ->willReturn(true);
 
         $this->model->attributes = [
             'name' => 'Tester',
@@ -33,10 +36,12 @@ public function testEmailIsSentOnContact()
         // using Yii2 module actions to check email was sent
         $this->tester->seeEmailIsSent();
 
+        /** @var MessageInterface $emailMessage */
         $emailMessage = $this->tester->grabLastSentEmail();
         expect('valid email is sent', $emailMessage)->isInstanceOf('yii\mail\MessageInterface');
         expect($emailMessage->getTo())->hasKey('admin@example.com');
-        expect($emailMessage->getFrom())->hasKey('tester@example.com');
+        expect($emailMessage->getFrom())->hasKey('noreply@example.com');
+        expect($emailMessage->getReplyTo())->hasKey('tester@example.com');
         expect($emailMessage->getSubject())->equals('very important letter subject');
         expect($emailMessage->toString())->contains('body of current message');
     }

From 03697217bc9c231344796ee0b9f1cb95bf948d8b Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 23 Apr 2019 15:52:05 +0300
Subject: [PATCH 275/390] release version 2.0.18

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

diff --git a/composer.json b/composer.json
index 8ffc76db4..7cf03fadd 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From 088c23462dcec61af9fa0ae03a9ce05428d7ac78 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 23 Apr 2019 15:52:21 +0300
Subject: [PATCH 276/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 7cf03fadd..8ffc76db4 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From 9b4ae9c4ab1717a4498d41cc44dea9be352f09f9 Mon Sep 17 00:00:00 2001
From: Rafael Barros <admin@rafaelbarros.eti.br>
Date: Tue, 14 May 2019 13:07:55 -0300
Subject: [PATCH 277/390] Added a .htaccess file to the web directory (#206)

---
 web/.htaccess | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 web/.htaccess

diff --git a/web/.htaccess b/web/.htaccess
new file mode 100644
index 000000000..197199e8d
--- /dev/null
+++ b/web/.htaccess
@@ -0,0 +1,4 @@
+RewriteEngine on
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule . index.php [L]

From 0adae663e1d0f5fc048294ab658d8621aef9d247 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 21 May 2019 19:03:57 +0300
Subject: [PATCH 278/390] release version 2.0.19

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

diff --git a/composer.json b/composer.json
index 8ffc76db4..7cf03fadd 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From 14ae1633457fe7cf18597033e6ac0a892eb96ee7 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 21 May 2019 19:04:19 +0300
Subject: [PATCH 279/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 7cf03fadd..8ffc76db4 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From 00221016a2f089a5715af6f7fea5115e2566df51 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 23 May 2019 18:29:35 +0300
Subject: [PATCH 280/390] Create FUNDING.yml

---
 .github/FUNDING.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..89a45e51c
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: [samdark, machour, silverfire, cebe]
+open_collective: yiisoft

From d587bd0705e6f81a61d27183ee2ef59be8215deb Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 12 Jun 2019 23:01:56 +0300
Subject: [PATCH 281/390] Removed dev stability flag from readme [skip ci]

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6acc916b2..287a6ff87 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
 You can then install this project template using the following command:
 
 ~~~
-php composer.phar create-project --prefer-dist --stability=dev yiisoft/yii2-app-basic basic
+composer create-project --prefer-dist yiisoft/yii2-app-basic basic
 ~~~
 
 Now you should be able to access the application through the following URL, assuming `basic` is the directory

From 9f62ee2af5232ee564d930db08ffd9827c2cb202 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 2 Jul 2019 15:39:05 +0300
Subject: [PATCH 282/390] Remove github from funding options [skip ci]

---
 .github/FUNDING.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 89a45e51c..c0c1cacbc 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,4 +1,3 @@
 # These are supported funding model platforms
 
-github: [samdark, machour, silverfire, cebe]
 open_collective: yiisoft

From 4223df0b861ae6165beaadc64af9835528c63503 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 2 Jul 2019 23:48:04 +0300
Subject: [PATCH 283/390] release version 2.0.22

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

diff --git a/composer.json b/composer.json
index 8ffc76db4..7cf03fadd 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From fc049dda1286dd9ab955635aa8d0a8e8ee029a88 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 2 Jul 2019 23:48:17 +0300
Subject: [PATCH 284/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 7cf03fadd..8ffc76db4 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From 928e0b6b8221ad55bb706adaaca440ef8298c538 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 4 Sep 2019 00:44:59 +0300
Subject: [PATCH 285/390] release version 2.0.26

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

diff --git a/composer.json b/composer.json
index 8ffc76db4..7cf03fadd 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From ff3baf4d3aa87a3321c279691f30f6f553af5d63 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 4 Sep 2019 00:45:12 +0300
Subject: [PATCH 286/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 7cf03fadd..8ffc76db4 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From 7e643e7da5fef21186929842a01906bb43bd3f6c Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 4 Sep 2019 01:50:29 +0300
Subject: [PATCH 287/390] Fix travis build

---
 .travis.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 18e63d91a..aa4b85026 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,17 @@
 language: php
 
-php:
-  - 5.4
-  - 5.5
-  - 5.6
-  - 7.0
-  - 7.1
-#  - hhvm
+matrix:
+  fast_finish: true
+  include:
+    - php: "7.3"
+    - php: "7.2"
+    - php: "7.1"
+    - php: "7.0"
+    - php: "5.6"
+    - php: "5.5"
+      dist: trusty
+    - php: "5.4"
+      dist: trusty
 
 # faster builds on new travis setup not using sudo
 sudo: false

From 660ebb41df50638b42d6c1ffb2983620a87b9b7d Mon Sep 17 00:00:00 2001
From: Gintautas Miselis <gintautas@miselis.lt>
Date: Fri, 22 Nov 2019 21:02:47 +0200
Subject: [PATCH 288/390] Upgrade to Codeception 4.0 (#218)

* Use modular Codeception 4.0
* Moved bootstrap setting to top level

Because old location is deprecated
See https://bit.ly/2YrRzVc

* Use stringContainsString instead of contains

Because using assertContains() with string haystacks is deprecated and will not be supported in PHPUnit 9.

* Removed 5.4 and 5.5
---
 .travis.yml                           |  4 ----
 codeception.yml                       |  2 +-
 composer.json                         | 10 ++++++----
 tests/unit/models/ContactFormTest.php |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index aa4b85026..4583c1bf4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,10 +8,6 @@ matrix:
     - php: "7.1"
     - php: "7.0"
     - php: "5.6"
-    - php: "5.5"
-      dist: trusty
-    - php: "5.4"
-      dist: trusty
 
 # faster builds on new travis setup not using sudo
 sudo: false
diff --git a/codeception.yml b/codeception.yml
index a95affe04..d5aecb308 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -1,11 +1,11 @@
 actor: Tester
+bootstrap: _bootstrap.php
 paths:
     tests: tests
     log: tests/_output
     data: tests/_data
     helpers: tests/_support
 settings:
-    bootstrap: _bootstrap.php
     memory_limit: 1024M
     colors: true
 modules:
diff --git a/composer.json b/composer.json
index 8ffc76db4..324bd02ea 100644
--- a/composer.json
+++ b/composer.json
@@ -23,11 +23,13 @@
         "yiisoft/yii2-debug": "~2.1.0",
         "yiisoft/yii2-gii": "~2.1.0",
         "yiisoft/yii2-faker": "~2.0.0",
-
-        "codeception/base": "~2.3.0",
-        "codeception/verify": "~0.4.0",
+        "codeception/codeception": "4.0.x-dev | ^4.0",
+        "codeception/verify": "~0.5.0 || ~1.1.0",
         "codeception/specify": "~0.4.6",
-        "symfony/browser-kit": ">=2.7 <=4.2.4"
+        "symfony/browser-kit": ">=2.7 <=4.2.4",
+        "codeception/module-filesystem": "^1.0.0",
+        "codeception/module-yii2": "^1.0.0",
+        "codeception/module-asserts": "^1.0.0"
     },
     "config": {
         "process-timeout": 1800,
diff --git a/tests/unit/models/ContactFormTest.php b/tests/unit/models/ContactFormTest.php
index 031d2bd4f..074448771 100644
--- a/tests/unit/models/ContactFormTest.php
+++ b/tests/unit/models/ContactFormTest.php
@@ -43,6 +43,6 @@ public function testEmailIsSentOnContact()
         expect($emailMessage->getFrom())->hasKey('noreply@example.com');
         expect($emailMessage->getReplyTo())->hasKey('tester@example.com');
         expect($emailMessage->getSubject())->equals('very important letter subject');
-        expect($emailMessage->toString())->contains('body of current message');
+        expect($emailMessage->toString())->stringContainsString('body of current message');
     }
 }

From 2cbc7fccb7bc3fa60240783eeeea809bb7fd76d0 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 6 Dec 2019 19:16:12 +0300
Subject: [PATCH 289/390] Migrate Travis from .org to .com

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 287a6ff87..28b0c2ed3 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ features to your application.
 
 [![Latest Stable Version](https://img.shields.io/packagist/v/yiisoft/yii2-app-basic.svg)](https://packagist.org/packages/yiisoft/yii2-app-basic)
 [![Total Downloads](https://img.shields.io/packagist/dt/yiisoft/yii2-app-basic.svg)](https://packagist.org/packages/yiisoft/yii2-app-basic)
-[![Build Status](https://travis-ci.org/yiisoft/yii2-app-basic.svg?branch=master)](https://travis-ci.org/yiisoft/yii2-app-basic)
+[![Build Status](https://travis-ci.com/yiisoft/yii2-app-basic.svg?branch=master)](https://travis-ci.com/yiisoft/yii2-app-basic)
 
 DIRECTORY STRUCTURE
 -------------------

From a3534702cdb8f74b2414b66d7ae835f5887c0bcb Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 18 Dec 2019 16:02:37 +0300
Subject: [PATCH 290/390] release version 2.0.31

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

diff --git a/composer.json b/composer.json
index 324bd02ea..75d9c29ec 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From eaabb0fdb496d4e990dc35357174d18324d4cc56 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 18 Dec 2019 16:02:55 +0300
Subject: [PATCH 291/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 75d9c29ec..324bd02ea 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.4.0",
         "yiisoft/yii2": "~2.0.14",

From d9dd911eee10cf833b844dba25aa38e61ce5c98a Mon Sep 17 00:00:00 2001
From: Robert Korulczyk <robert@korulczyk.pl>
Date: Tue, 24 Dec 2019 11:09:46 +0100
Subject: [PATCH 292/390] Update PHP requirements after bumping Codeception
 (#219)

---
 README.md     | 2 +-
 composer.json | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 28b0c2ed3..fe3c1528f 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ DIRECTORY STRUCTURE
 REQUIREMENTS
 ------------
 
-The minimum requirement by this project template that your Web server supports PHP 5.4.0.
+The minimum requirement by this project template that your Web server supports PHP 5.6.0.
 
 
 INSTALLATION
diff --git a/composer.json b/composer.json
index 324bd02ea..d0a5e2889 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     },
     "minimum-stability": "dev",
     "require": {
-        "php": ">=5.4.0",
+        "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",
         "yiisoft/yii2-bootstrap": "~2.0.0",
         "yiisoft/yii2-swiftmailer": "~2.0.0 || ~2.1.0"
@@ -23,7 +23,7 @@
         "yiisoft/yii2-debug": "~2.1.0",
         "yiisoft/yii2-gii": "~2.1.0",
         "yiisoft/yii2-faker": "~2.0.0",
-        "codeception/codeception": "4.0.x-dev | ^4.0",
+        "codeception/codeception": "^4.0",
         "codeception/verify": "~0.5.0 || ~1.1.0",
         "codeception/specify": "~0.4.6",
         "symfony/browser-kit": ">=2.7 <=4.2.4",

From d6a48353cc3b8a548556da5c1594411ec0cfb06d Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 22 Jan 2020 01:38:32 +0300
Subject: [PATCH 293/390] release version 2.0.32

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

diff --git a/composer.json b/composer.json
index d0a5e2889..739328036 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From bc5fae6cc0c495cce6d2c095c4b321ca3ebb4fc4 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 22 Jan 2020 01:38:53 +0300
Subject: [PATCH 294/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 739328036..d0a5e2889 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From f6683cd10da3d39fe54ed04bf363846db8a809cc Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 24 Mar 2020 23:33:58 +0300
Subject: [PATCH 295/390] release version 2.0.33

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

diff --git a/composer.json b/composer.json
index d0a5e2889..739328036 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From 7efa02c17534260dd2a95a5d0a882ce5831354c4 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 24 Mar 2020 23:34:15 +0300
Subject: [PATCH 296/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 739328036..d0a5e2889 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From e7a77ad5b195e04b673daf6184d96e530e94beee Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 26 Mar 2020 23:53:44 +0300
Subject: [PATCH 297/390] release version 2.0.34

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

diff --git a/composer.json b/composer.json
index d0a5e2889..739328036 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From aeda534dfdd7d080a0fcb8d3dcbb486796da0e08 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 26 Mar 2020 23:54:01 +0300
Subject: [PATCH 298/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 739328036..d0a5e2889 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From ead01a9e66d5c018a72c494f87309efdfbb28bad Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 2 May 2020 14:23:27 +0300
Subject: [PATCH 299/390] release version 2.0.35

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

diff --git a/composer.json b/composer.json
index d0a5e2889..739328036 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From db08432751ba63fe2fe079271b222c07ec53c89c Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 2 May 2020 14:23:46 +0300
Subject: [PATCH 300/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 739328036..d0a5e2889 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From 8a50308e089f4aa7bbe36df73dce15a80bfc64a9 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 25 Jun 2020 17:25:16 +0300
Subject: [PATCH 301/390] Update meta

---
 .github/FUNDING.yml | 1 +
 .github/SECURITY.md | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 .github/SECURITY.md

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index c0c1cacbc..692239301 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,3 +1,4 @@
 # These are supported funding model platforms
 
 open_collective: yiisoft
+tidelift: "packagist/yiisoft/yii2-app-basic"
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
new file mode 100644
index 000000000..f71384759
--- /dev/null
+++ b/.github/SECURITY.md
@@ -0,0 +1,6 @@
+# Security Policy
+
+Please use the [security issue form](https://www.yiiframework.com/security) to report to us any security issue you find in Yii.
+DO NOT use the issue tracker or discuss it in the public forum as it will cause more damage than help.
+
+Please note that as a non-commerial OpenSource project we are not able to pay bounties at the moment.

From 06a1e468dc1e18c460d40b503166d613bc9083b6 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 8 Jul 2020 00:55:17 +0300
Subject: [PATCH 302/390] release version 2.0.36

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

diff --git a/composer.json b/composer.json
index d0a5e2889..739328036 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From beffef99246369b18415c5e8295396b801f68f7d Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 8 Jul 2020 00:55:35 +0300
Subject: [PATCH 303/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 739328036..d0a5e2889 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From c76b9a3bb9d56c27805c3dd758f173fc7b0f5c20 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 7 Aug 2020 23:21:27 +0300
Subject: [PATCH 304/390] release version 2.0.37

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

diff --git a/composer.json b/composer.json
index d0a5e2889..739328036 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From f5f03e1dced295f2de6aed52b760793dfe4b4ee5 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 7 Aug 2020 23:21:43 +0300
Subject: [PATCH 305/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 739328036..d0a5e2889 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From 988e7283a630abdc8c7b7928a19f9f9e81dbfef7 Mon Sep 17 00:00:00 2001
From: Nazar Holubovskyy <golubha3ik@gmail.com>
Date: Fri, 4 Sep 2020 18:33:21 +0100
Subject: [PATCH 306/390] Cleaner bash-shell instructions to install MySQL
 (#228)

---
 vagrant/provision/once-as-root.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/vagrant/provision/once-as-root.sh b/vagrant/provision/once-as-root.sh
index 311d77b4c..ad596039d 100644
--- a/vagrant/provision/once-as-root.sh
+++ b/vagrant/provision/once-as-root.sh
@@ -22,8 +22,8 @@ info "Configure timezone"
 timedatectl set-timezone ${timezone} --no-ask-password
 
 info "Prepare root password for MySQL"
-debconf-set-selections <<< "mariadb-server-10.0 mysql-server/root_password password \"''\""
-debconf-set-selections <<< "mariadb-server-10.0 mysql-server/root_password_again password \"''\""
+debconf-set-selections <<< 'mariadb-server mysql-server/root_password password'
+debconf-set-selections <<< 'mariadb-server mysql-server/root_password_again password'
 echo "Done!"
 
 info "Update OS software"
@@ -34,11 +34,11 @@ info "Install additional software"
 apt-get install -y php7.0-curl php7.0-cli php7.0-intl php7.0-mysqlnd php7.0-gd php7.0-fpm php7.0-mbstring php7.0-xml unzip nginx mariadb-server-10.0 php.xdebug
 
 info "Configure MySQL"
-sed -i "s/.*bind-address.*/bind-address = 0.0.0.0/" /etc/mysql/mariadb.conf.d/50-server.cnf
-mysql -uroot <<< "CREATE USER 'root'@'%' IDENTIFIED BY ''"
-mysql -uroot <<< "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%'"
-mysql -uroot <<< "DROP USER 'root'@'localhost'"
-mysql -uroot <<< "FLUSH PRIVILEGES"
+sed -i 's/.*bind-address.*/bind-address = 0.0.0.0/' /etc/mysql/mariadb.conf.d/50-server.cnf
+mysql <<< "CREATE USER 'root'@'%' IDENTIFIED BY ''"
+mysql <<< "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%'"
+mysql <<< "DROP USER 'root'@'localhost'"
+mysql <<< 'FLUSH PRIVILEGES'
 echo "Done!"
 
 info "Configure PHP-FPM"
@@ -67,8 +67,8 @@ rm /etc/nginx/sites-enabled/default
 echo "Done!"
 
 info "Initailize databases for MySQL"
-mysql -uroot <<< "CREATE DATABASE yii2basic"
-mysql -uroot <<< "CREATE DATABASE yii2basic_test"
+mysql <<< 'CREATE DATABASE yii2basic'
+mysql <<< 'CREATE DATABASE yii2basic_test'
 echo "Done!"
 
 info "Install composer"

From eb265a4edb6020d3439eb6f3c7a5d041141d4428 Mon Sep 17 00:00:00 2001
From: Nazar Holubovskyy <golubha3ik@gmail.com>
Date: Fri, 4 Sep 2020 20:19:20 +0100
Subject: [PATCH 307/390] Add virtual machine IP to the Yii2 "allowedIPs"
 (#229)

---
 Vagrantfile                       |  2 +-
 vagrant/provision/once-as-root.sh |  4 +++
 vagrant/provision/provision.awk   | 50 +++++++++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 vagrant/provision/provision.awk

diff --git a/Vagrantfile b/Vagrantfile
index 44fd76c6d..99c2a7831 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -72,7 +72,7 @@ Vagrant.configure(2) do |config|
   # config.vbguest.auto_update = false
 
   # provisioners
-  config.vm.provision 'shell', path: './vagrant/provision/once-as-root.sh', args: [options['timezone']]
+  config.vm.provision 'shell', path: './vagrant/provision/once-as-root.sh', args: [options['timezone'], options['ip']]
   config.vm.provision 'shell', path: './vagrant/provision/once-as-vagrant.sh', args: [options['github_token']], privileged: false
   config.vm.provision 'shell', path: './vagrant/provision/always-as-root.sh', run: 'always'
 
diff --git a/vagrant/provision/once-as-root.sh b/vagrant/provision/once-as-root.sh
index ad596039d..689a7af39 100644
--- a/vagrant/provision/once-as-root.sh
+++ b/vagrant/provision/once-as-root.sh
@@ -3,6 +3,7 @@
 #== Import script args ==
 
 timezone=$(echo "$1")
+readonly IP=$2
 
 #== Bash helpers ==
 
@@ -21,6 +22,9 @@ export DEBIAN_FRONTEND=noninteractive
 info "Configure timezone"
 timedatectl set-timezone ${timezone} --no-ask-password
 
+info "Add the VM IP to the list of allowed IPs"
+awk -v ip=$IP -f /app/vagrant/provision/provision.awk /app/config/web.php
+
 info "Prepare root password for MySQL"
 debconf-set-selections <<< 'mariadb-server mysql-server/root_password password'
 debconf-set-selections <<< 'mariadb-server mysql-server/root_password_again password'
diff --git a/vagrant/provision/provision.awk b/vagrant/provision/provision.awk
new file mode 100644
index 000000000..bcf44d3be
--- /dev/null
+++ b/vagrant/provision/provision.awk
@@ -0,0 +1,50 @@
+###
+# Modifying Yii2's files for Vagrant VM
+#
+# @author HA3IK <golubha3ik@gmail.com>
+# @version 1.0.0
+
+BEGIN {
+    print "AWK BEGINs its work:"
+    IGNORECASE = 1
+
+    # Correct IP - wildcard last octet
+    match(ip, /(([0-9]+\.)+)/, arr)
+    ip = arr[1] "*"
+}
+# BODY
+{
+    # Check if it's the same file
+    if (FILENAME != isFile["same"]){
+        msg = "- Work with: " FILENAME
+        # Close a previous file
+        close(isFile["same"])
+        # Delete previous data
+        delete isFile
+        # Save current file
+        isFile["same"] = FILENAME
+        # Define array index for the file
+        switch (FILENAME){
+        case /config\/web\.php$/:
+            isFile["IsConfWeb"] = 1
+            msg = msg " - add allowed IP: " ip
+            break
+        }
+        # Print the concatenated message for the file
+        print msg
+    }
+
+    # IF config/web.php
+    if (isFile["IsConfWeb"]){
+        # IF line has "allowedIPs" and doesn't has our IP
+        if (match($0, "allowedIPs") && !match($0, ip)){
+            match($0, /([^\]]+)(.+)/, arr)
+            $0 = sprintf("%s, '%s'%s", arr[1], ip, arr[2])
+        }
+        # Rewrite the file
+        print $0 > FILENAME
+    }
+}
+END {
+    print "AWK ENDs its work."
+}

From 9e0b45841baff3d212b0422e1d860f5eac98c20d Mon Sep 17 00:00:00 2001
From: Nazar Holubovskyy <golubha3ik@gmail.com>
Date: Fri, 4 Sep 2020 23:42:12 +0100
Subject: [PATCH 308/390] Enh: Vagrant process is not interrupted, now, after
 the installation of each plugin (#227)

---
 Vagrantfile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index 99c2a7831..73a04c7c6 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -1,9 +1,19 @@
 require 'yaml'
 require 'fileutils'
 
+required_plugins_installed = nil
 required_plugins = %w( vagrant-hostmanager vagrant-vbguest )
 required_plugins.each do |plugin|
-    exec "vagrant plugin install #{plugin}" unless Vagrant.has_plugin? plugin
+  unless Vagrant.has_plugin? plugin
+    system "vagrant plugin install #{plugin}"
+    required_plugins_installed = true
+  end
+end
+
+# IF plugin[s] was just installed - restart required
+if required_plugins_installed
+  system "vagrant up"
+  exit
 end
 
 domains = {

From 6c12534a70d23573a2e2a85cefaf53c76b29897e Mon Sep 17 00:00:00 2001
From: Nazar Holubovskyy <golubha3ik@gmail.com>
Date: Sat, 5 Sep 2020 19:58:16 +0100
Subject: [PATCH 309/390] Bug: rm "blacklist" from the codeception.yml;
 corrected "TESTING" instruction in README.md (#231)

---
 README.md       | 6 +++---
 codeception.yml | 9 ---------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index fe3c1528f..96832d7c1 100644
--- a/README.md
+++ b/README.md
@@ -221,13 +221,13 @@ to collect code coverage. You can run your tests and collect coverage with the f
 
 ```
 #collect coverage for all tests
-vendor/bin/codecept run -- --coverage-html --coverage-xml
+vendor/bin/codecept run --coverage --coverage-html --coverage-xml
 
 #collect coverage only for unit tests
-vendor/bin/codecept run unit -- --coverage-html --coverage-xml
+vendor/bin/codecept run unit --coverage --coverage-html --coverage-xml
 
 #collect coverage for unit and functional tests
-vendor/bin/codecept run functional,unit -- --coverage-html --coverage-xml
+vendor/bin/codecept run functional,unit --coverage --coverage-html --coverage-xml
 ```
 
 You can see code coverage output under the `tests/_output` directory.
diff --git a/codeception.yml b/codeception.yml
index d5aecb308..c8c21690d 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -25,12 +25,3 @@ modules:
 #            - controllers/*
 #            - commands/*
 #            - mail/*
-#    blacklist:
-#        include:
-#            - assets/*
-#            - config/*
-#            - runtime/*
-#            - vendor/*
-#            - views/*
-#            - web/*
-#            - tests/*

From e319588b18e9e056a714835190ab040887ec4319 Mon Sep 17 00:00:00 2001
From: Nazar Holubovskyy <golubha3ik@gmail.com>
Date: Sun, 6 Sep 2020 13:54:51 +0100
Subject: [PATCH 310/390] Updated Vagrant box to Ubuntu 18.04 with PHP 7.2 etc
 (#176) (#230)

---
 Vagrantfile                         |  2 +-
 vagrant/nginx/app.conf              |  2 +-
 vagrant/provision/always-as-root.sh |  4 ++--
 vagrant/provision/once-as-root.sh   | 12 ++++++------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 73a04c7c6..d752f5b92 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -41,7 +41,7 @@ end
 # vagrant configurate
 Vagrant.configure(2) do |config|
   # select the box
-  config.vm.box = 'bento/ubuntu-16.04'
+  config.vm.box = 'bento/ubuntu-18.04'
 
   # should we ask about box updates?
   config.vm.box_check_update = options['box_check_update']
diff --git a/vagrant/nginx/app.conf b/vagrant/nginx/app.conf
index b22e66106..1bfc0d583 100644
--- a/vagrant/nginx/app.conf
+++ b/vagrant/nginx/app.conf
@@ -28,7 +28,7 @@ server {
        include fastcgi_params;
        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
        #fastcgi_pass   127.0.0.1:9000;
-       fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
+       fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
        try_files $uri =404;
    }
 
diff --git a/vagrant/provision/always-as-root.sh b/vagrant/provision/always-as-root.sh
index e5d8e33e1..17fb58421 100644
--- a/vagrant/provision/always-as-root.sh
+++ b/vagrant/provision/always-as-root.sh
@@ -13,6 +13,6 @@ function info {
 info "Provision-script user: `whoami`"
 
 info "Restart web-stack"
-service php7.0-fpm restart
+service php7.2-fpm restart
 service nginx restart
-service mysql restart
\ No newline at end of file
+service mysql restart
diff --git a/vagrant/provision/once-as-root.sh b/vagrant/provision/once-as-root.sh
index 689a7af39..75cbf5a2c 100644
--- a/vagrant/provision/once-as-root.sh
+++ b/vagrant/provision/once-as-root.sh
@@ -35,7 +35,7 @@ apt-get update
 apt-get upgrade -y
 
 info "Install additional software"
-apt-get install -y php7.0-curl php7.0-cli php7.0-intl php7.0-mysqlnd php7.0-gd php7.0-fpm php7.0-mbstring php7.0-xml unzip nginx mariadb-server-10.0 php.xdebug
+apt-get install -y php7.2-curl php7.2-cli php7.2-intl php7.2-mysqlnd php7.2-gd php7.2-fpm php7.2-mbstring php7.2-xml unzip nginx mariadb-server-10.1 php.xdebug
 
 info "Configure MySQL"
 sed -i 's/.*bind-address.*/bind-address = 0.0.0.0/' /etc/mysql/mariadb.conf.d/50-server.cnf
@@ -46,10 +46,10 @@ mysql <<< 'FLUSH PRIVILEGES'
 echo "Done!"
 
 info "Configure PHP-FPM"
-sed -i 's/user = www-data/user = vagrant/g' /etc/php/7.0/fpm/pool.d/www.conf
-sed -i 's/group = www-data/group = vagrant/g' /etc/php/7.0/fpm/pool.d/www.conf
-sed -i 's/owner = www-data/owner = vagrant/g' /etc/php/7.0/fpm/pool.d/www.conf
-cat << EOF > /etc/php/7.0/mods-available/xdebug.ini
+sed -i 's/user = www-data/user = vagrant/g' /etc/php/7.2/fpm/pool.d/www.conf
+sed -i 's/group = www-data/group = vagrant/g' /etc/php/7.2/fpm/pool.d/www.conf
+sed -i 's/owner = www-data/owner = vagrant/g' /etc/php/7.2/fpm/pool.d/www.conf
+cat << EOF > /etc/php/7.2/mods-available/xdebug.ini
 zend_extension=xdebug.so
 xdebug.remote_enable=1
 xdebug.remote_connect_back=1
@@ -76,4 +76,4 @@ mysql <<< 'CREATE DATABASE yii2basic_test'
 echo "Done!"
 
 info "Install composer"
-curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
\ No newline at end of file
+curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer

From 7cc58b3e39c80db99cdb1da0806847b05cabeb01 Mon Sep 17 00:00:00 2001
From: Nazar Holubovskyy <golubha3ik@gmail.com>
Date: Tue, 8 Sep 2020 23:38:53 +0100
Subject: [PATCH 311/390] `yii2_basic_tests` database is renamed to
 `yii2basic_test` (#232)

---
 .travis.yml        | 2 +-
 README.md          | 2 +-
 config/test_db.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4583c1bf4..846a0ad8f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,7 +21,7 @@ services:
   - mysql
 
 before_install:
-  - mysql -e 'CREATE DATABASE IF NOT EXISTS yii2_basic_tests;'
+  - mysql -e 'CREATE DATABASE IF NOT EXISTS yii2basic_test;'
 
 install:
   - travis_retry composer self-update && composer --version
diff --git a/README.md b/README.md
index 96832d7c1..116f82fd2 100644
--- a/README.md
+++ b/README.md
@@ -186,7 +186,7 @@ To execute acceptance tests do the following:
     docker run --net=host selenium/standalone-firefox:2.53.0
     ```
 
-5. (Optional) Create `yii2_basic_tests` database and update it by applying migrations if you have them.
+5. (Optional) Create `yii2basic_test` database and update it by applying migrations if you have them.
 
    ```
    tests/bin/yii migrate
diff --git a/config/test_db.php b/config/test_db.php
index 5d213e135..f4290e0b0 100644
--- a/config/test_db.php
+++ b/config/test_db.php
@@ -1,6 +1,6 @@
 <?php
 $db = require __DIR__ . '/db.php';
 // test database! Important not to run tests on production or development databases
-$db['dsn'] = 'mysql:host=localhost;dbname=yii2_basic_tests';
+$db['dsn'] = 'mysql:host=localhost;dbname=yii2basic_test';
 
 return $db;

From 216df5f4d191ca84d0ed647995c980a9dd4a7dec Mon Sep 17 00:00:00 2001
From: Nazar Holubovskyy <golubha3ik@gmail.com>
Date: Thu, 10 Sep 2020 23:40:36 +0100
Subject: [PATCH 312/390] Bug: Repeat CLI command after Vagrant plugin[s]
 installation nonstop (#233)

---
 Vagrantfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Vagrantfile b/Vagrantfile
index d752f5b92..258aea601 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -12,7 +12,8 @@ end
 
 # IF plugin[s] was just installed - restart required
 if required_plugins_installed
-  system "vagrant up"
+  # Get CLI command[s] and call again
+  system 'vagrant' + ARGV.to_s.gsub(/\[\"|\", \"|\"\]/, ' ')
   exit
 end
 

From 60f6fa0f70738e54cb249a6e1635d37cb3577917 Mon Sep 17 00:00:00 2001
From: Wilmer Arambula <42547589+terabytesoftw@users.noreply.github.com>
Date: Mon, 14 Sep 2020 07:14:26 -0300
Subject: [PATCH 313/390] Switch to GitHub actions (#234)

---
 .github/workflows/ci-linux.yml   | 81 ++++++++++++++++++++++++++++++++
 .github/workflows/ci-windows.yml | 76 ++++++++++++++++++++++++++++++
 .travis.yml                      | 46 ------------------
 README.md                        |  3 +-
 4 files changed, 159 insertions(+), 47 deletions(-)
 create mode 100644 .github/workflows/ci-linux.yml
 create mode 100644 .github/workflows/ci-windows.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
new file mode 100644
index 000000000..43b27b906
--- /dev/null
+++ b/.github/workflows/ci-linux.yml
@@ -0,0 +1,81 @@
+on:
+  - pull_request
+  - push
+
+name: ci-linux
+
+jobs:
+  tests:
+    name: PHP ${{ matrix.php-version }}
+    env:
+      extensions: curl, dom, gd, imagick, intl, json, mbstring, libxml, xml, xmlwriter
+      key: cache-v1
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+
+        php-version:
+          - "5.6"
+          - "7.0"
+          - "7.1"
+          - "7.2"
+          - "7.3"
+          - "7.4"
+          
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup cache environment
+        id: cache-env
+        uses: shivammathur/cache-extensions@v1
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: ${{ env.extensions }}
+          key: ${{ env.key }}
+
+      - name: Cache extensions
+        uses: actions/cache@v1
+        with:
+          path: ${{ steps.cache-env.outputs.dir }}
+          key: ${{ steps.cache-env.outputs.key }}
+          restore-keys: ${{ steps.cache-env.outputs.key }}
+
+      - name: Install PHP with extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: ${{ env.extensions }}
+          ini-values: date.timezone='UTC'
+          coverage: xdebug
+          tools: composer:v2, pecl
+
+      - name: Determine composer cache directory on Linux
+        run: echo "::set-env name=COMPOSER_CACHE_DIR::$(composer config cache-dir)"
+
+      - name: Cache dependencies installed with composer
+        uses: actions/cache@v1
+        with:
+          path: ${{ env.COMPOSER_CACHE_DIR }}
+          key: php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
+
+      - name: Install dependencies with composer php PHP [5.6 - 7.4]
+        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader
+
+      - name: Run tests with codeception with coverage on Linux PHP [5.6 - 7.4]
+        run: |
+          sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web.php
+          php -S 127.0.0.1:8080 -t public > ./runtime/yii.log 2>&1 &
+          vendor/bin/codecept run --coverage --coverage-xml
+
+      - name: Upload code coverage scrutinizer on Linux PHP 7.4
+        if: matrix.php-version == '7.4'
+        run: |
+          wget https://scrutinizer-ci.com/ocular.phar
+          php ocular.phar code-coverage:upload --format=php-clover tests/_output/coverage.xml
\ No newline at end of file
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
new file mode 100644
index 000000000..40a2a0c33
--- /dev/null
+++ b/.github/workflows/ci-windows.yml
@@ -0,0 +1,76 @@
+on:
+  - pull_request
+  - push
+
+name: ci-windows
+
+jobs:
+  tests:
+    name: PHP ${{ matrix.php-version }}
+    env:
+      extensions: curl, dom, gd, intl, json, mbstring, libxml, xml, xmlwriter
+      key: cache-v1
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os:
+          - windows-latest
+
+        php-version:
+          - "5.6"
+          - "7.0"
+          - "7.1"
+          - "7.2"
+          - "7.3"
+          - "7.4"
+          
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Setup cache environment
+        id: cache-env
+        uses: shivammathur/cache-extensions@v1
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: ${{ env.extensions }}
+          key: ${{ env.key }}
+
+      - name: Cache extensions
+        uses: actions/cache@v1
+        with:
+          path: ${{ steps.cache-env.outputs.dir }}
+          key: ${{ steps.cache-env.outputs.key }}
+          restore-keys: ${{ steps.cache-env.outputs.key }}
+
+      - name: Install PHP with extensions
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          extensions: ${{ env.extensions }}
+          ini-values: date.timezone='UTC'
+          coverage: xdebug
+          tools: composer:v2, pecl
+
+      - name: Determine composer cache directory on Windows
+        run: ECHO "::set-env name=COMPOSER_CACHE_DIR::~\AppData\Local\Composer"
+
+      - name: Cache dependencies installed with composer
+        uses: actions/cache@v1
+        with:
+          path: ${{ env.COMPOSER_CACHE_DIR }}
+          key: php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}
+          restore-keys: |
+            php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
+
+      - name: Install dependencies with composer php PHP [5.6 - 7.4]
+        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader
+
+      - name: Run tests with codeception on Windows PHP [5.6 - 7.4]
+        run: |
+          sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web.php
+          php -S 127.0.0.1:8080 -t public > ./runtime/yii.log 2>&1 &
+          vendor/bin/codecept run
+        shell: bash
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 846a0ad8f..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-language: php
-
-matrix:
-  fast_finish: true
-  include:
-    - php: "7.3"
-    - php: "7.2"
-    - php: "7.1"
-    - php: "7.0"
-    - php: "5.6"
-
-# faster builds on new travis setup not using sudo
-sudo: false
-
-# cache vendor dirs
-cache:
-  directories:
-    - $HOME/.composer/cache
-
-services:
-  - mysql
-
-before_install:
-  - mysql -e 'CREATE DATABASE IF NOT EXISTS yii2basic_test;'
-
-install:
-  - travis_retry composer self-update && composer --version
-  - travis_retry composer update --dev --prefer-dist --no-interaction
-  # install php extensions
-  - |
-    if (php --version | grep -i HipHop > /dev/null); then
-      echo "Skipping imagick and gmagick tests on HHVM"
-    else
-      pear config-set preferred_state beta
-      printf "\n" | pecl install imagick
-      # gmagick is not installed on travis currently
-      #printf "\n" | pecl install gmagick
-    fi
-# setup application:
-  - |
-    sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web.php
-
-script:
-  - |
-    php -S localhost:8080 -t web > /dev/null 2>&1 &
-    vendor/bin/codecept run
diff --git a/README.md b/README.md
index 116f82fd2..7674e3b62 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,8 @@ features to your application.
 
 [![Latest Stable Version](https://img.shields.io/packagist/v/yiisoft/yii2-app-basic.svg)](https://packagist.org/packages/yiisoft/yii2-app-basic)
 [![Total Downloads](https://img.shields.io/packagist/dt/yiisoft/yii2-app-basic.svg)](https://packagist.org/packages/yiisoft/yii2-app-basic)
-[![Build Status](https://travis-ci.com/yiisoft/yii2-app-basic.svg?branch=master)](https://travis-ci.com/yiisoft/yii2-app-basic)
+[![ci-linux](https://github.com/yiisoft/yii2-app-basic/workflows/ci-linux/badge.svg)](https://github.com/yiisoft/yii2-app-basic/actions?query=workflow%3Aci-linux)
+[![ci-windows](https://github.com/yiisoft/yii2-app-basic/workflows/ci-windows/badge.svg)](https://github.com/yiisoft/yii2-app-basic/actions?query=workflow%3Aci-windows)
 
 DIRECTORY STRUCTURE
 -------------------

From e070a0ae31d156eb7211ec4fb50ed5bef414c1ff Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 15 Sep 2020 01:06:12 +0300
Subject: [PATCH 314/390] release version 2.0.38

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

diff --git a/composer.json b/composer.json
index d0a5e2889..739328036 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From b50d3e1dfe73985fb84b54a61a18eb74bb60b1fa Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 15 Sep 2020 01:06:27 +0300
Subject: [PATCH 315/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 739328036..d0a5e2889 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From d969d6cdf6bbd4be7052281c2a03da0e08b63f72 Mon Sep 17 00:00:00 2001
From: Gildus <72762+Gildus@users.noreply.github.com>
Date: Wed, 28 Oct 2020 15:14:23 -0500
Subject: [PATCH 316/390] Upgrade PHP version in docker-compose to 7.2 (#238)

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index c3800ff53..d943939f7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,9 @@
 version: '2'
 services:
   php:
-    image: yiisoftware/yii2-php:7.1-apache
+    image: yiisoftware/yii2-php:7.2-apache
     volumes:
       - ~/.composer-docker/cache:/root/.composer/cache:delegated
       - ./:/app:delegated
     ports:
-      - '8000:80'
\ No newline at end of file
+      - '8000:80'

From f95f012873b7965d40a5fcf91fafff2db661c7a1 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 29 Oct 2020 10:59:47 +0300
Subject: [PATCH 317/390] Bump Docker PHP version

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d943939f7..86be3bd0d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   php:
-    image: yiisoftware/yii2-php:7.2-apache
+    image: yiisoftware/yii2-php:7.4-apache
     volumes:
       - ~/.composer-docker/cache:/root/.composer/cache:delegated
       - ./:/app:delegated

From 3fe4c34d62fb13ff69efd10a2fafda4433b251a7 Mon Sep 17 00:00:00 2001
From: Wilmer Arambula <42547589+terabytesoftw@users.noreply.github.com>
Date: Sat, 31 Oct 2020 13:25:13 -0300
Subject: [PATCH 318/390] Update GitHub actions (#239)

---
 .github/workflows/{ci-linux.yml => build.yml} | 25 +++---
 .github/workflows/ci-windows.yml              | 76 -------------------
 README.md                                     |  3 +-
 3 files changed, 11 insertions(+), 93 deletions(-)
 rename .github/workflows/{ci-linux.yml => build.yml} (69%)
 delete mode 100644 .github/workflows/ci-windows.yml

diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/build.yml
similarity index 69%
rename from .github/workflows/ci-linux.yml
rename to .github/workflows/build.yml
index 43b27b906..848b870bf 100644
--- a/.github/workflows/ci-linux.yml
+++ b/.github/workflows/build.yml
@@ -2,11 +2,11 @@ on:
   - pull_request
   - push
 
-name: ci-linux
+name: build
 
 jobs:
   tests:
-    name: PHP ${{ matrix.php-version }}
+    name: PHP ${{ matrix.php }}
     env:
       extensions: curl, dom, gd, imagick, intl, json, mbstring, libxml, xml, xmlwriter
       key: cache-v1
@@ -17,8 +17,9 @@ jobs:
       matrix:
         os:
           - ubuntu-latest
+          - windows-latest
 
-        php-version:
+        php:
           - "5.6"
           - "7.0"
           - "7.1"
@@ -34,7 +35,7 @@ jobs:
         id: cache-env
         uses: shivammathur/cache-extensions@v1
         with:
-          php-version: ${{ matrix.php-version }}
+          php-version: ${{ matrix.php }}
           extensions: ${{ env.extensions }}
           key: ${{ env.key }}
 
@@ -48,7 +49,7 @@ jobs:
       - name: Install PHP with extensions
         uses: shivammathur/setup-php@v2
         with:
-          php-version: ${{ matrix.php-version }}
+          php-version: ${{ matrix.php }}
           extensions: ${{ env.extensions }}
           ini-values: date.timezone='UTC'
           coverage: xdebug
@@ -61,21 +62,15 @@ jobs:
         uses: actions/cache@v1
         with:
           path: ${{ env.COMPOSER_CACHE_DIR }}
-          key: php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}
+          key: php${{ matrix.php }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}
           restore-keys: |
-            php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
+            php${{ matrix.php }}-composer-${{ matrix.dependencies }}-
 
       - name: Install dependencies with composer php PHP [5.6 - 7.4]
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader
 
-      - name: Run tests with codeception with coverage on Linux PHP [5.6 - 7.4]
+      - name: Run tests with codeception
         run: |
           sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web.php
           php -S 127.0.0.1:8080 -t public > ./runtime/yii.log 2>&1 &
-          vendor/bin/codecept run --coverage --coverage-xml
-
-      - name: Upload code coverage scrutinizer on Linux PHP 7.4
-        if: matrix.php-version == '7.4'
-        run: |
-          wget https://scrutinizer-ci.com/ocular.phar
-          php ocular.phar code-coverage:upload --format=php-clover tests/_output/coverage.xml
\ No newline at end of file
+          vendor/bin/codecept run
\ No newline at end of file
diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml
deleted file mode 100644
index 40a2a0c33..000000000
--- a/.github/workflows/ci-windows.yml
+++ /dev/null
@@ -1,76 +0,0 @@
-on:
-  - pull_request
-  - push
-
-name: ci-windows
-
-jobs:
-  tests:
-    name: PHP ${{ matrix.php-version }}
-    env:
-      extensions: curl, dom, gd, intl, json, mbstring, libxml, xml, xmlwriter
-      key: cache-v1
-
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        os:
-          - windows-latest
-
-        php-version:
-          - "5.6"
-          - "7.0"
-          - "7.1"
-          - "7.2"
-          - "7.3"
-          - "7.4"
-          
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup cache environment
-        id: cache-env
-        uses: shivammathur/cache-extensions@v1
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: ${{ env.extensions }}
-          key: ${{ env.key }}
-
-      - name: Cache extensions
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.cache-env.outputs.dir }}
-          key: ${{ steps.cache-env.outputs.key }}
-          restore-keys: ${{ steps.cache-env.outputs.key }}
-
-      - name: Install PHP with extensions
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php-version }}
-          extensions: ${{ env.extensions }}
-          ini-values: date.timezone='UTC'
-          coverage: xdebug
-          tools: composer:v2, pecl
-
-      - name: Determine composer cache directory on Windows
-        run: ECHO "::set-env name=COMPOSER_CACHE_DIR::~\AppData\Local\Composer"
-
-      - name: Cache dependencies installed with composer
-        uses: actions/cache@v1
-        with:
-          path: ${{ env.COMPOSER_CACHE_DIR }}
-          key: php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}
-          restore-keys: |
-            php${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-
-
-      - name: Install dependencies with composer php PHP [5.6 - 7.4]
-        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader
-
-      - name: Run tests with codeception on Windows PHP [5.6 - 7.4]
-        run: |
-          sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web.php
-          php -S 127.0.0.1:8080 -t public > ./runtime/yii.log 2>&1 &
-          vendor/bin/codecept run
-        shell: bash
\ No newline at end of file
diff --git a/README.md b/README.md
index 7674e3b62..6db290bfa 100644
--- a/README.md
+++ b/README.md
@@ -15,8 +15,7 @@ features to your application.
 
 [![Latest Stable Version](https://img.shields.io/packagist/v/yiisoft/yii2-app-basic.svg)](https://packagist.org/packages/yiisoft/yii2-app-basic)
 [![Total Downloads](https://img.shields.io/packagist/dt/yiisoft/yii2-app-basic.svg)](https://packagist.org/packages/yiisoft/yii2-app-basic)
-[![ci-linux](https://github.com/yiisoft/yii2-app-basic/workflows/ci-linux/badge.svg)](https://github.com/yiisoft/yii2-app-basic/actions?query=workflow%3Aci-linux)
-[![ci-windows](https://github.com/yiisoft/yii2-app-basic/workflows/ci-windows/badge.svg)](https://github.com/yiisoft/yii2-app-basic/actions?query=workflow%3Aci-windows)
+[![build](https://github.com/yiisoft/yii2-app-basic/workflows/build/badge.svg)](https://github.com/yiisoft/yii2-app-basic/actions?query=workflow%3Abuild)
 
 DIRECTORY STRUCTURE
 -------------------

From 0df2109420576d4622d090da67594cd101f8fece Mon Sep 17 00:00:00 2001
From: Wilmer Arambula <42547589+terabytesoftw@users.noreply.github.com>
Date: Sat, 31 Oct 2020 14:17:46 -0300
Subject: [PATCH 319/390] Add names to tests

* Fix minor corrections.

* Add shell bash.

* Fix minor corrections.
---
 .github/workflows/build.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 848b870bf..c2b6bd92e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,9 +6,10 @@ name: build
 
 jobs:
   tests:
-    name: PHP ${{ matrix.php }}
+    name: PHP ${{ matrix.php }} - ${{ matrix.os }}
+
     env:
-      extensions: curl, dom, gd, imagick, intl, json, mbstring, libxml, xml, xmlwriter
+      extensions: dom, json, gd, imagick
       key: cache-v1
 
     runs-on: ${{ matrix.os }}
@@ -52,12 +53,15 @@ jobs:
           php-version: ${{ matrix.php }}
           extensions: ${{ env.extensions }}
           ini-values: date.timezone='UTC'
-          coverage: xdebug
-          tools: composer:v2, pecl
-
+          
       - name: Determine composer cache directory on Linux
+        if: matrix.os == 'ubuntu-latest'
         run: echo "::set-env name=COMPOSER_CACHE_DIR::$(composer config cache-dir)"
 
+      - name: Determine composer cache directory on Windows
+        if: matrix.os == 'windows-latest'
+        run: ECHO "::set-env name=COMPOSER_CACHE_DIR::~\AppData\Local\Composer"        
+
       - name: Cache dependencies installed with composer
         uses: actions/cache@v1
         with:
@@ -67,10 +71,11 @@ jobs:
             php${{ matrix.php }}-composer-${{ matrix.dependencies }}-
 
       - name: Install dependencies with composer php PHP [5.6 - 7.4]
-        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader
+        run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run tests with codeception
         run: |
           sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web.php
           php -S 127.0.0.1:8080 -t public > ./runtime/yii.log 2>&1 &
-          vendor/bin/codecept run
\ No newline at end of file
+          vendor/bin/codecept run
+        shell: bash
\ No newline at end of file

From e27be4eaf4d7c7278ff596600521ce13d3e830e1 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 10 Nov 2020 14:07:36 +0300
Subject: [PATCH 320/390] release version 2.0.39

---
 composer.json        | 2 +-
 models/LoginForm.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index d0a5e2889..739328036 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",
diff --git a/models/LoginForm.php b/models/LoginForm.php
index cc6af264c..66d658068 100644
--- a/models/LoginForm.php
+++ b/models/LoginForm.php
@@ -8,7 +8,7 @@
 /**
  * LoginForm is the model behind the login form.
  *
- * @property User|null $user This property is read-only.
+ * @property-read User|null $user This property is read-only.
  *
  */
 class LoginForm extends Model

From 7959d142a71ce598ee01cae3e81489d7de2be5b6 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Tue, 10 Nov 2020 14:07:54 +0300
Subject: [PATCH 321/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 739328036..d0a5e2889 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From a56693d88f893595d902c55f399355b80acbbac2 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Mon, 16 Nov 2020 16:22:10 +0300
Subject: [PATCH 322/390] Do not mock contact form in test

---
 tests/unit/models/ContactFormTest.php | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/tests/unit/models/ContactFormTest.php b/tests/unit/models/ContactFormTest.php
index 074448771..93313e4a6 100644
--- a/tests/unit/models/ContactFormTest.php
+++ b/tests/unit/models/ContactFormTest.php
@@ -7,7 +7,6 @@
 
 class ContactFormTest extends \Codeception\Test\Unit
 {
-    private $model;
     /**
      * @var \UnitTester
      */
@@ -15,23 +14,17 @@ class ContactFormTest extends \Codeception\Test\Unit
 
     public function testEmailIsSentOnContact()
     {
-        /** @var ContactForm $model */
-        $this->model = $this->getMockBuilder('app\models\ContactForm')
-            ->setMethods(['validate'])
-            ->getMock();
+        $model = new ContactForm();
 
-        $this->model->expects($this->once())
-            ->method('validate')
-            ->willReturn(true);
-
-        $this->model->attributes = [
+        $model->attributes = [
             'name' => 'Tester',
             'email' => 'tester@example.com',
             'subject' => 'very important letter subject',
             'body' => 'body of current message',
+            'verifyCode' => 'testme',
         ];
 
-        expect_that($this->model->contact('admin@example.com'));
+        expect_that($model->contact('admin@example.com'));
 
         // using Yii2 module actions to check email was sent
         $this->tester->seeEmailIsSent();

From 6b86dabfa33f93ccd3ae090dc95bd2cd1c8c356f Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 23 Dec 2020 18:52:36 +0300
Subject: [PATCH 323/390] release version 2.0.40

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

diff --git a/composer.json b/composer.json
index d0a5e2889..739328036 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From b1af6fa7f939281878551f5bed527144dfdc974b Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Wed, 23 Dec 2020 18:53:43 +0300
Subject: [PATCH 324/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 739328036..d0a5e2889 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From cc8f40eb7786c7c58f54bda2aca9e535ed3e6e69 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 4 Mar 2021 01:01:07 +0300
Subject: [PATCH 325/390] release version 2.0.41

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

diff --git a/composer.json b/composer.json
index d0a5e2889..739328036 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From 627f25c7b6caca80c14dd8307a6d124a4bf13c38 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 4 Mar 2021 01:01:53 +0300
Subject: [PATCH 326/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 739328036..d0a5e2889 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From d803a014050f53ad7d34a9d9670e973ac806b452 Mon Sep 17 00:00:00 2001
From: Toir427 <toir427@gmail.com>
Date: Wed, 17 Mar 2021 01:16:19 +0500
Subject: [PATCH 327/390] Fix GitHub action

---
 .github/workflows/build.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c2b6bd92e..af144a0f3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,16 +56,18 @@ jobs:
           
       - name: Determine composer cache directory on Linux
         if: matrix.os == 'ubuntu-latest'
-        run: echo "::set-env name=COMPOSER_CACHE_DIR::$(composer config cache-dir)"
+        run: |
+            echo "COMPOSER_CACHE_DIR=$(composer config cache-dir)" >> $GITHUB_ENV
 
       - name: Determine composer cache directory on Windows
         if: matrix.os == 'windows-latest'
-        run: ECHO "::set-env name=COMPOSER_CACHE_DIR::~\AppData\Local\Composer"        
+        run: |
+            echo "COMPOSER_CACHE_DIR=~\AppData\Local\Composer" >> $GITHUB_ENV
 
       - name: Cache dependencies installed with composer
         uses: actions/cache@v1
         with:
-          path: ${{ env.COMPOSER_CACHE_DIR }}
+          path: ${{ steps.cache-env.outputs.dir }}
           key: php${{ matrix.php }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}
           restore-keys: |
             php${{ matrix.php }}-composer-${{ matrix.dependencies }}-
@@ -78,4 +80,4 @@ jobs:
           sed -i "s/'cookieValidationKey' => ''/'cookieValidationKey' => 'testkey'/" config/web.php
           php -S 127.0.0.1:8080 -t public > ./runtime/yii.log 2>&1 &
           vendor/bin/codecept run
-        shell: bash
\ No newline at end of file
+        shell: bash

From f9189eb40566ef1573a0a43eccf591520f8ea197 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 6 May 2021 00:17:22 +0300
Subject: [PATCH 328/390] release version 2.0.42

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

diff --git a/composer.json b/composer.json
index d0a5e2889..739328036 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From 53e83b061ca2fa4557de52b3d124e5c2634ab57a Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 6 May 2021 00:17:39 +0300
Subject: [PATCH 329/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 739328036..d0a5e2889 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From e028d053c08abc15644261e77b5dae001c49d88b Mon Sep 17 00:00:00 2001
From: sinus <sinus_22@mail.ru>
Date: Sun, 9 May 2021 01:39:52 +0500
Subject: [PATCH 330/390] Update Gii (#247)

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

diff --git a/composer.json b/composer.json
index d0a5e2889..1375c0105 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.1.0",
-        "yiisoft/yii2-gii": "~2.1.0",
+        "yiisoft/yii2-gii": "~2.2.0",
         "yiisoft/yii2-faker": "~2.0.0",
         "codeception/codeception": "^4.0",
         "codeception/verify": "~0.5.0 || ~1.1.0",

From 0f2ec249687180a87c95bbd0ca7acd88c67462ac Mon Sep 17 00:00:00 2001
From: Bizley <pawel@positive.codes>
Date: Wed, 19 May 2021 14:01:06 +0200
Subject: [PATCH 331/390] Fix #245: Use Bootstrap 4 (#248)

---
 .github/workflows/build.yml |  3 +-
 assets/AppAsset.php         |  2 +-
 composer.json               |  2 +-
 views/layouts/main.php      | 36 +++++++++---------
 views/site/contact.php      |  6 +--
 views/site/index.php        | 10 ++---
 views/site/login.php        | 14 +++----
 web/css/site.css            | 73 +++++++++++--------------------------
 widgets/Alert.php           |  5 ++-
 9 files changed, 61 insertions(+), 90 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index af144a0f3..0671f8970 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,6 +27,7 @@ jobs:
           - "7.2"
           - "7.3"
           - "7.4"
+          - "8.0"
           
     steps:
       - name: Checkout
@@ -72,7 +73,7 @@ jobs:
           restore-keys: |
             php${{ matrix.php }}-composer-${{ matrix.dependencies }}-
 
-      - name: Install dependencies with composer php PHP [5.6 - 7.4]
+      - name: Install dependencies with composer php PHP [5.6 - 8.0]
         run: composer update --prefer-dist --no-interaction --no-progress --optimize-autoloader --ansi
 
       - name: Run tests with codeception
diff --git a/assets/AppAsset.php b/assets/AppAsset.php
index 47932b165..3b950fe7d 100644
--- a/assets/AppAsset.php
+++ b/assets/AppAsset.php
@@ -26,6 +26,6 @@ class AppAsset extends AssetBundle
     ];
     public $depends = [
         'yii\web\YiiAsset',
-        'yii\bootstrap\BootstrapAsset',
+        'yii\bootstrap4\BootstrapAsset',
     ];
 }
diff --git a/composer.json b/composer.json
index 1375c0105..e3068b065 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",
-        "yiisoft/yii2-bootstrap": "~2.0.0",
+        "yiisoft/yii2-bootstrap4": "~2.0.0",
         "yiisoft/yii2-swiftmailer": "~2.0.0 || ~2.1.0"
     },
     "require-dev": {
diff --git a/views/layouts/main.php b/views/layouts/main.php
index 87dfdcbc9..54d139995 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -3,40 +3,39 @@
 /* @var $this \yii\web\View */
 /* @var $content string */
 
-use app\widgets\Alert;
-use yii\helpers\Html;
-use yii\bootstrap\Nav;
-use yii\bootstrap\NavBar;
-use yii\widgets\Breadcrumbs;
 use app\assets\AppAsset;
+use app\widgets\Alert;
+use yii\bootstrap4\Breadcrumbs;
+use yii\bootstrap4\Html;
+use yii\bootstrap4\Nav;
+use yii\bootstrap4\NavBar;
 
 AppAsset::register($this);
 ?>
 <?php $this->beginPage() ?>
 <!DOCTYPE html>
-<html lang="<?= Yii::$app->language ?>">
+<html lang="<?= Yii::$app->language ?>" class="h-100">
 <head>
     <meta charset="<?= Yii::$app->charset ?>">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <?php $this->registerCsrfMetaTags() ?>
     <title><?= Html::encode($this->title) ?></title>
     <?php $this->head() ?>
 </head>
-<body>
+<body class="d-flex flex-column h-100">
 <?php $this->beginBody() ?>
 
-<div class="wrap">
+<header>
     <?php
     NavBar::begin([
         'brandLabel' => Yii::$app->name,
         'brandUrl' => Yii::$app->homeUrl,
         'options' => [
-            'class' => 'navbar-inverse navbar-fixed-top',
+            'class' => 'navbar navbar-expand-md navbar-dark bg-dark fixed-top',
         ],
     ]);
     echo Nav::widget([
-        'options' => ['class' => 'navbar-nav navbar-right'],
+        'options' => ['class' => 'navbar-nav'],
         'items' => [
             ['label' => 'Home', 'url' => ['/site/index']],
             ['label' => 'About', 'url' => ['/site/about']],
@@ -45,7 +44,7 @@
                 ['label' => 'Login', 'url' => ['/site/login']]
             ) : (
                 '<li>'
-                . Html::beginForm(['/site/logout'], 'post')
+                . Html::beginForm(['/site/logout'], 'post', ['class' => 'form-inline'])
                 . Html::submitButton(
                     'Logout (' . Yii::$app->user->identity->username . ')',
                     ['class' => 'btn btn-link logout']
@@ -57,7 +56,9 @@
     ]);
     NavBar::end();
     ?>
+</header>
 
+<main role="main" class="flex-shrink-0">
     <div class="container">
         <?= Breadcrumbs::widget([
             'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
@@ -65,13 +66,12 @@
         <?= Alert::widget() ?>
         <?= $content ?>
     </div>
-</div>
+</main>
 
-<footer class="footer">
+<footer class="footer mt-auto py-3 text-muted">
     <div class="container">
-        <p class="pull-left">&copy; My Company <?= date('Y') ?></p>
-
-        <p class="pull-right"><?= Yii::powered() ?></p>
+        <p class="float-left">&copy; My Company <?= date('Y') ?></p>
+        <p class="float-right"><?= Yii::powered() ?></p>
     </div>
 </footer>
 
diff --git a/views/site/contact.php b/views/site/contact.php
index f4c1e74a2..cf30f7f18 100644
--- a/views/site/contact.php
+++ b/views/site/contact.php
@@ -1,11 +1,11 @@
 <?php
 
 /* @var $this yii\web\View */
-/* @var $form yii\bootstrap\ActiveForm */
+/* @var $form yii\bootstrap4\ActiveForm */
 /* @var $model app\models\ContactForm */
 
-use yii\helpers\Html;
-use yii\bootstrap\ActiveForm;
+use yii\bootstrap4\ActiveForm;
+use yii\bootstrap4\Html;
 use yii\captcha\Captcha;
 
 $this->title = 'Contact';
diff --git a/views/site/index.php b/views/site/index.php
index f78061088..67c98b137 100644
--- a/views/site/index.php
+++ b/views/site/index.php
@@ -6,8 +6,8 @@
 ?>
 <div class="site-index">
 
-    <div class="jumbotron">
-        <h1>Congratulations!</h1>
+    <div class="jumbotron text-center bg-transparent">
+        <h1 class="display-4">Congratulations!</h1>
 
         <p class="lead">You have successfully created your Yii-powered application.</p>
 
@@ -25,7 +25,7 @@
                     ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
                     fugiat nulla pariatur.</p>
 
-                <p><a class="btn btn-default" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
+                <p><a class="btn btn-outline-secondary" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
             </div>
             <div class="col-lg-4">
                 <h2>Heading</h2>
@@ -35,7 +35,7 @@
                     ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
                     fugiat nulla pariatur.</p>
 
-                <p><a class="btn btn-default" href="http://www.yiiframework.com/forum/">Yii Forum &raquo;</a></p>
+                <p><a class="btn btn-outline-secondary" href="http://www.yiiframework.com/forum/">Yii Forum &raquo;</a></p>
             </div>
             <div class="col-lg-4">
                 <h2>Heading</h2>
@@ -45,7 +45,7 @@
                     ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
                     fugiat nulla pariatur.</p>
 
-                <p><a class="btn btn-default" href="http://www.yiiframework.com/extensions/">Yii Extensions &raquo;</a></p>
+                <p><a class="btn btn-outline-secondary" href="http://www.yiiframework.com/extensions/">Yii Extensions &raquo;</a></p>
             </div>
         </div>
 
diff --git a/views/site/login.php b/views/site/login.php
index 0944d37e4..8104ff130 100644
--- a/views/site/login.php
+++ b/views/site/login.php
@@ -1,11 +1,11 @@
 <?php
 
 /* @var $this yii\web\View */
-/* @var $form yii\bootstrap\ActiveForm */
+/* @var $form yii\bootstrap4\ActiveForm */
 /* @var $model app\models\LoginForm */
 
-use yii\helpers\Html;
-use yii\bootstrap\ActiveForm;
+use yii\bootstrap4\ActiveForm;
+use yii\bootstrap4\Html;
 
 $this->title = 'Login';
 $this->params['breadcrumbs'][] = $this->title;
@@ -20,7 +20,7 @@
         'layout' => 'horizontal',
         'fieldConfig' => [
             'template' => "{label}\n<div class=\"col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
-            'labelOptions' => ['class' => 'col-lg-1 control-label'],
+            'labelOptions' => ['class' => 'col-lg-1 col-form-label'],
         ],
     ]); ?>
 
@@ -29,18 +29,18 @@
         <?= $form->field($model, 'password')->passwordInput() ?>
 
         <?= $form->field($model, 'rememberMe')->checkbox([
-            'template' => "<div class=\"col-lg-offset-1 col-lg-3\">{input} {label}</div>\n<div class=\"col-lg-8\">{error}</div>",
+            'template' => "<div class=\"offset-lg-1 col-lg-3 custom-control custom-checkbox\">{input} {label}</div>\n<div class=\"col-lg-8\">{error}</div>",
         ]) ?>
 
         <div class="form-group">
-            <div class="col-lg-offset-1 col-lg-11">
+            <div class="offset-lg-1 col-lg-11">
                 <?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
             </div>
         </div>
 
     <?php ActiveForm::end(); ?>
 
-    <div class="col-lg-offset-1" style="color:#999;">
+    <div class="offset-lg-1" style="color:#999;">
         You may login with <strong>admin/admin</strong> or <strong>demo/demo</strong>.<br>
         To modify the username/password, please check out the code <code>app\models\User::$users</code>.
     </div>
diff --git a/web/css/site.css b/web/css/site.css
index 2bfebd275..cd81ae1c9 100644
--- a/web/css/site.css
+++ b/web/css/site.css
@@ -1,34 +1,16 @@
-html,
-body {
-    height: 100%;
-}
-
-.wrap {
-    min-height: 100%;
-    height: auto;
-    margin: 0 auto -60px;
-    padding: 0 0 60px;
-}
-
-.wrap > .container {
+main > .container {
     padding: 70px 15px 20px;
 }
 
 .footer {
-    height: 60px;
     background-color: #f5f5f5;
-    border-top: 1px solid #ddd;
-    padding-top: 20px;
-}
-
-.jumbotron {
-    text-align: center;
-    background-color: transparent;
+    font-size: .9em;
+    height: 60px;
 }
 
-.jumbotron .btn {
-    font-size: 21px;
-    padding: 14px 24px;
+.footer > .container {
+    padding-right: 15px;
+    padding-left: 15px;
 }
 
 .not-set {
@@ -38,38 +20,24 @@ body {
 
 /* add sorting icons to gridview sort links */
 a.asc:after, a.desc:after {
-    position: relative;
-    top: 1px;
+    content: '';
+    left: 3px;
     display: inline-block;
-    font-family: 'Glyphicons Halflings';
-    font-style: normal;
-    font-weight: normal;
-    line-height: 1;
-    padding-left: 5px;
+    width: 0;
+    height: 0;
+    border: solid 5px transparent;
+    margin: 4px 4px 2px 4px;
+    background: transparent;
 }
 
 a.asc:after {
-    content: /*"\e113"*/ "\e151";
+    border-bottom: solid 7px #212529;
+    border-top-width: 0;
 }
 
 a.desc:after {
-    content: /*"\e114"*/ "\e152";
-}
-
-.sort-numerical a.asc:after {
-    content: "\e153";
-}
-
-.sort-numerical a.desc:after {
-    content: "\e154";
-}
-
-.sort-ordinal a.asc:after {
-    content: "\e155";
-}
-
-.sort-ordinal a.desc:after {
-    content: "\e156";
+    border-top: solid 7px #212529;
+    border-bottom-width: 0;
 }
 
 .grid-view th {
@@ -92,8 +60,8 @@ a.desc:after {
 
 /* align the logout "link" (button in form) of the navbar */
 .nav li > form > button.logout {
-    padding: 15px;
-    border: none;
+    padding-top: 7px;
+    color: rgba(255, 255, 255, 0.5);
 }
 
 @media(max-width:767px) {
@@ -101,13 +69,14 @@ a.desc:after {
         display:block;
         text-align: left;
         width: 100%;
-        padding: 10px 15px;
+        padding: 10px 0;
     }
 }
 
 .nav > li > form > button.logout:focus,
 .nav > li > form > button.logout:hover {
     text-decoration: none;
+    color: rgba(255, 255, 255, 0.75);
 }
 
 .nav > li > form > button.logout:focus {
diff --git a/widgets/Alert.php b/widgets/Alert.php
index ae6c1d85c..9fbc73939 100644
--- a/widgets/Alert.php
+++ b/widgets/Alert.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace app\widgets;
 
 use Yii;
@@ -22,7 +23,7 @@
  * @author Kartik Visweswaran <kartikv2@gmail.com>
  * @author Alexander Makarov <sam@rmcreative.ru>
  */
-class Alert extends \yii\bootstrap\Widget
+class Alert extends \yii\bootstrap4\Widget
 {
     /**
      * @var array the alert types configuration for the flash messages.
@@ -59,7 +60,7 @@ public function run()
             }
 
             foreach ((array) $flash as $i => $message) {
-                echo \yii\bootstrap\Alert::widget([
+                echo \yii\bootstrap4\Alert::widget([
                     'body' => $message,
                     'closeButton' => $this->closeButton,
                     'options' => array_merge($this->options, [

From 2835572dc2dadd815121f8c740417729408fb376 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Mon, 9 Aug 2021 20:50:13 +0300
Subject: [PATCH 332/390] release version 2.0.43

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

diff --git a/composer.json b/composer.json
index e3068b065..75987a3dd 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From 4551a05d8892cf370ff7d2fff96e81cbb86dd081 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Mon, 9 Aug 2021 20:50:29 +0300
Subject: [PATCH 333/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 75987a3dd..e3068b065 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From 78604da44963bf84156ae8a688019ee44101f42b Mon Sep 17 00:00:00 2001
From: Mehdi Achour <machour@gmail.com>
Date: Sat, 4 Sep 2021 08:08:05 +0100
Subject: [PATCH 334/390] Fix typo in SECURITY.md [skip ci]

---
 .github/SECURITY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/SECURITY.md b/.github/SECURITY.md
index f71384759..405acca4e 100644
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -3,4 +3,4 @@
 Please use the [security issue form](https://www.yiiframework.com/security) to report to us any security issue you find in Yii.
 DO NOT use the issue tracker or discuss it in the public forum as it will cause more damage than help.
 
-Please note that as a non-commerial OpenSource project we are not able to pay bounties at the moment.
+Please note that as a non-commercial OpenSource project we are not able to pay bounties at the moment.

From fb5da1b4d0aa3371a995210be49db1e3e673b64b Mon Sep 17 00:00:00 2001
From: tobias-dietz <10538098+tobias-dietz@users.noreply.github.com>
Date: Wed, 15 Sep 2021 13:01:12 +0200
Subject: [PATCH 335/390] Fix #250: Make alert widget not access all flash data
 (#252)

---
 tests/unit/widgets/AlertTest.php | 261 +++++++++++++++++++++++++++++++
 widgets/Alert.php                |   7 +-
 2 files changed, 263 insertions(+), 5 deletions(-)
 create mode 100644 tests/unit/widgets/AlertTest.php

diff --git a/tests/unit/widgets/AlertTest.php b/tests/unit/widgets/AlertTest.php
new file mode 100644
index 000000000..5a84cbdb5
--- /dev/null
+++ b/tests/unit/widgets/AlertTest.php
@@ -0,0 +1,261 @@
+<?php
+
+namespace tests\unit\widgets;
+
+use app\widgets\Alert;
+use Yii;
+
+class AlertTest extends \Codeception\Test\Unit
+{
+    public function testSingleErrorMessage()
+    {
+        $message = 'This is an error message';
+
+        Yii::$app->session->setFlash('error', $message);
+
+        $renderingResult = Alert::widget();
+
+        expect($renderingResult)->stringContainsString($message);
+        expect($renderingResult)->stringContainsString('alert-danger');
+
+        expect($renderingResult)->stringNotContainsString('alert-success');
+        expect($renderingResult)->stringNotContainsString('alert-info');
+        expect($renderingResult)->stringNotContainsString('alert-warning');
+    }
+
+    public function testMultipleErrorMessages()
+    {
+        $firstMessage = 'This is the first error message';
+        $secondMessage = 'This is the second error message';
+
+        Yii::$app->session->setFlash('error', [$firstMessage, $secondMessage]);
+
+        $renderingResult = Alert::widget();
+
+        expect($renderingResult)->stringContainsString($firstMessage);
+        expect($renderingResult)->stringContainsString($secondMessage);
+        expect($renderingResult)->stringContainsString('alert-danger');
+
+        expect($renderingResult)->stringNotContainsString('alert-success');
+        expect($renderingResult)->stringNotContainsString('alert-info');
+        expect($renderingResult)->stringNotContainsString('alert-warning');
+    }
+
+    public function testSingleDangerMessage()
+    {
+        $message = 'This is a danger message';
+
+        Yii::$app->session->setFlash('danger', $message);
+
+        $renderingResult = Alert::widget();
+
+        expect($renderingResult)->stringContainsString($message);
+        expect($renderingResult)->stringContainsString('alert-danger');
+
+        expect($renderingResult)->stringNotContainsString('alert-success');
+        expect($renderingResult)->stringNotContainsString('alert-info');
+        expect($renderingResult)->stringNotContainsString('alert-warning');
+    }
+
+    public function testMultipleDangerMessages()
+    {
+        $firstMessage = 'This is the first danger message';
+        $secondMessage = 'This is the second danger message';
+
+        Yii::$app->session->setFlash('danger', [$firstMessage, $secondMessage]);
+
+        $renderingResult = Alert::widget();
+
+        expect($renderingResult)->stringContainsString($firstMessage);
+        expect($renderingResult)->stringContainsString($secondMessage);
+        expect($renderingResult)->stringContainsString('alert-danger');
+
+        expect($renderingResult)->stringNotContainsString('alert-success');
+        expect($renderingResult)->stringNotContainsString('alert-info');
+        expect($renderingResult)->stringNotContainsString('alert-warning');
+    }
+
+    public function testSingleSuccessMessage()
+    {
+        $message = 'This is a success message';
+
+        Yii::$app->session->setFlash('success', $message);
+
+        $renderingResult = Alert::widget();
+
+        expect($renderingResult)->stringContainsString($message);
+        expect($renderingResult)->stringContainsString('alert-success');
+
+        expect($renderingResult)->stringNotContainsString('alert-danger');
+        expect($renderingResult)->stringNotContainsString('alert-info');
+        expect($renderingResult)->stringNotContainsString('alert-warning');
+    }
+
+    public function testMultipleSuccessMessages()
+    {
+        $firstMessage = 'This is the first danger message';
+        $secondMessage = 'This is the second danger message';
+
+        Yii::$app->session->setFlash('success', [$firstMessage, $secondMessage]);
+
+        $renderingResult = Alert::widget();
+
+        expect($renderingResult)->stringContainsString($firstMessage);
+        expect($renderingResult)->stringContainsString($secondMessage);
+        expect($renderingResult)->stringContainsString('alert-success');
+
+        expect($renderingResult)->stringNotContainsString('alert-danger');
+        expect($renderingResult)->stringNotContainsString('alert-info');
+        expect($renderingResult)->stringNotContainsString('alert-warning');
+    }
+
+    public function testSingleInfoMessage()
+    {
+        $message = 'This is an info message';
+
+        Yii::$app->session->setFlash('info', $message);
+
+        $renderingResult = Alert::widget();
+
+        expect($renderingResult)->stringContainsString($message);
+        expect($renderingResult)->stringContainsString('alert-info');
+
+        expect($renderingResult)->stringNotContainsString('alert-danger');
+        expect($renderingResult)->stringNotContainsString('alert-success');
+        expect($renderingResult)->stringNotContainsString('alert-warning');
+    }
+
+    public function testMultipleInfoMessages()
+    {
+        $firstMessage = 'This is the first info message';
+        $secondMessage = 'This is the second info message';
+
+        Yii::$app->session->setFlash('info', [$firstMessage, $secondMessage]);
+
+        $renderingResult = Alert::widget();
+
+        expect($renderingResult)->stringContainsString($firstMessage);
+        expect($renderingResult)->stringContainsString($secondMessage);
+        expect($renderingResult)->stringContainsString('alert-info');
+
+        expect($renderingResult)->stringNotContainsString('alert-danger');
+        expect($renderingResult)->stringNotContainsString('alert-success');
+        expect($renderingResult)->stringNotContainsString('alert-warning');
+    }
+
+    public function testSingleWarningMessage()
+    {
+        $message = 'This is a warning message';
+
+        Yii::$app->session->setFlash('warning', $message);
+
+        $renderingResult = Alert::widget();
+
+        expect($renderingResult)->stringContainsString($message);
+        expect($renderingResult)->stringContainsString('alert-warning');
+
+        expect($renderingResult)->stringNotContainsString('alert-danger');
+        expect($renderingResult)->stringNotContainsString('alert-success');
+        expect($renderingResult)->stringNotContainsString('alert-info');
+    }
+
+    public function testMultipleWarningMessages()
+    {
+        $firstMessage = 'This is the first warning message';
+        $secondMessage = 'This is the second warning message';
+
+        Yii::$app->session->setFlash('warning', [$firstMessage, $secondMessage]);
+
+        $renderingResult = Alert::widget();
+
+        expect($renderingResult)->stringContainsString($firstMessage);
+        expect($renderingResult)->stringContainsString($secondMessage);
+        expect($renderingResult)->stringContainsString('alert-warning');
+
+        expect($renderingResult)->stringNotContainsString('alert-danger');
+        expect($renderingResult)->stringNotContainsString('alert-success');
+        expect($renderingResult)->stringNotContainsString('alert-info');
+    }
+
+    public function testSingleMixedMessages() {
+        $errorMessage = 'This is an error message';
+        $dangerMessage = 'This is a danger message';
+        $successMessage = 'This is a success message';
+        $infoMessage = 'This is a info message';
+        $warningMessage = 'This is a warning message';
+
+        Yii::$app->session->setFlash('error', $errorMessage);
+        Yii::$app->session->setFlash('danger', $dangerMessage);
+        Yii::$app->session->setFlash('success', $successMessage);
+        Yii::$app->session->setFlash('info', $infoMessage);
+        Yii::$app->session->setFlash('warning', $warningMessage);
+
+        $renderingResult = Alert::widget();
+
+        expect($renderingResult)->stringContainsString($errorMessage);
+        expect($renderingResult)->stringContainsString($dangerMessage);
+        expect($renderingResult)->stringContainsString($successMessage);
+        expect($renderingResult)->stringContainsString($infoMessage);
+        expect($renderingResult)->stringContainsString($warningMessage);
+
+        expect($renderingResult)->stringContainsString('alert-danger');
+        expect($renderingResult)->stringContainsString('alert-success');
+        expect($renderingResult)->stringContainsString('alert-info');
+        expect($renderingResult)->stringContainsString('alert-warning');
+    }
+
+    public function testMultipleMixedMessages() {
+        $firstErrorMessage = 'This is the first error message';
+        $secondErrorMessage = 'This is the second error message';
+        $firstDangerMessage = 'This is the first danger message';
+        $secondDangerMessage = 'This is the second';
+        $firstSuccessMessage = 'This is the first success message';
+        $secondSuccessMessage = 'This is the second success message';
+        $firstInfoMessage = 'This is the first info message';
+        $secondInfoMessage = 'This is the second info message';
+        $firstWarningMessage = 'This is the first warning message';
+        $secondWarningMessage = 'This is the second warning message';
+
+        Yii::$app->session->setFlash('error', [$firstErrorMessage, $secondErrorMessage]);
+        Yii::$app->session->setFlash('danger', [$firstDangerMessage, $secondDangerMessage]);
+        Yii::$app->session->setFlash('success', [$firstSuccessMessage, $secondSuccessMessage]);
+        Yii::$app->session->setFlash('info', [$firstInfoMessage, $secondInfoMessage]);
+        Yii::$app->session->setFlash('warning', [$firstWarningMessage, $secondWarningMessage]);
+
+        $renderingResult = Alert::widget();
+
+        expect($renderingResult)->stringContainsString($firstErrorMessage);
+        expect($renderingResult)->stringContainsString($secondErrorMessage);
+        expect($renderingResult)->stringContainsString($firstDangerMessage);
+        expect($renderingResult)->stringContainsString($secondDangerMessage);
+        expect($renderingResult)->stringContainsString($firstSuccessMessage);
+        expect($renderingResult)->stringContainsString($secondSuccessMessage);
+        expect($renderingResult)->stringContainsString($firstInfoMessage);
+        expect($renderingResult)->stringContainsString($secondInfoMessage);
+        expect($renderingResult)->stringContainsString($firstWarningMessage);
+        expect($renderingResult)->stringContainsString($secondWarningMessage);
+
+        expect($renderingResult)->stringContainsString('alert-danger');
+        expect($renderingResult)->stringContainsString('alert-success');
+        expect($renderingResult)->stringContainsString('alert-info');
+        expect($renderingResult)->stringContainsString('alert-warning');
+    }
+
+    public function testFlashIntegrity()
+    {
+        $errorMessage = 'This is an error message';
+        $unrelatedMessage = 'This is a message that is not related to the alert widget';
+
+        Yii::$app->session->setFlash('error', $errorMessage);
+        Yii::$app->session->setFlash('unrelated', $unrelatedMessage);
+
+        Alert::widget();
+
+        // Simulate redirect
+        Yii::$app->session->close();
+        Yii::$app->session->open();
+
+        expect(Yii::$app->session->getFlash('error'))->null();
+        expect(Yii::$app->session->getFlash('unrelated'))->equals($unrelatedMessage);
+    }
+}
diff --git a/widgets/Alert.php b/widgets/Alert.php
index 9fbc73939..fd2b1955c 100644
--- a/widgets/Alert.php
+++ b/widgets/Alert.php
@@ -51,13 +51,10 @@ class Alert extends \yii\bootstrap4\Widget
     public function run()
     {
         $session = Yii::$app->session;
-        $flashes = $session->getAllFlashes();
         $appendClass = isset($this->options['class']) ? ' ' . $this->options['class'] : '';
 
-        foreach ($flashes as $type => $flash) {
-            if (!isset($this->alertTypes[$type])) {
-                continue;
-            }
+        foreach (array_keys($this->alertTypes) as $type) {
+            $flash = $session->getFlash($type);
 
             foreach ((array) $flash as $i => $message) {
                 echo \yii\bootstrap4\Alert::widget([

From 032681963751244b4d1154d53ed83bb71b3ff217 Mon Sep 17 00:00:00 2001
From: Sohel Ahmed Mesaniya <sam.wankaner@gmail.com>
Date: Tue, 28 Sep 2021 03:54:29 +0530
Subject: [PATCH 336/390] Add IDE autocomplete hints (#253)

---
 config/__autocomplete.php | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 config/__autocomplete.php

diff --git a/config/__autocomplete.php b/config/__autocomplete.php
new file mode 100644
index 000000000..d99dea50e
--- /dev/null
+++ b/config/__autocomplete.php
@@ -0,0 +1,33 @@
+<?php
+
+/**
+ * This class only exists here for IDE (PHPStorm/Netbeans/...) autocompletion.
+ * This file is never included anywhere.
+ * Adjust this file to match classes configured in your application config, to enable IDE autocompletion for custom components.
+ * Example: A property phpdoc can be added in `__Application` class as `@property \vendor\package\Rollbar|__Rollbar $rollbar` and adding a class in this file
+ * ```php
+ * // @property of \vendor\package\Rollbar goes here
+ * class __Rollbar {
+ * }
+ * ```
+ */
+class Yii {
+    /**
+     * @var \yii\web\Application|\yii\console\Application|__Application
+     */
+    public static $app;
+}
+
+/**
+ * @property yii\rbac\DbManager $authManager 
+ * @property \yii\web\User|__WebUser $user
+ * 
+ */
+class __Application {
+}
+
+/**
+ * @property app\models\User $identity
+ */
+class __WebUser {
+}

From f878dd90847488fa423a9b2e87cc4d894e6c20bf Mon Sep 17 00:00:00 2001
From: Toir Tuychiev <toir427@gmail.com>
Date: Sat, 2 Oct 2021 12:21:51 +0500
Subject: [PATCH 337/390] Typo fixes (#254)

---
 .github/ISSUE_TEMPLATE.md         | 2 +-
 README.md                         | 4 ++--
 config/web.php                    | 2 +-
 vagrant/provision/once-as-root.sh | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 52ec8692f..a2ee92439 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -9,6 +9,6 @@
 
 | Q                | A
 | ---------------- | ---
-| Yii vesion       |
+| Yii version       |
 | PHP version      |
 | Operating system |
diff --git a/README.md b/README.md
index 6db290bfa..fd9b5f6a1 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ TESTING
 -------
 
 Tests are located in `tests` directory. They are developed with [Codeception PHP Testing Framework](http://codeception.com/).
-By default there are 3 test suites:
+By default, there are 3 test suites:
 
 - `unit`
 - `functional`
@@ -155,7 +155,7 @@ To execute acceptance tests do the following:
 
 1. Rename `tests/acceptance.suite.yml.example` to `tests/acceptance.suite.yml` to enable suite configuration
 
-2. Replace `codeception/base` package in `composer.json` with `codeception/codeception` to install full featured
+2. Replace `codeception/base` package in `composer.json` with `codeception/codeception` to install full-featured
    version of Codeception
 
 3. Update dependencies with Composer 
diff --git a/config/web.php b/config/web.php
index 3c03de8c5..25cb0d0a2 100644
--- a/config/web.php
+++ b/config/web.php
@@ -29,7 +29,7 @@
         'mailer' => [
             'class' => 'yii\swiftmailer\Mailer',
             // send all mails to a file by default. You have to set
-            // 'useFileTransport' to false and configure a transport
+            // 'useFileTransport' to false and configure transport
             // for the mailer to send real emails.
             'useFileTransport' => true,
         ],
diff --git a/vagrant/provision/once-as-root.sh b/vagrant/provision/once-as-root.sh
index 75cbf5a2c..1d2917016 100644
--- a/vagrant/provision/once-as-root.sh
+++ b/vagrant/provision/once-as-root.sh
@@ -70,7 +70,7 @@ info "Removing default site configuration"
 rm /etc/nginx/sites-enabled/default
 echo "Done!"
 
-info "Initailize databases for MySQL"
+info "Initialize databases for MySQL"
 mysql <<< 'CREATE DATABASE yii2basic'
 mysql <<< 'CREATE DATABASE yii2basic_test'
 echo "Done!"

From 1d283a477af32f0c1ccd43fe5e661710a50dff53 Mon Sep 17 00:00:00 2001
From: Bizley <pawel@positive.codes>
Date: Sun, 31 Oct 2021 19:06:57 +0000
Subject: [PATCH 338/390] Fix #256: Fix error message in login form (#257)

---
 views/site/login.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/views/site/login.php b/views/site/login.php
index 8104ff130..598fd81ad 100644
--- a/views/site/login.php
+++ b/views/site/login.php
@@ -19,8 +19,10 @@
         'id' => 'login-form',
         'layout' => 'horizontal',
         'fieldConfig' => [
-            'template' => "{label}\n<div class=\"col-lg-3\">{input}</div>\n<div class=\"col-lg-8\">{error}</div>",
-            'labelOptions' => ['class' => 'col-lg-1 col-form-label'],
+            'template' => "{label}\n{input}\n{error}",
+            'labelOptions' => ['class' => 'col-lg-1 col-form-label mr-lg-3'],
+            'inputOptions' => ['class' => 'col-lg-3 form-control'],
+            'errorOptions' => ['class' => 'col-lg-7 invalid-feedback'],
         ],
     ]); ?>
 

From 479a83cc94518ee148f96338eda53c1119a19578 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 30 Dec 2021 10:59:54 +0300
Subject: [PATCH 339/390] release version 2.0.44

---
 composer.json        | 2 +-
 models/LoginForm.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index e3068b065..75987a3dd 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",
diff --git a/models/LoginForm.php b/models/LoginForm.php
index 66d658068..dce15ccf7 100644
--- a/models/LoginForm.php
+++ b/models/LoginForm.php
@@ -8,7 +8,7 @@
 /**
  * LoginForm is the model behind the login form.
  *
- * @property-read User|null $user This property is read-only.
+ * @property-read User|null $user
  *
  */
 class LoginForm extends Model

From 47614b78e07bba944382300ab2c97a797c39ca37 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 30 Dec 2021 11:00:09 +0300
Subject: [PATCH 340/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 75987a3dd..e3068b065 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From 19f5d09c92d0e0b5e80e3bf07c38d53bafe50f33 Mon Sep 17 00:00:00 2001
From: Evgeniy Tkachenko <et.coder@gmail.com>
Date: Fri, 14 Jan 2022 22:47:17 +0300
Subject: [PATCH 341/390] docs: correct Syntax for phpDoc (#258)

Co-authored-by: githubjeka <etcoder@gmail.com>
---
 mail/layouts/html.php  | 6 +++---
 views/layouts/main.php | 4 ++--
 views/site/about.php   | 2 +-
 views/site/contact.php | 6 +++---
 views/site/error.php   | 8 ++++----
 views/site/index.php   | 2 +-
 views/site/login.php   | 6 +++---
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/mail/layouts/html.php b/mail/layouts/html.php
index bddbc6129..95732cdfa 100644
--- a/mail/layouts/html.php
+++ b/mail/layouts/html.php
@@ -1,9 +1,9 @@
 <?php
 use yii\helpers\Html;
 
-/* @var $this \yii\web\View view component instance */
-/* @var $message \yii\mail\MessageInterface the message being composed */
-/* @var $content string main view render result */
+/** @var \yii\web\View $this view component instance */
+/** @var \yii\mail\MessageInterface $message the message being composed */
+/** @var string $content main view render result */
 ?>
 <?php $this->beginPage() ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
diff --git a/views/layouts/main.php b/views/layouts/main.php
index 54d139995..67328ca86 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -1,7 +1,7 @@
 <?php
 
-/* @var $this \yii\web\View */
-/* @var $content string */
+/** @var yii\web\View $this */
+/** @var string $content */
 
 use app\assets\AppAsset;
 use app\widgets\Alert;
diff --git a/views/site/about.php b/views/site/about.php
index 68d5cf3bd..ea006ecda 100644
--- a/views/site/about.php
+++ b/views/site/about.php
@@ -1,6 +1,6 @@
 <?php
 
-/* @var $this yii\web\View */
+/** @var yii\web\View $this */
 
 use yii\helpers\Html;
 
diff --git a/views/site/contact.php b/views/site/contact.php
index cf30f7f18..d92e21ff5 100644
--- a/views/site/contact.php
+++ b/views/site/contact.php
@@ -1,8 +1,8 @@
 <?php
 
-/* @var $this yii\web\View */
-/* @var $form yii\bootstrap4\ActiveForm */
-/* @var $model app\models\ContactForm */
+/** @var yii\web\View $this */
+/** @var yii\bootstrap4\ActiveForm $form */
+/** @var app\models\ContactForm $model */
 
 use yii\bootstrap4\ActiveForm;
 use yii\bootstrap4\Html;
diff --git a/views/site/error.php b/views/site/error.php
index 0ba257465..4a37b2568 100644
--- a/views/site/error.php
+++ b/views/site/error.php
@@ -1,9 +1,9 @@
 <?php
 
-/* @var $this yii\web\View */
-/* @var $name string */
-/* @var $message string */
-/* @var $exception Exception */
+/** @var yii\web\View $this */
+/** @var string $name */
+/** @var string $message */
+/** @var Exception$exception */
 
 use yii\helpers\Html;
 
diff --git a/views/site/index.php b/views/site/index.php
index 67c98b137..a981f912c 100644
--- a/views/site/index.php
+++ b/views/site/index.php
@@ -1,6 +1,6 @@
 <?php
 
-/* @var $this yii\web\View */
+/** @var yii\web\View $this */
 
 $this->title = 'My Yii Application';
 ?>
diff --git a/views/site/login.php b/views/site/login.php
index 598fd81ad..c8d495ebe 100644
--- a/views/site/login.php
+++ b/views/site/login.php
@@ -1,8 +1,8 @@
 <?php
 
-/* @var $this yii\web\View */
-/* @var $form yii\bootstrap4\ActiveForm */
-/* @var $model app\models\LoginForm */
+/** @var yii\web\View $this */
+/** @var yii\bootstrap4\ActiveForm $form */
+/** @var app\models\LoginForm $model */
 
 use yii\bootstrap4\ActiveForm;
 use yii\bootstrap4\Html;

From 36bdb82034c1d9386427a9a1492618ca7505c0ce Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 11 Feb 2022 16:26:38 +0300
Subject: [PATCH 342/390] release version 2.0.45

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

diff --git a/composer.json b/composer.json
index e3068b065..75987a3dd 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From 0f429780b44c9e8b347c22bbded672fb176b83b0 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 11 Feb 2022 16:28:03 +0300
Subject: [PATCH 343/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 75987a3dd..e3068b065 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.0",
         "yiisoft/yii2": "~2.0.14",

From 60d89fc5527fc8bf04d3d4683a5739270dec6f5b Mon Sep 17 00:00:00 2001
From: Luke English <luke@developedsoftware.com>
Date: Thu, 24 Feb 2022 21:45:17 +0000
Subject: [PATCH 344/390] Make template compatible with PHP 8.1 and Codeception
 5 (#259)

Co-authored-by: Luke English <luke.english@ec2i.biz>
---
 .github/workflows/build.yml          | 1 +
 tests/functional.suite.yml           | 1 +
 tests/functional/ContactFormCest.php | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0671f8970..103e74537 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,6 +28,7 @@ jobs:
           - "7.3"
           - "7.4"
           - "8.0"
+          - "8.1"
           
     steps:
       - name: Checkout
diff --git a/tests/functional.suite.yml b/tests/functional.suite.yml
index 374c6df45..6d6ff7b4d 100644
--- a/tests/functional.suite.yml
+++ b/tests/functional.suite.yml
@@ -11,3 +11,4 @@ modules:
     enabled:
       - Filesystem
       - Yii2
+      - Asserts
diff --git a/tests/functional/ContactFormCest.php b/tests/functional/ContactFormCest.php
index ad8167865..d17ef52fd 100644
--- a/tests/functional/ContactFormCest.php
+++ b/tests/functional/ContactFormCest.php
@@ -4,7 +4,7 @@ class ContactFormCest
 {
     public function _before(\FunctionalTester $I)
     {
-        $I->amOnPage(['site/contact']);
+        $I->amOnRoute('site/contact');
     }
 
     public function openContactPage(\FunctionalTester $I)

From 94bfe898451a67c066cff9559b6e7dc2634aaee4 Mon Sep 17 00:00:00 2001
From: Luke English <luke@developedsoftware.com>
Date: Fri, 25 Feb 2022 14:58:50 +0000
Subject: [PATCH 345/390] Update to PHP 7.4 and codeception/verify 2.2 (#260)

Co-authored-by: Luke English <luke.english@ec2i.biz>
---
 .github/workflows/build.yml           |   5 -
 composer.json                         |  19 +--
 controllers/SiteController.php        |   4 +-
 tests/unit/models/ContactFormTest.php |  14 +--
 tests/unit/models/LoginFormTest.php   |  16 +--
 tests/unit/models/UserTest.php        |  24 ++--
 tests/unit/widgets/AlertTest.php      | 162 +++++++++++++-------------
 views/site/contact.php                |   2 +-
 8 files changed, 122 insertions(+), 124 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 103e74537..f1065f909 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,11 +21,6 @@ jobs:
           - windows-latest
 
         php:
-          - "5.6"
-          - "7.0"
-          - "7.1"
-          - "7.2"
-          - "7.3"
           - "7.4"
           - "8.0"
           - "8.1"
diff --git a/composer.json b/composer.json
index e3068b065..7db83cfc4 100644
--- a/composer.json
+++ b/composer.json
@@ -14,24 +14,27 @@
     },
     "minimum-stability": "dev",
     "require": {
-        "php": ">=5.6.0",
+        "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.14",
         "yiisoft/yii2-bootstrap4": "~2.0.0",
-        "yiisoft/yii2-swiftmailer": "~2.0.0 || ~2.1.0"
+        "yiisoft/yii2-swiftmailer": "~2.0.0 || ~2.1.0",
+        "yiisoft/yii2-symfonymailer": "~2.0.3"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.1.0",
         "yiisoft/yii2-gii": "~2.2.0",
         "yiisoft/yii2-faker": "~2.0.0",
         "codeception/codeception": "^4.0",
-        "codeception/verify": "~0.5.0 || ~1.1.0",
-        "codeception/specify": "~0.4.6",
-        "symfony/browser-kit": ">=2.7 <=4.2.4",
-        "codeception/module-filesystem": "^1.0.0",
-        "codeception/module-yii2": "^1.0.0",
-        "codeception/module-asserts": "^1.0.0"
+        "codeception/module-asserts": "^1.0",
+        "codeception/module-yii2": "^1.0",
+        "codeception/module-filesystem": "^1.0",
+        "codeception/verify": "^2.2",
+        "symfony/browser-kit": ">=2.7 <=4.2.4"
     },
     "config": {
+        "allow-plugins": {
+            "yiisoft/yii2-composer" : true
+        },
         "process-timeout": 1800,
         "fxp-asset": {
             "enabled": false
diff --git a/controllers/SiteController.php b/controllers/SiteController.php
index 6e8a85d10..67c3f50f8 100644
--- a/controllers/SiteController.php
+++ b/controllers/SiteController.php
@@ -19,7 +19,7 @@ public function behaviors()
     {
         return [
             'access' => [
-                'class' => AccessControl::className(),
+                'class' => AccessControl::class,
                 'only' => ['logout'],
                 'rules' => [
                     [
@@ -30,7 +30,7 @@ public function behaviors()
                 ],
             ],
             'verbs' => [
-                'class' => VerbFilter::className(),
+                'class' => VerbFilter::class,
                 'actions' => [
                     'logout' => ['post'],
                 ],
diff --git a/tests/unit/models/ContactFormTest.php b/tests/unit/models/ContactFormTest.php
index 93313e4a6..1bb1bb2d0 100644
--- a/tests/unit/models/ContactFormTest.php
+++ b/tests/unit/models/ContactFormTest.php
@@ -24,18 +24,18 @@ public function testEmailIsSentOnContact()
             'verifyCode' => 'testme',
         ];
 
-        expect_that($model->contact('admin@example.com'));
+        verify($model->contact('admin@example.com'))->notEmpty();
 
         // using Yii2 module actions to check email was sent
         $this->tester->seeEmailIsSent();
 
         /** @var MessageInterface $emailMessage */
         $emailMessage = $this->tester->grabLastSentEmail();
-        expect('valid email is sent', $emailMessage)->isInstanceOf('yii\mail\MessageInterface');
-        expect($emailMessage->getTo())->hasKey('admin@example.com');
-        expect($emailMessage->getFrom())->hasKey('noreply@example.com');
-        expect($emailMessage->getReplyTo())->hasKey('tester@example.com');
-        expect($emailMessage->getSubject())->equals('very important letter subject');
-        expect($emailMessage->toString())->stringContainsString('body of current message');
+        verify($emailMessage)->instanceOf('yii\mail\MessageInterface');
+        verify($emailMessage->getTo())->arrayHasKey('admin@example.com');
+        verify($emailMessage->getFrom())->arrayHasKey('noreply@example.com');
+        verify($emailMessage->getReplyTo())->arrayHasKey('tester@example.com');
+        verify($emailMessage->getSubject())->equals('very important letter subject');
+        verify($emailMessage->toString())->stringContainsString('body of current message');
     }
 }
diff --git a/tests/unit/models/LoginFormTest.php b/tests/unit/models/LoginFormTest.php
index ecdb14512..3c1dcddaa 100644
--- a/tests/unit/models/LoginFormTest.php
+++ b/tests/unit/models/LoginFormTest.php
@@ -20,8 +20,8 @@ public function testLoginNoUser()
             'password' => 'not_existing_password',
         ]);
 
-        expect_not($this->model->login());
-        expect_that(\Yii::$app->user->isGuest);
+        verify($this->model->login())->false();
+        verify(\Yii::$app->user->isGuest)->true();
     }
 
     public function testLoginWrongPassword()
@@ -31,9 +31,9 @@ public function testLoginWrongPassword()
             'password' => 'wrong_password',
         ]);
 
-        expect_not($this->model->login());
-        expect_that(\Yii::$app->user->isGuest);
-        expect($this->model->errors)->hasKey('password');
+        verify($this->model->login())->false();
+        verify(\Yii::$app->user->isGuest)->true();
+        verify($this->model->errors)->arrayHasKey('password');
     }
 
     public function testLoginCorrect()
@@ -43,9 +43,9 @@ public function testLoginCorrect()
             'password' => 'demo',
         ]);
 
-        expect_that($this->model->login());
-        expect_not(\Yii::$app->user->isGuest);
-        expect($this->model->errors)->hasntKey('password');
+        verify($this->model->login())->true();
+        verify(\Yii::$app->user->isGuest)->false();
+        verify($this->model->errors)->arrayHasNotKey('password');
     }
 
 }
diff --git a/tests/unit/models/UserTest.php b/tests/unit/models/UserTest.php
index cb612785f..cd1072593 100644
--- a/tests/unit/models/UserTest.php
+++ b/tests/unit/models/UserTest.php
@@ -8,24 +8,24 @@ class UserTest extends \Codeception\Test\Unit
 {
     public function testFindUserById()
     {
-        expect_that($user = User::findIdentity(100));
-        expect($user->username)->equals('admin');
+        verify($user = User::findIdentity(100))->notEmpty();
+        verify($user->username)->equals('admin');
 
-        expect_not(User::findIdentity(999));
+        verify(User::findIdentity(999))->empty();
     }
 
     public function testFindUserByAccessToken()
     {
-        expect_that($user = User::findIdentityByAccessToken('100-token'));
-        expect($user->username)->equals('admin');
+        verify($user = User::findIdentityByAccessToken('100-token'))->notEmpty();
+        verify($user->username)->equals('admin');
 
-        expect_not(User::findIdentityByAccessToken('non-existing'));        
+        verify(User::findIdentityByAccessToken('non-existing'))->empty();        
     }
 
     public function testFindUserByUsername()
     {
-        expect_that($user = User::findByUsername('admin'));
-        expect_not(User::findByUsername('not-admin'));
+        verify($user = User::findByUsername('admin'))->notEmpty();
+        verify(User::findByUsername('not-admin'))->empty();
     }
 
     /**
@@ -34,11 +34,11 @@ public function testFindUserByUsername()
     public function testValidateUser($user)
     {
         $user = User::findByUsername('admin');
-        expect_that($user->validateAuthKey('test100key'));
-        expect_not($user->validateAuthKey('test102key'));
+        verify($user->validateAuthKey('test100key'))->notEmpty();
+        verify($user->validateAuthKey('test102key'))->empty();
 
-        expect_that($user->validatePassword('admin'));
-        expect_not($user->validatePassword('123456'));        
+        verify($user->validatePassword('admin'))->notEmpty();
+        verify($user->validatePassword('123456'))->empty();        
     }
 
 }
diff --git a/tests/unit/widgets/AlertTest.php b/tests/unit/widgets/AlertTest.php
index 5a84cbdb5..e9857a161 100644
--- a/tests/unit/widgets/AlertTest.php
+++ b/tests/unit/widgets/AlertTest.php
@@ -15,12 +15,12 @@ public function testSingleErrorMessage()
 
         $renderingResult = Alert::widget();
 
-        expect($renderingResult)->stringContainsString($message);
-        expect($renderingResult)->stringContainsString('alert-danger');
+        verify($renderingResult)->stringContainsString($message);
+        verify($renderingResult)->stringContainsString('alert-danger');
 
-        expect($renderingResult)->stringNotContainsString('alert-success');
-        expect($renderingResult)->stringNotContainsString('alert-info');
-        expect($renderingResult)->stringNotContainsString('alert-warning');
+        verify($renderingResult)->stringNotContainsString('alert-success');
+        verify($renderingResult)->stringNotContainsString('alert-info');
+        verify($renderingResult)->stringNotContainsString('alert-warning');
     }
 
     public function testMultipleErrorMessages()
@@ -32,13 +32,13 @@ public function testMultipleErrorMessages()
 
         $renderingResult = Alert::widget();
 
-        expect($renderingResult)->stringContainsString($firstMessage);
-        expect($renderingResult)->stringContainsString($secondMessage);
-        expect($renderingResult)->stringContainsString('alert-danger');
+        verify($renderingResult)->stringContainsString($firstMessage);
+        verify($renderingResult)->stringContainsString($secondMessage);
+        verify($renderingResult)->stringContainsString('alert-danger');
 
-        expect($renderingResult)->stringNotContainsString('alert-success');
-        expect($renderingResult)->stringNotContainsString('alert-info');
-        expect($renderingResult)->stringNotContainsString('alert-warning');
+        verify($renderingResult)->stringNotContainsString('alert-success');
+        verify($renderingResult)->stringNotContainsString('alert-info');
+        verify($renderingResult)->stringNotContainsString('alert-warning');
     }
 
     public function testSingleDangerMessage()
@@ -49,12 +49,12 @@ public function testSingleDangerMessage()
 
         $renderingResult = Alert::widget();
 
-        expect($renderingResult)->stringContainsString($message);
-        expect($renderingResult)->stringContainsString('alert-danger');
+        verify($renderingResult)->stringContainsString($message);
+        verify($renderingResult)->stringContainsString('alert-danger');
 
-        expect($renderingResult)->stringNotContainsString('alert-success');
-        expect($renderingResult)->stringNotContainsString('alert-info');
-        expect($renderingResult)->stringNotContainsString('alert-warning');
+        verify($renderingResult)->stringNotContainsString('alert-success');
+        verify($renderingResult)->stringNotContainsString('alert-info');
+        verify($renderingResult)->stringNotContainsString('alert-warning');
     }
 
     public function testMultipleDangerMessages()
@@ -66,13 +66,13 @@ public function testMultipleDangerMessages()
 
         $renderingResult = Alert::widget();
 
-        expect($renderingResult)->stringContainsString($firstMessage);
-        expect($renderingResult)->stringContainsString($secondMessage);
-        expect($renderingResult)->stringContainsString('alert-danger');
+        verify($renderingResult)->stringContainsString($firstMessage);
+        verify($renderingResult)->stringContainsString($secondMessage);
+        verify($renderingResult)->stringContainsString('alert-danger');
 
-        expect($renderingResult)->stringNotContainsString('alert-success');
-        expect($renderingResult)->stringNotContainsString('alert-info');
-        expect($renderingResult)->stringNotContainsString('alert-warning');
+        verify($renderingResult)->stringNotContainsString('alert-success');
+        verify($renderingResult)->stringNotContainsString('alert-info');
+        verify($renderingResult)->stringNotContainsString('alert-warning');
     }
 
     public function testSingleSuccessMessage()
@@ -83,12 +83,12 @@ public function testSingleSuccessMessage()
 
         $renderingResult = Alert::widget();
 
-        expect($renderingResult)->stringContainsString($message);
-        expect($renderingResult)->stringContainsString('alert-success');
+        verify($renderingResult)->stringContainsString($message);
+        verify($renderingResult)->stringContainsString('alert-success');
 
-        expect($renderingResult)->stringNotContainsString('alert-danger');
-        expect($renderingResult)->stringNotContainsString('alert-info');
-        expect($renderingResult)->stringNotContainsString('alert-warning');
+        verify($renderingResult)->stringNotContainsString('alert-danger');
+        verify($renderingResult)->stringNotContainsString('alert-info');
+        verify($renderingResult)->stringNotContainsString('alert-warning');
     }
 
     public function testMultipleSuccessMessages()
@@ -100,13 +100,13 @@ public function testMultipleSuccessMessages()
 
         $renderingResult = Alert::widget();
 
-        expect($renderingResult)->stringContainsString($firstMessage);
-        expect($renderingResult)->stringContainsString($secondMessage);
-        expect($renderingResult)->stringContainsString('alert-success');
+        verify($renderingResult)->stringContainsString($firstMessage);
+        verify($renderingResult)->stringContainsString($secondMessage);
+        verify($renderingResult)->stringContainsString('alert-success');
 
-        expect($renderingResult)->stringNotContainsString('alert-danger');
-        expect($renderingResult)->stringNotContainsString('alert-info');
-        expect($renderingResult)->stringNotContainsString('alert-warning');
+        verify($renderingResult)->stringNotContainsString('alert-danger');
+        verify($renderingResult)->stringNotContainsString('alert-info');
+        verify($renderingResult)->stringNotContainsString('alert-warning');
     }
 
     public function testSingleInfoMessage()
@@ -117,12 +117,12 @@ public function testSingleInfoMessage()
 
         $renderingResult = Alert::widget();
 
-        expect($renderingResult)->stringContainsString($message);
-        expect($renderingResult)->stringContainsString('alert-info');
+        verify($renderingResult)->stringContainsString($message);
+        verify($renderingResult)->stringContainsString('alert-info');
 
-        expect($renderingResult)->stringNotContainsString('alert-danger');
-        expect($renderingResult)->stringNotContainsString('alert-success');
-        expect($renderingResult)->stringNotContainsString('alert-warning');
+        verify($renderingResult)->stringNotContainsString('alert-danger');
+        verify($renderingResult)->stringNotContainsString('alert-success');
+        verify($renderingResult)->stringNotContainsString('alert-warning');
     }
 
     public function testMultipleInfoMessages()
@@ -134,13 +134,13 @@ public function testMultipleInfoMessages()
 
         $renderingResult = Alert::widget();
 
-        expect($renderingResult)->stringContainsString($firstMessage);
-        expect($renderingResult)->stringContainsString($secondMessage);
-        expect($renderingResult)->stringContainsString('alert-info');
+        verify($renderingResult)->stringContainsString($firstMessage);
+        verify($renderingResult)->stringContainsString($secondMessage);
+        verify($renderingResult)->stringContainsString('alert-info');
 
-        expect($renderingResult)->stringNotContainsString('alert-danger');
-        expect($renderingResult)->stringNotContainsString('alert-success');
-        expect($renderingResult)->stringNotContainsString('alert-warning');
+        verify($renderingResult)->stringNotContainsString('alert-danger');
+        verify($renderingResult)->stringNotContainsString('alert-success');
+        verify($renderingResult)->stringNotContainsString('alert-warning');
     }
 
     public function testSingleWarningMessage()
@@ -151,12 +151,12 @@ public function testSingleWarningMessage()
 
         $renderingResult = Alert::widget();
 
-        expect($renderingResult)->stringContainsString($message);
-        expect($renderingResult)->stringContainsString('alert-warning');
+        verify($renderingResult)->stringContainsString($message);
+        verify($renderingResult)->stringContainsString('alert-warning');
 
-        expect($renderingResult)->stringNotContainsString('alert-danger');
-        expect($renderingResult)->stringNotContainsString('alert-success');
-        expect($renderingResult)->stringNotContainsString('alert-info');
+        verify($renderingResult)->stringNotContainsString('alert-danger');
+        verify($renderingResult)->stringNotContainsString('alert-success');
+        verify($renderingResult)->stringNotContainsString('alert-info');
     }
 
     public function testMultipleWarningMessages()
@@ -168,13 +168,13 @@ public function testMultipleWarningMessages()
 
         $renderingResult = Alert::widget();
 
-        expect($renderingResult)->stringContainsString($firstMessage);
-        expect($renderingResult)->stringContainsString($secondMessage);
-        expect($renderingResult)->stringContainsString('alert-warning');
+        verify($renderingResult)->stringContainsString($firstMessage);
+        verify($renderingResult)->stringContainsString($secondMessage);
+        verify($renderingResult)->stringContainsString('alert-warning');
 
-        expect($renderingResult)->stringNotContainsString('alert-danger');
-        expect($renderingResult)->stringNotContainsString('alert-success');
-        expect($renderingResult)->stringNotContainsString('alert-info');
+        verify($renderingResult)->stringNotContainsString('alert-danger');
+        verify($renderingResult)->stringNotContainsString('alert-success');
+        verify($renderingResult)->stringNotContainsString('alert-info');
     }
 
     public function testSingleMixedMessages() {
@@ -192,16 +192,16 @@ public function testSingleMixedMessages() {
 
         $renderingResult = Alert::widget();
 
-        expect($renderingResult)->stringContainsString($errorMessage);
-        expect($renderingResult)->stringContainsString($dangerMessage);
-        expect($renderingResult)->stringContainsString($successMessage);
-        expect($renderingResult)->stringContainsString($infoMessage);
-        expect($renderingResult)->stringContainsString($warningMessage);
+        verify($renderingResult)->stringContainsString($errorMessage);
+        verify($renderingResult)->stringContainsString($dangerMessage);
+        verify($renderingResult)->stringContainsString($successMessage);
+        verify($renderingResult)->stringContainsString($infoMessage);
+        verify($renderingResult)->stringContainsString($warningMessage);
 
-        expect($renderingResult)->stringContainsString('alert-danger');
-        expect($renderingResult)->stringContainsString('alert-success');
-        expect($renderingResult)->stringContainsString('alert-info');
-        expect($renderingResult)->stringContainsString('alert-warning');
+        verify($renderingResult)->stringContainsString('alert-danger');
+        verify($renderingResult)->stringContainsString('alert-success');
+        verify($renderingResult)->stringContainsString('alert-info');
+        verify($renderingResult)->stringContainsString('alert-warning');
     }
 
     public function testMultipleMixedMessages() {
@@ -224,21 +224,21 @@ public function testMultipleMixedMessages() {
 
         $renderingResult = Alert::widget();
 
-        expect($renderingResult)->stringContainsString($firstErrorMessage);
-        expect($renderingResult)->stringContainsString($secondErrorMessage);
-        expect($renderingResult)->stringContainsString($firstDangerMessage);
-        expect($renderingResult)->stringContainsString($secondDangerMessage);
-        expect($renderingResult)->stringContainsString($firstSuccessMessage);
-        expect($renderingResult)->stringContainsString($secondSuccessMessage);
-        expect($renderingResult)->stringContainsString($firstInfoMessage);
-        expect($renderingResult)->stringContainsString($secondInfoMessage);
-        expect($renderingResult)->stringContainsString($firstWarningMessage);
-        expect($renderingResult)->stringContainsString($secondWarningMessage);
-
-        expect($renderingResult)->stringContainsString('alert-danger');
-        expect($renderingResult)->stringContainsString('alert-success');
-        expect($renderingResult)->stringContainsString('alert-info');
-        expect($renderingResult)->stringContainsString('alert-warning');
+        verify($renderingResult)->stringContainsString($firstErrorMessage);
+        verify($renderingResult)->stringContainsString($secondErrorMessage);
+        verify($renderingResult)->stringContainsString($firstDangerMessage);
+        verify($renderingResult)->stringContainsString($secondDangerMessage);
+        verify($renderingResult)->stringContainsString($firstSuccessMessage);
+        verify($renderingResult)->stringContainsString($secondSuccessMessage);
+        verify($renderingResult)->stringContainsString($firstInfoMessage);
+        verify($renderingResult)->stringContainsString($secondInfoMessage);
+        verify($renderingResult)->stringContainsString($firstWarningMessage);
+        verify($renderingResult)->stringContainsString($secondWarningMessage);
+
+        verify($renderingResult)->stringContainsString('alert-danger');
+        verify($renderingResult)->stringContainsString('alert-success');
+        verify($renderingResult)->stringContainsString('alert-info');
+        verify($renderingResult)->stringContainsString('alert-warning');
     }
 
     public function testFlashIntegrity()
@@ -255,7 +255,7 @@ public function testFlashIntegrity()
         Yii::$app->session->close();
         Yii::$app->session->open();
 
-        expect(Yii::$app->session->getFlash('error'))->null();
-        expect(Yii::$app->session->getFlash('unrelated'))->equals($unrelatedMessage);
+        verify(Yii::$app->session->getFlash('error'))->empty();
+        verify(Yii::$app->session->getFlash('unrelated'))->equals($unrelatedMessage);
     }
 }
diff --git a/views/site/contact.php b/views/site/contact.php
index d92e21ff5..4ae25a933 100644
--- a/views/site/contact.php
+++ b/views/site/contact.php
@@ -51,7 +51,7 @@
 
                     <?= $form->field($model, 'body')->textarea(['rows' => 6]) ?>
 
-                    <?= $form->field($model, 'verifyCode')->widget(Captcha::className(), [
+                    <?= $form->field($model, 'verifyCode')->widget(Captcha::class, [
                         'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
                     ]) ?>
 

From 6720c62f6861a8a6416cf06eb96edd5e6c51d1ea Mon Sep 17 00:00:00 2001
From: Anton <info@ensostudio.ru>
Date: Tue, 26 Apr 2022 21:57:19 +0300
Subject: [PATCH 346/390] Add missing file '/mail/layouts/text.php' (#261)

---
 mail/layouts/text.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 mail/layouts/text.php

diff --git a/mail/layouts/text.php b/mail/layouts/text.php
new file mode 100644
index 000000000..c3768640b
--- /dev/null
+++ b/mail/layouts/text.php
@@ -0,0 +1,13 @@
+<?php
+
+/** 
+ * @var yii\web\View $this view component instance
+ * @var yii\mail\BaseMessage $message the message being composed
+ * @var string $content main view render result
+ */
+
+$this->beginPage();
+$this->beginBody();
+echo $content;
+$this->endBody();
+$this->endPage();

From 24d97b99f8a3dd85bac90f9e72c6e206d61d8436 Mon Sep 17 00:00:00 2001
From: Lucas Bartholemy <luke-@users.noreply.github.com>
Date: Fri, 17 Jun 2022 17:46:18 +0200
Subject: [PATCH 347/390] Removed Swiftmailer dependency (#264)

---
 composer.json   | 1 -
 config/test.php | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7db83cfc4..0edbf98d2 100644
--- a/composer.json
+++ b/composer.json
@@ -17,7 +17,6 @@
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.14",
         "yiisoft/yii2-bootstrap4": "~2.0.0",
-        "yiisoft/yii2-swiftmailer": "~2.0.0 || ~2.1.0",
         "yiisoft/yii2-symfonymailer": "~2.0.3"
     },
     "require-dev": {
diff --git a/config/test.php b/config/test.php
index f95bc031e..f2e26ef58 100644
--- a/config/test.php
+++ b/config/test.php
@@ -17,6 +17,7 @@
         'db' => $db,
         'mailer' => [
             'useFileTransport' => true,
+            'messageClass' => 'yii\symfonymailer\Message'
         ],
         'assetManager' => [
             'basePath' => __DIR__ . '/../web/assets',

From 9d3b84517ad93b228311886e0737b213616bb716 Mon Sep 17 00:00:00 2001
From: Luke English <luke@developedsoftware.com>
Date: Fri, 17 Jun 2022 17:15:52 +0100
Subject: [PATCH 348/390] Update composer depedencies to be the same as the
 advanced application (#262)

* Compatible with PHP 8.1 and Codeception 5
* Add PHP 8.1 to workflow
* PHP 7.4 as a minimum
* Updated dependencies

Co-authored-by: Luke English <luke.english@ec2i.biz>
---
 .gitignore                         |  3 +++
 assets/AppAsset.php                |  2 +-
 codeception.yml                    |  2 +-
 composer.json                      | 16 +++++++++-------
 config/test.php                    |  3 +++
 config/web.php                     |  7 +++----
 tests/acceptance.suite.yml.example |  2 +-
 tests/functional.suite.yml         |  2 +-
 tests/unit.suite.yml               |  2 +-
 tests/unit/models/UserTest.php     |  2 +-
 views/layouts/main.php             |  8 ++++----
 views/site/contact.php             |  6 +++---
 views/site/login.php               |  6 +++---
 widgets/Alert.php                  |  4 ++--
 14 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5bd9be80b..28419e445 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,9 @@ Thumbs.db
 # composer itself is not needed
 composer.phar
 
+# composer lock
+composer.lock
+
 # Mac DS_Store Files
 .DS_Store
 
diff --git a/assets/AppAsset.php b/assets/AppAsset.php
index 3b950fe7d..732d48efc 100644
--- a/assets/AppAsset.php
+++ b/assets/AppAsset.php
@@ -26,6 +26,6 @@ class AppAsset extends AssetBundle
     ];
     public $depends = [
         'yii\web\YiiAsset',
-        'yii\bootstrap4\BootstrapAsset',
+        'yii\bootstrap5\BootstrapAsset'
     ];
 }
diff --git a/codeception.yml b/codeception.yml
index c8c21690d..dd8febcff 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -2,7 +2,7 @@ actor: Tester
 bootstrap: _bootstrap.php
 paths:
     tests: tests
-    log: tests/_output
+    output: tests/_output
     data: tests/_data
     helpers: tests/_support
 settings:
diff --git a/composer.json b/composer.json
index 0edbf98d2..31d1a6db3 100644
--- a/composer.json
+++ b/composer.json
@@ -15,20 +15,22 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=7.4.0",
-        "yiisoft/yii2": "~2.0.14",
-        "yiisoft/yii2-bootstrap4": "~2.0.0",
+        "yiisoft/yii2": "~2.0.45",
+        "yiisoft/yii2-bootstrap5": "~2.0.2",
         "yiisoft/yii2-symfonymailer": "~2.0.3"
     },
     "require-dev": {
         "yiisoft/yii2-debug": "~2.1.0",
         "yiisoft/yii2-gii": "~2.2.0",
         "yiisoft/yii2-faker": "~2.0.0",
-        "codeception/codeception": "^4.0",
-        "codeception/module-asserts": "^1.0",
-        "codeception/module-yii2": "^1.0",
-        "codeception/module-filesystem": "^1.0",
+        "phpunit/phpunit": "~9.5.0",
+        "codeception/codeception": "^5.0.0-alpha2 || ^4.0",
+        "codeception/lib-innerbrowser": "^3.0 || ^1.1",
+        "codeception/module-asserts": "^3.0 || ^1.1",
+        "codeception/module-yii2": "dev-codecept5 || ^1.1",
+        "codeception/module-filesystem": "^3.0 || ^1.1",
         "codeception/verify": "^2.2",
-        "symfony/browser-kit": ">=2.7 <=4.2.4"
+        "symfony/browser-kit": "^6.0 || >=2.7 <=4.2.4"
     },
     "config": {
         "allow-plugins": {
diff --git a/config/test.php b/config/test.php
index f2e26ef58..317bc1cb6 100644
--- a/config/test.php
+++ b/config/test.php
@@ -16,6 +16,9 @@
     'components' => [
         'db' => $db,
         'mailer' => [
+            'class' => \yii\symfonymailer\Mailer::class,
+            'viewPath' => '@app/mail',
+            // send all mails to a file by default.
             'useFileTransport' => true,
             'messageClass' => 'yii\symfonymailer\Message'
         ],
diff --git a/config/web.php b/config/web.php
index 25cb0d0a2..8b9dd3f94 100644
--- a/config/web.php
+++ b/config/web.php
@@ -27,10 +27,9 @@
             'errorAction' => 'site/error',
         ],
         'mailer' => [
-            'class' => 'yii\swiftmailer\Mailer',
-            // send all mails to a file by default. You have to set
-            // 'useFileTransport' to false and configure transport
-            // for the mailer to send real emails.
+            'class' => \yii\symfonymailer\Mailer::class,
+            'viewPath' => '@app/mail',
+            // send all mails to a file by default.
             'useFileTransport' => true,
         ],
         'log' => [
diff --git a/tests/acceptance.suite.yml.example b/tests/acceptance.suite.yml.example
index 7bb4986fd..3821d4fe4 100644
--- a/tests/acceptance.suite.yml.example
+++ b/tests/acceptance.suite.yml.example
@@ -1,4 +1,4 @@
-class_name: AcceptanceTester
+actor: AcceptanceTester
 modules:
     enabled:
         - WebDriver:
diff --git a/tests/functional.suite.yml b/tests/functional.suite.yml
index 6d6ff7b4d..9d8cf149c 100644
--- a/tests/functional.suite.yml
+++ b/tests/functional.suite.yml
@@ -6,7 +6,7 @@
 
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 #basic/web/index.php
-class_name: FunctionalTester
+actor: FunctionalTester
 modules:
     enabled:
       - Filesystem
diff --git a/tests/unit.suite.yml b/tests/unit.suite.yml
index d2e6622f8..c14e49c37 100644
--- a/tests/unit.suite.yml
+++ b/tests/unit.suite.yml
@@ -3,7 +3,7 @@
 # suite for unit (internal) tests.
 # RUN `build` COMMAND AFTER ADDING/REMOVING MODULES.
 
-class_name: UnitTester
+actor: UnitTester
 modules:
     enabled:
       - Asserts
diff --git a/tests/unit/models/UserTest.php b/tests/unit/models/UserTest.php
index cd1072593..28986cbbd 100644
--- a/tests/unit/models/UserTest.php
+++ b/tests/unit/models/UserTest.php
@@ -31,7 +31,7 @@ public function testFindUserByUsername()
     /**
      * @depends testFindUserByUsername
      */
-    public function testValidateUser($user)
+    public function testValidateUser()
     {
         $user = User::findByUsername('admin');
         verify($user->validateAuthKey('test100key'))->notEmpty();
diff --git a/views/layouts/main.php b/views/layouts/main.php
index 67328ca86..8de99c540 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -5,10 +5,10 @@
 
 use app\assets\AppAsset;
 use app\widgets\Alert;
-use yii\bootstrap4\Breadcrumbs;
-use yii\bootstrap4\Html;
-use yii\bootstrap4\Nav;
-use yii\bootstrap4\NavBar;
+use yii\bootstrap5\Breadcrumbs;
+use yii\bootstrap5\Html;
+use yii\bootstrap5\Nav;
+use yii\bootstrap5\NavBar;
 
 AppAsset::register($this);
 ?>
diff --git a/views/site/contact.php b/views/site/contact.php
index 4ae25a933..597fabcb2 100644
--- a/views/site/contact.php
+++ b/views/site/contact.php
@@ -1,11 +1,11 @@
 <?php
 
 /** @var yii\web\View $this */
-/** @var yii\bootstrap4\ActiveForm $form */
+/** @var yii\bootstrap5\ActiveForm $form */
 /** @var app\models\ContactForm $model */
 
-use yii\bootstrap4\ActiveForm;
-use yii\bootstrap4\Html;
+use yii\bootstrap5\ActiveForm;
+use yii\bootstrap5\Html;
 use yii\captcha\Captcha;
 
 $this->title = 'Contact';
diff --git a/views/site/login.php b/views/site/login.php
index c8d495ebe..ebb07d9c3 100644
--- a/views/site/login.php
+++ b/views/site/login.php
@@ -1,11 +1,11 @@
 <?php
 
 /** @var yii\web\View $this */
-/** @var yii\bootstrap4\ActiveForm $form */
+/** @var yii\bootstrap5\ActiveForm $form */
 /** @var app\models\LoginForm $model */
 
-use yii\bootstrap4\ActiveForm;
-use yii\bootstrap4\Html;
+use yii\bootstrap5\ActiveForm;
+use yii\bootstrap5\Html;
 
 $this->title = 'Login';
 $this->params['breadcrumbs'][] = $this->title;
diff --git a/widgets/Alert.php b/widgets/Alert.php
index fd2b1955c..1302c1f29 100644
--- a/widgets/Alert.php
+++ b/widgets/Alert.php
@@ -23,7 +23,7 @@
  * @author Kartik Visweswaran <kartikv2@gmail.com>
  * @author Alexander Makarov <sam@rmcreative.ru>
  */
-class Alert extends \yii\bootstrap4\Widget
+class Alert extends \yii\bootstrap5\Widget
 {
     /**
      * @var array the alert types configuration for the flash messages.
@@ -57,7 +57,7 @@ public function run()
             $flash = $session->getFlash($type);
 
             foreach ((array) $flash as $i => $message) {
-                echo \yii\bootstrap4\Alert::widget([
+                echo \yii\bootstrap5\Alert::widget([
                     'body' => $message,
                     'closeButton' => $this->closeButton,
                     'options' => array_merge($this->options, [

From 69461fcd871bfbaf00ad6234194ad64a952736d6 Mon Sep 17 00:00:00 2001
From: Luke English <luke@developedsoftware.com>
Date: Fri, 17 Jun 2022 23:41:05 +0100
Subject: [PATCH 349/390] replace "codeception/codeception": "^5.0.0-alpha2"
 with "codeception/codeception": "^5.0.0"

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

diff --git a/composer.json b/composer.json
index 31d1a6db3..f169290f4 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "yiisoft/yii2-gii": "~2.2.0",
         "yiisoft/yii2-faker": "~2.0.0",
         "phpunit/phpunit": "~9.5.0",
-        "codeception/codeception": "^5.0.0-alpha2 || ^4.0",
+        "codeception/codeception": "^5.0.0 || ^4.0",
         "codeception/lib-innerbrowser": "^3.0 || ^1.1",
         "codeception/module-asserts": "^3.0 || ^1.1",
         "codeception/module-yii2": "dev-codecept5 || ^1.1",

From b306be778d958c6c9d2e527a722bf10c71d3d5ae Mon Sep 17 00:00:00 2001
From: Luke English <luke@developedsoftware.com>
Date: Tue, 21 Jun 2022 12:34:09 +0100
Subject: [PATCH 350/390] update yii2 codeception module as its now a proper
 release (1.1.6)

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

diff --git a/composer.json b/composer.json
index f169290f4..fae8c1a58 100644
--- a/composer.json
+++ b/composer.json
@@ -27,7 +27,7 @@
         "codeception/codeception": "^5.0.0 || ^4.0",
         "codeception/lib-innerbrowser": "^3.0 || ^1.1",
         "codeception/module-asserts": "^3.0 || ^1.1",
-        "codeception/module-yii2": "dev-codecept5 || ^1.1",
+        "codeception/module-yii2": "^1.1",
         "codeception/module-filesystem": "^3.0 || ^1.1",
         "codeception/verify": "^2.2",
         "symfony/browser-kit": "^6.0 || >=2.7 <=4.2.4"

From e35ea2e81436c17b5fd2db1d4c626409f47f2f87 Mon Sep 17 00:00:00 2001
From: Anton <info@ensostudio.ru>
Date: Fri, 19 Aug 2022 00:57:02 +0300
Subject: [PATCH 351/390] Fix #267: Adjust main layout for Bootstrap5 (#268)

---
 views/layouts/main.php | 56 ++++++++++++++++++++++--------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/views/layouts/main.php b/views/layouts/main.php
index 8de99c540..0fa458c5f 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -11,28 +11,30 @@
 use yii\bootstrap5\NavBar;
 
 AppAsset::register($this);
+
+$this->registerCsrfMetaTags();
+$this->registerMetaTag(['charset' => Yii::$app->charset], 'charset');
+$this->registerMetaTag(['name' => 'viewport', 'content' => 'width=device-width, initial-scale=1, shrink-to-fit=no']);
+$this->registerMetaTag(['name' => 'description', 'content' => $this->params['meta_description'] ?? '']);
+$this->registerMetaTag(['name' => 'keywords', 'content' => $this->params['meta_keywords'] ?? '']);
+$this->registerLinkTag(['rel' => 'icon', 'type' => 'image/x-icon', 'href' => '@web/favicon.ico']);
 ?>
 <?php $this->beginPage() ?>
 <!DOCTYPE html>
 <html lang="<?= Yii::$app->language ?>" class="h-100">
 <head>
-    <meta charset="<?= Yii::$app->charset ?>">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <?php $this->registerCsrfMetaTags() ?>
     <title><?= Html::encode($this->title) ?></title>
     <?php $this->head() ?>
 </head>
 <body class="d-flex flex-column h-100">
 <?php $this->beginBody() ?>
 
-<header>
+<header id="header">
     <?php
     NavBar::begin([
         'brandLabel' => Yii::$app->name,
         'brandUrl' => Yii::$app->homeUrl,
-        'options' => [
-            'class' => 'navbar navbar-expand-md navbar-dark bg-dark fixed-top',
-        ],
+        'options' => ['class' => 'navbar-expand-md navbar-dark bg-dark fixed-top']
     ]);
     echo Nav::widget([
         'options' => ['class' => 'navbar-nav'],
@@ -40,38 +42,38 @@
             ['label' => 'Home', 'url' => ['/site/index']],
             ['label' => 'About', 'url' => ['/site/about']],
             ['label' => 'Contact', 'url' => ['/site/contact']],
-            Yii::$app->user->isGuest ? (
-                ['label' => 'Login', 'url' => ['/site/login']]
-            ) : (
-                '<li>'
-                . Html::beginForm(['/site/logout'], 'post', ['class' => 'form-inline'])
-                . Html::submitButton(
-                    'Logout (' . Yii::$app->user->identity->username . ')',
-                    ['class' => 'btn btn-link logout']
-                )
-                . Html::endForm()
-                . '</li>'
-            )
-        ],
+            Yii::$app->user->isGuest
+                ? ['label' => 'Login', 'url' => ['/site/login']]
+                : '<li class="nav-item">'
+                    . Html::beginForm(['/site/logout'])
+                    . Html::submitButton(
+                        'Logout (' . Yii::$app->user->identity->username . ')',
+                        ['class' => 'nav-link btn btn-link logout']
+                    )
+                    . Html::endForm()
+                    . '</li>'
+        ]
     ]);
     NavBar::end();
     ?>
 </header>
 
-<main role="main" class="flex-shrink-0">
+<main id="main" class="flex-shrink-0" role="main">
     <div class="container">
-        <?= Breadcrumbs::widget([
-            'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
-        ]) ?>
+        <?php if (!empty($this->params['breadcrumbs'])): ?>
+            <?= Breadcrumbs::widget(['links' => $this->params['breadcrumbs']]) ?>
+        <?php endif ?>
         <?= Alert::widget() ?>
         <?= $content ?>
     </div>
 </main>
 
-<footer class="footer mt-auto py-3 text-muted">
+<footer id="footer" class="mt-auto py-3 bg-light">
     <div class="container">
-        <p class="float-left">&copy; My Company <?= date('Y') ?></p>
-        <p class="float-right"><?= Yii::powered() ?></p>
+        <div class="row text-muted">
+            <div class="col-md-6 text-center text-md-start">&copy; My Company <?= date('Y') ?></div>
+            <div class="col-md-6 text-center text-md-end"><?= Yii::powered() ?></div>
+        </div>
     </div>
 </footer>
 

From 0bc68e87e0f502f015de8460146b759a5b31408a Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 19 Aug 2022 01:32:47 +0300
Subject: [PATCH 352/390] release version 2.0.46

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

diff --git a/composer.json b/composer.json
index fae8c1a58..626f0f8e6 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From d4d5c10691816be03699425a782690989d7b8fd3 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 19 Aug 2022 01:33:13 +0300
Subject: [PATCH 353/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 626f0f8e6..fae8c1a58 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From bfa08d479d3d0b01478713103e768479bec0ee6f Mon Sep 17 00:00:00 2001
From: Anton <info@ensostudio.ru>
Date: Wed, 24 Aug 2022 17:33:32 +0300
Subject: [PATCH 354/390] Fix #275: Fix favicon link in views/layouts/main.php
 (#276)

---
 views/layouts/main.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/layouts/main.php b/views/layouts/main.php
index 0fa458c5f..c204435c0 100644
--- a/views/layouts/main.php
+++ b/views/layouts/main.php
@@ -17,7 +17,7 @@
 $this->registerMetaTag(['name' => 'viewport', 'content' => 'width=device-width, initial-scale=1, shrink-to-fit=no']);
 $this->registerMetaTag(['name' => 'description', 'content' => $this->params['meta_description'] ?? '']);
 $this->registerMetaTag(['name' => 'keywords', 'content' => $this->params['meta_keywords'] ?? '']);
-$this->registerLinkTag(['rel' => 'icon', 'type' => 'image/x-icon', 'href' => '@web/favicon.ico']);
+$this->registerLinkTag(['rel' => 'icon', 'type' => 'image/x-icon', 'href' => Yii::getAlias('@web/favicon.ico')]);
 ?>
 <?php $this->beginPage() ?>
 <!DOCTYPE html>

From da817e691aa2fc208116411110551120ea913155 Mon Sep 17 00:00:00 2001
From: Vasilis Lourdas <lourdas@users.noreply.github.com>
Date: Thu, 13 Oct 2022 23:18:59 +0300
Subject: [PATCH 355/390] Fix #274: Fix PHP 8.0 dependency issue for new
 projects (#279)

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

diff --git a/composer.json b/composer.json
index fae8c1a58..77b5a9fbe 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         "codeception/lib-innerbrowser": "^3.0 || ^1.1",
         "codeception/module-asserts": "^3.0 || ^1.1",
         "codeception/module-yii2": "^1.1",
-        "codeception/module-filesystem": "^3.0 || ^1.1",
+        "codeception/module-filesystem": "^2.0 || ^1.1",
         "codeception/verify": "^2.2",
         "symfony/browser-kit": "^6.0 || >=2.7 <=4.2.4"
     },

From ba107f7494621dfba516169b3812e6e43e22bad4 Mon Sep 17 00:00:00 2001
From: Basil <git@nadar.io>
Date: Thu, 13 Oct 2022 22:19:53 +0200
Subject: [PATCH 356/390] Add debugger to console (#277)

---
 config/console.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/config/console.php b/config/console.php
index 299656afc..ca429affa 100644
--- a/config/console.php
+++ b/config/console.php
@@ -43,6 +43,14 @@
     $config['modules']['gii'] = [
         'class' => 'yii\gii\Module',
     ];
+    // configuration adjustments for 'dev' environment
+    // requires version `2.1.21` of yii2-debug module
+    $config['bootstrap'][] = 'debug';
+    $config['modules']['debug'] = [
+        'class' => 'yii\debug\Module',
+        // uncomment the following to add your IP if you are not connecting from localhost.
+        //'allowedIPs' => ['127.0.0.1', '::1'],
+    ];
 }
 
 return $config;

From d85776aadc2be8869240e463e53d4d62e293b8df Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 15 Oct 2022 01:09:58 +0400
Subject: [PATCH 357/390] Update PHP version in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fd9b5f6a1..b93a740e6 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ DIRECTORY STRUCTURE
 REQUIREMENTS
 ------------
 
-The minimum requirement by this project template that your Web server supports PHP 5.6.0.
+The minimum requirement by this project template that your Web server supports PHP 7.4.
 
 
 INSTALLATION

From 597e84a590bfc91082b5c617e9aaaa470cc1bd25 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 18 Nov 2022 20:35:15 +0400
Subject: [PATCH 358/390] Use https in links

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 77b5a9fbe..955c4ed61 100644
--- a/composer.json
+++ b/composer.json
@@ -2,13 +2,13 @@
     "name": "yiisoft/yii2-app-basic",
     "description": "Yii 2 Basic Project Template",
     "keywords": ["yii2", "framework", "basic", "project template"],
-    "homepage": "http://www.yiiframework.com/",
+    "homepage": "https://www.yiiframework.com/",
     "type": "project",
     "license": "BSD-3-Clause",
     "support": {
         "issues": "https://github.com/yiisoft/yii2/issues?state=open",
-        "forum": "http://www.yiiframework.com/forum/",
-        "wiki": "http://www.yiiframework.com/wiki/",
+        "forum": "https://www.yiiframework.com/forum/",
+        "wiki": "https://www.yiiframework.com/wiki/",
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },

From 50d8576eebd684015b335f9a1fedd4bf81633922 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 18 Nov 2022 20:35:30 +0400
Subject: [PATCH 359/390] release version 2.0.47

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

diff --git a/composer.json b/composer.json
index 955c4ed61..1de5c872a 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From adcbcfb919407b70bcc37c405d98351e82fdb7df Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 18 Nov 2022 20:35:42 +0400
Subject: [PATCH 360/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 1de5c872a..955c4ed61 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From 980c25ed47545a6c0d12951a731c59cb95f97f9c Mon Sep 17 00:00:00 2001
From: Emile Bons <emile@emilebons.nl>
Date: Tue, 17 Jan 2023 21:24:43 +0100
Subject: [PATCH 361/390] Update codeception/module-filesystem to 3.0 (#283)

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

diff --git a/composer.json b/composer.json
index 955c4ed61..48bbda8eb 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         "codeception/lib-innerbrowser": "^3.0 || ^1.1",
         "codeception/module-asserts": "^3.0 || ^1.1",
         "codeception/module-yii2": "^1.1",
-        "codeception/module-filesystem": "^2.0 || ^1.1",
+        "codeception/module-filesystem": "^3.0 || ^1.1",
         "codeception/verify": "^2.2",
         "symfony/browser-kit": "^6.0 || >=2.7 <=4.2.4"
     },

From 6938fc41f22890bc70e7d7e29188a6da897dc6d1 Mon Sep 17 00:00:00 2001
From: lmsmartins <lmsmartins@gmail.com>
Date: Mon, 27 Feb 2023 16:19:42 -0100
Subject: [PATCH 362/390] Fix #285: Fix CSS issues in login form, homepage and
 form-group class (#287)

---
 views/site/index.php |  6 ++---
 views/site/login.php | 52 ++++++++++++++++++++++++--------------------
 web/css/site.css     |  4 ++++
 3 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/views/site/index.php b/views/site/index.php
index a981f912c..dcb288fdc 100644
--- a/views/site/index.php
+++ b/views/site/index.php
@@ -6,7 +6,7 @@
 ?>
 <div class="site-index">
 
-    <div class="jumbotron text-center bg-transparent">
+    <div class="jumbotron text-center bg-transparent mt-5 mb-5">
         <h1 class="display-4">Congratulations!</h1>
 
         <p class="lead">You have successfully created your Yii-powered application.</p>
@@ -17,7 +17,7 @@
     <div class="body-content">
 
         <div class="row">
-            <div class="col-lg-4">
+            <div class="col-lg-4 mb-3">
                 <h2>Heading</h2>
 
                 <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
@@ -27,7 +27,7 @@
 
                 <p><a class="btn btn-outline-secondary" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
             </div>
-            <div class="col-lg-4">
+            <div class="col-lg-4 mb-3">
                 <h2>Heading</h2>
 
                 <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
diff --git a/views/site/login.php b/views/site/login.php
index ebb07d9c3..db003c01c 100644
--- a/views/site/login.php
+++ b/views/site/login.php
@@ -2,6 +2,7 @@
 
 /** @var yii\web\View $this */
 /** @var yii\bootstrap5\ActiveForm $form */
+
 /** @var app\models\LoginForm $model */
 
 use yii\bootstrap5\ActiveForm;
@@ -15,35 +16,40 @@
 
     <p>Please fill out the following fields to login:</p>
 
-    <?php $form = ActiveForm::begin([
-        'id' => 'login-form',
-        'layout' => 'horizontal',
-        'fieldConfig' => [
-            'template' => "{label}\n{input}\n{error}",
-            'labelOptions' => ['class' => 'col-lg-1 col-form-label mr-lg-3'],
-            'inputOptions' => ['class' => 'col-lg-3 form-control'],
-            'errorOptions' => ['class' => 'col-lg-7 invalid-feedback'],
-        ],
-    ]); ?>
+    <div class="row">
+        <div class="col-lg-5">
+
+            <?php $form = ActiveForm::begin([
+                'id' => 'login-form',
+                'fieldConfig' => [
+                    'template' => "{label}\n{input}\n{error}",
+                    'labelOptions' => ['class' => 'col-lg-1 col-form-label mr-lg-3'],
+                    'inputOptions' => ['class' => 'col-lg-3 form-control'],
+                    'errorOptions' => ['class' => 'col-lg-7 invalid-feedback'],
+                ],
+            ]); ?>
 
-        <?= $form->field($model, 'username')->textInput(['autofocus' => true]) ?>
+            <?= $form->field($model, 'username')->textInput(['autofocus' => true]) ?>
 
-        <?= $form->field($model, 'password')->passwordInput() ?>
+            <?= $form->field($model, 'password')->passwordInput() ?>
 
-        <?= $form->field($model, 'rememberMe')->checkbox([
-            'template' => "<div class=\"offset-lg-1 col-lg-3 custom-control custom-checkbox\">{input} {label}</div>\n<div class=\"col-lg-8\">{error}</div>",
-        ]) ?>
+            <?= $form->field($model, 'rememberMe')->checkbox([
+                'template' => "<div class=\"custom-control custom-checkbox\">{input} {label}</div>\n<div class=\"col-lg-8\">{error}</div>",
+            ]) ?>
 
-        <div class="form-group">
-            <div class="offset-lg-1 col-lg-11">
-                <?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
+            <div class="form-group">
+                <div>
+                    <?= Html::submitButton('Login', ['class' => 'btn btn-primary', 'name' => 'login-button']) ?>
+                </div>
             </div>
-        </div>
 
-    <?php ActiveForm::end(); ?>
+            <?php ActiveForm::end(); ?>
 
-    <div class="offset-lg-1" style="color:#999;">
-        You may login with <strong>admin/admin</strong> or <strong>demo/demo</strong>.<br>
-        To modify the username/password, please check out the code <code>app\models\User::$users</code>.
+            <div style="color:#999;">
+                You may login with <strong>admin/admin</strong> or <strong>demo/demo</strong>.<br>
+                To modify the username/password, please check out the code <code>app\models\User::$users</code>.
+            </div>
+
+        </div>
     </div>
 </div>
diff --git a/web/css/site.css b/web/css/site.css
index cd81ae1c9..fb300b39e 100644
--- a/web/css/site.css
+++ b/web/css/site.css
@@ -82,3 +82,7 @@ a.desc:after {
 .nav > li > form > button.logout:focus {
     outline: none;
 }
+
+.form-group {
+    margin-bottom: 1rem;
+}
\ No newline at end of file

From 943608d179824f892429e69e48e7470dda953d90 Mon Sep 17 00:00:00 2001
From: Arhell <arhell333@gmail.com>
Date: Sun, 30 Apr 2023 09:38:33 +0300
Subject: [PATCH 363/390] update irc link

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

diff --git a/composer.json b/composer.json
index 48bbda8eb..251234a07 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
         "issues": "https://github.com/yiisoft/yii2/issues?state=open",
         "forum": "https://www.yiiframework.com/forum/",
         "wiki": "https://www.yiiframework.com/wiki/",
-        "irc": "irc://irc.freenode.net/yii",
+        "irc": "ircs://irc.libera.chat:6697/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
     "minimum-stability": "dev",

From 332f794a1b7e3e6d5acb9c06dd079376ee4ceb36 Mon Sep 17 00:00:00 2001
From: Ihor Sychevskyi <arhell333@gmail.com>
Date: Tue, 2 May 2023 08:07:01 +0300
Subject: [PATCH 364/390] update github folder link (#291)

---
 .github/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 3d8d32c25..ea75bda5f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -3,5 +3,5 @@ Contributing to Yii2
 
 - [Report an issue](https://github.com/yiisoft/yii2/blob/master/docs/internals/report-an-issue.md)
 - [Translate documentation or messages](https://github.com/yiisoft/yii2/blob/master/docs/internals/translation-workflow.md)
-- [Give us feedback or start a design discussion](http://www.yiiframework.com/forum/index.php/forum/42-general-discussions-for-yii-20/)
+- [Give us feedback or start a design discussion](https://www.yiiframework.com/forum/index.php/forum/42-general-discussions-for-yii-20/)
 - [Contribute to the core code or fix bugs](https://github.com/yiisoft/yii2/blob/master/docs/internals/git-workflow.md)

From 5772c69cb52a41ed05d444c6faab71fb26402170 Mon Sep 17 00:00:00 2001
From: Arhell <arhell333@gmail.com>
Date: Thu, 4 May 2023 00:41:22 +0300
Subject: [PATCH 365/390] update assets folder links

---
 assets/AppAsset.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/AppAsset.php b/assets/AppAsset.php
index 732d48efc..3d40487ae 100644
--- a/assets/AppAsset.php
+++ b/assets/AppAsset.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link http://www.yiiframework.com/
+ * @link https://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
+ * @license https://www.yiiframework.com/license/
  */
 
 namespace app\assets;

From 1d80ebd0cef16e6baffcee00a33ccbfc5568cc4e Mon Sep 17 00:00:00 2001
From: Ihor Sychevskyi <arhell333@gmail.com>
Date: Sun, 7 May 2023 12:08:51 +0300
Subject: [PATCH 366/390] update commands folder links (#295)

---
 commands/HelloController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/commands/HelloController.php b/commands/HelloController.php
index 20066c40c..9ec914d3c 100644
--- a/commands/HelloController.php
+++ b/commands/HelloController.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @link http://www.yiiframework.com/
+ * @link https://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
+ * @license https://www.yiiframework.com/license/
  */
 
 namespace app\commands;

From 37a259ca75e7cb4d8df730348b1789dff2b12a6d Mon Sep 17 00:00:00 2001
From: Ihor Sychevskyi <arhell333@gmail.com>
Date: Wed, 10 May 2023 09:53:16 +0300
Subject: [PATCH 367/390] update tests folder links (#297)

---
 tests/bin/yii     | 4 ++--
 tests/bin/yii.bat | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/bin/yii b/tests/bin/yii
index 4923537fb..39df4013d 100755
--- a/tests/bin/yii
+++ b/tests/bin/yii
@@ -3,9 +3,9 @@
 /**
  * Yii console bootstrap file.
  *
- * @link http://www.yiiframework.com/
+ * @link https://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
+ * @license https://www.yiiframework.com/license/
  */
 
 defined('YII_DEBUG') or define('YII_DEBUG', true);
diff --git a/tests/bin/yii.bat b/tests/bin/yii.bat
index d516b3a19..ce14c92bc 100644
--- a/tests/bin/yii.bat
+++ b/tests/bin/yii.bat
@@ -4,9 +4,9 @@ rem -------------------------------------------------------------
 rem  Yii command line bootstrap script for Windows.
 rem
 rem  @author Qiang Xue <qiang.xue@gmail.com>
-rem  @link http://www.yiiframework.com/
+rem  @link https://www.yiiframework.com/
 rem  @copyright Copyright (c) 2008 Yii Software LLC
-rem  @license http://www.yiiframework.com/license/
+rem  @license https://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 
 @setlocal

From 7c567643e327344a7049a2a9731cfe39bbc133c1 Mon Sep 17 00:00:00 2001
From: Ihor Sychevskyi <arhell333@gmail.com>
Date: Sat, 13 May 2023 11:33:44 +0300
Subject: [PATCH 368/390] update views folder links (#299)

---
 views/site/index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/site/index.php b/views/site/index.php
index dcb288fdc..df5df7c3d 100644
--- a/views/site/index.php
+++ b/views/site/index.php
@@ -11,7 +11,7 @@
 
         <p class="lead">You have successfully created your Yii-powered application.</p>
 
-        <p><a class="btn btn-lg btn-success" href="http://www.yiiframework.com/">Get started with Yii</a></p>
+        <p><a class="btn btn-lg btn-success" href="https://www.yiiframework.com/">Get started with Yii</a></p>
     </div>
 
     <div class="body-content">
@@ -25,7 +25,7 @@
                     ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
                     fugiat nulla pariatur.</p>
 
-                <p><a class="btn btn-outline-secondary" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
+                <p><a class="btn btn-outline-secondary" href="https://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
             </div>
             <div class="col-lg-4 mb-3">
                 <h2>Heading</h2>
@@ -35,7 +35,7 @@
                     ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
                     fugiat nulla pariatur.</p>
 
-                <p><a class="btn btn-outline-secondary" href="http://www.yiiframework.com/forum/">Yii Forum &raquo;</a></p>
+                <p><a class="btn btn-outline-secondary" href="https://www.yiiframework.com/forum/">Yii Forum &raquo;</a></p>
             </div>
             <div class="col-lg-4">
                 <h2>Heading</h2>
@@ -45,7 +45,7 @@
                     ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
                     fugiat nulla pariatur.</p>
 
-                <p><a class="btn btn-outline-secondary" href="http://www.yiiframework.com/extensions/">Yii Extensions &raquo;</a></p>
+                <p><a class="btn btn-outline-secondary" href="https://www.yiiframework.com/extensions/">Yii Extensions &raquo;</a></p>
             </div>
         </div>
 

From db7f9237660c9bec41f04f4fa34221bf7a5d778d Mon Sep 17 00:00:00 2001
From: Ihor Sychevskyi <arhell333@gmail.com>
Date: Mon, 15 May 2023 09:48:51 +0300
Subject: [PATCH 369/390] update root folder links (#301)

---
 README.md        | 12 ++++++------
 requirements.php | 10 +++++-----
 yii              |  4 ++--
 yii.bat          |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index b93a740e6..981a7f9d9 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
     <br>
 </p>
 
-Yii 2 Basic Project Template is a skeleton [Yii 2](http://www.yiiframework.com/) application best for
+Yii 2 Basic Project Template is a skeleton [Yii 2](https://www.yiiframework.com/) application best for
 rapidly creating small projects.
 
 The template contains the basic features including user login/logout and a contact page.
@@ -45,8 +45,8 @@ INSTALLATION
 
 ### Install via Composer
 
-If you do not have [Composer](http://getcomposer.org/), you may install it by following the instructions
-at [getcomposer.org](http://getcomposer.org/doc/00-intro.md#installation-nix).
+If you do not have [Composer](https://getcomposer.org/), you may install it by following the instructions
+at [getcomposer.org](https://getcomposer.org/doc/00-intro.md#installation-nix).
 
 You can then install this project template using the following command:
 
@@ -63,7 +63,7 @@ http://localhost/basic/web/
 
 ### Install from an Archive File
 
-Extract the archive file downloaded from [yiiframework.com](http://www.yiiframework.com/download/) to
+Extract the archive file downloaded from [yiiframework.com](https://www.yiiframework.com/download/) to
 a directory named `basic` that is directly under the Web root.
 
 Set cookie validation key in `config/web.php` file to some random secret string:
@@ -131,7 +131,7 @@ return [
 TESTING
 -------
 
-Tests are located in `tests` directory. They are developed with [Codeception PHP Testing Framework](http://codeception.com/).
+Tests are located in `tests` directory. They are developed with [Codeception PHP Testing Framework](https://codeception.com/).
 By default, there are 3 test suites:
 
 - `unit`
@@ -164,7 +164,7 @@ To execute acceptance tests do the following:
     composer update  
     ```
 
-4. Download [Selenium Server](http://www.seleniumhq.org/download/) and launch it:
+4. Download [Selenium Server](https://www.seleniumhq.org/download/) and launch it:
 
     ```
     java -jar ~/selenium-server-standalone-x.xx.x.jar
diff --git a/requirements.php b/requirements.php
index 6cf322eb0..c1a6bf680 100644
--- a/requirements.php
+++ b/requirements.php
@@ -105,22 +105,22 @@
         'name' => 'Memcache extension',
         'mandatory' => false,
         'condition' => extension_loaded('memcache') || extension_loaded('memcached'),
-        'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-caching-memcache.html">MemCache</a>',
-        'memo' => extension_loaded('memcached') ? 'To use memcached set <a href="http://www.yiiframework.com/doc-2.0/yii-caching-memcache.html#$useMemcached-detail">MemCache::useMemcached</a> to <code>true</code>.' : ''
+        'by' => '<a href="https://www.yiiframework.com/doc-2.0/yii-caching-memcache.html">MemCache</a>',
+        'memo' => extension_loaded('memcached') ? 'To use memcached set <a href="https://www.yiiframework.com/doc-2.0/yii-caching-memcache.html#$useMemcached-detail">MemCache::useMemcached</a> to <code>true</code>.' : ''
     ),
     // CAPTCHA:
     array(
         'name' => 'GD PHP extension with FreeType support',
         'mandatory' => false,
         'condition' => $gdOK,
-        'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-captcha-captcha.html">Captcha</a>',
+        'by' => '<a href="https://www.yiiframework.com/doc-2.0/yii-captcha-captcha.html">Captcha</a>',
         'memo' => $gdMemo,
     ),
     array(
         'name' => 'ImageMagick PHP extension with PNG support',
         'mandatory' => false,
         'condition' => $imagickOK,
-        'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-captcha-captcha.html">Captcha</a>',
+        'by' => '<a href="https://www.yiiframework.com/doc-2.0/yii-captcha-captcha.html">Captcha</a>',
         'memo' => $imagickMemo,
     ),
     // PHP ini :
@@ -153,7 +153,7 @@
         'name' => 'APC extension',
         'mandatory' => false,
         'condition' => extension_loaded('apc'),
-        'by' => '<a href="http://www.yiiframework.com/doc-2.0/yii-caching-apccache.html">ApcCache</a>',
+        'by' => '<a href="https://www.yiiframework.com/doc-2.0/yii-caching-apccache.html">ApcCache</a>',
     );
 }
 
diff --git a/yii b/yii
index 2a2e8ede7..1d0008f5d 100755
--- a/yii
+++ b/yii
@@ -3,9 +3,9 @@
 /**
  * Yii console bootstrap file.
  *
- * @link http://www.yiiframework.com/
+ * @link https://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
- * @license http://www.yiiframework.com/license/
+ * @license https://www.yiiframework.com/license/
  */
 
 defined('YII_DEBUG') or define('YII_DEBUG', true);
diff --git a/yii.bat b/yii.bat
index d516b3a19..ce14c92bc 100644
--- a/yii.bat
+++ b/yii.bat
@@ -4,9 +4,9 @@ rem -------------------------------------------------------------
 rem  Yii command line bootstrap script for Windows.
 rem
 rem  @author Qiang Xue <qiang.xue@gmail.com>
-rem  @link http://www.yiiframework.com/
+rem  @link https://www.yiiframework.com/
 rem  @copyright Copyright (c) 2008 Yii Software LLC
-rem  @license http://www.yiiframework.com/license/
+rem  @license https://www.yiiframework.com/license/
 rem -------------------------------------------------------------
 
 @setlocal

From eb38308780bfd358a50892cc3bc14bbce1de2c29 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Mon, 22 May 2023 21:24:55 +0400
Subject: [PATCH 370/390] Update dependencies so app is installable with PHP
 8.2

---
 composer.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 251234a07..59b9380ee 100644
--- a/composer.json
+++ b/composer.json
@@ -9,10 +9,10 @@
         "issues": "https://github.com/yiisoft/yii2/issues?state=open",
         "forum": "https://www.yiiframework.com/forum/",
         "wiki": "https://www.yiiframework.com/wiki/",
-        "irc": "ircs://irc.libera.chat:6697/yii",
+        "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",
@@ -25,11 +25,11 @@
         "yiisoft/yii2-faker": "~2.0.0",
         "phpunit/phpunit": "~9.5.0",
         "codeception/codeception": "^5.0.0 || ^4.0",
-        "codeception/lib-innerbrowser": "^3.0 || ^1.1",
+        "codeception/lib-innerbrowser": "^4.0 || ^3.0 || ^1.1",
         "codeception/module-asserts": "^3.0 || ^1.1",
         "codeception/module-yii2": "^1.1",
-        "codeception/module-filesystem": "^3.0 || ^1.1",
-        "codeception/verify": "^2.2",
+        "codeception/module-filesystem": "^3.0 || ^2.0 || ^1.1",
+        "codeception/verify": "^3.0 || ^2.2",
         "symfony/browser-kit": "^6.0 || >=2.7 <=4.2.4"
     },
     "config": {

From d9b5bcc4009d46f6c6abf00d94484f9a90efc52e Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Mon, 22 May 2023 21:34:17 +0400
Subject: [PATCH 371/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 59b9380ee..84d901d2e 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "irc://irc.freenode.net/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From 6ee68d17d5f921f042a85b81278f078b42302e91 Mon Sep 17 00:00:00 2001
From: Arhell <arhell333@gmail.com>
Date: Wed, 14 Jun 2023 03:23:18 +0300
Subject: [PATCH 372/390] update irc link

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

diff --git a/composer.json b/composer.json
index 84d901d2e..722fcba65 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
         "issues": "https://github.com/yiisoft/yii2/issues?state=open",
         "forum": "https://www.yiiframework.com/forum/",
         "wiki": "https://www.yiiframework.com/wiki/",
-        "irc": "irc://irc.freenode.net/yii",
+        "irc": "ircs://irc.libera.chat:6697/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
     "minimum-stability": "dev",

From c083f404c25ee4113dbc8e5dba4b0c45c79375a5 Mon Sep 17 00:00:00 2001
From: Bizley <pawel@positive.codes>
Date: Tue, 29 Aug 2023 16:27:32 +0200
Subject: [PATCH 373/390] release version 2.0.49

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

diff --git a/composer.json b/composer.json
index 722fcba65..f60a8f9e2 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "ircs://irc.libera.chat:6697/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From cf0fbf086f902d13c27331686b8521548a3cb24e Mon Sep 17 00:00:00 2001
From: Bizley <pawel@positive.codes>
Date: Tue, 29 Aug 2023 16:27:51 +0200
Subject: [PATCH 374/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index f60a8f9e2..722fcba65 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "ircs://irc.libera.chat:6697/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From 645ec663377730395311c089115844f52444356a Mon Sep 17 00:00:00 2001
From: Stefan Linke <particleflux@gmail.com>
Date: Fri, 13 Oct 2023 21:08:54 +0200
Subject: [PATCH 375/390] Remove explicit phpunit/phpunit requirement

phpunit is not explicitly required, all the included tests run with
codeception, not phpunit (not directly, at least).

Fixes #308
---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index 722fcba65..7819706f1 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,6 @@
         "yiisoft/yii2-debug": "~2.1.0",
         "yiisoft/yii2-gii": "~2.2.0",
         "yiisoft/yii2-faker": "~2.0.0",
-        "phpunit/phpunit": "~9.5.0",
         "codeception/codeception": "^5.0.0 || ^4.0",
         "codeception/lib-innerbrowser": "^4.0 || ^3.0 || ^1.1",
         "codeception/module-asserts": "^3.0 || ^1.1",

From 8dd081c9973c1c1e3f7fa9e4f2a3114e952a0eb1 Mon Sep 17 00:00:00 2001
From: Stefan Linke <particleflux@users.noreply.github.com>
Date: Thu, 19 Oct 2023 16:18:23 +0000
Subject: [PATCH 376/390] Fix #303: Remove composer.lock from .gitignore (#309)

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 28419e445..5bd9be80b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,9 +18,6 @@ Thumbs.db
 # composer itself is not needed
 composer.phar
 
-# composer lock
-composer.lock
-
 # Mac DS_Store Files
 .DS_Store
 

From 530178da663f0f09ef36ae78e5519bcf37827536 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 30 May 2024 20:36:00 +0300
Subject: [PATCH 377/390] release version 2.0.50

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

diff --git a/composer.json b/composer.json
index 7819706f1..3b612fac2 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "ircs://irc.libera.chat:6697/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From a5a02bb4b08a5c34065671e4300f922195c3a302 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 30 May 2024 20:36:12 +0300
Subject: [PATCH 378/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 3b612fac2..7819706f1 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "ircs://irc.libera.chat:6697/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From 607351720de1ad8c4f12b89b69397941be61c045 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 18 Jul 2024 23:03:04 +0300
Subject: [PATCH 379/390] release version 2.0.51

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

diff --git a/composer.json b/composer.json
index 7819706f1..3b612fac2 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "ircs://irc.libera.chat:6697/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From 44e6fe42887df64f50be4e96ceacca8132b3c102 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 18 Jul 2024 23:03:18 +0300
Subject: [PATCH 380/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 3b612fac2..7819706f1 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "ircs://irc.libera.chat:6697/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From 510f0e24ade3fbc0e926e1e86d8cb78adaa2a1b0 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Sat, 7 Sep 2024 18:24:39 +0300
Subject: [PATCH 381/390] Remove explicit version of symfony/browser-kit

See https://github.com/Codeception/module-yii2/issues/105
---
 composer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 7819706f1..4b6cab88c 100644
--- a/composer.json
+++ b/composer.json
@@ -28,8 +28,7 @@
         "codeception/module-asserts": "^3.0 || ^1.1",
         "codeception/module-yii2": "^1.1",
         "codeception/module-filesystem": "^3.0 || ^2.0 || ^1.1",
-        "codeception/verify": "^3.0 || ^2.2",
-        "symfony/browser-kit": "^6.0 || >=2.7 <=4.2.4"
+        "codeception/verify": "^3.0 || ^2.2"
     },
     "config": {
         "allow-plugins": {

From 8a980897015c85017260c2a66fb72e4be44b787a Mon Sep 17 00:00:00 2001
From: Matheus Evangelista Morais <thtmorais@hotmail.com>
Date: Wed, 12 Feb 2025 22:25:20 -0300
Subject: [PATCH 382/390] Just adding space in comments for documentation

---
 views/site/error.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/site/error.php b/views/site/error.php
index 4a37b2568..176874796 100644
--- a/views/site/error.php
+++ b/views/site/error.php
@@ -3,7 +3,7 @@
 /** @var yii\web\View $this */
 /** @var string $name */
 /** @var string $message */
-/** @var Exception$exception */
+/** @var Exception $exception */
 
 use yii\helpers\Html;
 

From fa65fe091e50daadab408b8b72744ff3c9a0b3a2 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 13 Feb 2025 23:25:15 +0300
Subject: [PATCH 383/390] release version 2.0.52

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

diff --git a/composer.json b/composer.json
index 4b6cab88c..0d05011ca 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "ircs://irc.libera.chat:6697/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From 281a5dcec4e0856764c1a94594e3535a73678208 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Thu, 13 Feb 2025 23:25:29 +0300
Subject: [PATCH 384/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 0d05011ca..4b6cab88c 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "ircs://irc.libera.chat:6697/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From 2b430206f2ac40fb6d93b00462493cbc77b2036b Mon Sep 17 00:00:00 2001
From: Fejan <63099555+fejan-malek@users.noreply.github.com>
Date: Mon, 9 Jun 2025 15:40:44 +0530
Subject: [PATCH 385/390] Update cache version and PHP version in GH workflow
 action (#320)

---
 .github/workflows/build.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f1065f909..564343a98 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
 
     env:
       extensions: dom, json, gd, imagick
-      key: cache-v1
+      key: cache-v4
 
     runs-on: ${{ matrix.os }}
 
@@ -24,6 +24,9 @@ jobs:
           - "7.4"
           - "8.0"
           - "8.1"
+          - "8.2"
+          - "8.3"
+          - "8.4"
           
     steps:
       - name: Checkout
@@ -38,7 +41,7 @@ jobs:
           key: ${{ env.key }}
 
       - name: Cache extensions
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.cache-env.outputs.dir }}
           key: ${{ steps.cache-env.outputs.key }}
@@ -62,7 +65,7 @@ jobs:
             echo "COMPOSER_CACHE_DIR=~\AppData\Local\Composer" >> $GITHUB_ENV
 
       - name: Cache dependencies installed with composer
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ${{ steps.cache-env.outputs.dir }}
           key: php${{ matrix.php }}-composer-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}

From 2fedf51a4f4c662a57133294ef1850c4d838f947 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 27 Jun 2025 11:01:57 +0300
Subject: [PATCH 386/390] release version 2.0.53

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

diff --git a/composer.json b/composer.json
index 4b6cab88c..0d05011ca 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "ircs://irc.libera.chat:6697/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "dev",
+    "minimum-stability": "stable",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From 9836ece64899d4faac10ad43aaed85a99ace9410 Mon Sep 17 00:00:00 2001
From: Alexander Makarov <sam@rmcreative.ru>
Date: Fri, 27 Jun 2025 11:02:11 +0300
Subject: [PATCH 387/390] prepare for next release

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

diff --git a/composer.json b/composer.json
index 0d05011ca..4b6cab88c 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
         "irc": "ircs://irc.libera.chat:6697/yii",
         "source": "https://github.com/yiisoft/yii2"
     },
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "require": {
         "php": ">=7.4.0",
         "yiisoft/yii2": "~2.0.45",

From 3c14e8bade29455f6315d9e7216dacc9dacfc9f2 Mon Sep 17 00:00:00 2001
From: Fejan <63099555+fejan-malek@users.noreply.github.com>
Date: Thu, 14 Aug 2025 21:50:58 +0530
Subject: [PATCH 388/390] Change: updated checkout version in GH from v2 to v5
 (#321)

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 564343a98..a5beac653 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,7 +30,7 @@ jobs:
           
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v5
 
       - name: Setup cache environment
         id: cache-env

From 0f91f32ecff52ef479addb0a5013342d59fe0697 Mon Sep 17 00:00:00 2001
From: Maksim Spirkov <63721828+mspirkov@users.noreply.github.com>
Date: Mon, 27 Oct 2025 10:51:14 +0300
Subject: [PATCH 389/390] Fix codestyle (#322)

---
 assets/AppAsset.php                  |  1 +
 commands/HelloController.php         |  1 +
 config/__autocomplete.php            | 12 +++++++-----
 config/test.php                      |  1 +
 config/test_db.php                   |  1 +
 mail/layouts/text.php                |  2 +-
 models/LoginForm.php                 |  2 +-
 requirements.php                     |  1 +
 tests/_bootstrap.php                 |  3 ++-
 tests/_support/AcceptanceTester.php  |  6 +++---
 tests/_support/FunctionalTester.php  |  1 -
 tests/_support/UnitTester.php        |  6 +++---
 tests/acceptance/ContactCest.php     |  4 ++--
 tests/acceptance/HomeCest.php        |  6 +++---
 tests/functional/ContactFormCest.php |  8 ++++----
 tests/functional/LoginFormCest.php   |  5 ++---
 tests/unit/models/LoginFormTest.php  |  1 -
 tests/unit/models/UserTest.php       |  5 ++---
 tests/unit/widgets/AlertTest.php     |  6 ++++--
 19 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/assets/AppAsset.php b/assets/AppAsset.php
index 3d40487ae..d9d4cc430 100644
--- a/assets/AppAsset.php
+++ b/assets/AppAsset.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
diff --git a/commands/HelloController.php b/commands/HelloController.php
index 9ec914d3c..28dba79cd 100644
--- a/commands/HelloController.php
+++ b/commands/HelloController.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @link https://www.yiiframework.com/
  * @copyright Copyright (c) 2008 Yii Software LLC
diff --git a/config/__autocomplete.php b/config/__autocomplete.php
index d99dea50e..e5e1c00d7 100644
--- a/config/__autocomplete.php
+++ b/config/__autocomplete.php
@@ -11,7 +11,8 @@
  * }
  * ```
  */
-class Yii {
+class Yii
+{
     /**
      * @var \yii\web\Application|\yii\console\Application|__Application
      */
@@ -19,15 +20,16 @@ class Yii {
 }
 
 /**
- * @property yii\rbac\DbManager $authManager 
+ * @property yii\rbac\DbManager $authManager
  * @property \yii\web\User|__WebUser $user
- * 
  */
-class __Application {
+class __Application
+{
 }
 
 /**
  * @property app\models\User $identity
  */
-class __WebUser {
+class __WebUser
+{
 }
diff --git a/config/test.php b/config/test.php
index 317bc1cb6..fb5e2929e 100644
--- a/config/test.php
+++ b/config/test.php
@@ -1,4 +1,5 @@
 <?php
+
 $params = require __DIR__ . '/params.php';
 $db = require __DIR__ . '/test_db.php';
 
diff --git a/config/test_db.php b/config/test_db.php
index f4290e0b0..f10835fe1 100644
--- a/config/test_db.php
+++ b/config/test_db.php
@@ -1,4 +1,5 @@
 <?php
+
 $db = require __DIR__ . '/db.php';
 // test database! Important not to run tests on production or development databases
 $db['dsn'] = 'mysql:host=localhost;dbname=yii2basic_test';
diff --git a/mail/layouts/text.php b/mail/layouts/text.php
index c3768640b..0873d7728 100644
--- a/mail/layouts/text.php
+++ b/mail/layouts/text.php
@@ -1,6 +1,6 @@
 <?php
 
-/** 
+/**
  * @var yii\web\View $this view component instance
  * @var yii\mail\BaseMessage $message the message being composed
  * @var string $content main view render result
diff --git a/models/LoginForm.php b/models/LoginForm.php
index dce15ccf7..5304eecf4 100644
--- a/models/LoginForm.php
+++ b/models/LoginForm.php
@@ -60,7 +60,7 @@ public function validatePassword($attribute, $params)
     public function login()
     {
         if ($this->validate()) {
-            return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600*24*30 : 0);
+            return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600 * 24 * 30 : 0);
         }
         return false;
     }
diff --git a/requirements.php b/requirements.php
index c1a6bf680..db69a36ee 100644
--- a/requirements.php
+++ b/requirements.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Application requirement checker script.
  *
diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
index 131da42af..4b8424f73 100644
--- a/tests/_bootstrap.php
+++ b/tests/_bootstrap.php
@@ -1,6 +1,7 @@
 <?php
+
 define('YII_ENV', 'test');
 defined('YII_DEBUG') or define('YII_DEBUG', true);
 
 require_once __DIR__ . '/../vendor/yiisoft/yii2/Yii.php';
-require __DIR__ .'/../vendor/autoload.php';
\ No newline at end of file
+require __DIR__ .'/../vendor/autoload.php';
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index 4c7dcbb6d..3fb3a9f03 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -20,7 +20,7 @@ class AcceptanceTester extends \Codeception\Actor
 {
     use _generated\AcceptanceTesterActions;
 
-   /**
-    * Define custom actions here
-    */
+    /**
+     * Define custom actions here
+     */
 }
diff --git a/tests/_support/FunctionalTester.php b/tests/_support/FunctionalTester.php
index db2ce28be..5213d954d 100644
--- a/tests/_support/FunctionalTester.php
+++ b/tests/_support/FunctionalTester.php
@@ -19,5 +19,4 @@
 class FunctionalTester extends \Codeception\Actor
 {
     use _generated\FunctionalTesterActions;
-
 }
diff --git a/tests/_support/UnitTester.php b/tests/_support/UnitTester.php
index 28353572c..8d3cc473b 100644
--- a/tests/_support/UnitTester.php
+++ b/tests/_support/UnitTester.php
@@ -20,7 +20,7 @@ class UnitTester extends \Codeception\Actor
 {
     use _generated\UnitTesterActions;
 
-   /**
-    * Define custom actions here
-    */
+    /**
+     * Define custom actions here
+     */
 }
diff --git a/tests/acceptance/ContactCest.php b/tests/acceptance/ContactCest.php
index 90f98482e..ac74fdb1f 100644
--- a/tests/acceptance/ContactCest.php
+++ b/tests/acceptance/ContactCest.php
@@ -8,7 +8,7 @@ public function _before(\AcceptanceTester $I)
     {
         $I->amOnPage(Url::toRoute('/site/contact'));
     }
-    
+
     public function contactPageWorks(AcceptanceTester $I)
     {
         $I->wantTo('ensure that contact page works');
@@ -25,7 +25,7 @@ public function contactFormCanBeSubmitted(AcceptanceTester $I)
         $I->fillField('#contactform-verifycode', 'testme');
 
         $I->click('contact-button');
-        
+
         $I->wait(2); // wait for button to be clicked
 
         $I->dontSeeElement('#contact-form');
diff --git a/tests/acceptance/HomeCest.php b/tests/acceptance/HomeCest.php
index e65df16ae..98fb6b9f7 100644
--- a/tests/acceptance/HomeCest.php
+++ b/tests/acceptance/HomeCest.php
@@ -6,13 +6,13 @@ class HomeCest
 {
     public function ensureThatHomePageWorks(AcceptanceTester $I)
     {
-        $I->amOnPage(Url::toRoute('/site/index'));        
+        $I->amOnPage(Url::toRoute('/site/index'));
         $I->see('My Company');
-        
+
         $I->seeLink('About');
         $I->click('About');
         $I->wait(2); // wait for page to be opened
-        
+
         $I->see('This is the About page.');
     }
 }
diff --git a/tests/functional/ContactFormCest.php b/tests/functional/ContactFormCest.php
index d17ef52fd..f1ccaf18f 100644
--- a/tests/functional/ContactFormCest.php
+++ b/tests/functional/ContactFormCest.php
@@ -1,6 +1,6 @@
 <?php
 
-class ContactFormCest 
+class ContactFormCest
 {
     public function _before(\FunctionalTester $I)
     {
@@ -9,7 +9,7 @@ public function _before(\FunctionalTester $I)
 
     public function openContactPage(\FunctionalTester $I)
     {
-        $I->see('Contact', 'h1');        
+        $I->see('Contact', 'h1');
     }
 
     public function submitEmptyForm(\FunctionalTester $I)
@@ -38,7 +38,7 @@ public function submitFormWithIncorrectEmail(\FunctionalTester $I)
         $I->see('Email is not a valid email address.');
         $I->dontSee('Subject cannot be blank', '.help-inline');
         $I->dontSee('Body cannot be blank', '.help-inline');
-        $I->dontSee('The verification code is incorrect', '.help-inline');        
+        $I->dontSee('The verification code is incorrect', '.help-inline');
     }
 
     public function submitFormSuccessfully(\FunctionalTester $I)
@@ -52,6 +52,6 @@ public function submitFormSuccessfully(\FunctionalTester $I)
         ]);
         $I->seeEmailIsSent();
         $I->dontSeeElement('#contact-form');
-        $I->see('Thank you for contacting us. We will respond to you as soon as possible.');        
+        $I->see('Thank you for contacting us. We will respond to you as soon as possible.');
     }
 }
diff --git a/tests/functional/LoginFormCest.php b/tests/functional/LoginFormCest.php
index 7a83a27d6..a1545a706 100644
--- a/tests/functional/LoginFormCest.php
+++ b/tests/functional/LoginFormCest.php
@@ -10,7 +10,6 @@ public function _before(\FunctionalTester $I)
     public function openLoginPage(\FunctionalTester $I)
     {
         $I->see('Login', 'h1');
-
     }
 
     // demonstrates `amLoggedInAs` method
@@ -54,6 +53,6 @@ public function loginSuccessfully(\FunctionalTester $I)
             'LoginForm[password]' => 'admin',
         ]);
         $I->see('Logout (admin)');
-        $I->dontSeeElement('form#login-form');              
+        $I->dontSeeElement('form#login-form');
     }
-}
\ No newline at end of file
+}
diff --git a/tests/unit/models/LoginFormTest.php b/tests/unit/models/LoginFormTest.php
index 3c1dcddaa..6f96c2377 100644
--- a/tests/unit/models/LoginFormTest.php
+++ b/tests/unit/models/LoginFormTest.php
@@ -47,5 +47,4 @@ public function testLoginCorrect()
         verify(\Yii::$app->user->isGuest)->false();
         verify($this->model->errors)->arrayHasNotKey('password');
     }
-
 }
diff --git a/tests/unit/models/UserTest.php b/tests/unit/models/UserTest.php
index 28986cbbd..3db9772a3 100644
--- a/tests/unit/models/UserTest.php
+++ b/tests/unit/models/UserTest.php
@@ -19,7 +19,7 @@ public function testFindUserByAccessToken()
         verify($user = User::findIdentityByAccessToken('100-token'))->notEmpty();
         verify($user->username)->equals('admin');
 
-        verify(User::findIdentityByAccessToken('non-existing'))->empty();        
+        verify(User::findIdentityByAccessToken('non-existing'))->empty();
     }
 
     public function testFindUserByUsername()
@@ -38,7 +38,6 @@ public function testValidateUser()
         verify($user->validateAuthKey('test102key'))->empty();
 
         verify($user->validatePassword('admin'))->notEmpty();
-        verify($user->validatePassword('123456'))->empty();        
+        verify($user->validatePassword('123456'))->empty();
     }
-
 }
diff --git a/tests/unit/widgets/AlertTest.php b/tests/unit/widgets/AlertTest.php
index e9857a161..af2db5d21 100644
--- a/tests/unit/widgets/AlertTest.php
+++ b/tests/unit/widgets/AlertTest.php
@@ -177,7 +177,8 @@ public function testMultipleWarningMessages()
         verify($renderingResult)->stringNotContainsString('alert-info');
     }
 
-    public function testSingleMixedMessages() {
+    public function testSingleMixedMessages()
+    {
         $errorMessage = 'This is an error message';
         $dangerMessage = 'This is a danger message';
         $successMessage = 'This is a success message';
@@ -204,7 +205,8 @@ public function testSingleMixedMessages() {
         verify($renderingResult)->stringContainsString('alert-warning');
     }
 
-    public function testMultipleMixedMessages() {
+    public function testMultipleMixedMessages()
+    {
         $firstErrorMessage = 'This is the first error message';
         $secondErrorMessage = 'This is the second error message';
         $firstDangerMessage = 'This is the first danger message';

From db54e5150dcdcebe1ca3ee2edab1f7e2a84f72f3 Mon Sep 17 00:00:00 2001
From: Maksim Spirkov <63721828+mspirkov@users.noreply.github.com>
Date: Mon, 27 Oct 2025 21:41:22 +0300
Subject: [PATCH 390/390] Exclude commits with CS changes from Git Blame (#323)

---
 .git-blame-ignore-revs |  8 ++++++++
 .gitattributes         | 11 ++++++-----
 .gitignore             |  3 +++
 3 files changed, 17 insertions(+), 5 deletions(-)
 create mode 100644 .git-blame-ignore-revs

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 000000000..011c056bb
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,8 @@
+# Reformat code te be PSR-2 compatible
+93cc82c4bf42cea403e1acaab201338bea304b6e
+# Convert to short syntax (array)
+332030325fbad38a64c5e60980d3b14b6434d6dd
+# Convert to short syntax
+b0fcdfab1aecaeb620f75a83f15aa02bc25765a0
+# Fix codestyle
+0f91f32ecff52ef479addb0a5013342d59fe0697
diff --git a/.gitattributes b/.gitattributes
index 3e9092c68..705fb391d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,7 @@
 # Ignore all test and documentation for archive
-/.github            export-ignore
-/.gitattributes     export-ignore
-/.scrutinizer.yml   export-ignore
-/.travis.yml        export-ignore
-/docs               export-ignore
+/.github                    export-ignore
+/.git-blame-ignore-revs     export-ignore
+/.gitattributes             export-ignore
+/.scrutinizer.yml           export-ignore
+/.travis.yml                export-ignore
+/docs                       export-ignore
diff --git a/.gitignore b/.gitignore
index 5bd9be80b..05fb29d1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 # phpstorm project files
 .idea
 
+# visual studio code project files
+.vscode
+
 # netbeans project files
 nbproject