diff --git a/core/drupalci.yml b/core/drupalci.yml
index 2085b97..560d916 100644
--- a/core/drupalci.yml
+++ b/core/drupalci.yml
@@ -15,36 +15,3 @@ build:
         sniff-all-files: false
         halt-on-fail: false
     testing:
-      # run_tests task is executed several times in order of performance speeds.
-      # halt-on-fail can be set on the run_tests tasks in order to fail fast.
-      # suppress-deprecations is false in order to be alerted to usages of
-      # deprecated code.
-      run_tests.phpunit:
-        types: 'PHPUnit-Unit'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.kernel:
-        types: 'PHPUnit-Kernel'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.simpletest:
-         types: 'Simpletest'
-         testgroups: '--all'
-         suppress-deprecations: false
-         halt-on-fail: false
-      run_tests.functional:
-        types: 'PHPUnit-Functional'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      run_tests.javascript:
-        concurrency: 15
-        types: 'PHPUnit-FunctionalJavascript'
-        testgroups: '--all'
-        suppress-deprecations: false
-        halt-on-fail: false
-      # Run nightwatch testing.
-      # @see https://www.drupal.org/project/drupal/issues/2869825
-      nightwatchjs:
diff --git a/core/includes/database.inc b/core/includes/database.inc
index 04132b8..9ad470e 100644
--- a/core/includes/database.inc
+++ b/core/includes/database.inc
@@ -44,7 +44,7 @@
  * @return \Drupal\Core\Database\StatementInterface
  *   A prepared statement object, already executed.
  *
- * @deprecated in drupal:8.0.0 and will be removed from drupal:9.0.0. Instead,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
  *   get a database connection injected into your service from the container
  *   and call query() on it. For example,
  *   $injected_database->query($query, $args, $options);
@@ -54,7 +54,7 @@
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_query($query, array $args = [], array $options = []) {
-  @trigger_error('db_query() is deprecated in drupal:8.0.0. It will be removed before drupal:9.0.0. Instead, get a database connection injected into your service from the container and call query() on it. For example, $injected_database->query($query, $args, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_query() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call query() on it. For example, $injected_database->query($query, $args, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options))->query($query, $args, $options);
 }
 
@@ -80,16 +80,17 @@ function db_query($query, array $args = [], array $options = []) {
  * @return \Drupal\Core\Database\StatementInterface
  *   A prepared statement object, already executed.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container and
  *   call queryRange() on it. For example,
  *   $injected_database->queryRange($query, $from, $count, $args, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::queryRange()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_query_range($query, $from, $count, array $args = [], array $options = []) {
-  @trigger_error('db_query_range() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call queryRange() on it. For example, $injected_database->queryRange($query, $from, $count, $args, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_query_range() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call queryRange() on it. For example, $injected_database->queryRange($query, $from, $count, $args, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options))->queryRange($query, $from, $count, $args, $options);
 }
 
@@ -113,16 +114,17 @@ function db_query_range($query, $from, $count, array $args = [], array $options
  * @return string
  *   The name of the temporary table.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container and
  *   call queryTemporary() on it. For example,
  *   $injected_database->queryTemporary($query, $args, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::queryTemporary()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_query_temporary($query, array $args = [], array $options = []) {
-  @trigger_error('db_query_temporary() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call queryTemporary() on it. For example, $injected_database->queryTemporary($query, $args, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_query_temporary() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call queryTemporary() on it. For example, $injected_database->queryTemporary($query, $args, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options))->queryTemporary($query, $args, $options);
 }
 
@@ -137,16 +139,17 @@ function db_query_temporary($query, array $args = [], array $options = []) {
  * @return \Drupal\Core\Database\Query\Insert
  *   A new Insert object for this connection.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container and
  *   call insert() on it. For example,
  *   $injected_database->insert($table, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::insert()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_insert($table, array $options = []) {
-  @trigger_error('db_insert() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call insert() on it. For example, $injected_database->insert($table, $options); See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_insert() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call insert() on it. For example, $injected_database->insert($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options, FALSE))->insert($table, $options);
 }
 
@@ -161,16 +164,17 @@ function db_insert($table, array $options = []) {
  * @return \Drupal\Core\Database\Query\Merge
  *   A new Merge object for this connection.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container and
  *   call merge() on it. For example,
  *   $injected_database->merge($table, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::merge()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_merge($table, array $options = []) {
-  @trigger_error('db_merge() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call merge() on it. For example, $injected_database->merge($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_merge() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call merge() on it. For example, $injected_database->merge($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options, FALSE))->merge($table, $options);
 }
 
@@ -185,16 +189,17 @@ function db_merge($table, array $options = []) {
  * @return \Drupal\Core\Database\Query\Update
  *   A new Update object for this connection.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container and
  *   call update() on it. For example,
  *   $injected_database->update($table, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::update()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_update($table, array $options = []) {
-  @trigger_error('db_update() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call call update() on it. For example, $injected_database->update($table, $options); See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_update() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call call update() on it. For example, $injected_database->update($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options, FALSE))->update($table, $options);
 }
 
@@ -209,16 +214,17 @@ function db_update($table, array $options = []) {
  * @return \Drupal\Core\Database\Query\Delete
  *   A new Delete object for this connection.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container and
  *   call delete() on it. For example,
  *   $injected_database->delete($table, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::delete()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_delete($table, array $options = []) {
-  @trigger_error('db_delete is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call delete() on it. For example, $injected_database->delete($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_delete() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call delete() on it. For example, $injected_database->delete($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options, FALSE))->delete($table, $options);
 }
 
@@ -233,16 +239,17 @@ function db_delete($table, array $options = []) {
  * @return \Drupal\Core\Database\Query\Truncate
  *   A new Truncate object for this connection.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container and
  *   call truncate() on it. For example,
  *   $injected_database->truncate($table, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::truncate()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_truncate($table, array $options = []) {
-  @trigger_error('db_truncate() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call truncate() on it. For example, $injected_database->truncate($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_truncate() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call truncate() on it. For example, $injected_database->truncate($table, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options, FALSE))->truncate($table, $options);
 }
 
@@ -261,16 +268,17 @@ function db_truncate($table, array $options = []) {
  * @return \Drupal\Core\Database\Query\Select
  *   A new Select object for this connection.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container and
  *   call select() on it. For example,
  *   $injected_database->select($table, $alias, $options);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::select()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_select($table, $alias = NULL, array $options = []) {
-  @trigger_error('db_select() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call call select() on it. For example, $injected_database->db_select($table, $alias, $options); See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_select() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call call select() on it. For example, $injected_database->db_select($table, $alias, $options). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options))->select($table, $alias, $options);
 }
 
@@ -286,16 +294,17 @@ function db_select($table, $alias = NULL, array $options = []) {
  * @return \Drupal\Core\Database\Transaction
  *   A new Transaction object for this connection.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container and
  *   call startTransaction() on it. For example,
  *   $injected_database->startTransaction($name);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::startTransaction()
  * @see \Drupal\Core\Database\Connection::defaultOptions()
  */
 function db_transaction($name = NULL, array $options = []) {
-  @trigger_error('db_transaction is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call startTransaction() on it. For example, $injected_database->startTransaction($name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_transaction() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call startTransaction() on it. For example, $injected_database->startTransaction($name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection(_db_get_target($options))->startTransaction($name);
 }
 
@@ -308,11 +317,13 @@ function db_transaction($name = NULL, array $options = []) {
  * @return string|null
  *   The key of the formerly active database.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Use
- * \Drupal\Core\Database\Database::setActiveConnection().
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
+ *   \Drupal\Core\Database\Database::setActiveConnection().
+ *
+ * @see https://www.drupal.org/node/2944084
  */
 function db_set_active($key = 'default') {
-  @trigger_error('db_set_active() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\Database::setActiveConnection() instead. See https://www.drupal.org/node/2944084.', E_USER_DEPRECATED);
+  @trigger_error('db_set_active() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Database\Database::setActiveConnection() instead. See https://www.drupal.org/node/2944084', E_USER_DEPRECATED);
   return Database::setActiveConnection($key);
 }
 
@@ -327,15 +338,16 @@ function db_set_active($key = 'default') {
  * @return string
  *   The escaped table name as a string.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container and
  *   call escapeTable() on it. For example,
  *   $injected_database->escapeTable($table);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::escapeTable()
  */
 function db_escape_table($table) {
-  @trigger_error('db_escape_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call escapeTable() on it. For example, $injected_database->escapeTable($table). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_escape_table() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call escapeTable() on it. For example, $injected_database->escapeTable($table). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->escapeTable($table);
 }
 
@@ -350,15 +362,16 @@ function db_escape_table($table) {
  * @return string
  *   The escaped field name as a string.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container and
  *   call escapeField() on it. For example,
  *   $injected_database->escapeField($field);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::escapeField()
  */
 function db_escape_field($field) {
-  @trigger_error('db_escape_field() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call escapeField() on it. For example, $injected_database->escapeField($field). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_escape_field() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call escapeField() on it. For example, $injected_database->escapeField($field). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->escapeField($field);
 }
 
@@ -392,15 +405,16 @@ function db_escape_field($field) {
  * @return string
  *   The escaped string.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container and
  *   call escapeLike() on it. For example,
  *   $injected_database->escapeLike($string);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::escapeLike()
  */
 function db_like($string) {
-  @trigger_error('db_like() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call escapeLike() on it. For example, $injected_database->escapeLike($string). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_like() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call escapeLike() on it. For example, $injected_database->escapeLike($string). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->escapeLike($string);
 }
 
@@ -410,14 +424,15 @@ function db_like($string) {
  * @return string
  *   The name of the currently active database driver.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container and
  *   call driver() on it. For example, $injected_database->driver($string);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::driver()
  */
 function db_driver() {
-  @trigger_error('db_driver() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call driver() on it. For example, $injected_database->driver($string). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_driver() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call driver() on it. For example, $injected_database->driver($string). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->driver();
 }
 
@@ -428,13 +443,14 @@ function db_driver() {
  *   An array of options to control which connection is closed. Only the target
  *   key has any meaning in this case.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Use
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Core\Database\Database::closeConnection($target).
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Database::closeConnection()
  */
 function db_close(array $options = []) {
-  @trigger_error('db_close() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\Database::closeConnection() instead. See https://www.drupal.org/node/2993033.', E_USER_DEPRECATED);
+  @trigger_error('db_close() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Database\Database::closeConnection() instead. See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   Database::closeConnection(_db_get_target($options));
 }
 
@@ -456,7 +472,7 @@ function db_close(array $options = []) {
  *
  * @internal
  *
- * @deprecated in drupal:8.8.0 and will be removed from drupal:9.0.0. There is
+ * @deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. There is
  *   no replacement, this function should not be used. It was introduced in
  *   Drupal 8.8.0 only as a byproduct of the deprecation of the db_* procedural
  *   functions.
@@ -464,7 +480,7 @@ function db_close(array $options = []) {
  * @see https://www.drupal.org/node/2993033
  */
 function _db_get_target(array &$options, $allow_replica = TRUE) {
-  @trigger_error('_db_get_target() is deprecated in drupal:8.8.0. Will be removed before drupal:9.0.0. See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('_db_get_target() is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. There is no replacement and it should not be used. See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   if (empty($options['target']) || ($options['target'] === 'replica' && !$allow_replica)) {
     $options['target'] = 'default';
   }
@@ -488,14 +504,15 @@ function _db_get_target(array &$options, $allow_replica = TRUE) {
  * @return int
  *   An integer number larger than any number returned before for this sequence.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container and
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container and
  *   call nextId() on it. For example, $injected_database->nextId($existing_id);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Connection::nextId()
  */
 function db_next_id($existing_id = 0) {
-  @trigger_error('db_next_id() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call nextId() on it. For example, $injected_database->nextId($existing_id). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_next_id() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call nextId() on it. For example, $injected_database->nextId($existing_id). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->nextId($existing_id);
 }
 
@@ -505,14 +522,15 @@ function db_next_id($existing_id = 0) {
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to "OR" all conditions together.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Create
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create
  *   a \Drupal\Core\Database\Query\Condition object, specifying an OR
  *   conjunction: new Condition('OR');
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Query\Condition
  */
 function db_or() {
-  @trigger_error('db_or() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an OR conjunction: new Condition(\'OR\'), instead. See https://www.drupal.org/node/2993033.', E_USER_DEPRECATED);
+  @trigger_error('db_or() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an OR conjunction: new Condition(\'OR\'), instead. See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return new Condition('OR');
 }
 
@@ -522,14 +540,15 @@ function db_or() {
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to "AND" all conditions together.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Create
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create
  *   a \Drupal\Core\Database\Query\Condition object, specifying an AND
  *   conjunction: new Condition('AND');
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Query\Condition
  */
 function db_and() {
-  @trigger_error('db_and() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an AND conjunction: new Condition(\'AND\'), instead. See https://www.drupal.org/node/2993033.', E_USER_DEPRECATED);
+  @trigger_error('db_and() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an AND conjunction: new Condition(\'AND\'), instead. See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return new Condition('AND');
 }
 
@@ -539,14 +558,15 @@ function db_and() {
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to "XOR" all conditions together.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Create
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create
  *   a \Drupal\Core\Database\Query\Condition object, specifying a XOR
  *   conjunction: new Condition('XOR');
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Query\Condition
  */
 function db_xor() {
-  @trigger_error('db_xor() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying a XOR conjunction: new Condition(\'XOR\'), instead. See https://www.drupal.org/node/2993033.', E_USER_DEPRECATED);
+  @trigger_error('db_xor() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying a XOR conjunction: new Condition(\'XOR\'), instead. See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return new Condition('XOR');
 }
 
@@ -563,14 +583,15 @@ function db_xor() {
  * @return \Drupal\Core\Database\Query\Condition
  *   A new Condition object, set to the specified conjunction.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Create
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create
  *   a \Drupal\Core\Database\Query\Condition object, specifying the desired
  *   conjunction: new Condition($conjunction);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Query\Condition
  */
 function db_condition($conjunction) {
-  @trigger_error('db_condition() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying the desired conjunction: new Condition($conjunction), instead. See https://www.drupal.org/node/2993033.', E_USER_DEPRECATED);
+  @trigger_error('db_condition() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying the desired conjunction: new Condition($conjunction), instead. See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return new Condition($conjunction);
 }
 
@@ -592,15 +613,16 @@ function db_condition($conjunction) {
  * @param array $table
  *   A Schema API table definition array.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call createTable() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call createTable() on it. For example,
  *   $injected_database->schema()->createTable($name, $table);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::createTable()
  */
 function db_create_table($name, $table) {
-  @trigger_error('db_create_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call createTable() on it. For example, $injected_database->schema()->createTable($name, $table). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_create_table() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call createTable() on it. For example, $injected_database->schema()->createTable($name, $table). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->createTable($name, $table);
 }
 
@@ -616,15 +638,16 @@ function db_create_table($name, $table) {
  * @return array
  *   An array of field names.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call fieldNames() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call fieldNames() on it. For example,
  *   $injected_database->schema()->fieldNames($fields);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::fieldNames()
  */
 function db_field_names($fields) {
-  @trigger_error('db_field_names() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldNames() on it. For example, $injected_database->schema()->fieldNames($fields). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_field_names() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldNames() on it. For example, $injected_database->schema()->fieldNames($fields). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->fieldNames($fields);
 }
 
@@ -639,15 +662,16 @@ function db_field_names($fields) {
  * @return bool
  *   TRUE if the given index exists, otherwise FALSE.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call indexExists() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call indexExists() on it. For example,
  *   $injected_database->schema()->indexExists($table, $name);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::indexExists()
  */
 function db_index_exists($table, $name) {
-  @trigger_error('db_index_exists() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call indexExists() on it. For example, $injected_database->schema()->indexExists($table, $name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_index_exists() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call indexExists() on it. For example, $injected_database->schema()->indexExists($table, $name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->indexExists($table, $name);
 }
 
@@ -660,16 +684,17 @@ function db_index_exists($table, $name) {
  * @return bool
  *   TRUE if the given table exists, otherwise FALSE.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call tableExists() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call tableExists() on it. For example,
  *   $injected_database->schema()->tableExists($table);
  *
+ * @see https://www.drupal.org/node/2947929
  * @see \Drupal\Core\Database\Schema::tableExists()
  */
 function db_table_exists($table) {
   @trigger_error(
-    'db_table_exists() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use $injected_database->schema()->tableExists($table) instead. See https://www.drupal.org/node/2947929.',
+    'db_table_exists() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use $injected_database->schema()->tableExists($table) instead. See https://www.drupal.org/node/2947929',
     E_USER_DEPRECATED
   );
 
@@ -687,15 +712,16 @@ function db_table_exists($table) {
  * @return bool
  *   TRUE if the given column exists, otherwise FALSE.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call fieldExists() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call fieldExists() on it. For example,
  *   $injected_database->schema()->fieldExists($table, $field);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::fieldExists()
  */
 function db_field_exists($table, $field) {
-  @trigger_error('db_field_exists() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldExists() on it. For example, $injected_database->schema()->fieldExists($table, $field). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_field_exists() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldExists() on it. For example, $injected_database->schema()->fieldExists($table, $field). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->fieldExists($table, $field);
 }
 
@@ -708,16 +734,17 @@ function db_field_exists($table, $field) {
  * @return array
  *   Array, both the keys and the values are the matching tables.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call findTables() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call findTables() on it. For example,
  *   $injected_database->schema()->findTables($table_expression);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::findTables()
  */
 function db_find_tables($table_expression) {
   @trigger_error(
-    'db_find_tables() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use $injected_database->schema()->findTables($table_expression) instead. See https://www.drupal.org/node/2993033',
+    'db_find_tables() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use $injected_database->schema()->findTables($table_expression) instead. See https://www.drupal.org/node/2993033',
     E_USER_DEPRECATED
   );
   return Database::getConnection()->schema()->findTables($table_expression);
@@ -731,15 +758,16 @@ function db_find_tables($table_expression) {
  * @param $new_name
  *   The new name for the table.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call renameTable() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call renameTable() on it. For example,
  *   $injected_database->schema()->renameTable($table, $new_name);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::renameTable()
  */
 function db_rename_table($table, $new_name) {
-  @trigger_error('db_rename_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call renameTable() on it. For example, $injected_database->schema()->renameTable($table, $new_name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_rename_table() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call renameTable() on it. For example, $injected_database->schema()->renameTable($table, $new_name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->renameTable($table, $new_name);
 }
 
@@ -749,15 +777,16 @@ function db_rename_table($table, $new_name) {
  * @param $table
  *   The table to be dropped.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call dropTable() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call dropTable() on it. For example,
  *   $injected_database->schema()->dropTable($table);
  *
+ * @see https://www.drupal.org/node/2987737
  * @see \Drupal\Core\Database\Schema::dropTable()
  */
 function db_drop_table($table) {
-  @trigger_error('db_drop_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\Database::getConnection()->schema()->dropTable() instead. See https://www.drupal.org/node/2987737', E_USER_DEPRECATED);
+  @trigger_error('db_drop_table() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Database\Database::getConnection()->schema()->dropTable() instead. See https://www.drupal.org/node/2987737', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->dropTable($table);
 }
 
@@ -780,16 +809,17 @@ function db_drop_table($table) {
  *   MUST specify at least one key or index including it in this array. See
  *   \Drupal\Core\Database\Schema::changeField() for more explanation why.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call addField() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call addField() on it. For example,
  *   $injected_database->schema()->addField($table, $field, $spec, $keys_new);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::addField()
  * @see \Drupal\Core\Database\Schema::changeField()
  */
 function db_add_field($table, $field, $spec, $keys_new = []) {
-  @trigger_error('db_add_field() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addField() on it. For example, $injected_database->schema()->addField($table, $field, $spec, $keys_new). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_add_field() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addField() on it. For example, $injected_database->schema()->addField($table, $field, $spec, $keys_new). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->addField($table, $field, $spec, $keys_new);
 }
 
@@ -805,15 +835,16 @@ function db_add_field($table, $field, $spec, $keys_new = []) {
  *   TRUE if the field was successfully dropped, FALSE if there was no field by
  *   that name to begin with.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call dropField() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call dropField() on it. For example,
  *   $injected_database->schema()->dropField($table, $field);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::dropField()
  */
 function db_drop_field($table, $field) {
-  @trigger_error('db_drop_field() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropField() on it. For example, $injected_database->schema()->dropField($table, $field). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_drop_field() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropField() on it. For example, $injected_database->schema()->dropField($table, $field). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->dropField($table, $field);
 }
 
@@ -827,16 +858,17 @@ function db_drop_field($table, $field) {
  * @param $default
  *   Default value to be set. NULL for 'default NULL'.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call changeField() on it, passing a full field
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call changeField() on it, passing a full field
  *   specification. For example,
  *   $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::changeField()
  */
 function db_field_set_default($table, $field, $default) {
-  @trigger_error('db_field_set_default() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_field_set_default() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->fieldSetDefault($table, $field, $default);
 }
 
@@ -848,16 +880,17 @@ function db_field_set_default($table, $field, $default) {
  * @param $field
  *   The field to be altered.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call changeField() on it, passing a full field
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call changeField() on it, passing a full field
  *   specification. For example,
  *   $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::changeField()
  */
 function db_field_set_no_default($table, $field) {
-  @trigger_error('db_field_set_no_default() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_field_set_no_default() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->fieldSetNoDefault($table, $field);
 }
 
@@ -869,15 +902,16 @@ function db_field_set_no_default($table, $field) {
  * @param $fields
  *   Array of fields for the primary key.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call addPrimaryKey() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call addPrimaryKey() on it. For example,
  *   $injected_database->schema()->addPrimaryKey($table, $fields);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::addPrimaryKey()
  */
 function db_add_primary_key($table, $fields) {
-  @trigger_error('db_add_primary_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addPrimaryKey() on it. For example, $injected_database->schema()->addPrimaryKey($table, $fields). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_add_primary_key() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addPrimaryKey() on it. For example, $injected_database->schema()->addPrimaryKey($table, $fields). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->addPrimaryKey($table, $fields);
 }
 
@@ -891,15 +925,16 @@ function db_add_primary_key($table, $fields) {
  *   TRUE if the primary key was successfully dropped, FALSE if there was no
  *   primary key on this table to begin with.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call dropPrimaryKey() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call dropPrimaryKey() on it. For example,
  *   $injected_database->schema()->dropPrimaryKey($table);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::dropPrimaryKey()
  */
 function db_drop_primary_key($table) {
-  @trigger_error('db_drop_primary_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropPrimaryKey() on it. For example, $injected_database->schema()->dropPrimaryKey($table). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_drop_primary_key() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropPrimaryKey() on it. For example, $injected_database->schema()->dropPrimaryKey($table). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->dropPrimaryKey($table);
 }
 
@@ -913,15 +948,16 @@ function db_drop_primary_key($table) {
  * @param array $fields
  *   An array of field names.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call addUniqueKey() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call addUniqueKey() on it. For example,
  *   $injected_database->schema()->addUniqueKey($table, $name, $fields);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::addUniqueKey()
  */
 function db_add_unique_key($table, $name, $fields) {
-  @trigger_error('db_add_unique_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addUniqueKey() on it. For example, $injected_database->schema()->addUniqueKey($table, $name, $fields). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_add_unique_key() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addUniqueKey() on it. For example, $injected_database->schema()->addUniqueKey($table, $name, $fields). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->addUniqueKey($table, $name, $fields);
 }
 
@@ -937,15 +973,16 @@ function db_add_unique_key($table, $name, $fields) {
  *   TRUE if the key was successfully dropped, FALSE if there was no key by
  *   that name to begin with.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call dropUniqueKey() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call dropUniqueKey() on it. For example,
  *   $injected_database->schema()->dropUniqueKey($table, $name);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::dropUniqueKey()
  */
 function db_drop_unique_key($table, $name) {
-  @trigger_error('db_drop_unique_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropUniqueKey() on it. For example, $injected_database->schema()->dropUniqueKey($table, $name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_drop_unique_key() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropUniqueKey() on it. For example, $injected_database->schema()->dropUniqueKey($table, $name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->dropUniqueKey($table, $name);
 }
 
@@ -963,17 +1000,18 @@ function db_drop_unique_key($table, $name) {
  *   definition. See \Drupal\Core\Database\Schema::addIndex() for how to obtain
  *   this specification.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call addIndex() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call addIndex() on it. For example,
  *   $injected_database->schema()->addIndex($table, $name, $fields, $spec);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see hook_schema()
  * @see schemaapi
  * @see \Drupal\Core\Database\Schema::addIndex()
  */
 function db_add_index($table, $name, $fields, array $spec) {
-  @trigger_error('db_add_index() is deprecated in Drupal 8.0.x and will be removed in Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addIndex() on it. For example, $injected_database->schema()->addIndex($table, $name, $fields, $spec). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_add_index() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addIndex() on it. For example, $injected_database->schema()->addIndex($table, $name, $fields, $spec). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   Database::getConnection()->schema()->addIndex($table, $name, $fields, $spec);
 }
 
@@ -989,15 +1027,16 @@ function db_add_index($table, $name, $fields, array $spec) {
  *   TRUE if the index was successfully dropped, FALSE if there was no index
  *   by that name to begin with.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call dropIndex() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call dropIndex() on it. For example,
  *   $injected_database->schema()->dropIndex($table, $name);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::dropIndex()
  */
 function db_drop_index($table, $name) {
-  @trigger_error('db_drop_index() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropIndex() on it. For example, $injected_database->schema()->dropIndex($table, $name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
+  @trigger_error('db_drop_index() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropIndex() on it. For example, $injected_database->schema()->dropIndex($table, $name). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
   return Database::getConnection()->schema()->dropIndex($table, $name);
 }
 
@@ -1063,15 +1102,16 @@ function db_drop_index($table, $name) {
  *   with changing the field. The format is the same as a table specification
  *   but without the 'fields' element.
  *
- * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get
- *   a database connection injected into your service from the container, get
- *   its schema driver, and call changeField() on it. For example,
+ * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead,
+ *   get a database connection injected into your service from the container,
+ *   get its schema driver, and call changeField() on it. For example,
  *   $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new);
  *
+ * @see https://www.drupal.org/node/2993033
  * @see \Drupal\Core\Database\Schema::changeField()
  */
 function db_change_field($table, $field, $field_new, $spec, $keys_new = []) {
-  @trigger_error("Deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it. For example, \$injected_database->schema()->changeField(\$table, \$field, \$field_new, \$spec, \$keys_new). See https://www.drupal.org/node/2993033", E_USER_DEPRECATED);
+  @trigger_error("db_change_field() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it. For example, \$injected_database->schema()->changeField(\$table, \$field, \$field_new, \$spec, \$keys_new). See https://www.drupal.org/node/2993033", E_USER_DEPRECATED);
   return Database::getConnection()->schema()->changeField($table, $field, $field_new, $spec, $keys_new);
 }
 
@@ -1084,13 +1124,13 @@ function db_change_field($table, $field, $field_new, $spec, $keys_new = []) {
  * server (A replica server is traditionally referred to as
  * a "slave" in database server documentation).
  *
- * @deprecated as of Drupal 8.7.x, will be removed in Drupal 9.0.0. Use
+ * @deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use
  *   \Drupal::service('database.replica_kill_switch')->trigger() instead.
  *
  * @see https://www.drupal.org/node/2997500
  * @see https://www.drupal.org/node/2275877
  */
 function db_ignore_replica() {
-  @trigger_error('db_ignore_replica() is deprecated in Drupal 8.7.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\ReplicaKillSwitch::trigger() instead. See https://www.drupal.org/node/2997500', E_USER_DEPRECATED);
+  @trigger_error('db_ignore_replica() is deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Database\ReplicaKillSwitch::trigger() instead. See https://www.drupal.org/node/2997500', E_USER_DEPRECATED);
   \Drupal::service('database.replica_kill_switch')->trigger();
 }
diff --git a/core/includes/unicode.inc b/core/includes/unicode.inc
index e9cc76c..d8bb0ff 100644
--- a/core/includes/unicode.inc
+++ b/core/includes/unicode.inc
@@ -14,12 +14,13 @@
 /**
  * Moves unicode_requirements() logic to system_requirements().
  *
- * @deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0.
+ * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. There is no
+ * replacement; system_requirements() now includes the logic instead.
  *
  * @see https://www.drupal.org/node/2884698
  */
 function unicode_requirements() {
-  @trigger_error('unicode_requirements() is deprecated in Drupal 8.4.0 and will be removed before Drupal 9.0.0. There is no replacement; system_requirements() now includes the logic instead. See https://www.drupal.org/node/2884698', E_USER_DEPRECATED);
+  @trigger_error('unicode_requirements() is deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. There is no replacement; system_requirements() now includes the logic instead. See https://www.drupal.org/node/2884698', E_USER_DEPRECATED);
 
   $libraries = [
     Unicode::STATUS_SINGLEBYTE => t('Standard PHP'),
@@ -85,7 +86,7 @@ function unicode_requirements() {
  *
  * @ingroup php_wrappers
  *
- * @deprecated in Drupal 8.3.0 and will bre removed in Drupal 9.0.0. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   xml_parser_create() and
  *   xml_parser_set_option($xml_parser, XML_OPTION_TARGET_ENCODING, 'utf-8')
  *   instead.
diff --git a/core/lib/Drupal/Core/Controller/ControllerResolver.php b/core/lib/Drupal/Core/Controller/ControllerResolver.php
index 6c887b5..d790b8b 100644
--- a/core/lib/Drupal/Core/Controller/ControllerResolver.php
+++ b/core/lib/Drupal/Core/Controller/ControllerResolver.php
@@ -129,7 +129,7 @@ protected function doGetArguments(Request $request, $controller, array $paramete
     // Note this duplicates the deprecation message of
     // Symfony\Component\HttpKernel\Controller\ControllerResolver::getArguments()
     // to ensure it is removed in Drupal 9.
-    @trigger_error(sprintf('%s is deprecated as of 8.6.0 and will be removed in 9.0. Inject the "http_kernel.controller.argument_resolver" service instead.', __METHOD__, ArgumentResolverInterface::class), E_USER_DEPRECATED);
+    @trigger_error(sprintf('%s is deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Inject the "http_kernel.controller.argument_resolver" service instead. See http:', __METHOD__, ArgumentResolverInterface::class), E_USER_DEPRECATED);
     $attributes = $request->attributes->all();
     $raw_parameters = $request->attributes->has('_raw_variables') ? $request->attributes->get('_raw_variables') : [];
     $arguments = [];
diff --git a/core/lib/Drupal/Core/Database/Connection.php b/core/lib/Drupal/Core/Database/Connection.php
index 5efa47a..5a39d4c 100644
--- a/core/lib/Drupal/Core/Database/Connection.php
+++ b/core/lib/Drupal/Core/Database/Connection.php
@@ -600,7 +600,7 @@ public function query($query, array $args = [], $options = []) {
     // Use default values if not already set.
     $options += $this->defaultOptions();
     if (isset($options['target'])) {
-      @trigger_error('Passing a \'target\' key to \\Drupal\\Core\\Database\\Connection::query $options argument is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, use \\Drupal\\Core\\Database\\Database::getConnection($target)->query(). See https://www.drupal.org/node/2993033.', E_USER_DEPRECATED);
+      @trigger_error('Passing a \'target\' key to \\Drupal\\Core\\Database\\Connection::query $options argument is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, use \\Drupal\\Core\\Database\\Database::getConnection($target)->query(). See https://www.drupal.org/node/2993033', E_USER_DEPRECATED);
     }
 
     try {
diff --git a/core/lib/Drupal/Core/Entity/EntityBase.php b/core/lib/Drupal/Core/Entity/EntityBase.php
index ee6d846..2cb00da 100644
--- a/core/lib/Drupal/Core/Entity/EntityBase.php
+++ b/core/lib/Drupal/Core/Entity/EntityBase.php
@@ -69,14 +69,16 @@ public function __construct(array $values, $entity_type) {
    *
    * @return \Drupal\Core\Entity\EntityManagerInterface
    *
-   * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
+   * @deprecated in drupal:8.0.0 and is removed from drupal:9.0.0.
    *   Use \Drupal::entityTypeManager() instead in most cases. If the needed
    *   method is not on \Drupal\Core\Entity\EntityTypeManagerInterface, see the
    *   deprecated \Drupal\Core\Entity\EntityManager to find the
    *   correct interface or service.
+   *
+   * @see https://www.drupal.org/node/2549139
    */
   protected function entityManager() {
-    @trigger_error('Entity::getEntityManager() is deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Use ::getEntityTypeManager() instead. See https://www.drupal.org/node/2549139.', E_USER_DEPRECATED);
+    @trigger_error('Entity::getEntityManager() is deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use ::getEntityTypeManager() instead. See https://www.drupal.org/node/2549139', E_USER_DEPRECATED);
     return \Drupal::entityManager();
   }
 
@@ -179,7 +181,7 @@ public function label() {
    * {@inheritdoc}
    */
   public function urlInfo($rel = 'canonical', array $options = []) {
-    @trigger_error('EntityInterface::urlInfo() is deprecated in Drupal 8.0.0 and will be removed in Drupal 9.0.0. EntityInterface::toUrl() instead. See https://www.drupal.org/node/2614344', E_USER_DEPRECATED);
+    @trigger_error('EntityInterface::urlInfo() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use EntityInterface::toUrl() instead. See https://www.drupal.org/node/2614344', E_USER_DEPRECATED);
     return $this->toUrl($rel, $options);
   }
 
@@ -268,7 +270,7 @@ protected function linkTemplates() {
    * {@inheritdoc}
    */
   public function link($text = NULL, $rel = 'canonical', array $options = []) {
-    @trigger_error("EntityInterface::link() is deprecated in Drupal 8.0.0 and will be removed in Drupal 9.0.0. EntityInterface::toLink() instead. Note, the default relationship for configuration entities changes from 'edit-form' to 'canonical'. See https://www.drupal.org/node/2614344", E_USER_DEPRECATED);
+    @trigger_error("EntityInterface::link() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use EntityInterface::toLink() instead. Note, the default relationship for configuration entities changes from 'edit-form' to 'canonical'. See https://www.drupal.org/node/2614344", E_USER_DEPRECATED);
     return $this->toLink($text, $rel, $options)->toString();
   }
 
@@ -289,7 +291,7 @@ public function toLink($text = NULL, $rel = 'canonical', array $options = []) {
    * {@inheritdoc}
    */
   public function url($rel = 'canonical', $options = []) {
-    @trigger_error('EntityInterface::url() is deprecated in Drupal 8.0.0 and will be removed in Drupal 9.0.0. EntityInterface::toUrl() instead. Note, a \Drupal\Core\Url object is returned. See https://www.drupal.org/node/2614344', E_USER_DEPRECATED);
+    @trigger_error('EntityInterface::url() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use EntityInterface::toUrl() instead. Note, a \Drupal\Core\Url object is returned. See https://www.drupal.org/node/2614344', E_USER_DEPRECATED);
     // While self::toUrl() will throw an exception if the entity has no id,
     // the expected result for a URL is always a string.
     if ($this->id() === NULL || !$this->hasLinkTemplate($rel)) {
diff --git a/core/modules/config/src/Tests/SchemaCheckTestTrait.php b/core/modules/config/src/Tests/SchemaCheckTestTrait.php
index bfe2689..e632921 100644
--- a/core/modules/config/src/Tests/SchemaCheckTestTrait.php
+++ b/core/modules/config/src/Tests/SchemaCheckTestTrait.php
@@ -2,13 +2,15 @@
 
 namespace Drupal\config\Tests;
 
-@trigger_error(__NAMESPACE__ . '\SchemaCheckTestTrait is deprecated as of 8.3.x, will be removed in before Drupal 9.0.0. Use \Drupal\Tests\SchemaCheckTestTrait instead.', E_USER_DEPRECATED);
+@trigger_error(__NAMESPACE__ . '\SchemaCheckTestTrait is deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use \Drupal\Tests\SchemaCheckTestTrait instead. See http://', E_USER_DEPRECATED);
 
 /**
  * Provides a class for checking configuration schema.
  *
- * @deprecated as of 8.3.x, will be removed in before Drupal 9.0.0. Use
+ * @deprecated in drupal:8.3.0 and is removed from drupal:9.0.0. Use
  *   \Drupal\Tests\SchemaCheckTestTrait instead.
+ *
+ * @see http://
  */
 trait SchemaCheckTestTrait {
 
diff --git a/core/modules/rest/src/Plugin/views/display/RestExport.php b/core/modules/rest/src/Plugin/views/display/RestExport.php
index 93605b8..f18d1b9 100644
--- a/core/modules/rest/src/Plugin/views/display/RestExport.php
+++ b/core/modules/rest/src/Plugin/views/display/RestExport.php
@@ -102,8 +102,10 @@ class RestExport extends PathPluginBase implements ResponseDisplayPluginInterfac
    *   ['cookie' => 'user', 'basic_auth' => 'basic_auth']
    * @endcode
    *
-   * @deprecated as of 8.4.x, will be removed in before Drupal 9.0.0, see
-   *   https://www.drupal.org/node/2825204.
+   * @deprecated in drupal:8.4.0 and is removed from drupal:9.0.0. 
+   *   $authenticationProviderIds now has the data.
+   *
+   * @see https://www.drupal.org/node/2825204
    *
    * @var string[]
    */
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index 6fa3085..88b6ac8 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -23,149 +23,9 @@
   <exclude-pattern>./core/lib/Drupal/Component/Diff/</exclude-pattern>
 
   <!-- Only include specific sniffs that pass. This ensures that, if new sniffs are added, HEAD does not fail.-->
-  <!-- Drupal sniffs -->
-  <rule ref="Drupal.Arrays.Array">
-    <!-- Sniff for these errors: CommaLastItem -->
-    <exclude name="Drupal.Arrays.Array.ArrayClosingIndentation"/>
-    <exclude name="Drupal.Arrays.Array.ArrayIndentation"/>
-    <exclude name="Drupal.Arrays.Array.LongLineDeclaration"/>
-  </rule>
-  <rule ref="Drupal.Classes.ClassCreateInstance"/>
-  <rule ref="Drupal.Classes.ClassDeclaration"/>
-  <rule ref="Drupal.Classes.FullyQualifiedNamespace"/>
-  <rule ref="Drupal.Classes.InterfaceName"/>
-  <rule ref="Drupal.Classes.UnusedUseStatement"/>
-  <rule ref="Drupal.Classes.UseLeadingBackslash"/>
-  <rule ref="Drupal.CSS.ClassDefinitionNameSpacing"/>
-  <rule ref="Drupal.CSS.ColourDefinition"/>
-  <rule ref="Drupal.Commenting.ClassComment">
-    <exclude name="Drupal.Commenting.ClassComment.Missing"/>
-  </rule>
-  <rule ref="Drupal.Commenting.DataTypeNamespace"/>
-  <rule ref="Drupal.Commenting.DocComment">
-    <!-- Sniff for these errors: SpacingAfterTagGroup, WrongEnd, SpacingBetween,
-      ContentAfterOpen, SpacingBeforeShort, TagValueIndent, ShortStartSpace,
-      SpacingAfter, LongNotCapital -->
-    <!-- ParamNotFirst still not decided for PHPUnit-based tests.
-      @see https://www.drupal.org/node/2253915 -->
-    <exclude name="Drupal.Commenting.DocComment.ParamNotFirst"/>
-    <exclude name="Drupal.Commenting.DocComment.SpacingBeforeTags"/>
-    <exclude name="Drupal.Commenting.DocComment.LongFullStop"/>
-    <exclude name="Drupal.Commenting.DocComment.ShortNotCapital"/>
-    <exclude name="Drupal.Commenting.DocComment.ShortFullStop"/>
-    <!-- TagsNotGrouped and ParamGroup have false-positives.
-      @see https://www.drupal.org/node/2060925 -->
-    <exclude name="Drupal.Commenting.DocComment.TagsNotGrouped"/>
-    <exclude name="Drupal.Commenting.DocComment.ParamGroup"/>
-    <exclude name="Drupal.Commenting.DocComment.ShortSingleLine"/>
-    <exclude name="Drupal.Commenting.DocComment.TagGroupSpacing"/>
-    <exclude name="Drupal.Commenting.DocComment.MissingShort"/>
-  </rule>
-  <rule ref="Drupal.Commenting.DocCommentStar"/>
-  <rule ref="Drupal.Commenting.FileComment"/>
-  <rule ref="Drupal.Commenting.FunctionComment">
-    <exclude name="Drupal.Commenting.FunctionComment.IncorrectTypeHint"/>
-    <exclude name="Drupal.Commenting.FunctionComment.InvalidNoReturn"/>
-    <exclude name="Drupal.Commenting.FunctionComment.InvalidTypeHint"/>
-    <exclude name="Drupal.Commenting.FunctionComment.Missing"/>
-    <exclude name="Drupal.Commenting.FunctionComment.MissingParamComment"/>
-    <exclude name="Drupal.Commenting.FunctionComment.MissingParamType"/>
-    <exclude name="Drupal.Commenting.FunctionComment.MissingReturnComment"/>
-    <exclude name="Drupal.Commenting.FunctionComment.MissingReturnType"/>
-    <exclude name="Drupal.Commenting.FunctionComment.ParamCommentFullStop"/>
-    <exclude name="Drupal.Commenting.FunctionComment.ParamMissingDefinition"/>
-    <exclude name="Drupal.Commenting.FunctionComment.TypeHintMissing"/>
-  </rule>
-  <rule ref="Drupal.Commenting.GenderNeutralComment" />
-  <rule ref="Drupal.Commenting.VariableComment">
-    <!-- Sniff for: DuplicateVar, EmptyVar, InlineVariableName -->
-    <exclude name="Drupal.Commenting.VariableComment.IncorrectVarType"/>
-    <exclude name="Drupal.Commenting.VariableComment.MissingVar"/>
-    <exclude name="Drupal.Commenting.VariableComment.VarOrder"/>
-    <exclude name="Drupal.Commenting.VariableComment.WrongStyle"/>
-  </rule>
-  <rule ref="Drupal.Commenting.InlineComment">
-    <!-- Sniff for: NoSpaceBefore, WrongStyle -->
-    <exclude name="Drupal.Commenting.InlineComment.DocBlock"/>
-    <exclude name="Drupal.Commenting.InlineComment.InvalidEndChar"/>
-    <exclude name="Drupal.Commenting.InlineComment.NotCapital"/>
-    <exclude name="Drupal.Commenting.InlineComment.SpacingAfter"/>
-    <exclude name="Drupal.Commenting.InlineComment.SpacingBefore"/>
-  </rule>
-  <rule ref="Drupal.Commenting.PostStatementComment"/>
-  <rule ref="Drupal.ControlStructures.ElseIf"/>
-  <rule ref="Drupal.ControlStructures.ControlSignature"/>
-  <rule ref="Drupal.ControlStructures.InlineControlStructure"/>
-  <rule ref="Drupal.Files.EndFileNewline"/>
-  <rule ref="Drupal.Files.FileEncoding"/>
-  <rule ref="Drupal.Files.TxtFileLineLength"/>
-  <rule ref="Drupal.Formatting.MultiLineAssignment"/>
-  <rule ref="Drupal.Formatting.MultipleStatementAlignment"/>
-  <rule ref="Drupal.Formatting.SpaceInlineIf"/>
-  <rule ref="Drupal.Formatting.SpaceUnaryOperator"/>
-  <rule ref="Drupal.Functions.DiscouragedFunctions"/>
-  <rule ref="Drupal.Functions.FunctionDeclaration"/>
-  <rule ref="Drupal.InfoFiles.AutoAddedKeys"/>
-  <rule ref="Drupal.InfoFiles.ClassFiles"/>
-  <rule ref="Drupal.InfoFiles.DuplicateEntry"/>
-  <rule ref="Drupal.InfoFiles.Required"/>
-  <rule ref="Drupal.Methods.MethodDeclaration">
-    <!-- Silence method name underscore warning which is covered already in
-      Drupal.NamingConventions.ValidFunctionName.ScopeNotCamelCaps. -->
-    <exclude name="Drupal.Methods.MethodDeclaration.Underscore"/>
-  </rule>
-  <rule ref="Drupal.NamingConventions.ValidVariableName">
-    <!-- Sniff for: LowerStart -->
-    <exclude name="Drupal.NamingConventions.ValidVariableName.LowerCamelName"/>
-  </rule>
-  <rule ref="Drupal.Scope.MethodScope"/>
-  <rule ref="Drupal.Semantics.EmptyInstall"/>
-  <rule ref="Drupal.Semantics.FunctionAlias"/>
-  <rule ref="Drupal.Semantics.FunctionT">
-    <exclude name="Drupal.Semantics.FunctionT.NotLiteralString"/>
-    <exclude name="Drupal.Semantics.FunctionT.ConcatString"/>
-  </rule>
-  <rule ref="Drupal.Semantics.FunctionWatchdog"/>
-  <rule ref="Drupal.Semantics.InstallHooks"/>
-  <rule ref="Drupal.Semantics.LStringTranslatable"/>
-  <rule ref="Drupal.Semantics.PregSecurity"/>
-  <rule ref="Drupal.Semantics.TInHookMenu"/>
-  <rule ref="Drupal.Semantics.TInHookSchema"/>
-  <rule ref="Drupal.Strings.UnnecessaryStringConcat"/>
-  <rule ref="Drupal.WhiteSpace.CloseBracketSpacing"/>
-  <rule ref="Drupal.WhiteSpace.Comma"/>
-  <rule ref="Drupal.WhiteSpace.EmptyLines"/>
-  <rule ref="Drupal.WhiteSpace.Namespace"/>
-  <rule ref="Drupal.WhiteSpace.ObjectOperatorIndent"/>
-  <rule ref="Drupal.WhiteSpace.ObjectOperatorSpacing"/>
-  <rule ref="Drupal.WhiteSpace.OpenBracketSpacing"/>
-  <rule ref="Drupal.WhiteSpace.OpenTagNewline"/>
-  <rule ref="Drupal.WhiteSpace.OperatorSpacing"/>
-  <rule ref="Drupal.WhiteSpace.ScopeClosingBrace"/>
-  <rule ref="Drupal.WhiteSpace.ScopeIndent"/>
-
-  <!-- Drupal Practice sniffs -->
-  <rule ref="DrupalPractice.Commenting.ExpectedException"/>
-
-  <!-- Generic sniffs -->
-  <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
-  <rule ref="Generic.CodeAnalysis.EmptyPHPStatement" />
-  <rule ref="Generic.Files.ByteOrderMark"/>
-  <rule ref="Generic.Files.LineEndings"/>
-  <rule ref="Generic.Formatting.SpaceAfterCast"/>
-  <rule ref="Generic.Functions.FunctionCallArgumentSpacing"/>
-  <rule ref="Generic.Functions.OpeningFunctionBraceKernighanRitchie">
-    <properties>
-      <property name="checkClosures" value="true"/>
-    </properties>
-  </rule>
-  <rule ref="Generic.NamingConventions.ConstructorName"/>
-  <rule ref="Generic.NamingConventions.UpperCaseConstantName"/>
-  <rule ref="Generic.PHP.DeprecatedFunctions"/>
-  <rule ref="Generic.PHP.DisallowShortOpenTag"/>
-  <rule ref="Generic.PHP.LowerCaseKeyword"/>
-  <rule ref="Generic.PHP.UpperCaseConstant"/>
-  <rule ref="Generic.WhiteSpace.DisallowTabIndent"/>
+  <!-- Just test one new Drupal sniff -->
+<!--   <rule ref="Drupal.Semantics.FunctionTriggerError"/> -->
+  <rule ref="Drupal.Commenting.Deprecated"/>
 
   <!-- Internal sniffs -->
   <rule ref="Internal.NoCodeFound">
diff --git a/core/tests/Drupal/KernelTests/Core/Database/DatabaseLegacyTest.php b/core/tests/Drupal/KernelTests/Core/Database/DatabaseLegacyTest.php
index 9fa3fc0..626534f 100644
--- a/core/tests/Drupal/KernelTests/Core/Database/DatabaseLegacyTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Database/DatabaseLegacyTest.php
@@ -31,7 +31,7 @@ class DatabaseLegacyTest extends DatabaseTestBase {
   /**
    * Tests deprecation of the db_and() function.
    *
-   * @expectedDeprecation db_and() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an AND conjunction: new Condition('AND'), instead. See https://www.drupal.org/node/2993033.
+   * @expectedDeprecation db_and() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an AND conjunction: new Condition('AND'), instead. See https://www.drupal.org/node/2993033.
    */
   public function testDbAnd() {
     $this->assertInstanceOf(Condition::class, db_and());
@@ -40,7 +40,7 @@ public function testDbAnd() {
   /**
    * Tests deprecation of the db_condition() function.
    *
-   * @expectedDeprecation db_condition() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying the desired conjunction: new Condition($conjunction), instead. See https://www.drupal.org/node/2993033.
+   * @expectedDeprecation db_condition() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying the desired conjunction: new Condition($conjunction), instead. See https://www.drupal.org/node/2993033.
    */
   public function testDbCondition() {
     $this->assertInstanceOf(Condition::class, db_condition('AND'));
@@ -49,7 +49,7 @@ public function testDbCondition() {
   /**
    * Tests deprecation of the db_or() function.
    *
-   * @expectedDeprecation db_or() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an OR conjunction: new Condition('OR'), instead. See https://www.drupal.org/node/2993033.
+   * @expectedDeprecation db_or() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying an OR conjunction: new Condition('OR'), instead. See https://www.drupal.org/node/2993033.
    */
   public function testDbOr() {
     $this->assertInstanceOf(Condition::class, db_or());
@@ -58,7 +58,7 @@ public function testDbOr() {
   /**
    * Tests deprecation of the db_xor() function.
    *
-   * @expectedDeprecation db_xor() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying a XOR conjunction: new Condition('XOR'), instead. See https://www.drupal.org/node/2993033.
+   * @expectedDeprecation db_xor() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Create a \Drupal\Core\Database\Query\Condition object, specifying a XOR conjunction: new Condition('XOR'), instead. See https://www.drupal.org/node/2993033.
    */
   public function testDbXor() {
     $this->assertInstanceOf(Condition::class, db_xor());
@@ -67,7 +67,7 @@ public function testDbXor() {
   /**
    * Tests the db_table_exists() function.
    *
-   * @expectedDeprecation db_table_exists() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use $injected_database->schema()->tableExists($table) instead. See https://www.drupal.org/node/2947929.
+   * @expectedDeprecation db_table_exists() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use $injected_database->schema()->tableExists($table) instead. See https://www.drupal.org/node/2947929.
    */
   public function testDbTableExists() {
     $this->assertTrue(db_table_exists('test'));
@@ -76,7 +76,7 @@ public function testDbTableExists() {
   /**
    * Tests the db_find_tables() function.
    *
-   * @expectedDeprecation db_find_tables() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use $injected_database->schema()->findTables($table_expression) instead. See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_find_tables() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use $injected_database->schema()->findTables($table_expression) instead. See https://www.drupal.org/node/2993033
    */
   public function testDbFindTables() {
     $expected = [
@@ -89,7 +89,7 @@ public function testDbFindTables() {
   /**
    * Tests the db_set_active() function.
    *
-   * @expectedDeprecation db_set_active() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\Database::setActiveConnection() instead. See https://www.drupal.org/node/2944084.
+   * @expectedDeprecation db_set_active() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Database\Database::setActiveConnection() instead. See https://www.drupal.org/node/2944084.
    */
   public function testDbSetActive() {
     $get_active_db = $this->connection->getKey();
@@ -99,7 +99,7 @@ public function testDbSetActive() {
   /**
    * Tests the db_drop_table() function.
    *
-   * @expectedDeprecation db_drop_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\Database::getConnection()->schema()->dropTable() instead. See https://www.drupal.org/node/2987737
+   * @expectedDeprecation db_drop_table() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Database\Database::getConnection()->schema()->dropTable() instead. See https://www.drupal.org/node/2987737
    */
   public function testDbDropTable() {
     $this->assertFalse(db_drop_table('temp_test_table'));
@@ -108,7 +108,7 @@ public function testDbDropTable() {
   /**
    * Tests deprecation of the db_next_id() function.
    *
-   * @expectedDeprecation db_next_id() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call nextId() on it. For example, $injected_database->nextId($existing_id). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_next_id() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call nextId() on it. For example, $injected_database->nextId($existing_id). See https://www.drupal.org/node/2993033
    */
   public function testDbNextId() {
     $this->installSchema('system', 'sequences');
@@ -118,7 +118,7 @@ public function testDbNextId() {
   /**
    * Tests the db_change_field() function is deprecated.
    *
-   * @expectedDeprecation Deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_change_field() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033
    */
   public function testDbChangeField() {
     $spec = [
@@ -135,8 +135,8 @@ public function testDbChangeField() {
   /**
    * Tests deprecation of the db_field_set_default() function.
    *
-   * @expectedDeprecation db_field_set_default() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033
-   * @expectedDeprecation fieldSetDefault() is deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035
+   * @expectedDeprecation db_field_set_default() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation fieldSetDefault() is deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035
    */
   public function testDbFieldSetDefault() {
     db_field_set_default('test', 'job', 'baz');
@@ -145,8 +145,8 @@ public function testDbFieldSetDefault() {
   /**
    * Tests deprecation of the db_field_set_no_default() function.
    *
-   * @expectedDeprecation db_field_set_no_default() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033
-   * @expectedDeprecation fieldSetNoDefault() is deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035
+   * @expectedDeprecation db_field_set_no_default() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call changeField() on it, passing a full field specification. For example, $injected_database->schema()->changeField($table, $field, $field_new, $spec, $keys_new). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation fieldSetNoDefault() is deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035
    */
   public function testDbFieldSetNoDefault() {
     db_field_set_no_default('test_null', 'age');
@@ -155,8 +155,8 @@ public function testDbFieldSetNoDefault() {
   /**
    * Tests Schema::fieldSetDefault and Schema::fieldSetNoDefault.
    *
-   * @expectedDeprecation fieldSetDefault() is deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035
-   * @expectedDeprecation fieldSetNoDefault() is deprecated in Drupal 8.7.0 and will be removed before Drupal 9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035
+   * @expectedDeprecation fieldSetDefault() is deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035
+   * @expectedDeprecation fieldSetNoDefault() is deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Instead, call ::changeField() passing a full field specification. See https://www.drupal.org/node/2999035
    */
   public function testSchemaFieldDefaultChange() {
     // Create a table.
@@ -208,7 +208,7 @@ public function testSchemaFieldDefaultChange() {
   /**
    * Tests deprecation of the db_transaction() function.
    *
-   * @expectedDeprecation db_transaction is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call startTransaction() on it. For example, $injected_database->startTransaction($name). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_transaction() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call startTransaction() on it. For example, $injected_database->startTransaction($name). See https://www.drupal.org/node/2993033
    */
   public function testDbTransaction() {
     $this->assertInstanceOf(Transaction::class, db_transaction());
@@ -217,7 +217,7 @@ public function testDbTransaction() {
   /**
    * Tests the db_close() function.
    *
-   * @expectedDeprecation db_close() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\Database::closeConnection() instead. See https://www.drupal.org/node/2993033.
+   * @expectedDeprecation db_close() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Database\Database::closeConnection() instead. See https://www.drupal.org/node/2993033
    */
   public function testDbClose() {
     $this->assertTrue(Database::isActiveConnection(), 'Database connection is active');
@@ -228,7 +228,7 @@ public function testDbClose() {
   /**
    * Tests deprecation of the db_add_field() function.
    *
-   * @expectedDeprecation db_add_field() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addField() on it. For example, $injected_database->schema()->addField($table, $field, $spec, $keys_new). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_add_field() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addField() on it. For example, $injected_database->schema()->addField($table, $field, $spec, $keys_new). See https://www.drupal.org/node/2993033
    */
   public function testDbAddField() {
     $this->assertFalse($this->connection->schema()->fieldExists('test', 'anint'));
@@ -244,7 +244,7 @@ public function testDbAddField() {
   /**
    * Tests deprecation of the db_drop_field() function.
    *
-   * @expectedDeprecation db_drop_field() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropField() on it. For example, $injected_database->schema()->dropField($table, $field). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_drop_field() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropField() on it. For example, $injected_database->schema()->dropField($table, $field). See https://www.drupal.org/node/2993033
    */
   public function testDbDropField() {
     $this->assertTrue($this->connection->schema()->fieldExists('test', 'age'));
@@ -255,7 +255,7 @@ public function testDbDropField() {
   /**
    * Tests deprecation of the db_field_exists() function.
    *
-   * @expectedDeprecation db_field_exists() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldExists() on it. For example, $injected_database->schema()->fieldExists($table, $field). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_field_exists() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldExists() on it. For example, $injected_database->schema()->fieldExists($table, $field). See https://www.drupal.org/node/2993033
    */
   public function testDbFieldExists() {
     $this->assertTrue(db_field_exists('test', 'age'));
@@ -264,7 +264,7 @@ public function testDbFieldExists() {
   /**
    * Tests deprecation of the db_field_names() function.
    *
-   * @expectedDeprecation db_field_names() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldNames() on it. For example, $injected_database->schema()->fieldNames($fields). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_field_names() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call fieldNames() on it. For example, $injected_database->schema()->fieldNames($fields). See https://www.drupal.org/node/2993033
    */
   public function testDbFieldNames() {
     $this->assertSame(['test_field'], db_field_names(['test_field']));
@@ -273,7 +273,7 @@ public function testDbFieldNames() {
   /**
    * Tests deprecation of the db_create_table() function.
    *
-   * @expectedDeprecation db_create_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call createTable() on it. For example, $injected_database->schema()->createTable($name, $table). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_create_table() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call createTable() on it. For example, $injected_database->schema()->createTable($name, $table). See https://www.drupal.org/node/2993033
    */
   public function testDbCreateTable() {
     $name = 'test_create_table';
@@ -294,7 +294,7 @@ public function testDbCreateTable() {
   /**
    * Tests deprecation of the db_merge() function.
    *
-   * @expectedDeprecation db_merge() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call merge() on it. For example, $injected_database->merge($table, $options). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_merge() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call merge() on it. For example, $injected_database->merge($table, $options). See https://www.drupal.org/node/2993033
    */
   public function testDbMerge() {
     $this->assertInstanceOf(Merge::class, db_merge('test'));
@@ -303,7 +303,7 @@ public function testDbMerge() {
   /**
    * Tests deprecation of the db_driver() function.
    *
-   * @expectedDeprecation db_driver() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call driver() on it. For example, $injected_database->driver($string). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_driver() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call driver() on it. For example, $injected_database->driver($string). See https://www.drupal.org/node/2993033
    */
   public function testDbDriver() {
     $this->assertNotNull(db_driver());
@@ -312,7 +312,7 @@ public function testDbDriver() {
   /**
    * Tests deprecation of the db_escape_field() function.
    *
-   * @expectedDeprecation db_escape_field() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call escapeField() on it. For example, $injected_database->escapeField($field). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_escape_field() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call escapeField() on it. For example, $injected_database->escapeField($field). See https://www.drupal.org/node/2993033
    */
   public function testDbEscapeField() {
     $this->assertNotNull(db_escape_field('test'));
@@ -321,7 +321,7 @@ public function testDbEscapeField() {
   /**
    * Tests deprecation of the db_like() function.
    *
-   * @expectedDeprecation db_like() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call escapeLike() on it. For example, $injected_database->escapeLike($string). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_like() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call escapeLike() on it. For example, $injected_database->escapeLike($string). See https://www.drupal.org/node/2993033
    */
   public function testDbLike() {
     $this->assertSame('test\%', db_like('test%'));
@@ -330,7 +330,7 @@ public function testDbLike() {
   /**
    * Tests deprecation of the db_escape_table() function.
    *
-   * @expectedDeprecation db_escape_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call escapeTable() on it. For example, $injected_database->escapeTable($table). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_escape_table() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call escapeTable() on it. For example, $injected_database->escapeTable($table). See https://www.drupal.org/node/2993033
    */
   public function testDbEscapeTable() {
     $this->assertNotNull(db_escape_table('test'));
@@ -339,7 +339,7 @@ public function testDbEscapeTable() {
   /**
    * Tests deprecation of the db_rename_table() function.
    *
-   * @expectedDeprecation db_rename_table() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call renameTable() on it. For example, $injected_database->schema()->renameTable($table, $new_name). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_rename_table() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call renameTable() on it. For example, $injected_database->schema()->renameTable($table, $new_name). See https://www.drupal.org/node/2993033
    */
   public function testDbRenameTable() {
     $this->assertTrue($this->connection->schema()->tableExists('test'));
@@ -350,7 +350,7 @@ public function testDbRenameTable() {
   /**
    * Tests deprecation of the db_drop_index() function.
    *
-   * @expectedDeprecation db_drop_index() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropIndex() on it. For example, $injected_database->schema()->dropIndex($table, $name). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_drop_index() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropIndex() on it. For example, $injected_database->schema()->dropIndex($table, $name). See https://www.drupal.org/node/2993033
    */
   public function testDbDropIndex() {
     $this->assertFalse(db_drop_index('test', 'no_such_index'));
@@ -359,7 +359,7 @@ public function testDbDropIndex() {
   /**
    * Tests deprecation of the db_index_exists() function.
    *
-   * @expectedDeprecation db_index_exists() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call indexExists() on it. For example, $injected_database->schema()->indexExists($table, $name). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_index_exists() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call indexExists() on it. For example, $injected_database->schema()->indexExists($table, $name). See https://www.drupal.org/node/2993033
    */
   public function testDbIndexExists() {
     $this->assertFalse(db_index_exists('test', 'no_such_index'));
@@ -368,7 +368,7 @@ public function testDbIndexExists() {
   /**
    * Tests deprecation of the db_drop_unique_key() function.
    *
-   * @expectedDeprecation db_drop_unique_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropUniqueKey() on it. For example, $injected_database->schema()->dropUniqueKey($table, $name). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_drop_unique_key() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropUniqueKey() on it. For example, $injected_database->schema()->dropUniqueKey($table, $name). See https://www.drupal.org/node/2993033
    */
   public function testDbDropUniqueKey() {
     $this->assertTrue(db_drop_unique_key('test', 'name'));
@@ -377,7 +377,7 @@ public function testDbDropUniqueKey() {
   /**
    * Tests deprecation of the db_add_unique_key() function.
    *
-   * @expectedDeprecation db_add_unique_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addUniqueKey() on it. For example, $injected_database->schema()->addUniqueKey($table, $name, $fields). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_add_unique_key() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addUniqueKey() on it. For example, $injected_database->schema()->addUniqueKey($table, $name, $fields). See https://www.drupal.org/node/2993033
    */
   public function testDbAddUniqueKey() {
     db_add_unique_key('test', 'age', ['age']);
@@ -386,7 +386,7 @@ public function testDbAddUniqueKey() {
   /**
    * Tests deprecation of the db_drop_primary_key() function.
    *
-   * @expectedDeprecation db_drop_primary_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropPrimaryKey() on it. For example, $injected_database->schema()->dropPrimaryKey($table). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_drop_primary_key() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call dropPrimaryKey() on it. For example, $injected_database->schema()->dropPrimaryKey($table). See https://www.drupal.org/node/2993033
    */
   public function testDbDropPrimaryKey() {
     $this->assertTrue(db_drop_primary_key('test_people'));
@@ -395,7 +395,7 @@ public function testDbDropPrimaryKey() {
   /**
    * Tests deprecation of the db_add_primary_key() function.
    *
-   * @expectedDeprecation db_add_primary_key() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addPrimaryKey() on it. For example, $injected_database->schema()->addPrimaryKey($table, $fields). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_add_primary_key() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addPrimaryKey() on it. For example, $injected_database->schema()->addPrimaryKey($table, $fields). See https://www.drupal.org/node/2993033
    */
   public function testDbAddPrimaryKey() {
     $this->connection->schema()->dropPrimaryKey('test_people');
@@ -405,7 +405,7 @@ public function testDbAddPrimaryKey() {
   /**
    * Tests the db_update() function.
    *
-   * @expectedDeprecation db_update() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call call update() on it. For example, $injected_database->update($table, $options); See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_update() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call call update() on it. For example, $injected_database->update($table, $options); See https://www.drupal.org/node/2993033
    */
   public function testDbUpdate() {
     $this->assertInstanceOf(Update::class, db_update('test'));
@@ -414,7 +414,7 @@ public function testDbUpdate() {
   /**
    * Tests the db_query() function.
    *
-   * @expectedDeprecation db_query() is deprecated in drupal:8.0.0. It will be removed before drupal:9.0.0. Instead, get a database connection injected into your service from the container and call query() on it. For example, $injected_database->query($query, $args, $options). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_query() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call query() on it. For example, $injected_database->query($query, $args, $options). See https://www.drupal.org/node/2993033
    */
   public function testDbQuery() {
     $this->assertInstanceOf(StatementInterface::class, db_query('SELECT name FROM {test} WHERE name = :name', [':name' => "John"]));
@@ -423,7 +423,7 @@ public function testDbQuery() {
   /**
    * Tests deprecation of the db_delete() function.
    *
-   * @expectedDeprecation db_delete is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call delete() on it. For example, $injected_database->delete($table, $options). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_delete() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call delete() on it. For example, $injected_database->delete($table, $options). See https://www.drupal.org/node/2993033
    */
   public function testDbDelete() {
     $this->assertInstanceOf(Delete::class, db_delete('test'));
@@ -432,7 +432,7 @@ public function testDbDelete() {
   /**
    * Tests deprecation of the db_truncate() function.
    *
-   * @expectedDeprecation db_truncate() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call truncate() on it. For example, $injected_database->truncate($table, $options). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_truncate() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call truncate() on it. For example, $injected_database->truncate($table, $options). See https://www.drupal.org/node/2993033
    */
   public function testDbTruncate() {
     $this->assertInstanceOf(Truncate::class, db_truncate('test'));
@@ -441,7 +441,7 @@ public function testDbTruncate() {
   /**
    * Tests deprecation of the $options 'target' key in Connection::query.
    *
-   * @expectedDeprecation Passing a 'target' key to \Drupal\Core\Database\Connection::query $options argument is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, use \Drupal\Core\Database\Database::getConnection($target)->query(). See https://www.drupal.org/node/2993033.
+   * @expectedDeprecation Passing a 'target' key to \Drupal\Core\Database\Connection::query $options argument is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, use \Drupal\Core\Database\Database::getConnection($target)->query(). See https://www.drupal.org/node/2993033
    */
   public function testDbOptionsTarget() {
     $this->assertNotNull($this->connection->query('SELECT * FROM {test}', [], ['target' => 'bar']));
@@ -450,7 +450,7 @@ public function testDbOptionsTarget() {
   /**
    * Tests deprecation of the $options 'target' key in Select.
    *
-   * @expectedDeprecation Passing a 'target' key to \Drupal\Core\Database\Connection::query $options argument is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, use \Drupal\Core\Database\Database::getConnection($target)->query(). See https://www.drupal.org/node/2993033.
+   * @expectedDeprecation Passing a 'target' key to \Drupal\Core\Database\Connection::query $options argument is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, use \Drupal\Core\Database\Database::getConnection($target)->query(). See https://www.drupal.org/node/2993033
    */
   public function testDbOptionsTargetInSelect() {
     $this->assertNotNull($this->connection->select('test', 't', ['target' => 'bar'])->fields('t')->execute());
@@ -459,7 +459,7 @@ public function testDbOptionsTargetInSelect() {
   /**
    * Tests deprecation of the db_query_temporary() function.
    *
-   * @expectedDeprecation db_query_temporary() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call queryTemporary() on it. For example, $injected_database->queryTemporary($query, $args, $options). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_query_temporary() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call queryTemporary() on it. For example, $injected_database->queryTemporary($query, $args, $options). See https://www.drupal.org/node/2993033
    */
   public function testDbQueryTemporary() {
     $expected = $this->connection->select('test')->countQuery()->execute()->fetchField();
@@ -471,7 +471,7 @@ public function testDbQueryTemporary() {
   /**
    * Tests deprecation of the db_query_range() function.
    *
-   * @expectedDeprecation db_query_range() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call queryRange() on it. For example, $injected_database->queryRange($query, $from, $count, $args, $options). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_query_range() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call queryRange() on it. For example, $injected_database->queryRange($query, $from, $count, $args, $options). See https://www.drupal.org/node/2993033
    */
   public function testDbQueryRange() {
     $count = count(db_query_range('SELECT name FROM {test}', 1, 3)->fetchAll());
@@ -481,7 +481,7 @@ public function testDbQueryRange() {
   /**
    * Tests deprecation of the db_add_index() function.
    *
-   * @expectedDeprecation db_add_index() is deprecated in Drupal 8.0.x and will be removed in Drupal 9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addIndex() on it. For example, $injected_database->schema()->addIndex($table, $name, $fields, $spec). See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_add_index() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container, get its schema driver, and call addIndex() on it. For example, $injected_database->schema()->addIndex($table, $name, $fields, $spec). See https://www.drupal.org/node/2993033
    */
   public function testDbAddIndex() {
     $table_specification = [
@@ -501,7 +501,7 @@ public function testDbAddIndex() {
   /**
    * Tests the db_insert() function.
    *
-   * @expectedDeprecation db_insert() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call insert() on it. For example, $injected_database->insert($table, $options); See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_insert() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call insert() on it. For example, $injected_database->insert($table, $options); See https://www.drupal.org/node/2993033
    */
   public function testDbInsert() {
     $this->assertInstanceOf(Insert::class, db_insert('test'));
@@ -510,7 +510,7 @@ public function testDbInsert() {
   /**
    * Tests the db_select() function.
    *
-   * @expectedDeprecation db_select() is deprecated in Drupal 8.0.x and will be removed before Drupal 9.0.0. Instead, get a database connection injected into your service from the container and call call select() on it. For example, $injected_database->db_select($table, $alias, $options); See https://www.drupal.org/node/2993033
+   * @expectedDeprecation db_select() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Instead, get a database connection injected into your service from the container and call call select() on it. For example, $injected_database->db_select($table, $alias, $options); See https://www.drupal.org/node/2993033
    */
   public function testDbSelect() {
     $this->assertInstanceOf(Select::class, db_select('test'));
@@ -519,7 +519,7 @@ public function testDbSelect() {
   /**
    * Tests the db_ignore_replica() function.
    *
-   * @expectedDeprecation db_ignore_replica() is deprecated in Drupal 8.7.x and will be removed before Drupal 9.0.0. Use \Drupal\Core\Database\ReplicaKillSwitch::trigger() instead. See https://www.drupal.org/node/2997500
+   * @expectedDeprecation db_ignore_replica() is deprecated in drupal:8.7.0 and is removed from drupal:9.0.0. Use \Drupal\Core\Database\ReplicaKillSwitch::trigger() instead. See https://www.drupal.org/node/2997500
    */
   public function testDbIgnoreReplica() {
     $connection = Database::getConnectionInfo('default');
@@ -533,7 +533,7 @@ public function testDbIgnoreReplica() {
   /**
    * Tests the _db_get_target() function.
    *
-   * @expectedDeprecation _db_get_target() is deprecated in drupal:8.8.0. Will be removed before drupal:9.0.0. See https://www.drupal.org/node/2993033
+   * @expectedDeprecation _db_get_target() is deprecated in drupal:8.8.0 and is removed from drupal:9.0.0. See https://www.drupal.org/node/2993033
    */
   public function testDbGetTarget() {
     $op1 = $op2 = ['target' => 'replica'];
diff --git a/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php b/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
index f393f6a..c5bb72c 100644
--- a/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
+++ b/core/tests/Drupal/Tests/Core/Controller/ControllerResolverTest.php
@@ -72,7 +72,7 @@ protected function setUp() {
    * @see \Drupal\Core\Controller\ControllerResolver::doGetArguments()
    *
    * @group legacy
-   * @expectedDeprecation Drupal\Core\Controller\ControllerResolver::doGetArguments is deprecated as of 8.6.0 and will be removed in 9.0. Inject the "http_kernel.controller.argument_resolver" service instead.
+   * @expectedDeprecation Drupal\Core\Controller\ControllerResolver::doGetArguments is deprecated in drupal:8.6.0 and is removed from drupal:9.0.0. Inject the "http_kernel.controller.argument_resolver" service instead. See http:
    */
   public function testGetArguments() {
     if (!in_array('Symfony\Component\HttpKernel\Controller\ArgumentResolverInterface', class_implements('Symfony\Component\HttpKernel\Controller\ControllerResolver'))) {
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
index 7027d7f..64c11af 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
@@ -389,7 +389,7 @@ public function providerTestToUrlUriCallback() {
    * @dataProvider providerTestUrlInfo
    *
    * @group legacy
-   * @expectedDeprecation EntityInterface::urlInfo() is deprecated in Drupal 8.0.0 and will be removed in Drupal 9.0.0. EntityInterface::toUrl() instead. See https://www.drupal.org/node/2614344
+   * @expectedDeprecation EntityInterface::urlInfo() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use EntityInterface::toUrl() instead. See https://www.drupal.org/node/2614344
    */
   public function testUrlInfo($rel, $options) {
     $entity = $this->getEntity(EntityBase::class, [], ['toUrl']);
@@ -406,7 +406,7 @@ public function testUrlInfo($rel, $options) {
    * @covers ::urlInfo
    *
    * @group legacy
-   * @expectedDeprecation EntityInterface::link() is deprecated in Drupal 8.0.0 and will be removed in Drupal 9.0.0. EntityInterface::toLink() instead. Note, the default relationship for configuration entities changes from 'edit-form' to 'canonical'. See https://www.drupal.org/node/2614344
+   * @expectedDeprecation EntityInterface::link() is deprecated in drupal:8.0.0 and is removed from drupal:9.0.0. Use EntityInterface::toLink() instead. Note, the default relationship for configuration entities changes from 'edit-form' to 'canonical'. See https://www.drupal.org/node/2614344
    */
   public function testLink() {
 
@@ -453,7 +453,7 @@ public function providerTestUrlInfo() {
    * @dataProvider providerTestUrl
    *
    * @group legacy
-   * @expectedDeprecation EntityInterface::url() is deprecated in Drupal 8.0.0 and will be removed in Drupal 9.0.0. EntityInterface::toUrl() instead. Note, a \Drupal\Core\Url object is returned. See https://www.drupal.org/node/2614344
+   * @expectedDeprecation EntityInterface::url() is deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use EntityInterface::toUrl() instead. Note, a \Drupal\Core\Url object is returned. See https://www.drupal.org/node/2614344
    */
   public function testUrlEmpty($rel) {
     $entity = $this->getEntity(EntityBase::class, []);
@@ -494,7 +494,7 @@ public function providerTestUrlEmpty() {
    * @dataProvider providerTestUrl
    *
    * @group legacy
-   * @expectedDeprecation EntityInterface::url() is deprecated in Drupal 8.0.0 and will be removed in Drupal 9.0.0. EntityInterface::toUrl() instead. Note, a \Drupal\Core\Url object is returned. See https://www.drupal.org/node/2614344
+   * @expectedDeprecation EntityInterface::url() is deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0. Use EntityInterface::toUrl() instead. Note, a \Drupal\Core\Url object is returned. See https://www.drupal.org/node/2614344
    */
   public function testUrl($rel, $options, $default_options, $expected_options) {
     $entity = $this->getEntity(EntityBase::class, ['id' => $this->entityId], ['toUrl']);