[SD-1637] Drupal 10.6.x upgrade (#745)

* [SD-1637] Drupal 10.6.x upgrade

* Bypass tfa requirement for reset login page.

* lint

Author: vincent-gao

composer.dev.json

@@ -6,8 +6,8 @@
         "composer/installers": "^1.9",
         "cweagans/composer-patches": "^1.6.0",
         "drupal/core-composer-scaffold": "^11.0",
-        "drupal/core": "10.5.2",
-        "drupal/core-recommended": "10.5.2",
+        "drupal/core": "10.6.x",
+        "drupal/core-recommended": "10.6.x",
         "drush/drush": "^13",
         "vlucas/phpdotenv": "^4.1",
         "webflo/drupal-finder": "^1.0"
@@ -30,12 +30,12 @@
         "symfony/filesystem": "^6.2",
         "php-http/curl-client": "*",
         "phpunit/phpunit": "^8.5.14 || ^9",
-        "drupal/core-dev":"10.5.x",
+        "drupal/core-dev":"10.6.x",
         "phpspec/prophecy-phpunit":"^2",
         "weitzman/drupal-test-traits": "^1.5",
         "php-http/message": "~1.13",
         "php-http/message-factory": "^1.1",
-        "guzzlehttp/psr7": "~2.7.0",
+        "guzzlehttp/psr7": "~2.8.0",
         "dpc-sdp/tide_test": "^4.0.0",
         "drupal/test_helpers": "^1.2"
     },

composer.json

@@ -16,8 +16,8 @@
         "drupal/config_perms": "2.x-dev@dev",
         "drupal/config_split": "^2.0",
         "drupal/config_update": "^2.0@alpha",
-        "drupal/core": "10.5.2",
-        "drupal/core-recommended": "10.5.2",
+        "drupal/core": "10.6.x",
+        "drupal/core-recommended": "10.6.x",
         "drupal/monitoring": "^1.13",
         "drupal/ckeditor_templates": "dev-feature/d10-compatible-with-ck5-support",
         "drupal/ctools": "^3.14",

modules/tide_tfa/tide_tfa.install

@@ -7,6 +7,15 @@
 
 use Drupal\tide_tfa\TideTfaOperation;
 
+/**
+ * Bypass tfa requirement for reset login page.
+ */
+function tide_tfa_requirements_alter(array &$requirements) {
+  if (isset($requirements['tfa.route.user.reset.login'])) {
+    unset($requirements['tfa.route.user.reset.login']);
+  }
+}
+
 /**
  * Setup TFA.
  */

tests/behat/bootstrap/TideCommonTrait.php

@@ -26,7 +26,7 @@ public function assertCurrentPath($path) {
   /**
    * Overriding parent function.
    */
-  public function assertAuthenticatedByRole($role) {
+  public function assertAuthenticatedByRole(string $role): void {
     // Override parent assertion to allow using 'anonymous user' role without
     // actually creating a user with role. By default,
     // assertAuthenticatedByRole() will create a user with 'authenticated role'