diff --git a/apps/advanced/tests/codeception/backend/acceptance/LoginCept.php b/apps/advanced/tests/codeception/backend/acceptance/LoginCept.php
index 8ed1b54e19..898b1c9d7b 100644
--- a/apps/advanced/tests/codeception/backend/acceptance/LoginCept.php
+++ b/apps/advanced/tests/codeception/backend/acceptance/LoginCept.php
@@ -3,6 +3,8 @@
 use tests\codeception\backend\AcceptanceTester;
 use tests\codeception\common\_pages\LoginPage;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure login page works');
 
diff --git a/apps/advanced/tests/codeception/backend/functional/LoginCept.php b/apps/advanced/tests/codeception/backend/functional/LoginCept.php
index 3072d97521..7e7e26d72a 100644
--- a/apps/advanced/tests/codeception/backend/functional/LoginCept.php
+++ b/apps/advanced/tests/codeception/backend/functional/LoginCept.php
@@ -3,6 +3,8 @@
 use tests\codeception\backend\FunctionalTester;
 use tests\codeception\common\_pages\LoginPage;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure login page works');
 
diff --git a/apps/advanced/tests/codeception/frontend/acceptance/AboutCept.php b/apps/advanced/tests/codeception/frontend/acceptance/AboutCept.php
index 7f7f97e318..50bf9bad50 100644
--- a/apps/advanced/tests/codeception/frontend/acceptance/AboutCept.php
+++ b/apps/advanced/tests/codeception/frontend/acceptance/AboutCept.php
@@ -2,6 +2,8 @@
 use tests\codeception\frontend\AcceptanceTester;
 use tests\codeception\frontend\_pages\AboutPage;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that about works');
 AboutPage::openBy($I);
diff --git a/apps/advanced/tests/codeception/frontend/acceptance/ContactCept.php b/apps/advanced/tests/codeception/frontend/acceptance/ContactCept.php
index f589460e33..f7a6bc89e3 100644
--- a/apps/advanced/tests/codeception/frontend/acceptance/ContactCept.php
+++ b/apps/advanced/tests/codeception/frontend/acceptance/ContactCept.php
@@ -2,6 +2,8 @@
 use tests\codeception\frontend\AcceptanceTester;
 use tests\codeception\frontend\_pages\ContactPage;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that contact works');
 
diff --git a/apps/advanced/tests/codeception/frontend/acceptance/HomeCept.php b/apps/advanced/tests/codeception/frontend/acceptance/HomeCept.php
index 5cf837916f..9566a2ee2f 100644
--- a/apps/advanced/tests/codeception/frontend/acceptance/HomeCept.php
+++ b/apps/advanced/tests/codeception/frontend/acceptance/HomeCept.php
@@ -1,6 +1,8 @@
 <?php
 use tests\codeception\frontend\AcceptanceTester;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);
diff --git a/apps/advanced/tests/codeception/frontend/acceptance/LoginCept.php b/apps/advanced/tests/codeception/frontend/acceptance/LoginCept.php
index e4363a837d..599e24f496 100644
--- a/apps/advanced/tests/codeception/frontend/acceptance/LoginCept.php
+++ b/apps/advanced/tests/codeception/frontend/acceptance/LoginCept.php
@@ -2,6 +2,8 @@
 use tests\codeception\frontend\AcceptanceTester;
 use tests\codeception\common\_pages\LoginPage;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new AcceptanceTester($scenario);
 $I->wantTo('ensure login page works');
 
diff --git a/apps/advanced/tests/codeception/frontend/functional/AboutCept.php b/apps/advanced/tests/codeception/frontend/functional/AboutCept.php
index bc6459061c..8b5bee23a4 100644
--- a/apps/advanced/tests/codeception/frontend/functional/AboutCept.php
+++ b/apps/advanced/tests/codeception/frontend/functional/AboutCept.php
@@ -2,6 +2,8 @@
 use tests\codeception\frontend\FunctionalTester;
 use tests\codeception\frontend\_pages\AboutPage;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that about works');
 AboutPage::openBy($I);
diff --git a/apps/advanced/tests/codeception/frontend/functional/ContactCept.php b/apps/advanced/tests/codeception/frontend/functional/ContactCept.php
index 1aaac3f5a1..c61d4c2d58 100644
--- a/apps/advanced/tests/codeception/frontend/functional/ContactCept.php
+++ b/apps/advanced/tests/codeception/frontend/functional/ContactCept.php
@@ -2,6 +2,8 @@
 use tests\codeception\frontend\FunctionalTester;
 use tests\codeception\frontend\_pages\ContactPage;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that contact works');
 
diff --git a/apps/advanced/tests/codeception/frontend/functional/HomeCept.php b/apps/advanced/tests/codeception/frontend/functional/HomeCept.php
index 0f5b2ffbb9..f3400614f6 100644
--- a/apps/advanced/tests/codeception/frontend/functional/HomeCept.php
+++ b/apps/advanced/tests/codeception/frontend/functional/HomeCept.php
@@ -1,5 +1,8 @@
 <?php
 use tests\codeception\frontend\FunctionalTester;
+
+/* @var $scenario Codeception\Scenario */
+
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure that home page works');
 $I->amOnPage(Yii::$app->homeUrl);
diff --git a/apps/advanced/tests/codeception/frontend/functional/LoginCept.php b/apps/advanced/tests/codeception/frontend/functional/LoginCept.php
index 0fb3477614..daca12cf8c 100644
--- a/apps/advanced/tests/codeception/frontend/functional/LoginCept.php
+++ b/apps/advanced/tests/codeception/frontend/functional/LoginCept.php
@@ -2,6 +2,8 @@
 use tests\codeception\frontend\FunctionalTester;
 use tests\codeception\common\_pages\LoginPage;
 
+/* @var $scenario Codeception\Scenario */
+
 $I = new FunctionalTester($scenario);
 $I->wantTo('ensure login page works');
 
diff --git a/apps/basic/tests/codeception/acceptance/AboutCept.php b/apps/basic/tests/codeception/acceptance/AboutCept.php
index 1ef220ebe2..88a550698c 100644
--- a/apps/basic/tests/codeception/acceptance/AboutCept.php
+++ b/apps/basic/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/apps/basic/tests/codeception/acceptance/ContactCept.php b/apps/basic/tests/codeception/acceptance/ContactCept.php
index 4e8ee80b4e..b51d1c085c 100644
--- a/apps/basic/tests/codeception/acceptance/ContactCept.php
+++ b/apps/basic/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/apps/basic/tests/codeception/acceptance/HomeCept.php b/apps/basic/tests/codeception/acceptance/HomeCept.php
index 369ab7f481..1f93535958 100644
--- a/apps/basic/tests/codeception/acceptance/HomeCept.php
+++ b/apps/basic/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/apps/basic/tests/codeception/acceptance/LoginCept.php b/apps/basic/tests/codeception/acceptance/LoginCept.php
index 7575caf58c..90d0635836 100644
--- a/apps/basic/tests/codeception/acceptance/LoginCept.php
+++ b/apps/basic/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/apps/basic/tests/codeception/functional/AboutCept.php b/apps/basic/tests/codeception/functional/AboutCept.php
index ae7b45b308..09260612f6 100644
--- a/apps/basic/tests/codeception/functional/AboutCept.php
+++ b/apps/basic/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/apps/basic/tests/codeception/functional/ContactCept.php b/apps/basic/tests/codeception/functional/ContactCept.php
index 47604058d7..074820a702 100644
--- a/apps/basic/tests/codeception/functional/ContactCept.php
+++ b/apps/basic/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/apps/basic/tests/codeception/functional/HomeCept.php b/apps/basic/tests/codeception/functional/HomeCept.php
index 80aa551fc9..94efb09cdb 100644
--- a/apps/basic/tests/codeception/functional/HomeCept.php
+++ b/apps/basic/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/apps/basic/tests/codeception/functional/LoginCept.php b/apps/basic/tests/codeception/functional/LoginCept.php
index 991d27c3c9..66e760989a 100644
--- a/apps/basic/tests/codeception/functional/LoginCept.php
+++ b/apps/basic/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');