diff --git a/core/core.services.yml b/core/core.services.yml index f070b69..6b9ed2e 100644 --- a/core/core.services.yml +++ b/core/core.services.yml @@ -174,7 +174,7 @@ services: arguments: ['@container.namespaces', '@controller_resolver', '@request', '@module_handler'] plugin.manager.menu.local_task: class: Drupal\Core\Menu\LocalTaskManager - arguments: ['@container.namespaces', '@controller_resolver', '@request', '@router.route_provider', '@module_handler'] + arguments: ['@controller_resolver', '@request', '@router.route_provider', '@module_handler'] request: class: Symfony\Component\HttpFoundation\Request # @TODO the synthetic setting must be uncommented whenever drupal_session_initialize() diff --git a/core/lib/Drupal/Core/Menu/LocalTaskDefault.php b/core/lib/Drupal/Core/Menu/LocalTaskDefault.php new file mode 100644 index 0000000..57e32df --- /dev/null +++ b/core/lib/Drupal/Core/Menu/LocalTaskDefault.php @@ -0,0 +1,16 @@ + '', + // The static title for the local task. + 'id' => '', + 'route_name' => '', + // The plugin ID of the root tab. + 'tab_root_id' => '', + // The plugin ID of the parent tab (or NULL for the top-level tab). + 'tab_parent_id' => NULL, + // The weight of the tab. + 'weight' => NULL, + // The default link options. + 'options' => array(), + // Default class for local task implementations. + 'class' => 'Drupal\Core\Menu\LocalTaskDefault', + ); /** * A controller resolver object. @@ -53,9 +75,6 @@ class LocalTaskManager extends DefaultPluginManager { /** * Constructs a \Drupal\Core\Menu\LocalTaskManager object. * - * @param \Traversable $namespaces - * An object that implements \Traversable which contains the root paths - * keyed by the corresponding namespace to look for plugin implementations, * @param \Symfony\Component\HttpKernel\Controller\ControllerResolverInterface $controller_resolver * An object to use in introspecting route methods. * @param \Symfony\Component\HttpFoundation\Request $request @@ -63,14 +82,20 @@ class LocalTaskManager extends DefaultPluginManager { * @param \Drupal\Core\Routing\RouteProviderInterface $route_provider * The route provider to load routes by name. * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler - * The module handler.u + * The module handler. */ - public function __construct(\Traversable $namespaces, ControllerResolverInterface $controller_resolver, Request $request, RouteProviderInterface $route_provider, ModuleHandlerInterface $module_handler) { - parent::__construct('Plugin/Menu/LocalTask', $namespaces, array(), 'Drupal\Core\Annotation\Menu\LocalTask'); + public function __construct(ControllerResolverInterface $controller_resolver, Request $request, RouteProviderInterface $route_provider, ModuleHandlerInterface $module_handler) { + $this->controllerResolver = $controller_resolver; $this->request = $request; $this->routeProvider = $route_provider; - $this->alterInfo($module_handler, 'local_tasks'); + + // @todo caching/compiling, translations and altering. + // $this->alterInfo($module_handler, 'local_tasks'); + $this->discovery = new YamlDiscovery('local_tasks', array_values($module_handler->getModuleDirectories())); + $this->discovery = new ContainerDerivativeDiscoveryDecorator($this->discovery); + $this->discovery = new ProcessDecorator($this->discovery, array($this, 'processDefinition')); + $this->factory = new ContainerFactory($this); } /** diff --git a/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php new file mode 100644 index 0000000..b802dfc --- /dev/null +++ b/core/lib/Drupal/Core/Plugin/Discovery/YamlDiscovery.php @@ -0,0 +1,63 @@ +discovery = new DrupalYamlDiscovery($name, $directories); + } + + /** + * {@inheritdoc} + */ + public function getDefinition($plugin_id) { + $definitions = $this->getDefinitions(); + return isset($definitions[$plugin_id]) ? $definitions[$plugin_id] : NULL; + } + + /** + * {@inheritdoc} + */ + public function getDefinitions() { + + $plugins = $this->discovery->findAll(); + + // Flatten definitions into what's expected from plugins. + $definitions = array(); + foreach ($plugins as $provider => $list) { + foreach ($list as $id => $tmp) { + $tmp['provider'] = $provider; + $definitions[$id] = $tmp; + } + } + + return $definitions; + } +} \ No newline at end of file diff --git a/core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php b/core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php index 1a32725..d3e481a 100644 --- a/core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php +++ b/core/modules/system/lib/Drupal/system/Tests/Menu/LocalTasksTest.php @@ -165,6 +165,7 @@ public function testPluginLocalTask() { $this->assertLocalTasks(array( 'menu-local-task-test/tasks/settings/sub1', 'menu-local-task-test/tasks/settings/sub2', + 'menu-local-task-test/tasks/settings/sub3', ), 1); $result = $this->xpath('//ul[contains(@class, "tabs")]//a[contains(@class, "active")]'); @@ -176,12 +177,13 @@ public function testPluginLocalTask() { $this->assertLocalTasks(array( 'menu-local-task-test/tasks/settings/sub1', 'menu-local-task-test/tasks/settings/sub2', + 'menu-local-task-test/tasks/settings/sub3', ), 1); $result = $this->xpath('//ul[contains(@class, "tabs")]//a[contains(@class, "active")]'); $this->assertEqual(2, count($result), 'There are tabs active on both levels.'); $this->assertEqual('Settings', (string) $result[0], 'The settings tab is active.'); - $this->assertEqual('sub1', (string) $result[1], 'The sub1 tab is active.'); + $this->assertEqual('Dynamic title', (string) $result[1], 'The sub1 tab is active.'); } } diff --git a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksEdit.php b/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksEdit.php deleted file mode 100644 index 40996c8..0000000 --- a/core/modules/system/tests/modules/menu_test/lib/Drupal/menu_test/Plugin/Menu/LocalTask/TestTasksEdit.php +++ /dev/null @@ -1,25 +0,0 @@ -