Merge branch 'develop' into feature/controllers

Author: tomodutch

core/exceptions/file_not_found.php

@@ -0,0 +1,9 @@
+<?php
+namespace Core\Exceptions;
+
+class FileNotFound extends \Exception {
+    public $message;
+    public function __construct($file) {
+        $this->message = "File: $file not found";
+    }
+}

core/loader.php

@@ -17,4 +17,16 @@ public function model($model_name) {
 
         return new $model_name();
     }
+
+    public function view($view_file, array $params=[]) {
+        $path_to_view = ENVIRONMENT_VIEWS . "$view_file";
+        if (!file_exists($path_to_view)) {
+            throw new \Core\Exceptions\FileNotFound($path_to_view);
+        }
+
+        ob_start();
+        extract($params);
+        include($path_to_view);
+        return ob_get_clean();
+    }
 }

core/views/template.php

@@ -0,0 +1,5 @@
+<?php
+
+class Template {
+
+}

index.php

@@ -5,6 +5,7 @@
 require_once('core/exceptions/method_not_found.php');
 require_once('core/exceptions/method_not_callable.php');
 require_once('core/exceptions/no_abstraction_of_base.php');
+require_once('core/exceptions/file_not_found.php');
 require_once('core/Parser.php');
 require_once('core/loader.php');
 require_once('core/input.php');
@@ -14,6 +15,7 @@
 // TODO: set ENVIRONMENT constants to either admin or 'frontend'
 define('ENVIRONMENT', 'not yet impleneted');
 define('ENVIRONMENT_CONTROLLERS', 'controllers/');
+define('ENVIRONMENT_VIEWS', 'views/');
 
 //TODO: Add configurable default controller
 $controller = isset($_GET['controller']) ? $_GET['controller'] : 'Welcome';

tests/Test.php

@@ -5,13 +5,17 @@
 require_once('core/exceptions/method_not_found.php');
 require_once('core/exceptions/method_not_callable.php');
 require_once('core/exceptions/no_abstraction_of_base.php');
+require_once('core/exceptions/file_not_found.php');
 require_once('core/Parser.php');
 require_once('core/loader.php');
 require_once('core/Input.php');
+require_once('core/views/template.php');
 
 define('ENVIRONMENT', 'test');
 define('ENVIRONMENT_CONTROLLERS', 'tests/controllers/');
 define('ENVIRONMENT_MODELS', 'tests/models/');
+define('ENVIRONMENT_VIEWS', 'tests/views/');
+
 foreach (glob('tests/*.php') as $file) {
     $filename = pathinfo($file, PATHINFO_FILENAME);
     if ($filename == pathinfo(__file__, PATHINFO_FILENAME)) {

tests/exceptions.php

@@ -3,6 +3,7 @@
 use \Core\Exceptions\MethodNotFound as MethodNotFound;
 use \Core\Exceptions\MethodNotCallable as MethodNotCallable;
 use \Core\Exceptions\NoAbstractionOfBase as NoAbstractionOfBase;
+use \Core\Exceptions\FileNotFound as FileNotFound;
 
 class ExceptionsTest extends PHPUnit_Framework_TestCase {
     public function test_class_not_found() {
@@ -25,4 +26,9 @@ public function test_no_abstraction_of_base() {
         $this->assertEquals($exception->message, 'MyController is no abstraction of base.');
     }
 
+    public function test_file_not_found() {
+        $exception = new FileNotFound('view.php');
+        $this->assertEquals($exception->message, 'File: view.php not found');
+    }
+
 }

tests/loader.php

@@ -28,4 +28,58 @@ public function test_duplicate_models() {
         $first_model->a_very_random_value = 1337;
         $this->assertFalse(isset($second_model->a_very_random_value));
     }
+
+    public function test_load_view() {
+        $loader = new Loader();
+        $view_content = file_get_contents('tests/views/myview.php');
+        $this->assertSame($view_content, $loader->view('myview.php'));
+    }
+
+    public function test_view_doesnt_exists() {
+        $this->setExpectedException('Core\Exceptions\FileNotFound');
+        $loader = new Loader();
+        $loader->view('nonExisting.adadawdakdawd');
+    }
+
+    public function test_view_passing_values() {
+        $loader = new Loader();
+        $view_content = $loader->view('multiply.php', ['two' => 2, 'three' => 3]);
+        $this->assertEquals($view_content, 6);
+    }
+
+    public function test_view_pass_object() {
+        $my_object = new DummyClass();
+        $loader = new Loader();
+        $view_content = $loader->view('object.php', ['object' => $my_object]);
+        $this->assertEquals($view_content, 10);
+    }
+
+    public function test_view_pass_function() {
+        $function = function($a, $b) {
+            return $a + $b;
+        };
+
+        $loader = new Loader();
+        $view_content = $loader->view('function.php', ['function' => $function]);
+        $this->assertEquals($view_content, 2);
+    }
+
+    public function test_view_html() {
+        $loader = new Loader();
+        $view_content = '<!DOCTYPE html><html><head></head><body>hai</body></html>';
+
+        $this->assertEquals($loader->view('normal.html'), $view_content);
+    }
+
+    public function test_view_html_with_params() {
+        $loader = new Loader();
+        $view_content = '<!DOCTYPE html><html><head></head><body>1</body></html>';
+        $this->assertEquals($loader->view('withphp.html', ['i' => 1]), $view_content);
+    }
 }
+
+class DummyClass {
+    public function sum(array $numbers) {
+        return array_sum($numbers);
+    }
+}

tests/views/function.php

@@ -0,0 +1,2 @@
+<?php
+echo $function(1, 1);

tests/views/multiply.php

@@ -0,0 +1,3 @@
+<?php
+    echo $two * $three;
+?>

tests/views/myview.php

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>haiya</title>
+</head>
+<body>
+    content
+</body>
+</html>

tests/views/normal.html

@@ -0,0 +1 @@
+<!DOCTYPE html><html><head></head><body>hai</body></html>

tests/views/object.php

@@ -0,0 +1,3 @@
+<?php
+    echo $object->sum([1, 2, 3, 4]);
+?>

tests/views/withphp.html

@@ -0,0 +1 @@
+<!DOCTYPE html><html><head></head><body><?=$i?></body></html>