spokje · Alex Pott
--- a/core/tests/Drupal/Tests/WebAssert.php
+++ b/core/tests/Drupal/Tests/WebAssert.php
    return preg_replace('/^\/[^\.\/]+\.php\//', '/', $path) . $query . $fragment;
  }

+  /**
+   * {@inheritdoc}
+   */
+  public function responseHeaderEquals(string $name, $value) {
+    if (is_null($value)) {
+      $this->responseHeaderDoesNotExist($name);
+      return;
+    }
+    parent::responseHeaderEquals($name, $value);
+  }
+
--- a/core/tests/Drupal/Tests/UiHelperTrait.php
+++ b/core/tests/Drupal/Tests/UiHelperTrait.php
    foreach ($edit as $name => $value) {
      $field = $assert_session->fieldExists($name, $form);

-      // Provide support for the values '1' and '0' for checkboxes instead of
-      // TRUE and FALSE.
-      // @todo Get rid of supporting 1/0 by converting all tests cases using
-      // this to boolean values.
      $field_type = $field->getAttribute('type');
-      if ($field_type === 'checkbox') {
+      if ($field_type === 'checkbox' && !is_bool($value)) {
+        @trigger_error("Setting a checkbox with a non-boolean value in " . __METHOD__ . "() is deprecated in drupal:10.2.0 and will be removed in drupal:11.0.0. Checkbox '$name' was set with value '$value'. See https://www.drupal.org/node/3408184", E_USER_DEPRECATED);
        $value = (bool) $value;
      }
--- a/core/tests/Drupal/Tests/UiHelperTrait.php
+++ b/core/tests/Drupal/Tests/UiHelperTrait.php
    foreach ($edit as $name => $value) {
      $field = $assert_session->fieldExists($name, $form);

-      // Provide support for the values '1' and '0' for checkboxes instead of
-      // TRUE and FALSE.
-      // @todo Get rid of supporting 1/0 by converting all tests cases using
-      // this to boolean values.
      $field_type = $field->getAttribute('type');
-      if ($field_type === 'checkbox') {
+      if ($field_type === 'checkbox' && !is_bool($value)) {
+        @trigger_error("Setting a checkbox with a non-boolean value in " . __METHOD__ . "() is deprecated in drupal:10.2.0 and will be removed in drupal:11.0.0. Checkbox '$name' was set with value '$value'. See https://www.drupal.org/node/3408184", E_USER_DEPRECATED);
-        @trigger_error("Setting a checkbox with a non-boolean value in " . __METHOD__ . "() is deprecated in drupal:10.2.0 and will be removed in drupal:11.0.0. Checkbox '$name' was set with value '$value'. See https://www.drupal.org/node/3408184", E_USER_DEPRECATED);
+        @trigger_error("Setting a checkbox with a non-boolean value in " . __METHOD__ . "() is deprecated in drupal:10.3.0 and will be removed in drupal:11.0.0. Checkbox '$name' was set with value '$value'. See https://www.drupal.org/node/3408184", E_USER_DEPRECATED);
--- a/core/tests/Drupal/Tests/WebAssert.php
+++ b/core/tests/Drupal/Tests/WebAssert.php
    return preg_replace('/^\/[^\.\/]+\.php\//', '/', $path) . $query . $fragment;
  }

+  /**
+   * {@inheritdoc}
+   */
+  public function responseHeaderEquals(string $name, $value) {
+    if (is_null($value)) {
+      @trigger_error('Calling ' . __METHOD__ . '() with NULL as the $value argument is deprecated in drupal:10.2.0 and will be removed in drupal:11.0.0. Use \Drupal\Tests\WebAssert::responseHeaderDoesNotExist instead. See https://www.drupal.org/node/3408184', E_USER_DEPRECATED);
-      @trigger_error('Calling ' . __METHOD__ . '() with NULL as the $value argument is deprecated in drupal:10.2.0 and will be removed in drupal:11.0.0. Use \Drupal\Tests\WebAssert::responseHeaderDoesNotExist instead. See https://www.drupal.org/node/3408184', E_USER_DEPRECATED);
+      @trigger_error('Calling ' . __METHOD__ . '() with NULL as the $value argument is deprecated in drupal:10.3.0 and will be removed in drupal:11.0.0. Use \Drupal\Tests\WebAssert::responseHeaderDoesNotExist instead. See https://www.drupal.org/node/3408184', E_USER_DEPRECATED);