Did some tests with another project and made some changes as a result.

Author: tsetliff

template/app/autoload.php

@@ -3,14 +3,8 @@
  * @param $className
  */
 function webAppFramework($className) {
-    $parts = explode('\\', $className);
-    $nameSpaceRoot = array_shift($parts);
-    if ($nameSpaceRoot == 'TSetliff') {
-        $fileToLoad = 'framework/' . implode('/', $parts) . '.php';
-        require($fileToLoad);
-    }
-
     // This auto loader should go after any other vendor auto loaders so this is the end of the line
+    $parts = explode('\\', $className);
     require("src/" . implode('/', $parts) . '.php');
 }
 

template/app/framework/TSetliff/WebAppFramework/ControllerBase.php

@@ -1,12 +1,11 @@
 <?php
-namespace TSetliff\WebAppFramework;
-
 /**
- * Created by PhpStorm.
- * User: Tom
- * Date: 2/28/2016
- * Time: 2:36 AM
+ * To keep the Config class clean, the main functionality that is extended is stored in this class.
+ *
+ * Do not declare any configuration here
  */
+namespace TSetliff\WebAppFramework;
+
 class ConfigBase
 {
     public static $instance;

template/app/framework/TSetliff/WebAppFramework/Kernel.php

@@ -0,0 +1,20 @@
+<?php
+namespace TSetliff\WebAppFramework;
+
+class ControllerBase
+{
+    /**
+     * @var Request $request
+     */
+    protected $request;
+    /**
+     * @var Response $response
+     */
+    protected $response;
+
+    public function __construct(Request $request, Response $response)
+    {
+        $this->request = $request;
+        $this->response = $response;
+    }
+}

template/app/framework/TSetliff/WebAppFramework/PhpTemplateWrapper.php

@@ -1,8 +1,11 @@
 <?php
+/**
+ * To keep the Di class clean, the main functionality that is extended is stored in this class.
+ *
+ * Do not declare any dependencies here.
+ */
 namespace TSetliff\WebAppFramework;
 
-use Exception;
-
 class DiBase
 {
     private static $instance = null;
@@ -19,27 +22,26 @@ protected function __construct()
     // This is how to get the built in classes from the base object
     //
 
+    /**
+     * @return Request
+     */
     public function getRequest()
     {
-        return new Request();
-    }
-
-    public function getResponse()
-    {
-        return new Response();
+        return $this->getSingleton('Request', function() {
+            return new Request();
+        });
     }
 
     /**
-     * If you want to use twig or something you can override this and return that instead
-     *
-     * @return PhpTemplateWrapper
+     * @return Response
      */
-    public function getTemplateWrapper()
+    public function getResponse()
     {
-        return new PhpTemplateWrapper();
+        return $this->getSingleton('Response', function() {
+            return new Response();
+        });
     }
 
-
     //
     // Continue with more DI framework code
     //
@@ -73,8 +75,8 @@ protected function setSingleton($name, $value)
     /**
      * @param $name
      * @param $callback
+     *
      * @return mixed
-     * @throws Exception If unable to find singleton and no callback to create it.
      */
     protected function getSingleton($name, $callback)
     {

template/app/framework/TSetliff/WebAppFramework/Request.php

@@ -0,0 +1,71 @@
+<?php
+namespace TSetliff\WebAppFramework;
+
+class Kernel {
+    public function __construct()
+    {
+        // When using redirect in .htaccess instead of PATH_INFO the data is in REDIRECT_PATH_INFO
+        if (isset($_SERVER['REDIRECT_PATH_INFO']) && $_SERVER['REDIRECT_PATH_INFO']) {
+            $_SERVER['PATH_INFO'] = $_SERVER['REDIRECT_PATH_INFO'];
+        }
+    }
+
+    public function route()
+    {
+        if (!isset($_SERVER['PATH_INFO']) || !$_SERVER['PATH_INFO']) {
+            // Just call the default controller
+            $controllerClassName = PROJECT_NAMESPACE . '\\Controller\\DefaultController';
+            $controllerClass = new $controllerClassName(DiBase::instance()->getRequest(), DiBase::instance()->getResponse());
+            $controllerClass->homeAction();
+            return;
+        }
+
+        // Load Controller
+        $parts = explode('/', $_SERVER['PATH_INFO']);
+        // Get rid of empty stuff before first slash
+        if (isset($parts[0]) && !$parts[0]) {
+            array_shift($parts);
+        }
+        $controller = $parts[0];
+        // Get the request object
+        $request = DiBase::instance()->getRequest();
+
+        // Return error if controller does not exist
+        $nameSpaceAsDir = str_replace('\\', '/', PROJECT_NAMESPACE);
+        $controllerFileName = PROJECT_APP_DIR . "/src/$nameSpaceAsDir/Controller/{$controller}Controller.php";
+        if (!file_exists($controllerFileName)) {
+            $this->return404PageNotFound();
+        }
+        $controllerClassName = PROJECT_NAMESPACE . '\\Controller\\' . $controller . 'Controller';
+
+        /**
+         * @var ControllerBase $controllerClass
+         */
+        $controllerClass = new $controllerClassName(DiBase::instance()->getRequest(), DiBase::instance()->getResponse());
+
+        // Try non REST call
+        $action = $parts[1];
+        $actionName = $action . 'Action';
+        if (method_exists($controllerClass, $actionName)) {
+            return $controllerClass->$actionName();
+        }
+
+        // Try REST call
+        $restVerb = strtolower($_SERVER('REQUEST_METHOD'));
+        $actionName = $restVerb . 'Action';
+        if (method_exists($controllerClass, $actionName)) {
+            $restParameters = array_splice($parts, 2);
+            $request->setRestParameters($restParameters);
+            return $controller->$actionName();
+        }
+
+        //echo("Using $controller $action and $controllerClassName $actionName");
+        $this->return404PageNotFound();
+    }
+
+    protected function return404PageNotFound()
+    {
+        header("HTTP/1.0 404 Not Found");
+        die("404 Page not found");
+    }
+}

template/app/framework/TSetliff/WebAppFramework/TemplateWrapper.php

@@ -0,0 +1,41 @@
+<?php
+namespace TSetliff\WebAppFramework;
+
+class Request {
+    protected $restParameters = 0;
+
+    /**
+     * Returns data from the request object
+     *
+     * @param $name
+     * @return string
+     */
+    public function get($name)
+    {
+        if (!isset($_REQUEST[$name])) {
+            return null;
+        }
+        return $_REQUEST[$name];
+    }
+
+    public function getRestParameter($index)
+    {
+        return $this->restParameters[$index];
+    }
+
+    /**
+     * @return int
+     */
+    public function getRestParameters()
+    {
+        return $this->restParameters;
+    }
+
+    /**
+     * @param int $restParameters
+     */
+    public function setRestParameters($restParameters)
+    {
+        $this->restParameters = $restParameters;
+    }
+}