From 264cb25ddc63d1c67cb7df24d4dd303ea3b9ca5a Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Mon, 19 Sep 2016 02:13:17 +0300
Subject: [PATCH] =?UTF-8?q?Upgrade=20Codeception=20=D0=B4=D0=BE=202.2=20(?=
 =?UTF-8?q?=D0=BF=D0=B0=D0=B4=D0=B0=D0=B5=D1=82=20=D1=82=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=20=D0=B2=20AccountIdentity=20=D0=BF=D1=80=D0=B8=20=D0=BC=D0=B0?=
 =?UTF-8?q?=D1=81=D1=81=D0=BE=D0=B2=D0=BE=D0=BC=20=D0=BF=D1=80=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BE=D0=BD=D0=B5,=20=D1=82.=D0=BA.=20=D0=B8=D0=B7=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=BB=D1=81=D1=8F=20=D0=B4=D0=BE=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?,=20=D0=BF=D0=BE=D1=85=D0=BE=D0=B4=D1=83)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json                                       | 5 +++--
 tests/codeception/api/_bootstrap.php                | 3 +--
 tests/codeception/bin/_bootstrap.php                | 3 +--
 tests/codeception/common/_bootstrap.php             | 3 +--
 tests/codeception/common/_support/FixtureHelper.php | 8 ++++----
 tests/codeception/console/_bootstrap.php            | 3 +--
 6 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index e3f4eed..a9de380 100644
--- a/composer.json
+++ b/composer.json
@@ -33,10 +33,11 @@
         "yiisoft/yii2-gii": "*",
         "yiisoft/yii2-faker": "*",
         "flow/jsonpath": "^0.3.1",
-        "codeception/codeception": "~2.1.10",
+        "codeception/codeception": "~2.2.4",
         "codeception/specify": "*",
         "codeception/verify": "*",
-        "phploc/phploc": "^3.0.1"
+        "phploc/phploc": "^3.0.1",
+        "predis/predis": "^1.0"
     },
     "config": {
         "process-timeout": 1800
diff --git a/tests/codeception/api/_bootstrap.php b/tests/codeception/api/_bootstrap.php
index 9c2d2aa..03865c3 100644
--- a/tests/codeception/api/_bootstrap.php
+++ b/tests/codeception/api/_bootstrap.php
@@ -3,8 +3,7 @@ use Codeception\Configuration;
 use Codeception\Specify\Config;
 
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_ENV_TEST') or define('YII_ENV_TEST', true);
-defined('YII_ENV') or define('YII_ENV', 'dev');
+defined('YII_ENV') or define('YII_ENV', 'test');
 
 defined('API_ENTRY_URL') or define('API_ENTRY_URL', parse_url(Configuration::config()['config']['test_entry_url'], PHP_URL_PATH));
 defined('API_ENTRY_FILE') or define('API_ENTRY_FILE', __DIR__ . '/../../../api/web/index.php');
diff --git a/tests/codeception/bin/_bootstrap.php b/tests/codeception/bin/_bootstrap.php
index 8b78584..abbeded 100644
--- a/tests/codeception/bin/_bootstrap.php
+++ b/tests/codeception/bin/_bootstrap.php
@@ -1,7 +1,6 @@
 <?php
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_ENV_TEST') or define('YII_ENV_TEST', true);
-defined('YII_ENV') or define('YII_ENV', 'dev');
+defined('YII_ENV') or define('YII_ENV', 'test');
 
 require_once __DIR__ . '/../../../vendor/autoload.php';
 require_once __DIR__ . '/../../../vendor/yiisoft/yii2/Yii.php';
diff --git a/tests/codeception/common/_bootstrap.php b/tests/codeception/common/_bootstrap.php
index 577fef2..f7c1a2d 100644
--- a/tests/codeception/common/_bootstrap.php
+++ b/tests/codeception/common/_bootstrap.php
@@ -1,7 +1,6 @@
 <?php
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_ENV_TEST') or define('YII_ENV_TEST', true);
-defined('YII_ENV') or define('YII_ENV', 'dev');
+defined('YII_ENV') or define('YII_ENV', 'test');
 
 require_once __DIR__ . '/../../../vendor/autoload.php';
 require_once __DIR__ . '/../../../vendor/yiisoft/yii2/Yii.php';
diff --git a/tests/codeception/common/_support/FixtureHelper.php b/tests/codeception/common/_support/FixtureHelper.php
index 28ab82d..5d198df 100644
--- a/tests/codeception/common/_support/FixtureHelper.php
+++ b/tests/codeception/common/_support/FixtureHelper.php
@@ -2,7 +2,7 @@
 namespace tests\codeception\common\_support;
 
 use Codeception\Module;
-use Codeception\TestCase;
+use Codeception\TestInterface;
 use tests\codeception\common\fixtures\AccountFixture;
 use tests\codeception\common\fixtures\AccountSessionFixture;
 use tests\codeception\common\fixtures\EmailActivationFixture;
@@ -32,17 +32,17 @@ class FixtureHelper extends Module {
         getFixture as protected;
     }
 
-    public function _before(TestCase $test) {
+    public function _before(TestInterface $test) {
         $this->loadFixtures();
     }
 
-    public function _after(TestCase $test) {
+    public function _after(TestInterface $test) {
         $this->unloadFixtures();
     }
 
     public function globalFixtures() {
         return [
-            InitDbFixture::className(),
+            InitDbFixture::class,
         ];
     }
 
diff --git a/tests/codeception/console/_bootstrap.php b/tests/codeception/console/_bootstrap.php
index 98f4993..97426fc 100644
--- a/tests/codeception/console/_bootstrap.php
+++ b/tests/codeception/console/_bootstrap.php
@@ -1,7 +1,6 @@
 <?php
 defined('YII_DEBUG') or define('YII_DEBUG', true);
-defined('YII_ENV_TEST') or define('YII_ENV_TEST', true);
-defined('YII_ENV') or define('YII_ENV', 'dev');
+defined('YII_ENV') or define('YII_ENV', 'test');
 
 require_once __DIR__ . '/../../../vendor/autoload.php';
 require_once __DIR__ . '/../../../vendor/yiisoft/yii2/Yii.php';