From a033d72f205d9309351b2a602c4cfdfd314cb928 Mon Sep 17 00:00:00 2001
From: Dmitriy Simushev <simushevds@ossg.ru>
Date: Thu, 26 Dec 2013 14:54:36 +0000
Subject: [PATCH] Use autoload for \Mibew\Plugin class

---
 src/mibew/libs/classes/Mibew/EventDispatcher.php        | 6 +++---
 src/mibew/libs/classes/{plugin.php => Mibew/Plugin.php} | 2 ++
 src/mibew/libs/classes/Mibew/PluginManager.php          | 6 +++---
 src/mibew/libs/init.php                                 | 3 ---
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename src/mibew/libs/classes/{plugin.php => Mibew/Plugin.php} (98%)

diff --git a/src/mibew/libs/classes/Mibew/EventDispatcher.php b/src/mibew/libs/classes/Mibew/EventDispatcher.php
index 70038fd2..c58d167c 100644
--- a/src/mibew/libs/classes/Mibew/EventDispatcher.php
+++ b/src/mibew/libs/classes/Mibew/EventDispatcher.php
@@ -65,13 +65,13 @@ Class EventDispatcher {
 	 * All event listeners must receive one argument of array type by reference.
 	 *
 	 * @param string $event_name Event's name
-	 * @param Plugin $plugin Plugin object, that handles the event
+	 * @param \Mibew\Plugin $plugin Plugin object, that handles the event
 	 * @param string $listener Plugins method, that handles the event
 	 * @param int $priority Priority of listener. If $priority = null, the plugin weight will
 	 * use instead.
 	 * @return boolean true on success or false on failure.
 	 *
-	 * @see Plugin::getWeight()
+	 * @see \Mibew\Plugin::getWeight()
 	 */
 	public function attachListener($event_name, Plugin $plugin, $listener, $priority = null){
 		// Check method is callable
@@ -100,7 +100,7 @@ Class EventDispatcher {
 	 * Detach listener function from event
 	 *
 	 * @param string $event_name Event's name
-	 * @param Plugin $plugin Plugin object, that handles the event
+	 * @param \Mibew\Plugin $plugin Plugin object, that handles the event
 	 * @param string $listener Plugins method, that handles the event
 	 * @return boolean true on success or false on failure.
 	 */
diff --git a/src/mibew/libs/classes/plugin.php b/src/mibew/libs/classes/Mibew/Plugin.php
similarity index 98%
rename from src/mibew/libs/classes/plugin.php
rename to src/mibew/libs/classes/Mibew/Plugin.php
index c0a41cd6..dd412b6e 100644
--- a/src/mibew/libs/classes/plugin.php
+++ b/src/mibew/libs/classes/Mibew/Plugin.php
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+namespace Mibew;
+
 /**
  * Base plugin class
  */
diff --git a/src/mibew/libs/classes/Mibew/PluginManager.php b/src/mibew/libs/classes/Mibew/PluginManager.php
index 2c5629eb..5fa7bb9b 100644
--- a/src/mibew/libs/classes/Mibew/PluginManager.php
+++ b/src/mibew/libs/classes/Mibew/PluginManager.php
@@ -96,7 +96,7 @@ Class PluginManager {
 			// Build name of the plugin class
 			$plugin_name_parts = explode('_', $plugin_name);
 			$plugin_name_parts = array_map('ucfirst', $plugin_name_parts);
-			$plugin_classname = implode('', $plugin_name_parts) . "Plugin";
+			$plugin_classname = '\\Mibew\\Plugin\\' . implode('', $plugin_name_parts);
 
 			// Try to load plugin file
 			if (! (include_once $plugin_name."/".$plugin_name."_plugin.php")) {
@@ -111,10 +111,10 @@ Class PluginManager {
 				continue;
 			}
 			// Check if plugin extends abstract 'Plugin' class
-			if ('Plugin' != get_parent_class($plugin_classname)) {
+			if ('Mibew\\Plugin' != get_parent_class($plugin_classname)) {
 				trigger_error(
 					"Plugin class '{$plugin_classname}' does not extend " .
-					"abstract 'Plugin' class!",
+					"abstract '\\Mibew\\Plugin' class!",
 					E_USER_WARNING
 				);
 				continue;
diff --git a/src/mibew/libs/init.php b/src/mibew/libs/init.php
index c5878346..aade9aa6 100644
--- a/src/mibew/libs/init.php
+++ b/src/mibew/libs/init.php
@@ -36,9 +36,6 @@ require_once(MIBEW_FS_ROOT.'/libs/common/constants.php');
 require_once(MIBEW_FS_ROOT.'/libs/common/autoload.php');
 spl_autoload_register('class_autoload');
 
-// Include system classes
-require_once(MIBEW_FS_ROOT.'/libs/classes/plugin.php');
-
 // Include common libs
 require_once(MIBEW_FS_ROOT.'/libs/common/configurations.php');
 require_once(MIBEW_FS_ROOT.'/libs/common/csrf.php');