From c5318a2e99ece72483ed17f5bfb686b9cfbad187 Mon Sep 17 00:00:00 2001
From: Abel Hoogeveen <abel@techfuze.net>
Date: Wed, 29 Apr 2015 17:18:33 +0200
Subject: [PATCH] Added new namespaces as described in Issue #37. The following
 namespaces are used: \FuzeWorks for Core classes \Controller for controller
 classes \Model for model classes \Module for modules

Also did the following changes:
- DatabaseModel now loads the database module as a dependency
- DatabaseModel is no longer abstract because of ModelServer
- Implemented a new mechanism for model types in the name of a ModelServer. This interface requires a Model Type Server to return a Model parent class based on a given type
- Added a backtrace to the logger class for easy and fast debugging

And that was it for this commit
---
 .../Controller/controller.standard.php        |  3 +++
 Application/Models/model.example.php          |  3 +++
 Core/Events/event.controllerLoadEvent.php     |  2 ++
 Core/Events/event.layoutLoadEvent.php         |  2 ++
 Core/Events/event.modelLoadEvent.php          |  2 ++
 Core/Events/event.routerRouteEvent.php        |  2 ++
 Core/System/class.abstract.bus.php            |  2 ++
 Core/System/class.abstract.event.php          |  2 ++
 Core/System/class.abstract.eventPriority.php  |  2 ++
 Core/System/class.abstract.model.php          | 18 ++++++++++++----
 Core/System/class.abstract.module.php         |  2 ++
 Core/System/class.config.php                  |  3 +++
 Core/System/class.core.php                    | 10 ++++++++-
 Core/System/class.events.php                  |  9 +++++---
 Core/System/class.layout.php                  |  3 +++
 Core/System/class.logger.php                  | 21 +++++++++++++++++++
 Core/System/class.models.php                  |  4 +++-
 Modules/database/class.database.php           |  6 +++++-
 Modules/databasemodel/class.model.php         | 14 +++++++++++--
 Modules/databasemodel/moduleInfo.php          |  7 +++++--
 Modules/router/class.router.php               |  6 ++++--
 Modules/sections/class.sections.php           |  4 ++--
 Modules/sections/moduleInfo.php               |  2 ++
 index.php                                     |  2 +-
 24 files changed, 112 insertions(+), 19 deletions(-)

diff --git a/Application/Controller/controller.standard.php b/Application/Controller/controller.standard.php
index 644309c..a17d212 100644
--- a/Application/Controller/controller.standard.php
+++ b/Application/Controller/controller.standard.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace Controller;
+use \FuzeWorks\Bus;
+
 class Standard extends Bus {
 	public function __construct(&$core) {
 		parent::__construct($core);
diff --git a/Application/Models/model.example.php b/Application/Models/model.example.php
index a9ac8ad..3b40f0d 100644
--- a/Application/Models/model.example.php
+++ b/Application/Models/model.example.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace Model;
+use \FuzeWorks\Model;
+
 class Example extends Model{
 
     public function __construct(&$core){
diff --git a/Core/Events/event.controllerLoadEvent.php b/Core/Events/event.controllerLoadEvent.php
index 63d3553..11dc967 100644
--- a/Core/Events/event.controllerLoadEvent.php
+++ b/Core/Events/event.controllerLoadEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+use \FuzeWorks\Event;
+
 class ControllerLoadEvent extends Event {
 	
 	public $route;
diff --git a/Core/Events/event.layoutLoadEvent.php b/Core/Events/event.layoutLoadEvent.php
index 60fc338..04f2514 100644
--- a/Core/Events/event.layoutLoadEvent.php
+++ b/Core/Events/event.layoutLoadEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+use \FuzeWorks\Event;
+
 class LayoutLoadEvent extends Event {
 	
     public $directory;
diff --git a/Core/Events/event.modelLoadEvent.php b/Core/Events/event.modelLoadEvent.php
index 0c8f0ce..ef5c08a 100644
--- a/Core/Events/event.modelLoadEvent.php
+++ b/Core/Events/event.modelLoadEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+use \FuzeWorks\Event;
+
 class ModelLoadEvent extends Event {
 	
     public $directory;
diff --git a/Core/Events/event.routerRouteEvent.php b/Core/Events/event.routerRouteEvent.php
index ba4b34a..4441290 100644
--- a/Core/Events/event.routerRouteEvent.php
+++ b/Core/Events/event.routerRouteEvent.php
@@ -1,5 +1,7 @@
 <?php
 
+use \FuzeWorks\Event;
+
 class RouterRouteEvent extends Event {
 	
 	public $controller;
diff --git a/Core/System/class.abstract.bus.php b/Core/System/class.abstract.bus.php
index 58e6552..2be7358 100644
--- a/Core/System/class.abstract.bus.php
+++ b/Core/System/class.abstract.bus.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace FuzeWorks;
+
 abstract class Bus {
     protected $core;
     protected $mods;
diff --git a/Core/System/class.abstract.event.php b/Core/System/class.abstract.event.php
index f203e02..e119043 100644
--- a/Core/System/class.abstract.event.php
+++ b/Core/System/class.abstract.event.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace FuzeWorks;
+
 class Event {
 
 	private $cancelled = false;
diff --git a/Core/System/class.abstract.eventPriority.php b/Core/System/class.abstract.eventPriority.php
index cf70665..018adf2 100644
--- a/Core/System/class.abstract.eventPriority.php
+++ b/Core/System/class.abstract.eventPriority.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace FuzeWorks;
+
 /**
  * Class EventPriority
  *
diff --git a/Core/System/class.abstract.model.php b/Core/System/class.abstract.model.php
index 6630c79..1cc1a24 100644
--- a/Core/System/class.abstract.model.php
+++ b/Core/System/class.abstract.model.php
@@ -1,5 +1,15 @@
 <?php
 
+namespace FuzeWorks;
+
+/**
+ * Interface for a Module that gives abstract model types
+ * A model server must contain the methods from this interface in order to correctly serve models
+ */
+interface ModelServer {
+	public function giveModel($type);
+}
+
 /**
  * Abstract class Model
  * 
@@ -28,11 +38,11 @@ abstract class Model extends Bus{
 	 * Set the type of this model. Eg, use techfuze/databasemodel and Databasemodel to get a SQL connected model
 	 * @access protected
 	 * @param String Module_name, the name of the module where the model can be found
-	 * @param String class name, the class to load and connect to
+	 * @param String Model_type, model type to return
 	 */
-	protected function setType($module_name, $class_name) {
-		$this->core->loadMod($module_name);
-		$this->parentClass = new $class_name($this->core);
+	protected function setType($module_name, $model_type) {
+		$mod = $this->core->loadMod($module_name);
+		$this->parentClass = $mod->giveModel($model_type);
 	}
 
 	/**
diff --git a/Core/System/class.abstract.module.php b/Core/System/class.abstract.module.php
index 0003a7c..fa1550c 100644
--- a/Core/System/class.abstract.module.php
+++ b/Core/System/class.abstract.module.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace FuzeWorks;
+
 /**
  * Class Module
  *
diff --git a/Core/System/class.config.php b/Core/System/class.config.php
index ec58af7..540285b 100644
--- a/Core/System/class.config.php
+++ b/Core/System/class.config.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace FuzeWorks;
+use \Exception;
+
 /**
  * Config Module
  * 
diff --git a/Core/System/class.core.php b/Core/System/class.core.php
index 8a59b87..be4bff2 100644
--- a/Core/System/class.core.php
+++ b/Core/System/class.core.php
@@ -1,5 +1,9 @@
 <?php
 
+namespace FuzeWorks;
+use \stdClass;
+use \Exception;
+
 if (!defined('FUZESYSPATH')) {
 	define('STARTTIME', microtime(true));
 	define( 'FUZESYSPATH', dirname(__FILE__) . '/' ); 
@@ -131,11 +135,15 @@ class Core {
 						$CLASS->setModulePath($cfg->directory);
 					}
 					if (method_exists($CLASS, 'setModuleLinkName')) {
-						$CLASS->setModuleLinkName($cfg->name);
+						$CLASS->setModuleLinkName(strtolower($cfg->module_name));
 					}
 					if (method_exists($CLASS, 'setModuleName')) {
 						$CLASS->setModuleName($name);
 					}
+
+					if (!method_exists($CLASS, 'onLoad')) {
+						throw new Exception("Module '".$name."' does not have an onLoad() method! Invalid module", 1);
+					}
 					$CLASS->onLoad();
 
 					// Add to the loaded modules
diff --git a/Core/System/class.events.php b/Core/System/class.events.php
index e3a98be..53bd4ba 100644
--- a/Core/System/class.events.php
+++ b/Core/System/class.events.php
@@ -3,7 +3,10 @@
  * @author FuzeNetwork
  * @package files
 */
- 
+
+namespace FuzeWorks;
+use \Exception;
+
 /** 
  * @name Events
 */
@@ -84,10 +87,10 @@ class Events extends Bus{
 	                // No event arguments? Looks like an notify-event
 	                if(func_num_args() == 1){
 	                    // Load notify-event-class
-	                    $eventClass = 'NotifierEvent';
+	                    $eventClass = '\FuzeWorks\NotifierEvent';
 	                }else{
 	                    // No notify-event: we tried all we could
-	                    throw new \Exception("Event ".$eventName." could not be found!");
+	                    throw new Exception("Event ".$eventName." could not be found!");
 	                }
 	            }
 	        }
diff --git a/Core/System/class.layout.php b/Core/System/class.layout.php
index f6aeb89..0539d6e 100644
--- a/Core/System/class.layout.php
+++ b/Core/System/class.layout.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace FuzeWorks;
+use \Exception;
+
 class Layout extends Bus {
 	
 	private $Smarty = array();
diff --git a/Core/System/class.logger.php b/Core/System/class.logger.php
index 4839074..0feb59f 100644
--- a/Core/System/class.logger.php
+++ b/Core/System/class.logger.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace FuzeWorks;
+use \Exception;
+
 class Logger extends Bus{
 
  	public $infoErrors = array();
@@ -113,6 +116,24 @@ class Logger extends Bus{
         }
  	}
 
+ 	public function backtrace() {
+	    $e = new Exception();
+	    $trace = explode("\n", $e->getTraceAsString());
+	    // reverse array to make steps line up chronologically
+	    $trace = array_reverse($trace);
+	    array_shift($trace); // remove {main}
+	    array_pop($trace); // remove call to this method
+	    $length = count($trace);
+	    $result = array();
+	    
+	    for ($i = 0; $i < $length; $i++)
+	    {
+	        $result[] = ($i + 1)  . ')' . substr($trace[$i], strpos($trace[$i], ' ')); // replace '#someNum' with '$i)', set the right ordering
+	    }
+	    
+	    return "\t" . implode("<br/>", $result);
+ 	}
+
  	/* =========================================LOGGING METHODS==============================================================*/
 
  	
diff --git a/Core/System/class.models.php b/Core/System/class.models.php
index 1e4b574..0386e00 100644
--- a/Core/System/class.models.php
+++ b/Core/System/class.models.php
@@ -3,6 +3,8 @@
  * @author FuzeNetwork
  */
 
+namespace FuzeWorks;
+
 class Models extends Bus{
 	
     private $models_array = array();
@@ -25,7 +27,7 @@ class Models extends Bus{
             $this->models_array[$name] = $this->model_types[$name];
         } elseif (file_exists($file)){
             require_once($file);
-            $model = ucfirst($name);
+            $model = "\Model\\" . ucfirst($name);
             $this->logger->logInfo('Loading Model: '.$model, $model);
             $this->models_array[$name] = new $model($this->core);
         } else{
diff --git a/Modules/database/class.database.php b/Modules/database/class.database.php
index c7cacd3..5e077a3 100644
--- a/Modules/database/class.database.php
+++ b/Modules/database/class.database.php
@@ -1,6 +1,10 @@
 <?php
 
-class Database extends Bus {
+use \FuzeWorks\Module;
+use \Exception;
+use \PDO;
+
+class Database extends Module {
 
 	private $DBH;
 	public $prefix;
diff --git a/Modules/databasemodel/class.model.php b/Modules/databasemodel/class.model.php
index 06dd053..90d72a5 100644
--- a/Modules/databasemodel/class.model.php
+++ b/Modules/databasemodel/class.model.php
@@ -1,6 +1,11 @@
 <?php
 
-class DatabaseModel extends Bus{
+namespace Module;
+use \FuzeWorks\Module;
+use \FuzeWorks\ModelServer;
+use \Exception;
+
+class DatabaseModel extends Module implements ModelServer {
 
     public $fields  = array();
 	public $primary = 'id';
@@ -8,7 +13,12 @@ class DatabaseModel extends Bus{
 
     public function __construct(&$core){
         parent::__construct($core);
-        $this->core->loadMod('database');
+    }
+
+    public function onLoad() {}
+
+    public function giveModel($type) {
+    	return new DatabaseModel($this->core);
     }
 
     public function select(){
diff --git a/Modules/databasemodel/moduleInfo.php b/Modules/databasemodel/moduleInfo.php
index aafc5dc..f4c85d6 100644
--- a/Modules/databasemodel/moduleInfo.php
+++ b/Modules/databasemodel/moduleInfo.php
@@ -1,11 +1,12 @@
 <?php
 return array(
 
-    'module_class'    => 'DatabaseModel',
+    'module_class'    => 'Module\DatabaseModel',
     'module_file'     => 'class.model.php',
     'module_name'     => 'databasemodel',
 
-    'abstract'      => true,
+    'abstract'      => false,
+    'dependencies'  => array('database'),
 
     'name'          => 'DatabaseModel',
     'description'   => 'Abstract type for easy database queries',
@@ -15,4 +16,6 @@ return array(
 
     'date_created'  => '26-02-2015',
     'date_updated'  => '26-02-2015',
+
+    'enabled'       => true,
 );
diff --git a/Modules/router/class.router.php b/Modules/router/class.router.php
index e7208d5..bf5e37d 100644
--- a/Modules/router/class.router.php
+++ b/Modules/router/class.router.php
@@ -1,6 +1,8 @@
 <?php
 
-class Router extends Bus {
+use \FuzeWorks\Module;
+
+class Router extends Module {
 
 	public $controller = null;
 	public $controllerName = null;
@@ -120,7 +122,7 @@ class Router extends Bus {
 			if (!class_exists(ucfirst($this->controllerName)))
 				require_once($file);
 
-			$this->controllerClass = ucfirst($this->controllerName);
+			$this->controllerClass = "\Controller\\" . ucfirst($this->controllerName);
 			$this->controller = new $this->controllerClass($this->core);
 
 			if (method_exists($this->controller, $this->function) || method_exists($this->controller, '__call')) {
diff --git a/Modules/sections/class.sections.php b/Modules/sections/class.sections.php
index 9be87b5..d5f99a1 100644
--- a/Modules/sections/class.sections.php
+++ b/Modules/sections/class.sections.php
@@ -1,8 +1,8 @@
 <?php
 
 namespace Module\Sections;
-use \Module;
-use \EventPriority;
+use \FuzeWorks\Module;
+use \FuzeWorks\EventPriority;
 
 /**
  * Sections module, see usage documentation
diff --git a/Modules/sections/moduleInfo.php b/Modules/sections/moduleInfo.php
index 51d6bb1..2441594 100644
--- a/Modules/sections/moduleInfo.php
+++ b/Modules/sections/moduleInfo.php
@@ -17,4 +17,6 @@ return array(
 
     'date_created'  => '29-04-2015',
     'date_updated'  => '29-04-2015',
+
+    'enabled'       => true,
 );
diff --git a/index.php b/index.php
index 5d28680..a6c445f 100644
--- a/index.php
+++ b/index.php
@@ -7,7 +7,7 @@ if (!defined('FUZEPATH')) {
 require_once( dirname(__FILE__) . "/Core/System/class.core.php");
 
 // Load it
-$core = new Core();
+$core = new \FuzeWorks\Core();
 $core->init();
 $core->loadMod('router');
 $core->mods->router->setPath( (isset($_GET['path']) ? $_GET['path'] : null)   );