D10 version

Author: guncha25

composer.json

@@ -9,8 +9,8 @@
         }
     ],
     "require": {
-        "codeception/codeception": "^4 || ^5",
-        "codeception/module-webdriver": "^3 || ^4",
+        "codeception/codeception": "^5",
+        "codeception/module-webdriver": "^4",
         "webflo/drupal-finder": "^1.2",
         "fakerphp/faker": "^1.23",
         "codeception/module-phpbrowser": "*",

src/Codeception/Module/DrupalBootstrap.php

@@ -17,9 +17,9 @@
  * #### Example (DrupalBootstrap)
  *     modules:
  *        - DrupalBootstrap:
- *          root: './web'
- *          site_path: 'sites/default'
- *          http_host: 'mysite.local'
+ *            root: './web'
+ *            site_path: 'sites/default'
+ *            http_host: 'mysite.local'
  *
  * @package Codeception\Module
  */
@@ -30,7 +30,7 @@ class DrupalBootstrap extends Module {
    *
    * @var array
    */
-  protected $config = [
+  protected array $config = [
     'site_path' => 'sites/default',
   ];
 

src/Codeception/Module/DrupalDrush.php

@@ -12,13 +12,13 @@
  * #### Example (DrupalDrush)
  *     modules:
  *        - DrupalDrush:
- *          working_directory: './web'
- *          timeout: 120
- *          drush: './vendor/bin/drush'
- *          alias: '@mysite.com'
- *          options:
- *            uri: http://mydomain.com
- *            root: /app/web
+ *            working_directory: './web'
+ *            timeout: 120
+ *            drush: './vendor/bin/drush'
+ *            alias: '@mysite.com'
+ *            options:
+ *              uri: http://mydomain.com
+ *              root: /app/web
  *
  * @package Codeception\Module
  */
@@ -29,7 +29,7 @@ class DrupalDrush extends Module {
    *
    * @var array
    */
-  protected $config = [
+  protected array $config = [
     'drush' => 'drush',
     'alias' => '',
     'options' => [],

src/Codeception/Module/DrupalEntity.php

@@ -3,9 +3,11 @@
 namespace Codeception\Module;
 
 use Codeception\Module;
+use Codeception\TestInterface;
 use Drupal\Core\Entity\FieldableEntityInterface;
 use Drupal\Core\Url;
 use Codeception\TestCase;
+use Exception;
 
 /**
  * Class DrupalEntity.
@@ -14,12 +16,12 @@
  * #### Example (DrupalEntity)
  *     modules:
  *        - DrupalEntity:
- *          cleanup_test: true
- *          cleanup_failed: false
- *          cleanup_suite: true
- *          route_entities:
- *            - node
- *            - taxonomy_term.
+ *            cleanup_test: true
+ *            cleanup_failed: false
+ *            cleanup_suite: true
+ *            route_entities:
+ *              - node
+ *              - taxonomy_term.
  *
  * @package Codeception\Module
  */
@@ -30,7 +32,7 @@ class DrupalEntity extends Module {
    *
    * @var array
    */
-  protected $config = [
+  protected array $config = [
     'cleanup_test' => TRUE,
     'cleanup_failed' => TRUE,
     'cleanup_suite' => TRUE,
@@ -60,7 +62,7 @@ public function _afterSuite() { // @codingStandardsIgnoreLine
   /**
    * {@inheritdoc}
    */
-  public function _after(TestCase $test) { // @codingStandardsIgnoreLine
+  public function _after(TestInterface $test) { // @codingStandardsIgnoreLine
     if ($this->config['cleanup_test']) {
       $this->doEntityCleanup();
     }
@@ -69,7 +71,7 @@ public function _after(TestCase $test) { // @codingStandardsIgnoreLine
   /**
    * {@inheritdoc}
    */
-  public function _failed(TestCase $test, $fail) { // @codingStandardsIgnoreLine
+  public function _failed(TestInterface $test, Exception $fail) { // @codingStandardsIgnoreLine
     if ($this->config['cleanup_failed']) {
       $this->doEntityCleanup();
     }

src/Codeception/Module/DrupalUser.php

@@ -3,11 +3,13 @@
 namespace Codeception\Module;
 
 use Codeception\Module;
+use Codeception\TestInterface;
 use Drupal\Core\Config\StorageInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\user\Entity\User;
 use Faker\Factory;
 use Codeception\Util\Drush;
+use Exception;
 
 /**
  * Class DrupalUser.
@@ -16,17 +18,17 @@
  * #### Example (DrupalUser)
  *     modules:
  *        - DrupalUser:
- *          default_role: 'authenticated'
- *          driver: 'PhpBrowser'
- *          drush: './vendor/bin/drush'
- *          cleanup_entities:
- *            - media
- *            - file
- *            - paragraph
- *          cleanup_test: false
- *          cleanup_failed: false
- *          cleanup_suite: true
- *          alias: @site.com
+ *            default_role: 'authenticated'
+ *            driver: 'PhpBrowser'
+ *            drush: './vendor/bin/drush'
+ *            cleanup_entities:
+ *              - media
+ *              - file
+ *              - paragraph
+ *            cleanup_test: false
+ *            cleanup_failed: false
+ *            cleanup_suite: true
+ *            alias: @site.com
  *
  * @package Codeception\Module
  */
@@ -51,7 +53,7 @@ class DrupalUser extends Module {
    *
    * @var array
    */
-  protected $config = [
+  protected array $config = [
     'alias' => '',
     'default_role' => 'authenticated',
     'driver' => 'WebDriver',
@@ -65,7 +67,7 @@ class DrupalUser extends Module {
   /**
    * {@inheritdoc}
    */
-  public function _beforeSuite($settings = []) { // @codingStandardsIgnoreLine
+  public function _beforeSuite(array $settings = []) { // @codingStandardsIgnoreLine
     $this->driver = null;
     if (!$this->hasModule($this->_getConfig('driver'))) {
       $this->fail('User driver module not found.');
@@ -77,7 +79,7 @@ public function _beforeSuite($settings = []) { // @codingStandardsIgnoreLine
   /**
    * {@inheritdoc}
    */
-  public function _after(\Codeception\TestCase $test) { // @codingStandardsIgnoreLine
+  public function _after(TestInterface $test) { // @codingStandardsIgnoreLine
     if ($this->_getConfig('cleanup_test')) {
       $this->userCleanup();
     }
@@ -86,7 +88,7 @@ public function _after(\Codeception\TestCase $test) { // @codingStandardsIgnoreL
   /**
    * {@inheritdoc}
    */
-  public function _failed(\Codeception\TestCase $test, $fail) { // @codingStandardsIgnoreLine
+  public function _failed(TestInterface $test, Exception $fail) { // @codingStandardsIgnoreLine
     if ($this->_getConfig('cleanup_failed')) {
       $this->userCleanup();
     }

src/Codeception/Module/DrupalWatchdog.php

@@ -35,7 +35,7 @@ class DrupalWatchdog extends Module {
    *
    * @var array
    */
-  protected $config = [
+  protected array $config = [
     'channels' => [],
     'level' => 'ERROR',
     'enabled' => TRUE,

src/Codeception/TestDrupalKernel.php

@@ -4,11 +4,11 @@
 
 use Drupal\Core\DrupalKernel;
 use Drupal\Core\Site\Settings;
-use Symfony\Cmf\Component\Routing\RouteObjectInterface;
+use Drupal\Core\Routing\RouteObjectInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 
-class TestDrupalKernel extends DrupalKernel{
+class TestDrupalKernel extends DrupalKernel {
 
   /**
    * TestDrupalKernel constructor.
@@ -44,4 +44,4 @@ public function bootTestEnvironment($sitePath, Request $request){
     $this->container->get('router.request_context')->fromRequest($request);
   }
 
-}
+}