Loading core/modules/navigation/src/Plugin/Block/UserNavigationBlock.php→core/modules/navigation/src/Plugin/Block/NavigationUserBlock.php +44 −0 Original line number Diff line number Diff line Loading @@ -6,10 +6,7 @@ use Drupal\Core\Block\Attribute\Block; use Drupal\Core\Block\BlockBase; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\StringTranslation\TranslatableMarkup; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Defines a user navigation block. Loading @@ -20,40 +17,7 @@ id: 'navigation_user', admin_label: new TranslatableMarkup('User'), )] final class UserNavigationBlock extends BlockBase implements ContainerFactoryPluginInterface { /** * Constructs the plugin instance. * * @param array $configuration * A configuration array containing information about the plugin instance. * @param string $plugin_id * The plugin_id for the plugin instance. * @param mixed $plugin_definition * The plugin implementation definition. * @param \Drupal\Core\Extension\ModuleHandlerInterface $moduleHandler * The module handler. */ public function __construct( array $configuration, $plugin_id, $plugin_definition, protected readonly ModuleHandlerInterface $moduleHandler, ) { parent::__construct($configuration, $plugin_id, $plugin_definition); } /** * {@inheritdoc} */ public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { return new static( $configuration, $plugin_id, $plugin_definition, $container->get('module_handler'), ); } final class NavigationUserBlock extends BlockBase { /** * {@inheritdoc} Loading core/modules/navigation/tests/src/Functional/UserNavigationBlockTest.php→core/modules/navigation/tests/src/Functional/NavigationUserBlockTest.php +4 −4 Original line number Diff line number Diff line Loading @@ -8,11 +8,11 @@ use Drupal\Tests\system\Functional\Cache\PageCacheTagsTestBase; /** * Tests for \Drupal\navigation\Plugin\NavigationBlock\UserNavigationBlock. * Tests for \Drupal\navigation\Plugin\NavigationBlock\NavigationUserBlock. * * @group navigation */ class UserNavigationBlockTest extends PageCacheTagsTestBase { class NavigationUserBlockTest extends PageCacheTagsTestBase { /** * Modules to install. Loading Loading @@ -63,9 +63,9 @@ protected function setUp(): void { } /** * Test output of the user navigation with regards to caching and contents. * Test output of user navigation block with regards to caching and contents. */ public function testUserNavigationBlock() { public function testNavigationUserBlock() { // Verify some basic cacheability metadata. Ensures that we're not doing // anything so egregious as to upset expected caching behavior. In this // case, as an anonymous user, we should have zero effect on the page. Loading Loading
core/modules/navigation/src/Plugin/Block/UserNavigationBlock.php→core/modules/navigation/src/Plugin/Block/NavigationUserBlock.php +44 −0 Original line number Diff line number Diff line Loading @@ -6,10 +6,7 @@ use Drupal\Core\Block\Attribute\Block; use Drupal\Core\Block\BlockBase; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Plugin\ContainerFactoryPluginInterface; use Drupal\Core\StringTranslation\TranslatableMarkup; use Symfony\Component\DependencyInjection\ContainerInterface; /** * Defines a user navigation block. Loading @@ -20,40 +17,7 @@ id: 'navigation_user', admin_label: new TranslatableMarkup('User'), )] final class UserNavigationBlock extends BlockBase implements ContainerFactoryPluginInterface { /** * Constructs the plugin instance. * * @param array $configuration * A configuration array containing information about the plugin instance. * @param string $plugin_id * The plugin_id for the plugin instance. * @param mixed $plugin_definition * The plugin implementation definition. * @param \Drupal\Core\Extension\ModuleHandlerInterface $moduleHandler * The module handler. */ public function __construct( array $configuration, $plugin_id, $plugin_definition, protected readonly ModuleHandlerInterface $moduleHandler, ) { parent::__construct($configuration, $plugin_id, $plugin_definition); } /** * {@inheritdoc} */ public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) { return new static( $configuration, $plugin_id, $plugin_definition, $container->get('module_handler'), ); } final class NavigationUserBlock extends BlockBase { /** * {@inheritdoc} Loading
core/modules/navigation/tests/src/Functional/UserNavigationBlockTest.php→core/modules/navigation/tests/src/Functional/NavigationUserBlockTest.php +4 −4 Original line number Diff line number Diff line Loading @@ -8,11 +8,11 @@ use Drupal\Tests\system\Functional\Cache\PageCacheTagsTestBase; /** * Tests for \Drupal\navigation\Plugin\NavigationBlock\UserNavigationBlock. * Tests for \Drupal\navigation\Plugin\NavigationBlock\NavigationUserBlock. * * @group navigation */ class UserNavigationBlockTest extends PageCacheTagsTestBase { class NavigationUserBlockTest extends PageCacheTagsTestBase { /** * Modules to install. Loading Loading @@ -63,9 +63,9 @@ protected function setUp(): void { } /** * Test output of the user navigation with regards to caching and contents. * Test output of user navigation block with regards to caching and contents. */ public function testUserNavigationBlock() { public function testNavigationUserBlock() { // Verify some basic cacheability metadata. Ensures that we're not doing // anything so egregious as to upset expected caching behavior. In this // case, as an anonymous user, we should have zero effect on the page. Loading