diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index 6789f882b1..f21631cf17 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -118,13 +118,13 @@ function forum_entity_type_build(array &$entity_types) { /** * Entity URI callback used in forum_entity_bundle_info_alter(). * - * @deprecated in drupal:9.2.0 and will be removed before drupal:10.0.0. Use + * @deprecated in drupal:9.2.0 and is removed in drupal:10.0.0. Use * $forum->toUrl() instead. * * @see https://www.drupal.org/node/2897455 */ function forum_uri($forum) { - @trigger_error('forum_uri() is deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. Use $forum->toUrl() instead. See https://www.drupal.org/node/2897455', E_USER_DEPRECATED); + @trigger_error('forum_uri() is deprecated in drupal:9.2.0 and is removed in drupal:10.0.0. Use $forum->toUrl() instead. See https://www.drupal.org/node/2897455', E_USER_DEPRECATED); return Url::fromRoute('forum.page', ['taxonomy_term' => $forum->id()]); } diff --git a/core/modules/forum/src/Routing/RouteProcessor.php b/core/modules/forum/src/Routing/RouteProcessor.php index 7dde7b0e3a..634f66bd9b 100644 --- a/core/modules/forum/src/Routing/RouteProcessor.php +++ b/core/modules/forum/src/Routing/RouteProcessor.php @@ -35,7 +35,7 @@ class RouteProcessor implements OutboundRouteProcessorInterface { * @param \Drupal\Core\Entity\EntityTypeManagerInterface $entity_type_manager * The entity type manager service. */ - function __construct(ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_type_manager) { + public function __construct(ConfigFactoryInterface $config_factory, EntityTypeManagerInterface $entity_type_manager) { $this->configFactory = $config_factory; $this->entityTypeManager = $entity_type_manager; } diff --git a/core/modules/forum/tests/src/Functional/ForumTest.php b/core/modules/forum/tests/src/Functional/ForumTest.php index 41474e5ce3..1fdd746712 100644 --- a/core/modules/forum/tests/src/Functional/ForumTest.php +++ b/core/modules/forum/tests/src/Functional/ForumTest.php @@ -452,8 +452,8 @@ public function createForum($type, $parent = 0) { new FormattableMarkup('@type was created', ['@type' => ucfirst($type)]) ); - // Verify that the creation message contains a link to a term. - $this->assertSession()->elementExists('xpath', '//div[@data-drupal-messages]//a[contains(@href, "term/")]'); + // Verify that the creation message contains a link to the forum. + $this->assertSession()->elementExists('xpath', '//div[@data-drupal-messages]//a[contains(@href, "forum/")]'); /** @var \Drupal\taxonomy\TermStorageInterface $taxonomy_term_storage */ $taxonomy_term_storage = $this->container->get('entity_type.manager')->getStorage('taxonomy_term'); diff --git a/core/modules/forum/tests/src/Kernel/ForumLegacyTest.php b/core/modules/forum/tests/src/Kernel/ForumLegacyTest.php index f787bf2e5f..4fa82f1885 100644 --- a/core/modules/forum/tests/src/Kernel/ForumLegacyTest.php +++ b/core/modules/forum/tests/src/Kernel/ForumLegacyTest.php @@ -31,7 +31,7 @@ public function testForumUri() { 'forum_container' => 0, ]); - $this->expectDeprecation('forum_uri() is deprecated in drupal:9.2.0 and is removed from drupal:10.0.0. Use $forum->toUrl() instead. See https://www.drupal.org/node/2897455'); + $this->expectDeprecation('forum_uri() is deprecated in drupal:9.2.0 and is removed in drupal:10.0.0. Use $forum->toUrl() instead. See https://www.drupal.org/node/2897455'); $this->assertNotEmpty(forum_uri($forum)); }