From 5a231af7751fac10d928b5b03ed4af601c4ed915 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sat, 20 Jun 2015 17:21:03 -0500
Subject: [PATCH] Issue #2504993 by Xano: HookDiscovery sets "module" instead
 of "provider" in plugin definitions

---
 .../Drupal/Core/Plugin/Discovery/HookDiscovery.php   |  2 +-
 .../Core/Plugin/Discovery/HookDiscoveryTest.php      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php b/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php
index 9d1bfa34b51..3331e97b151 100644
--- a/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php
+++ b/core/lib/Drupal/Core/Plugin/Discovery/HookDiscovery.php
@@ -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;
       }
     }
diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
index 650ea959bea..59c4ee44e3f 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/HookDiscoveryTest.php
@@ -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');
   }
 
   /**