Merge pull request #727 from LuckyCyborg/master

Split the Core\Error Controller part to App\Controllers\Error

app/Controllers/Demo.php

@@ -11,7 +11,6 @@
 */
 class Demo extends Controller
 {
-
     /**
      * Call the parent construct
      */

app/Controllers/Error.php

@@ -0,0 +1,34 @@
+<?php
+namespace App\Controllers;
+
+use Core\Controller;
+use Core\View;
+
+/**
+ * Error controller to generate 404 pages.
+ */
+class Error extends Controller
+{
+    /**
+     * Call the parent construct.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Load a 404 page with the Error message.
+     */
+    public function index($error)
+    {
+        $data['title'] = '404';
+        $data['error'] = $error;
+
+        View::addHeader("HTTP/1.0 404 Not Found");
+
+        View::renderTemplate('header', $data);
+        View::render('Error/404', $data);
+        View::renderTemplate('footer', $data);
+    }
+}

app/Controllers/Language.php

@@ -1,14 +1,26 @@
 <?php
 namespace App\Controllers;
 
+use Core\Controller;
 use Core\Language as CoreLanguage;
 use Helpers\Url;
 use Helpers\Cookie;
 use Helpers\Session;
 
 
-class Language
+class Language extends Controller
 {
+    /**
+     * Call the parent construct.
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Change the Framework Language.
+     */
     public function change($language)
     {
         // Only set language if it's in the Languages array

app/Routes.php

@@ -6,10 +6,10 @@
  * @version 3.0
  */
 
-/** Create alias for Router. */
 use Core\Router;
 use Helpers\Hooks;
 
+
 /** Define static routes. */
 
 // Default Routing
@@ -19,12 +19,13 @@
 
 // The Framework's Language Changer.
 Router::any('language/(:any)', 'App\Controllers\Language@change');
-/** End default routes */
+/** End default Routes */
 
-/** Module routes. */
+/** Module Routes. */
 $hooks = Hooks::get();
+
 $hooks->run('routes');
-/** End Module routes. */
+/** End Module Routes. */
 
-/** If no route found. */
-Router::error('Core\Error@index');
+/** If no Route found. */
+Router::error('App\Controllers\Error@index');

app/Views/Error/404.php

@@ -1,15 +1,10 @@
-<?php
-
-use Core\Error;
-
-?>
 <div class="container content">
 	<div class="row">
 		<div class="col-md-12">
 
 			<h1>404</h1>
 
-			<?php echo $data['error'];?>
+			<?= $error; ?>
 
 			<hr />
 

system/Core/Error.php

@@ -1,54 +1,18 @@
 <?php
 /**
- * Error class - calls a 404 page.
+ * Error class.
  *
  * @author David Carr - [email protected]
  * @version 3.0
  */
 
 namespace Core;
 
-use Core\Controller;
-use Core\View;
-
 /**
- * Error class to generate 404 pages.
+ * Error class.
  */
-class Error extends Controller
+class Error
 {
-    /**
-     * $error holder.
-     *
-     * @var string
-     */
-    private $error = null;
-
-    /**
-     * Save error to $this->error.
-     *
-     * @param string $error
-     */
-    public function __construct($error = null)
-    {
-        parent::__construct();
-        $this->error = $error;
-    }
-
-    /**
-     * Load a 404 page with the error message.
-     */
-    public function index($error = null)
-    {
-        header("HTTP/1.0 404 Not Found");
-
-        $data['title'] = '404';
-        $data['error'] = $error ? $error : $this->error;
-
-        View::renderTemplate('header', $data);
-        View::render('Error/404', $data);
-        View::renderTemplate('footer', $data);
-    }
-
     /**
      * Display errors.
      *

system/Core/Router.php

@@ -46,7 +46,7 @@ class Router
      *
      * @var null $errorCallback
      */
-    private $errorCallback = '\Core\Error@index';
+    private $errorCallback = '\App\Controllers\Error@index';
 
 
     /**