Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Issue #2504993 by Xano: HookDiscovery sets "module" instead of "provider" in plugin definitions

8.0.x
Alex Pott 2015-06-20 17:21:03 -05:00
parent f0342329bb
commit 5a231af775
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php
View File

@ -54,7 +54,7 @@ class HookDiscovery implements DiscoveryInterface {
foreach ($this->moduleHandler->getImplementations($this->hook) as $module) {
$result = $this->moduleHandler->invoke($module, $this->hook);
foreach ($result as $plugin_id => $definition) {
$definition['module'] = $module;
$definition['provider'] = $module;
$definitions[$plugin_id] = $definition;
}
}

12
core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
View File

@ -80,9 +80,9 @@ class HookDiscoveryTest extends UnitTestCase {
$this->assertEquals($definitions['test_id_3']['class'], 'Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry');
// Ensure that the module was set.
$this->assertEquals($definitions['test_id_1']['module'], 'hook_discovery_test');
$this->assertEquals($definitions['test_id_2']['module'], 'hook_discovery_test');
$this->assertEquals($definitions['test_id_3']['module'], 'hook_discovery_test2');
$this->assertEquals($definitions['test_id_1']['provider'], 'hook_discovery_test');
$this->assertEquals($definitions['test_id_2']['provider'], 'hook_discovery_test');
$this->assertEquals($definitions['test_id_3']['provider'], 'hook_discovery_test2');
}
/**
@ -108,15 +108,15 @@ class HookDiscoveryTest extends UnitTestCase {
$plugin_definition = $this->hookDiscovery->getDefinition('test_id_1');
$this->assertEquals($plugin_definition['class'], 'Drupal\plugin_test\Plugin\plugin_test\fruit\Apple');
$this->assertEquals($plugin_definition['module'], 'hook_discovery_test');
$this->assertEquals($plugin_definition['provider'], 'hook_discovery_test');
$plugin_definition = $this->hookDiscovery->getDefinition('test_id_2');
$this->assertEquals($plugin_definition['class'], 'Drupal\plugin_test\Plugin\plugin_test\fruit\Orange');
$this->assertEquals($plugin_definition['module'], 'hook_discovery_test');
$this->assertEquals($plugin_definition['provider'], 'hook_discovery_test');
$plugin_definition = $this->hookDiscovery->getDefinition('test_id_3');
$this->assertEquals($plugin_definition['class'], 'Drupal\plugin_test\Plugin\plugin_test\fruit\Cherry');
$this->assertEquals($plugin_definition['module'], 'hook_discovery_test2');
$this->assertEquals($plugin_definition['provider'], 'hook_discovery_test2');
}
/**