From 6be8b1d1addc4119da6536ed4b4afcef44d5f402 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 20 Feb 2020 08:07:25 +0000
Subject: [PATCH] Issue #3113988 by longwave: Remove all @deprecated code in
 run-tests.sh

---
 core/scripts/run-tests.sh | 37 +------------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

diff --git a/core/scripts/run-tests.sh b/core/scripts/run-tests.sh
index 61104aceef2..955eb5bf55b 100755
--- a/core/scripts/run-tests.sh
+++ b/core/scripts/run-tests.sh
@@ -177,12 +177,7 @@ simpletest_script_reporter_timer_stop();
 TestDatabase::releaseAllTestLocks();
 
 // Display results before database is cleared.
-if ($args['browser']) {
-  simpletest_script_open_browser();
-}
-else {
-  simpletest_script_reporter_display_results();
-}
+simpletest_script_reporter_display_results();
 
 if ($args['xml']) {
   simpletest_script_reporter_write_xml_results();
@@ -317,10 +312,6 @@ All arguments are long options.
               test database and configuration directories. Use in combination
               with --repeat for debugging random test failures.
 
-  --browser   Deprecated, use --verbose instead. This enforces --keep-results and
-              if you want to also view any pages rendered in the simpletest
-              browser you need to add --verbose to the command line.
-
   --non-html  Removes escaping from output. Useful for reading results on the
               CLI.
 
@@ -398,7 +389,6 @@ function simpletest_script_parse_args() {
     'repeat' => 1,
     'die-on-fail' => FALSE,
     'suppress-deprecations' => FALSE,
-    'browser' => FALSE,
     // Used internally.
     'test-id' => 0,
     'execute-test' => '',
@@ -449,10 +439,6 @@ function simpletest_script_parse_args() {
     exit(SIMPLETEST_SCRIPT_EXIT_FAILURE);
   }
 
-  if ($args['browser']) {
-    simpletest_script_print_error('The --browser option is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use --verbose instead. See https://www.drupal.org/node/3083549');
-    $args['keep-results'] = TRUE;
-  }
   return [$args, $count];
 }
 
@@ -1522,24 +1508,3 @@ function simpletest_script_load_messages_by_test_id($test_ids) {
 
   return $results;
 }
-
-/**
- * Display test results.
- *
- * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. This function
- *   supports the --browser option in this script. Use the --verbose option
- *   instead.
- *
- * @see https://www.drupal.org/node/3083549
- *
- * @todo Remove this in https://www.drupal.org/project/drupal/issues/3075490.
- */
-function simpletest_script_open_browser() {
-  // Note: the user already has received a message about the deprecation in CLI
-  // so we trigger an error just in case this method has been used as API.
-  @trigger_error('The --browser option is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. Use --verbose instead. See https://www.drupal.org/node/3083549', E_USER_DEPRECATED);
-  if (function_exists('_simpletest_run_tests_script_open_browser')) {
-    return _simpletest_run_tests_script_open_browser();
-  }
-  simpletest_script_print_error('In order to use the --browser option the Simpletest module must be available. See https://www.drupal.org/node/3083549.');
-}