From 72b003da6d48602c1a2dc4603e04c13aa1f72dfd Mon Sep 17 00:00:00 2001
From: Fariz Luqman <farizluqman@simplelinux.my>
Date: Thu, 16 Feb 2017 02:51:05 +0800
Subject: [PATCH 01/34] Use nightly builds for php-core package

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index bbfb907..7048584 100755
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
     "require": {
     	"php": ">=5.4.0",
     	"filp/whoops": "^2.1",
-        "stupidlysimple/php-core": "0.4.*",
+        "stupidlysimple/php-core": "dev-nightly",
     	"symfony/var-dumper": "^3.1",
     	"phpFastCache/phpFastCache": "^4.3",
     	"illuminate/database": "5.2.*",

From 80a546b5b06c0b1d8bbba825cadddbe049b738c3 Mon Sep 17 00:00:00 2001
From: Fariz Luqman <farizluqman@simplelinux.my>
Date: Thu, 16 Feb 2017 02:59:36 +0800
Subject: [PATCH 02/34] Update composer.lock

---
 composer.lock | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/composer.lock b/composer.lock
index 5e5f048..7728b08 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "58c3c1c9d434587c91e97c4ee3f8414f",
+    "content-hash": "9a8bcbb5a80f058cbb66ecc17eca28a0",
     "packages": [
         {
             "name": "cartalyst/sentry",
@@ -611,16 +611,16 @@
         },
         {
             "name": "stupidlysimple/php-core",
-            "version": "0.4.0",
+            "version": "dev-nightly",
             "source": {
                 "type": "git",
                 "url": "https://github.com/stupidlysimple/php-core.git",
-                "reference": "275c09f97aa88cbbfa7cd8033668f00609702f74"
+                "reference": "7017cafb57143f678ba53cae341b69165a4000de"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/stupidlysimple/php-core/zipball/275c09f97aa88cbbfa7cd8033668f00609702f74",
-                "reference": "275c09f97aa88cbbfa7cd8033668f00609702f74",
+                "url": "https://api.github.com/repos/stupidlysimple/php-core/zipball/7017cafb57143f678ba53cae341b69165a4000de",
+                "reference": "7017cafb57143f678ba53cae341b69165a4000de",
                 "shasum": ""
             },
             "require": {
@@ -653,7 +653,7 @@
                 "php framework",
                 "stupidly simple"
             ],
-            "time": "2017-02-15T17:05:53+00:00"
+            "time": "2017-02-15 18:06:17"
         },
         {
             "name": "symfony/polyfill-mbstring",
@@ -2150,7 +2150,9 @@
     ],
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {
+        "stupidlysimple/php-core": 20
+    },
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {

From bad97b682915e947c79d1bf694dbe613c946a5bf Mon Sep 17 00:00:00 2001
From: Fariz Luqman <farizluqman@simplelinux.my>
Date: Thu, 16 Feb 2017 03:05:32 +0800
Subject: [PATCH 03/34] Introducing Storage

---
 resources/storage/cache/index.php  | 2 ++
 resources/storage/upload/index.php | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 resources/storage/cache/index.php
 create mode 100644 resources/storage/upload/index.php

diff --git a/resources/storage/cache/index.php b/resources/storage/cache/index.php
new file mode 100644
index 0000000..aa21832
--- /dev/null
+++ b/resources/storage/cache/index.php
@@ -0,0 +1,2 @@
+<?php
+// Show nothing
\ No newline at end of file
diff --git a/resources/storage/upload/index.php b/resources/storage/upload/index.php
new file mode 100644
index 0000000..aa21832
--- /dev/null
+++ b/resources/storage/upload/index.php
@@ -0,0 +1,2 @@
+<?php
+// Show nothing
\ No newline at end of file

From 7baecdc1b7e4a92ef48660dae88cd87de1edae00 Mon Sep 17 00:00:00 2001
From: Fariz Luqman <farizluqman@simplelinux.my>
Date: Thu, 16 Feb 2017 03:07:49 +0800
Subject: [PATCH 04/34] Storage config file

---
 config/storage.php | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 config/storage.php

diff --git a/config/storage.php b/config/storage.php
new file mode 100644
index 0000000..5a07475
--- /dev/null
+++ b/config/storage.php
@@ -0,0 +1,5 @@
+<?php
+// storage configurations, nothing here yet
+return [
+
+];
\ No newline at end of file

From 79418d734191e1719f6c285b51a297a26f75d5ad Mon Sep 17 00:00:00 2001
From: Fariz Luqman <farizluqman@simplelinux.my>
Date: Thu, 16 Feb 2017 03:24:28 +0800
Subject: [PATCH 05/34] Remove para under nightly build

---
 README.md                          | 2 --
 resources/views/layouts/footer.php | 8 ++++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 709b3e7..0f7ad9e 100755
--- a/README.md
+++ b/README.md
@@ -92,8 +92,6 @@ Introducing nightly builds: we are really committed to project that we decided t
 
 Nightly builds are released more often than the stable build. Eventually a nightly build will be converted to stable.
 
-Developers are very recommended to create pull request under the nightly branch.
-
 [Get nightly builds](https://github.com/stupidlysimple/php/wiki/Nightly-Builds)
 
 [[back to top]](#table-of-contents)
diff --git a/resources/views/layouts/footer.php b/resources/views/layouts/footer.php
index b0e537a..cfe0bab 100644
--- a/resources/views/layouts/footer.php
+++ b/resources/views/layouts/footer.php
@@ -1,5 +1,5 @@
 <!-- Footer -->
-<footer id="footer">
+<footer id="footer" style="background: #383838; color: #fff;">
     <div class="inner">
         <section>
             <h2>About</h2>
@@ -9,12 +9,12 @@
         <section>
             <h2>Follow</h2>
             <ul class="icons">
-                <li><a href="https://www.facebook.com/stupidlysimpleforum" class="icon style2 fa-facebook"><span class="label">Facebook</span></a></li>
+                <li><a href="https://www.facebook.com/stupidlysimpleframework" class="icon style2 fa-facebook"><span class="label">Facebook</span></a></li>
                 <li><a href="https://github.com/stupidlysimple/php" class="icon style2 fa-github"><span class="label">Github</span></a></li>
             </ul>
         </section>
-        <ul class="copyright">
-            <li>Powered by StupidlySimple PHP</li>
+        <ul class="copyright" style="color: #bababa">
+            <li>Powered by StupidlySimple PHP - Nightly build</li>
             <li>Design: <a target="_blank" href="http://html5up.net">HTML5 UP</a></li>
         </ul>
     </div>

From 5e0035fb32b056800cd2156989d32e183c6fe90a Mon Sep 17 00:00:00 2001
From: Fariz Luqman <farizluqman@simplelinux.my>
Date: Thu, 16 Feb 2017 03:41:28 +0800
Subject: [PATCH 06/34] Added #second section

- for example apps
---
 resources/assets/css/main.css | 16 ++++++++
 resources/views/home.php      | 71 +++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)

diff --git a/resources/assets/css/main.css b/resources/assets/css/main.css
index b3f589f..8add9a4 100644
--- a/resources/assets/css/main.css
+++ b/resources/assets/css/main.css
@@ -2610,6 +2610,10 @@
 			margin: 2.5em 0 0 2.5em;
 		}
 
+		.tiles-smaller article {
+			width: calc(25% - 2.5em);
+		}
+
 			.tiles article > .image {
 				-moz-transition: -moz-transform 0.5s ease;
 				-webkit-transition: -webkit-transform 0.5s ease;
@@ -3179,6 +3183,18 @@
 
 		}
 
+	#second {
+		padding: 0em 0 6em 0 ;
+	}
+
+	@media screen and (max-width: 736px) {
+
+		#second {
+			padding: 0em 0 4em 0 ;
+		}
+
+	}
+
 /* Footer */
 
 	#footer {
diff --git a/resources/views/home.php b/resources/views/home.php
index d967c72..50be193 100644
--- a/resources/views/home.php
+++ b/resources/views/home.php
@@ -87,6 +87,77 @@
         </div>
     </div>
 
+    <!-- Second -->
+    <div id="second">
+        <div class="inner">
+            <header>
+                <h2>Example Applications.</h2>
+                <p>This is your very fresh homepage. All template files are located in <code>/resources/views</code>
+                    from the root directory. You can read tutorials and documentations on <a target="_blank" href="https://stupidlysimple.github.io">our website</a>
+                    or even from here.
+                    Start coding today and get creative.</p>
+            </header>
+            <section class="tiles tiles-smaller">
+                <article class="style1">
+                    <span class="image">
+                        <img src="resources/assets/images/pic1.jpg" alt=""/>
+                    </span>
+                    <a href="routing">
+                        <h2>Routing</h2>
+                        <div class="content">
+                            <p>Back in the days, we all used to route the web directly to our .html or .php files.
+                                Nowadays on MVC frameworks, we do it quite differently.</p>
+                        </div>
+                    </a>
+                </article>
+                <article class="style2">
+                    <span class="image">
+                        <img src="resources/assets/images/pic2.jpg" alt=""/>
+                    </span>
+                    <a href="controller">
+                        <h2>Controllers</h2>
+                        <div class="content">
+                            <p>See how controller works in the Framework.</p>
+                        </div>
+                    </a>
+                </article>
+                <article class="style3">
+                    <span class="image">
+                        <img src="resources/assets/images/pic3.jpg" alt=""/>
+                    </span>
+                    <a href="service">
+                        <h2>Services</h2>
+                        <div class="content">
+                            <p>See how service works in StupidlySimple Framework.</p>
+                        </div>
+                    </a>
+                </article>
+                <article class="style4">
+                    <span class="image">
+                        <img src="resources/assets/images/pic4.jpg" alt=""/>
+                    </span>
+                    <a href="model">
+                        <h2>Models</h2>
+                        <div class="content">
+                            <p>Provides easy access to your data. Models are powered by <code>Eloquent ORM</code></p>
+                        </div>
+                    </a>
+                </article>
+                <article class="">
+                    <span class="image">
+                        <img src="resources/assets/images/pic6.jpg" alt=""/>
+                    </span>
+                    <a href="https://stupidlysimple.github.io">
+                        <h2>And More!</h2>
+                        <div class="content">
+                            <p>More documentations are available on <code>stupidlysimple.github.io</code></p>
+                        </div>
+                    </a>
+                </article>
+            </section>
+        </div>
+    </div>
+
 <?php Viewer::file('layouts/footer.php') ?>
 
 </div>

From 4794892f8d8c784eaea7232969ddad678e807a49 Mon Sep 17 00:00:00 2001
From: Fariz Luqman <farizluqman@simplelinux.my>
Date: Thu, 16 Feb 2017 05:43:41 +0800
Subject: [PATCH 07/34] Add to main.css for styling the exec time

---
 .gitignore                    | 2 ++
 resources/assets/css/main.css | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c41c91b..20d7e5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 vendor/*
 .idea/*
+
+.zedstate
diff --git a/resources/assets/css/main.css b/resources/assets/css/main.css
index 8add9a4..7009373 100644
--- a/resources/assets/css/main.css
+++ b/resources/assets/css/main.css
@@ -3359,4 +3359,11 @@
 				padding: 0 1.25em;
 			}
 
-		}
\ No newline at end of file
+		}
+
+.ss_exec_time {
+	background: #383838;
+	width: 100%;
+	text-align: center;
+	color: #fff;
+}
\ No newline at end of file

From 8d520a89bb44c613b1b554cc9aff13af3d2d5313 Mon Sep 17 00:00:00 2001
From: Fariz Luqman <farizluqman@simplelinux.my>
Date: Thu, 16 Feb 2017 05:57:34 +0800
Subject: [PATCH 08/34] Directory structures, nightly footer class

---
 resources/assets/css/main.css      |   9 ++++
 resources/assets/images/pic5.jpg   | Bin 9897 -> 9930 bytes
 resources/views/home.php           |  71 +++++++----------------------
 resources/views/layouts/footer.php |   4 +-
 4 files changed, 28 insertions(+), 56 deletions(-)

diff --git a/resources/assets/css/main.css b/resources/assets/css/main.css
index 7009373..823ad6a 100644
--- a/resources/assets/css/main.css
+++ b/resources/assets/css/main.css
@@ -3366,4 +3366,13 @@
 	width: 100%;
 	text-align: center;
 	color: #fff;
+}
+
+.nightly {
+	background: #383838 !important;
+	color: #fff;
+}
+
+.nightly .copyright {
+	color: #bababa !important;
 }
\ No newline at end of file
diff --git a/resources/assets/images/pic5.jpg b/resources/assets/images/pic5.jpg
index e9543ec94d1f75921ad820d046129d16589089ed..75a794dc9477a008f8499db4487e34a79f6e9d7f 100644
GIT binary patch
delta 599
zcmZ4Kd&+mh8*W201p`wnQ!^_A!;Rl>GO=CqRGDVHZt^>RCEg{IJXP)gU%(K#h#_(b
zL*z1s$Q2Bcs|XQph+Q}TzvbC5S(a6DvK_0@<N#KI$px&!0?+E+%(7Dd-V^@(|AJ5A
zyD~OUW=&%jVE)7a0$dCX|G{AMXO7)0j4Yei^O_BmFId68*sLSS%B*6XWSpF2k!GQ5
zW}axSYhq@erVHd*>KYrTS(+xNnF57VCWnd?Dp(qrS-M!d8n~IdIy$;q7`ho68aY~;
z8#@{pnHX7^T1<W>QVxuz5Lhft&Ja~X=5L-Vn#AZzjCD#1#U-v~C06Absd=_aMh1rF
zx&}tNNJekA5%1+zk7r<H1P3jGU}eM<n*3hLm3fJB_-03CS?0+F3OtPVljGIA0GHa%
A^8f$<

delta 517
zcmX@*yV7^U8*T$*1tViC6EiDgqmAEhGBIAC>?j~RSx$hL^*_V^3n;vcD7;H3yvr!O
zD=56Ha2^NH%$xt;@=Tg6%PPreKiQtuM_@wc%?Dp!t!w-!w6b`Ciblld*{o^Io5eY|
zvM@4lKFe!HV<$2FXV~l|$jYpeXpmxNZfInpn`~}sscT|xl&EWwW@)6GoRn&iYLuE}
zmS$i!xmcu7!Pv;q&B@Wt)xf~e)ZEn3(b>t($-vUo$kfTj$;r&ca59T%IWSm5V8J@M
zO;ib)zj?E05~C|I)+s3zm$;UdSe0j_=GiJ485o-D8W`y!8NE45yq8-oj)9Sp0Tr-f
bh%ij%Q+8!sw>eQ+j(Ku}0yiU&RPzD=u-ct~

diff --git a/resources/views/home.php b/resources/views/home.php
index 50be193..ea33edc 100644
--- a/resources/views/home.php
+++ b/resources/views/home.php
@@ -72,6 +72,17 @@
                         </div>
                     </a>
                 </article>
+                <article class="">
+                    <span class="image">
+                        <img src="resources/assets/images/pic5.jpg" alt=""/>
+                    </span>
+                    <a href="directory_structure">
+                        <h2>Directory Structure</h2>
+                        <div class="content">
+                            <p>See the directory structure of the StupidlySimple PHP framework</p>
+                        </div>
+                    </a>
+                </article>
                 <article class="">
                     <span class="image">
                         <img src="resources/assets/images/pic6.jpg" alt=""/>
@@ -91,66 +102,18 @@
     <div id="second">
         <div class="inner">
             <header>
-                <h2>Example Applications.</h2>
-                <p>This is your very fresh homepage. All template files are located in <code>/resources/views</code>
-                    from the root directory. You can read tutorials and documentations on <a target="_blank" href="https://stupidlysimple.github.io">our website</a>
-                    or even from here.
-                    Start coding today and get creative.</p>
+                <h2>Example Applications</h2>
+                <p>StupidlySimple in the real world. See how StupidlySimple can be used in various applications / projects.</p>
             </header>
             <section class="tiles tiles-smaller">
-                <article class="style1">
-                    <span class="image">
-                        <img src="resources/assets/images/pic1.jpg" alt=""/>
-                    </span>
-                    <a href="routing">
-                        <h2>Routing</h2>
-                        <div class="content">
-                            <p>Back in the days, we all used to route the web directly to our .html or .php files.
-                                Nowadays on MVC frameworks, we do it quite differently.</p>
-                        </div>
-                    </a>
-                </article>
-                <article class="style2">
-                    <span class="image">
-                        <img src="resources/assets/images/pic2.jpg" alt=""/>
-                    </span>
-                    <a href="controller">
-                        <h2>Controllers</h2>
-                        <div class="content">
-                            <p>See how controller works in the Framework.</p>
-                        </div>
-                    </a>
-                </article>
-                <article class="style3">
-                    <span class="image">
-                        <img src="resources/assets/images/pic3.jpg" alt=""/>
-                    </span>
-                    <a href="service">
-                        <h2>Services</h2>
-                        <div class="content">
-                            <p>See how service works in StupidlySimple Framework.</p>
-                        </div>
-                    </a>
-                </article>
-                <article class="style4">
-                    <span class="image">
-                        <img src="resources/assets/images/pic4.jpg" alt=""/>
-                    </span>
-                    <a href="model">
-                        <h2>Models</h2>
-                        <div class="content">
-                            <p>Provides easy access to your data. Models are powered by <code>Eloquent ORM</code></p>
-                        </div>
-                    </a>
-                </article>
-                <article class="">
+                <article>
                     <span class="image">
                         <img src="resources/assets/images/pic6.jpg" alt=""/>
                     </span>
-                    <a href="https://stupidlysimple.github.io">
-                        <h2>And More!</h2>
+                    <a href="routing">
+                        <h2>Blogging</h2>
                         <div class="content">
-                            <p>More documentations are available on <code>stupidlysimple.github.io</code></p>
+                            <p>StupidlySimple does blogging.</p>
                         </div>
                     </a>
                 </article>
diff --git a/resources/views/layouts/footer.php b/resources/views/layouts/footer.php
index cfe0bab..18d0938 100644
--- a/resources/views/layouts/footer.php
+++ b/resources/views/layouts/footer.php
@@ -1,5 +1,5 @@
 <!-- Footer -->
-<footer id="footer" style="background: #383838; color: #fff;">
+<footer id="footer" class="nightly">
     <div class="inner">
         <section>
             <h2>About</h2>
@@ -13,7 +13,7 @@
                 <li><a href="https://github.com/stupidlysimple/php" class="icon style2 fa-github"><span class="label">Github</span></a></li>
             </ul>
         </section>
-        <ul class="copyright" style="color: #bababa">
+        <ul class="copyright">
             <li>Powered by StupidlySimple PHP - Nightly build</li>
             <li>Design: <a target="_blank" href="http://html5up.net">HTML5 UP</a></li>
         </ul>

From f6285beaba74325ca19ce781ea9ddffad81a948f Mon Sep 17 00:00:00 2001
From: Fariz Luqman <farizluqman@simplelinux.my>
Date: Thu, 16 Feb 2017 06:11:41 +0800
Subject: [PATCH 09/34] Add apps listing

---
 resources/assets/images/pic8.jpg | Bin 0 -> 9903 bytes
 resources/views/home.php         |  28 +++++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 resources/assets/images/pic8.jpg

diff --git a/resources/assets/images/pic8.jpg b/resources/assets/images/pic8.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..cc775d13f731e80d38d9dc5e463b4de7ce5979ba
GIT binary patch
literal 9903
zcmeGiTWllM^^PZYUS4mKP1xljI_u4{Y+J`O<JgG}Asai%uG@ImIEGzN0gY$I&XBRk
z%#4%lidNyRN_;FSZ3Q1yShlnhs1hxOs{P>Ems+WX1q!s4SSZj+Eag$4A4u-GcRb_A
zW+|ams?=P2?mhRMbI(2J-1nWSzEC~s_DwA*d4y6a^m&9(2l7$~(Ew3rEki_E@Mer~
z5g60HLwPJbasj@t217w=paugMbq;dlV(=WN&UN4is0$m)a##Wygy$iOCvZQ&FWjb}
zHb`;VHz7F$df{K!N6QH9>ao)aNz2JhdQLMnV@@kGi3G#5T$s5qC5TE1BX=V}jKo+z
z#zh!5663fS%Occ%6dsV>#_~M3TC)+?w(7F$buF*bHcZ`r%xCLQO&{Cr!26H&)NKcO
zIP8N5>uskVimvf^fZ+Iqy07jN>IaQJaZyga54#+F=rk4%!In$X>I>CV$V>ciO(KP;
z>RZT1a!6VRUaI;>bTjgHbaZrfcso12z1>~iy#t%Q-pvEswrm;LvSnMZmxNkkWm;ou
zQ+M|!-=-d)uczPV^Y!D%*KZZ+{UidakD=ZUG>=wk%8y*V6x~Zz{|rWURiC29K}$D9
z0w|0F4Lz;R?P>4m?CPdki4=0tHn9g$Z4~WlbGh3+9d6ni0%9-Sw!M#YPh2W&@n3fX
z@9Dqeo(JPQ1_v^a=R(8!jZY`qcdpF7eexaA2%mNAhc{g?`HieJ^~AkqWa~4Ry&}K+
zqnn>RQF-;f>0NgozvZECKK1Nh{_))(|NObv-oHG*aO=13d-xa6zy86<-h+k3+rIt1
zM}GN-H$Ln|E*EIqMs#ZTxWhz+?Ob0QXmFi>i<`gUj()7c<C&-54h`l`>Nl<=W(P!L
z_??{|tU&t(;U}H}CGOoSO<fi-<yRaP&aA<%x(d~oke4QP_M&n0YF~2j&f_b|ox2BD
zl3z*=u4Gougcz^>eqG#8uZ#Pcb#b3q7x%O4;(l&j+%Hy7dB0zuPeMa18jUAYZFnw1
zXzzK{m54rf=ci9$uEWzEk-3w|?0NlbZ{8i-_2KOY->9y>yY;7Ygcc*T*C6hJ2hS!5
zb(eLR(+*V3a>ax!o?21bFlTd`rV@^1$&}?%rHBa_#%V&;aegx?JF6^Vj<{mtGMH@1
zl=b~WQO-^s$^y!&%qo!9H7!3Yo0al`+_fSQy(o=zq`@zb7&MDyWTFZxV^OH9>~KSl
zh>5Fasiu)PS5Z_`DG`xC?<Cxb)D>U0ym1j0;R--hx45st;sa$<(Mkr;w_?sj*(}*c
zfRQ=f$z%#f%E=`3Qlg$Inf1&}PBk3L{(`ySWTuMhq>}+Z)<ws~`9jSRmX}awZ#)6o
zz+#6`Mq(IAtK{}*FXJo;d-c+3xVU;cUtE{6mzB)v9T^q3trOy^#H@wS7^+F|=_Pef
z#$oSTkVR9|Ck0c$77!)Vg|uP!3JharNU_>zM$TJeTB^;$TDn%Xv!ZI@)4I6l3M_$y
z9#PlI2j^sHT<D=nsbIU$hY1<bDXy8OR#df8p;p9eQ?LpR_)RuGqZH;E3EegUbaVLe
zSfNi@I@H!hmz|PvbOE9HYL!AVzHE&?`dxzSLa0hYZA@+=SUlR#C*{v>&eQLad?$$^
zqDbF`{Rj?SwV?yunCSIB!R|xBd>$w&#IXKDplX<V?z-E-@C1J)#5PZuVDNaTVTjCs
zLLTAqW@+6T(|^U}R;-o(PiVv!9ay$KI$e9fOn7R3J0C-2*J6$4b8wa(gUHezXAyNj
zlvxI#4J=TQh(<9Ip4QNS!~D2hb7)|22=!?Ll`1Np-SAB7$!V36WVDQ0(d2+eCUxA^
zo&E&Kmi~z1PQSI($T;1SnBp;1MU;)p)fqgnsHS?{ga+t7c-l!OIoVKGdqLMK<tCIz
z)0Kka%$ZZOSo#5i0~woyimC0DOR_GQvIGc}JzTb@{4R?bV=yIIEHIG#x9z7Zy4tjG
z5a%~zQbwV9aq$SMnH366Ts~1&)vUZ^CXIdB)QmlSb=c@8=FT}yKQf^z1=~}bE#vpu
zXt2CplJi1^OsAa-vTm-yez}cqX7A1w5}K;%4bJVg<j40q1So>`YbEUKPE#wxvTVqW
z^HrA$6WeK6Z;niar{TMyiRW6`$*8*!R|M-Wbm#H632copd`hyqFirR{2cmJe$Ae=P
zo_PRYM(9@n!`WdQoCP+{3L9sIjkCg;PekiHE0A%w9Yz{LSHS~UC9u&(6G(#XaSpb|
z3~ZL?05;(<2m}i^Y+pZ~gFy-SF^ESj;*hlsAT@cQFut{bqcX0mdeS#MXPV_$Fjz8%
z1bh=RBx=Rrl28tELu?RTJib&G#Ch3dax$zbWB$MY>`_0XNMrtk;S`%HC*(P0-w|D&
zJ+eP59+?-Tl7IXX=HjK;Qn6f=O@Ub|swE?~H0CG5V*q1x(9aMSbAHTEZW@?FsWg+&
zbeRbcMFJwnam+|`hzpN~`0y9WeN2#z201psaxspL@hnpdeyB~C^0Cb1bgeGPjrnUv
zEiNt&Ery0Py%6N0(P)t6gFGJqj(~BvWC}}xlCi^<Few|Nu8<P~gC)Z5w_=X@K~u|w
zVmXy^1h46>ViDU#xD9h^0SbSdZw<UO1T(UsRdi9FT98ZT4!gJ{I%UhSI1&RSF(|8Y
z5!ei98_ub!Y~NftMVgdz$fQB-3ZQw`X17}&GlIdfNlmQaI+K%j6H1z>NHIrjET0ob
z1Wu3xyZ{l$jR=9!=x8V)M`S)66~YmL6K!e9l3@xZQO43h{*VHa<a{&|9nD7ql9Uqy
z!xAS2av~oJgojynG?M2-5<hI0w{|gt+Nc%FO@~LOqmv;vF&vK!hevsCnx76$OiWBg
zSbjL+XCyI}*Yu(Q4Wbl<f*icIEEoJt-GmvrAc%*P>1<+BDaZ!!McGJnGCIXhho?Z!
zC^yY<{6uslGyxL%(eP+vX|kNBG)W%whZ^z8L;?<~c|`?+$P*J{30;P57o4pChc6Wa
zEFWM)S)PxDIrx8p9fhk!ixng)`NPeuTqH~GADj4KJV|g^`}drra@dl<sm>mDX}j~R
zb?u2qhSdx9DFz$~57)-ptbAP!QWb{u^q3&xll7S25Ef*~UqdQuwRRMGiNNIoIhKnC
zhI9FmKr|-<#L0PSR0<CZ_412w8a&NSp%@pk&9~|{w7j_}=<-AX`spV#tfrtiCzJ{@
zOlCoU@Y7rLiTbalYO_VHt@#<76U4Ka)mFjQW+b$R84s){D40eu=*-`j*z@d0y5WHh
z4{Uf~!vh;0*zmyrkq7E0K)D1vrA0X3RbO$P2b<e#(wPI($(bo~Xmxp2v1qv90<{Ql
zJK&WDbLfgInf5=yP14!$YGXHw3ZhY-NT+AW33ScqgXgWA+!FyTYfY9jBfBIxzXACp
zc&--9I=lj*z5;OfqFKi99Kij#c>-ULVI33%{80=SEciI#vEZK&o@@r*aZtYncu%1L
z&NaZbdVvMeBEEzFjDrdHnOJ1<5JK3emiW4_>Nxr=P$2}De8=lJ?HJsy!&?OUXdRck
z3!z7DL1^1cb==@8+&kQi(8IqIEBb;}2f{b-zoC9ji|&<<`R)&T#s@AvcX<0dyN~kQ
zE?Sv(U%GhJsrm8|_tzi1`}zlzN56XF$-lAip5QICz47Y-8uidF+PZkC$^9Sspx_Dk
zpn$sHwcPMQ!BgmJ>kg)-DM>sOzLjYTJ*}wK$9h|t9_wqxtXgl{Dfqyk7sTD(ByuCO
x;eibgtnC2`22KZjI!3us`{xJ@-}g8${=Ns@bd$y7@{Bt?4KPJve0%l9e*x%C%Uu8f

literal 0
HcmV?d00001

diff --git a/resources/views/home.php b/resources/views/home.php
index ea33edc..b383ca8 100644
--- a/resources/views/home.php
+++ b/resources/views/home.php
@@ -108,12 +108,34 @@
             <section class="tiles tiles-smaller">
                 <article>
                     <span class="image">
-                        <img src="resources/assets/images/pic6.jpg" alt=""/>
+                        <img src="resources/assets/images/pic8.jpg" alt=""/>
                     </span>
-                    <a href="routing">
+                    <a href="blogging/home">
                         <h2>Blogging</h2>
                         <div class="content">
-                            <p>StupidlySimple does blogging.</p>
+                            <p>StupidlySimple does blogging</p>
+                        </div>
+                    </a>
+                </article>
+                <article>
+                    <span class="image">
+                        <img src="resources/assets/images/pic8.jpg" alt=""/>
+                    </span>
+                    <a href="costing/home">
+                        <h2>Product Costing</h2>
+                        <div class="content">
+                            <p>Simple application to manage products and costing</p>
+                        </div>
+                    </a>
+                </article>
+                <article>
+                    <span class="image">
+                        <img src="resources/assets/images/pic8.jpg" alt=""/>
+                    </span>
+                    <a href="costing/home">
+                        <h2>Project Management</h2>
+                        <div class="content">
+                            <p>Basic project management app</p>
                         </div>
                     </a>
                 </article>

From 65ddd247aeb26fdb9249bf518b2ab5a77f9293f5 Mon Sep 17 00:00:00 2001
From: Fariz Luqman <farizluqman@simplelinux.my>
Date: Fri, 24 Feb 2017 14:04:40 +0800
Subject: [PATCH 10/34] Added tempting engine

---
 resources/views/layouts/head.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/layouts/head.php b/resources/views/layouts/head.php
index d2fcd7b..307387b 100644
--- a/resources/views/layouts/head.php
+++ b/resources/views/layouts/head.php
@@ -1,5 +1,5 @@
 <head profile="http://www.w3.org/2005/10/profile">
-    <title><?= $title ?></title>
+    <title>{{title}}</title>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <!--[if lte IE 8]><script src="resources/assets/js/ie/html5shiv.js"></script><![endif]-->

From 6aa5b98fdf98dc7336b2315e00dadd316dc70ec4 Mon Sep 17 00:00:00 2001
From: Fariz Luqman <fariz.fnb@gmail.com>
Date: Wed, 4 Oct 2017 03:45:58 +0800
Subject: [PATCH 11/34] Release candidate 0.5 (need to review changes)

---
 .htaccess                                     |  34 +-
 app/Controller/Auth.php                       |  80 ++-
 app/Controller/Hello.php                      |   8 +-
 app/Controller/User.php                       |  17 +-
 app/Middleware/Hello.php                      |  30 +
 app/bootstrap.php                             |   1 -
 composer.json                                 |  78 ++-
 config/mimetypes.php                          | 651 ++++++++++++++++++
 config/routes.php                             |  10 +-
 index.php                                     |   7 +-
 public/index.php                              |  56 ++
 .../views/admin/{home.php => home.tpl.php}    |  14 +-
 .../views/auth/{login.php => login.tpl.php}   |  10 +-
 .../auth/{register.php => register.tpl.php}   |  12 +-
 .../{controller.php => controller.tpl.php}    |  10 +-
 resources/views/{hello.php => hello.tpl.php}  |   0
 resources/views/{home.php => home.tpl.php}    |  15 +-
 .../layouts/{footer.php => footer.tpl.php}    |   0
 .../views/layouts/{head.php => head.tpl.php}  |   0
 .../views/layouts/{menu.php => menu.tpl.php}  |   0
 .../layouts/{scripts.php => scripts.tpl.php}  |   0
 .../views/layouts/{top.php => top.tpl.php}    |   0
 resources/views/{model.php => model.tpl.php}  |  11 +-
 .../views/{routing.php => routing.tpl.php}    |  11 +-
 .../views/{service.php => service.tpl.php}    |  10 +-
 resources/views/test.tpl.php                  |   2 +
 routes/auth.php                               |  20 +-
 routes/hello.php                              |  25 -
 routes/web.php                                |  59 +-
 29 files changed, 986 insertions(+), 185 deletions(-)
 create mode 100644 app/Middleware/Hello.php
 create mode 100644 config/mimetypes.php
 create mode 100755 public/index.php
 rename resources/views/admin/{home.php => home.tpl.php} (90%)
 rename resources/views/auth/{login.php => login.tpl.php} (91%)
 rename resources/views/auth/{register.php => register.tpl.php} (89%)
 rename resources/views/{controller.php => controller.tpl.php} (92%)
 rename resources/views/{hello.php => hello.tpl.php} (100%)
 rename resources/views/{home.php => home.tpl.php} (93%)
 rename resources/views/layouts/{footer.php => footer.tpl.php} (100%)
 rename resources/views/layouts/{head.php => head.tpl.php} (100%)
 rename resources/views/layouts/{menu.php => menu.tpl.php} (100%)
 rename resources/views/layouts/{scripts.php => scripts.tpl.php} (100%)
 rename resources/views/layouts/{top.php => top.tpl.php} (100%)
 rename resources/views/{model.php => model.tpl.php} (91%)
 rename resources/views/{routing.php => routing.tpl.php} (89%)
 rename resources/views/{service.php => service.tpl.php} (88%)
 create mode 100644 resources/views/test.tpl.php
 delete mode 100755 routes/hello.php

diff --git a/.htaccess b/.htaccess
index e3e820a..35b72bf 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,17 +1,17 @@
-<Files *.php>
-Order Deny,Allow
-Deny from all
-Allow from 127.0.0.1
-</Files>
-
-<Files index.php>
-Order Allow,Deny
-Allow from all
-</Files>
-
-Options +FollowSymLinks
-RewriteEngine On
-
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^ index.php [L]
\ No newline at end of file
+#<Files *.php>
+#Order Deny,Allow
+#Deny from all
+#Allow from 127.0.0.1
+#</Files>
+#
+#<Files index.php>
+#Order Allow,Deny
+#Allow from all
+#</Files>
+#
+#Options +FollowSymLinks
+#RewriteEngine On
+#
+#RewriteCond %{REQUEST_FILENAME} !-d
+#RewriteCond %{REQUEST_FILENAME} !-f
+#RewriteRule ^ index.php [L]
\ No newline at end of file
diff --git a/app/Controller/Auth.php b/app/Controller/Auth.php
index 6690e8e..af4b9a3 100755
--- a/app/Controller/Auth.php
+++ b/app/Controller/Auth.php
@@ -15,65 +15,74 @@
 use Request;
 use Viewer;
 
+/**
+ * Class Auth
+ * @package Controller
+ */
 class Auth {
-    public function __construct()
-    {
-    }
+    private static $successRedirectURL = 'admin';
 
-    public function displayRegisterPage()
+    /**
+     *
+     */
+    public static function check()
     {
-        Viewer::file('resources/views/auth/register');
-    }
-
-    public function displayLoginPage()
-    {
-        Viewer::file('resources/views/auth/login');
+        if(Sentry::check() !== true){
+            Response::redirect('login');
+        }
     }
 
-    public function doAuthenticate()
+    /**
+     *
+     */
+    public static function authenticate()
     {
-        try{
+        try {
             // Login credentials
             $credentials = array(
                 'email'    => Request::get('email'),
                 'password' => Request::get('password')
             );
+
             // Authenticate the user
             $user = Sentry::authenticate($credentials, false);
 
-        }catch (\Cartalyst\Sentry\Users\LoginRequiredException $e){
+        } catch (\Cartalyst\Sentry\Users\LoginRequiredException $e) {
             Response::redirect('login')->with([
                 'login_message'=>'Login credentials not supplied',
                 'type'         =>'alert-danger'
             ]);
 
-        }catch (\Cartalyst\Sentry\Users\PasswordRequiredException $e){
+        } catch (\Cartalyst\Sentry\Users\PasswordRequiredException $e) {
             Response::redirect('login')->with([
                 'login_message'=>'Password field is required',
                 'type'         =>'alert-danger'
             ]);
 
-        }catch (\Cartalyst\Sentry\Users\WrongPasswordException $e){
+        } catch (\Cartalyst\Sentry\Users\WrongPasswordException $e) {
             Response::redirect('login')->with([
                 'login_message'=>'Wrong password, try again.',
                 'type'         =>'alert-danger'
             ]);
 
-        }catch (\Cartalyst\Sentry\Users\UserNotFoundException $e){
+        } catch (\Cartalyst\Sentry\Users\UserNotFoundException $e) {
             Response::redirect('login')->with([
                 'login_message'=>'User not found.',
                 'type'         =>'alert-danger'
             ]);
 
-        }catch (\Cartalyst\Sentry\Users\UserNotActivatedException $e){
+        } catch (\Cartalyst\Sentry\Users\UserNotActivatedException $e) {
             Response::redirect('login')->with([
                 'login_message'=>'User is not activated.',
                 'type'         =>'alert-danger'
             ]);
 
-        }finally{
+        } finally {
             if(Sentry::check() === true){
-                Admin::redirectToAdminHome();
+                Response::redirect(self::$successRedirectURL)->with([
+                    'login_message'=>'Login successful.',
+                    'type'         =>'alert-success'
+                ]);
             }else{
                 Response::redirect('login')->with([
                     'login_message'=>'Unable to login',
@@ -83,36 +92,36 @@ public function doAuthenticate()
         }
     }
 
-    public function doRegister(){
-        try{
+    /**
+     *
+     */
+    public static function register()
+    {
+        try {
             $user = Sentry::register(array(
                 'email'    => Request::get('email'),
                 'password' => Request::get('password'),
                 'first_name' => Request::get('first_name'),
                 'last_name' => Request::get('last_name')
             ), $activate = true);
-
-        }catch (\Cartalyst\Sentry\Users\LoginRequiredException $e){
+        } catch (\Cartalyst\Sentry\Users\LoginRequiredException $e) {
             Response::redirect('register')->with([
                 'login_message'=>'Login credentials not supplied',
                 'type'         =>'alert-danger'
             ]);
-
-        }catch (\Cartalyst\Sentry\Users\PasswordRequiredException $e){
+        } catch (\Cartalyst\Sentry\Users\PasswordRequiredException $e) {
             Response::redirect('register')->with([
                 'login_message'=>'Password field is required',
                 'type'         =>'alert-danger'
             ]);
-
-        }catch (\Cartalyst\Sentry\Users\UserExistsException $e){
+        } catch (\Cartalyst\Sentry\Users\UserExistsException $e) {
             Response::redirect('register')->with([
                 'login_message'=>'User with that login already exist.',
                 'type'         =>'alert-danger'
             ]);
+        } catch(\Exception $e) {
 
-        }catch(\Exception $e){
-
-        }finally{
+        } finally {
             if($user){
                 Response::redirect('login')->with([
                     'login_message'=>'Registration successful. You can now login.',
@@ -122,9 +131,16 @@ public function doRegister(){
         }
     }
 
-    public function doLogout(){
+    /**
+     *
+     */
+    public static function logout()
+    {
         Sentry::logout();
-        Response::redirect('login');
+        Response::redirect('login')->with([
+            'login_message'=>'Logout successful.',
+            'type'         =>'alert-success'
+        ]);;
     }
 
 }
diff --git a/app/Controller/Hello.php b/app/Controller/Hello.php
index 28bc7ef..6406b95 100755
--- a/app/Controller/Hello.php
+++ b/app/Controller/Hello.php
@@ -14,10 +14,14 @@
 use Core\Request;
 
 class Hello {
-    public function greetWithName($name){
+
+    public function greetWithName($name)
+    {
         echo ('Hello, '. $name. '!');
     }
-    public function greetForm(){
+
+    public function greetForm()
+    {
         $name = Request::get('name');
         if($name == ''){
             echo 'How could you have no name :(';
diff --git a/app/Controller/User.php b/app/Controller/User.php
index 1613b5f..59f5524 100755
--- a/app/Controller/User.php
+++ b/app/Controller/User.php
@@ -17,13 +17,21 @@
 
 class User {
 
-    public function __construct(){
+    /**
+     * User constructor.
+     */
+    public function __construct()
+    {
         // Always check whether the user is logged in or not to do the action
         if(Sentry::check() !== true){
             Response::redirect('login');
         }
     }
 
+
+    /**
+     *
+     */
     public function editUser(){
         $id = Request::get('id');
         $first_name = Request::get('first_name');
@@ -72,12 +80,15 @@ public function editUser(){
                 }
             }
         }
-        catch (Exception $e)
+        catch (\Exception $e)
         {
             echo 'User was not found.';
         }
     }
 
+    /**
+     *
+     */
     public function deleteUser()
     {
         $id = Request::get('id');
@@ -90,7 +101,7 @@ public function deleteUser()
             }
 
             $user->delete();
-        }catch(Exception $e)
+        }catch(\Exception $e)
         {
             Response::redirect('admin?delete=failed');
         }
diff --git a/app/Middleware/Hello.php b/app/Middleware/Hello.php
new file mode 100644
index 0000000..9ed7a40
--- /dev/null
+++ b/app/Middleware/Hello.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: farizluqman
+ * Date: 30/09/2017
+ * Time: 3:38 PM
+ */
+namespace Middleware;
+
+use Router;
+use Response;
+
+/**
+ * Class Hello
+ * @package Middleware
+ */
+class Hello {
+    /**
+     *
+     */
+    public static function filter(){
+        // Always redirect this route to /login
+        if(Router::getCurrentRoute() == '/route/to/be/filtered'){
+            Response::redirect('../../../login')->with([
+                'login_message'=>'This route have been filtered by the Hello middleware',
+                'type'         =>'alert-warning'
+            ]);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/bootstrap.php b/app/bootstrap.php
index 02ad695..28aa517 100755
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -70,7 +70,6 @@
 |
 */
 $service = Service::loadServices();
-
 /*
 |--------------------------------------------------------------------------
 | Share the Singleton $app and $service
diff --git a/composer.json b/composer.json
index 7048584..704252a 100755
--- a/composer.json
+++ b/composer.json
@@ -1,38 +1,46 @@
 {
-    "name": "stupidlysimple/php",
-    "description": "StupidlySimple Framework for PHP - MVC Framework for lazy developers",
-    "keywords": ["micro framework","lazy","stupidlysimple","php framework"],
-    "license": "MIT",
-    "type": "project",
-    "authors": [{
-    	"name": "Fariz Luqman",
-    	"email": "fariz.fnb@gmail.com",
-	"homepage": "https://stupidlysimple.github.io",
-	"role": "Developer"
-    }],
-    "config": {
-    	"vendor-dir": "vendor"
-    },
-    "require": {
-    	"php": ">=5.4.0",
-    	"filp/whoops": "^2.1",
-        "stupidlysimple/php-core": "dev-nightly",
-    	"symfony/var-dumper": "^3.1",
-    	"phpFastCache/phpFastCache": "^4.3",
-    	"illuminate/database": "5.2.*",
-        "cartalyst/sentry": "2.1.*"
-    },
-    "require-dev": {
-      "phpunit/phpunit": "5.4.*"
-    },
-    "autoload": {
-      "psr-4": {
-          "Core\\": "app/Core"
-      },
-    	"classmap": [
-    	    "app/Model",
-            "app/Controller",
-            "app/Service"
-    	]
+  "name": "stupidlysimple/php",
+  "description": "StupidlySimple Framework for PHP - MVC Framework for lazy developers",
+  "keywords": [
+    "micro framework",
+    "lazy",
+    "stupidlysimple",
+    "php framework"
+  ],
+  "license": "MIT",
+  "type": "project",
+  "authors": [
+    {
+      "name": "Fariz Luqman",
+      "email": "fariz.fnb@gmail.com",
+      "homepage": "https://stupidlysimple.github.io",
+      "role": "Developer"
     }
+  ],
+  "config": {
+    "vendor-dir": "vendor"
+  },
+  "require": {
+    "php": ">=5.4.0",
+    "filp/whoops": "^2.1",
+    "stupidlysimple/php-core": "dev-nightly",
+    "symfony/var-dumper": "^3.1",
+    "phpFastCache/phpFastCache": "^4.3",
+    "illuminate/database": "5.2.*",
+    "cartalyst/sentry": "2.1.*"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "5.4.*"
+  },
+  "autoload": {
+    "psr-4": {
+      "Core\\": "app/Core"
+    },
+    "classmap": [
+      "app/Model",
+      "app/Controller",
+      "app/Service",
+      "app/Middleware"
+    ]
+  }
 }
diff --git a/config/mimetypes.php b/config/mimetypes.php
new file mode 100644
index 0000000..28005dd
--- /dev/null
+++ b/config/mimetypes.php
@@ -0,0 +1,651 @@
+<?php
+/**
+ * StupidlySimple - A PHP Framework For Lazy Developers
+ *
+ * @package		StupidlySimple
+ * @author		Fariz Luqman <fariz.fnb@gmail.com>
+ * @copyright	2017 Fariz Luqman
+ * @license		MIT
+ * @link		https://stupidlysimple.github.io/
+ */
+return [
+    '.3dm' => 'x-world/x-3dmf',
+    '.3dmf' => 'x-world/x-3dmf',
+    '.a' => 'application/octet-stream',
+    '.aab' => 'application/x-authorware-bin',
+    '.aam' => 'application/x-authorware-map',
+    '.aas' => 'application/x-authorware-seg',
+    '.abc' => 'text/vnd.abc',
+    '.acgi' => 'text/html',
+    '.afl' => 'video/animaflex',
+    '.ai' => 'application/postscript',
+    '.aif' => 'audio/aiff',
+    '.aif' => 'audio/x-aiff',
+    '.aifc' => 'audio/aiff',
+    '.aifc' => 'audio/x-aiff',
+    '.aiff' => 'audio/aiff',
+    '.aiff' => 'audio/x-aiff',
+    '.aim' => 'application/x-aim',
+    '.aip' => 'text/x-audiosoft-intra',
+    '.ani' => 'application/x-navi-animation',
+    '.aos' => 'application/x-nokia-9000-communicator-add-on-software',
+    '.aps' => 'application/mime',
+    '.arc' => 'application/octet-stream',
+    '.arj' => 'application/arj',
+    '.arj' => 'application/octet-stream',
+    '.art' => 'image/x-jg',
+    '.asf' => 'video/x-ms-asf',
+    '.asm' => 'text/x-asm',
+    '.asp' => 'text/asp',
+    '.asx' => 'application/x-mplayer2',
+    '.asx' => 'video/x-ms-asf',
+    '.asx' => 'video/x-ms-asf-plugin',
+    '.au' => 'audio/basic',
+    '.au' => 'audio/x-au',
+    '.avi' => 'application/x-troff-msvideo',
+    '.avi' => 'video/avi',
+    '.avi' => 'video/msvideo',
+    '.avi' => 'video/x-msvideo',
+    '.avs' => 'video/avs-video',
+    '.bcpio' => 'application/x-bcpio',
+    '.bin' => 'application/mac-binary',
+    '.bin' => 'application/macbinary',
+    '.bin' => 'application/octet-stream',
+    '.bin' => 'application/x-binary',
+    '.bin' => 'application/x-macbinary',
+    '.bm' => 'image/bmp',
+    '.bmp' => 'image/bmp',
+    '.bmp' => 'image/x-windows-bmp',
+    '.boo' => 'application/book',
+    '.book' => 'application/book',
+    '.boz' => 'application/x-bzip2',
+    '.bsh' => 'application/x-bsh',
+    '.bz' => 'application/x-bzip',
+    '.bz2' => 'application/x-bzip2',
+    '.c' => 'text/plain',
+    '.c++' => 'text/plain',
+    '.cat' => 'application/vnd.ms-pki.seccat',
+    '.cc' => 'text/plain',
+    '.cc' => 'text/x-c',
+    '.ccad' => 'application/clariscad',
+    '.cco' => 'application/x-cocoa',
+    '.cdf' => 'application/cdf',
+    '.cdf' => 'application/x-cdf',
+    '.cdf' => 'application/x-netcdf',
+    '.cer' => 'application/pkix-cert',
+    '.cer' => 'application/x-x509-ca-cert',
+    '.cha' => 'application/x-chat',
+    '.chat' => 'application/x-chat',
+    '.class' => 'application/java',
+    '.class' => 'application/java-byte-code',
+    '.class' => 'application/x-java-class',
+    '.com' => 'application/octet-stream',
+    '.com' => 'text/plain',
+    '.conf' => 'text/plain',
+    '.cpio' => 'application/x-cpio',
+    '.cpp' => 'text/x-c',
+    '.cpt' => 'application/mac-compactpro',
+    '.cpt' => 'application/x-compactpro',
+    '.cpt' => 'application/x-cpt',
+    '.crl' => 'application/pkcs-crl',
+    '.crl' => 'application/pkix-crl',
+    '.crt' => 'application/pkix-cert',
+    '.crt' => 'application/x-x509-ca-cert',
+    '.crt' => 'application/x-x509-user-cert',
+    '.csh' => 'application/x-csh',
+    '.csh' => 'text/x-script.csh',
+    '.css' => 'application/x-pointplus',
+    '.css' => 'text/css',
+    '.cxx' => 'text/plain',
+    '.dcr' => 'application/x-director',
+    '.deepv' => 'application/x-deepv',
+    '.def' => 'text/plain',
+    '.der' => 'application/x-x509-ca-cert',
+    '.dif' => 'video/x-dv',
+    '.dir' => 'application/x-director',
+    '.dl' => 'video/dl',
+    '.dl' => 'video/x-dl',
+    '.doc' => 'application/msword',
+    '.dot' => 'application/msword',
+    '.dp' => 'application/commonground',
+    '.drw' => 'application/drafting',
+    '.dump' => 'application/octet-stream',
+    '.dv' => 'video/x-dv',
+    '.dvi' => 'application/x-dvi',
+    '.dwf' => 'drawing/x-dwf (old)',
+    '.dwf' => 'model/vnd.dwf',
+    '.dwg' => 'application/acad',
+    '.dwg' => 'image/vnd.dwg',
+    '.dwg' => 'image/x-dwg',
+    '.dxf' => 'application/dxf',
+    '.dxf' => 'image/vnd.dwg',
+    '.dxf' => 'image/x-dwg',
+    '.dxr' => 'application/x-director',
+    '.el' => 'text/x-script.elisp',
+    '.elc' => 'application/x-bytecode.elisp (compiled elisp)',
+    '.elc' => 'application/x-elc',
+    '.env' => 'application/x-envoy',
+    '.eps' => 'application/postscript',
+    '.es' => 'application/x-esrehber',
+    '.etx' => 'text/x-setext',
+    '.evy' => 'application/envoy',
+    '.evy' => 'application/x-envoy',
+    '.exe' => 'application/octet-stream',
+    '.f' => 'text/plain',
+    '.f' => 'text/x-fortran',
+    '.f77' => 'text/x-fortran',
+    '.f90' => 'text/plain',
+    '.f90' => 'text/x-fortran',
+    '.fdf' => 'application/vnd.fdf',
+    '.fif' => 'application/fractals',
+    '.fif' => 'image/fif',
+    '.fli' => 'video/fli',
+    '.fli' => 'video/x-fli',
+    '.flo' => 'image/florian',
+    '.flx' => 'text/vnd.fmi.flexstor',
+    '.fmf' => 'video/x-atomic3d-feature',
+    '.for' => 'text/plain',
+    '.for' => 'text/x-fortran',
+    '.fpx' => 'image/vnd.fpx',
+    '.fpx' => 'image/vnd.net-fpx',
+    '.frl' => 'application/freeloader',
+    '.funk' => 'audio/make',
+    '.g' => 'text/plain',
+    '.g3' => 'image/g3fax',
+    '.gif' => 'image/gif',
+    '.gl' => 'video/gl',
+    '.gl' => 'video/x-gl',
+    '.gsd' => 'audio/x-gsm',
+    '.gsm' => 'audio/x-gsm',
+    '.gsp' => 'application/x-gsp',
+    '.gss' => 'application/x-gss',
+    '.gtar' => 'application/x-gtar',
+    '.gz' => 'application/x-compressed',
+    '.gz' => 'application/x-gzip',
+    '.gzip' => 'application/x-gzip',
+    '.gzip' => 'multipart/x-gzip',
+    '.h' => 'text/plain',
+    '.h' => 'text/x-h',
+    '.hdf' => 'application/x-hdf',
+    '.help' => 'application/x-helpfile',
+    '.hgl' => 'application/vnd.hp-hpgl',
+    '.hh' => 'text/plain',
+    '.hh' => 'text/x-h',
+    '.hlb' => 'text/x-script',
+    '.hlp' => 'application/hlp',
+    '.hlp' => 'application/x-helpfile',
+    '.hlp' => 'application/x-winhelp',
+    '.hpg' => 'application/vnd.hp-hpgl',
+    '.hpgl' => 'application/vnd.hp-hpgl',
+    '.hqx' => 'application/binhex',
+    '.hqx' => 'application/binhex4',
+    '.hqx' => 'application/mac-binhex',
+    '.hqx' => 'application/mac-binhex40',
+    '.hqx' => 'application/x-binhex40',
+    '.hqx' => 'application/x-mac-binhex40',
+    '.hta' => 'application/hta',
+    '.htc' => 'text/x-component',
+    '.htm' => 'text/html',
+    '.html' => 'text/html',
+    '.htmls' => 'text/html',
+    '.htt' => 'text/webviewhtml',
+    '.htx' => 'text/html',
+    '.ice' => 'x-conference/x-cooltalk',
+    '.ico' => 'image/x-icon',
+    '.idc' => 'text/plain',
+    '.ief' => 'image/ief',
+    '.iefs' => 'image/ief',
+    '.iges' => 'application/iges',
+    '.iges' => 'model/iges',
+    '.igs' => 'application/iges',
+    '.igs' => 'model/iges',
+    '.ima' => 'application/x-ima',
+    '.imap' => 'application/x-httpd-imap',
+    '.inf' => 'application/inf',
+    '.ins' => 'application/x-internett-signup',
+    '.ip' => 'application/x-ip2',
+    '.isu' => 'video/x-isvideo',
+    '.it' => 'audio/it',
+    '.iv' => 'application/x-inventor',
+    '.ivr' => 'i-world/i-vrml',
+    '.ivy' => 'application/x-livescreen',
+    '.jam' => 'audio/x-jam',
+    '.jav' => 'text/plain',
+    '.jav' => 'text/x-java-source',
+    '.java' => 'text/plain',
+    '.java' => 'text/x-java-source',
+    '.jcm' => 'application/x-java-commerce',
+    '.jfif' => 'image/jpeg',
+    '.jfif' => 'image/pjpeg',
+    '.jfif-tbnl' => 'image/jpeg',
+    '.jpe' => 'image/jpeg',
+    '.jpe' => 'image/pjpeg',
+    '.jpeg' => 'image/jpeg',
+    '.jpeg' => 'image/pjpeg',
+    '.jpg' => 'image/jpeg',
+    '.jpg' => 'image/pjpeg',
+    '.jps' => 'image/x-jps',
+    '.js' => 'application/x-javascript',
+    '.jut' => 'image/jutvision',
+    '.kar' => 'audio/midi',
+    '.kar' => 'music/x-karaoke',
+    '.ksh' => 'application/x-ksh',
+    '.ksh' => 'text/x-script.ksh',
+    '.la' => 'audio/nspaudio',
+    '.la' => 'audio/x-nspaudio',
+    '.lam' => 'audio/x-liveaudio',
+    '.latex' => 'application/x-latex',
+    '.lha' => 'application/lha',
+    '.lha' => 'application/octet-stream',
+    '.lha' => 'application/x-lha',
+    '.lhx' => 'application/octet-stream',
+    '.list' => 'text/plain',
+    '.lma' => 'audio/nspaudio',
+    '.lma' => 'audio/x-nspaudio',
+    '.log' => 'text/plain',
+    '.lsp' => 'application/x-lisp',
+    '.lsp' => 'text/x-script.lisp',
+    '.lst' => 'text/plain',
+    '.lsx' => 'text/x-la-asf',
+    '.ltx' => 'application/x-latex',
+    '.lzh' => 'application/octet-stream',
+    '.lzh' => 'application/x-lzh',
+    '.lzx' => 'application/lzx',
+    '.lzx' => 'application/octet-stream',
+    '.lzx' => 'application/x-lzx',
+    '.m' => 'text/plain',
+    '.m' => 'text/x-m',
+    '.m1v' => 'video/mpeg',
+    '.m2a' => 'audio/mpeg',
+    '.m2v' => 'video/mpeg',
+    '.m3u' => 'audio/x-mpequrl',
+    '.man' => 'application/x-troff-man',
+    '.map' => 'application/x-navimap',
+    '.mar' => 'text/plain',
+    '.mbd' => 'application/mbedlet',
+    '.mc' => 'application/x-magic-cap-package-1.0',
+    '.mcd' => 'application/mcad',
+    '.mcd' => 'application/x-mathcad',
+    '.mcf' => 'image/vasa',
+    '.mcf' => 'text/mcf',
+    '.mcp' => 'application/netmc',
+    '.me' => 'application/x-troff-me',
+    '.mht' => 'message/rfc822',
+    '.mhtml' => 'message/rfc822',
+    '.mid' => 'application/x-midi',
+    '.mid' => 'audio/midi',
+    '.mid' => 'audio/x-mid',
+    '.mid' => 'audio/x-midi',
+    '.mid' => 'music/crescendo',
+    '.mid' => 'x-music/x-midi',
+    '.midi' => 'application/x-midi',
+    '.midi' => 'audio/midi',
+    '.midi' => 'audio/x-mid',
+    '.midi' => 'audio/x-midi',
+    '.midi' => 'music/crescendo',
+    '.midi' => 'x-music/x-midi',
+    '.mif' => 'application/x-frame',
+    '.mif' => 'application/x-mif',
+    '.mime' => 'message/rfc822',
+    '.mime' => 'www/mime',
+    '.mjf' => 'audio/x-vnd.audioexplosion.mjuicemediafile',
+    '.mjpg' => 'video/x-motion-jpeg',
+    '.mm' => 'application/base64',
+    '.mm' => 'application/x-meme',
+    '.mme' => 'application/base64',
+    '.mod' => 'audio/mod',
+    '.mod' => 'audio/x-mod',
+    '.moov' => 'video/quicktime',
+    '.mov' => 'video/quicktime',
+    '.movie' => 'video/x-sgi-movie',
+    '.mp2' => 'audio/mpeg',
+    '.mp2' => 'audio/x-mpeg',
+    '.mp2' => 'video/mpeg',
+    '.mp2' => 'video/x-mpeg',
+    '.mp2' => 'video/x-mpeq2a',
+    '.mp3' => 'audio/mpeg3',
+    '.mp3' => 'audio/x-mpeg-3',
+    '.mp3' => 'video/mpeg',
+    '.mp3' => 'video/x-mpeg',
+    '.mpa' => 'audio/mpeg',
+    '.mpa' => 'video/mpeg',
+    '.mpc' => 'application/x-project',
+    '.mpe' => 'video/mpeg',
+    '.mpeg' => 'video/mpeg',
+    '.mpg' => 'audio/mpeg',
+    '.mpg' => 'video/mpeg',
+    '.mpga' => 'audio/mpeg',
+    '.mpp' => 'application/vnd.ms-project',
+    '.mpt' => 'application/x-project',
+    '.mpv' => 'application/x-project',
+    '.mpx' => 'application/x-project',
+    '.mrc' => 'application/marc',
+    '.ms' => 'application/x-troff-ms',
+    '.mv' => 'video/x-sgi-movie',
+    '.my' => 'audio/make',
+    '.mzz' => 'application/x-vnd.audioexplosion.mzz',
+    '.nap' => 'image/naplps',
+    '.naplps' => 'image/naplps',
+    '.nc' => 'application/x-netcdf',
+    '.ncm' => 'application/vnd.nokia.configuration-message',
+    '.nif' => 'image/x-niff',
+    '.niff' => 'image/x-niff',
+    '.nix' => 'application/x-mix-transfer',
+    '.nsc' => 'application/x-conference',
+    '.nvd' => 'application/x-navidoc',
+    '.o' => 'application/octet-stream',
+    '.oda' => 'application/oda',
+    '.omc' => 'application/x-omc',
+    '.omcd' => 'application/x-omcdatamaker',
+    '.omcr' => 'application/x-omcregerator',
+    '.p' => 'text/x-pascal',
+    '.p10' => 'application/pkcs10',
+    '.p10' => 'application/x-pkcs10',
+    '.p12' => 'application/pkcs-12',
+    '.p12' => 'application/x-pkcs12',
+    '.p7a' => 'application/x-pkcs7-signature',
+    '.p7c' => 'application/pkcs7-mime',
+    '.p7c' => 'application/x-pkcs7-mime',
+    '.p7m' => 'application/pkcs7-mime',
+    '.p7m' => 'application/x-pkcs7-mime',
+    '.p7r' => 'application/x-pkcs7-certreqresp',
+    '.p7s' => 'application/pkcs7-signature',
+    '.part' => 'application/pro_eng',
+    '.pas' => 'text/pascal',
+    '.pbm' => 'image/x-portable-bitmap',
+    '.pcl' => 'application/vnd.hp-pcl',
+    '.pcl' => 'application/x-pcl',
+    '.pct' => 'image/x-pict',
+    '.pcx' => 'image/x-pcx',
+    '.pdb' => 'chemical/x-pdb',
+    '.pdf' => 'application/pdf',
+    '.pfunk' => 'audio/make',
+    '.pgm' => 'image/x-portable-greymap',
+    '.pic' => 'image/pict',
+    '.pict' => 'image/pict',
+    '.pkg' => 'application/x-newton-compatible-pkg',
+    '.pko' => 'application/vnd.ms-pki.pko',
+    '.pl' => 'text/plain',
+    '.pl' => 'text/x-script.perl',
+    '.plx' => 'application/x-pixclscript',
+    '.pm' => 'image/x-xpixmap',
+    '.pm' => 'text/x-script.perl-module',
+    '.pm4' => 'application/x-pagemaker',
+    '.pm5' => 'application/x-pagemaker',
+    '.png' => 'image/png',
+    '.pnm' => 'application/x-portable-anymap',
+    '.pnm' => 'image/x-portable-anymap',
+    '.pot' => 'application/mspowerpoint',
+    '.pot' => 'application/vnd.ms-powerpoint',
+    '.pov' => 'model/x-pov',
+    '.ppa' => 'application/vnd.ms-powerpoint',
+    '.ppm' => 'image/x-portable-pixmap',
+    '.pps' => 'application/mspowerpoint',
+    '.pps' => 'application/vnd.ms-powerpoint',
+    '.ppt' => 'application/mspowerpoint',
+    '.ppt' => 'application/powerpoint',
+    '.ppt' => 'application/vnd.ms-powerpoint',
+    '.ppt' => 'application/x-mspowerpoint',
+    '.ppz' => 'application/mspowerpoint',
+    '.pre' => 'application/x-freelance',
+    '.prt' => 'application/pro_eng',
+    '.ps' => 'application/postscript',
+    '.psd' => 'application/octet-stream',
+    '.pvu' => 'paleovu/x-pv',
+    '.pwz' => 'application/vnd.ms-powerpoint',
+    '.py' => 'text/x-script.phyton',
+    '.pyc' => 'applicaiton/x-bytecode.python',
+    '.qcp' => 'audio/vnd.qcelp',
+    '.qd3' => 'x-world/x-3dmf',
+    '.qd3d' => 'x-world/x-3dmf',
+    '.qif' => 'image/x-quicktime',
+    '.qt' => 'video/quicktime',
+    '.qtc' => 'video/x-qtc',
+    '.qti' => 'image/x-quicktime',
+    '.qtif' => 'image/x-quicktime',
+    '.ra' => 'audio/x-pn-realaudio',
+    '.ra' => 'audio/x-pn-realaudio-plugin',
+    '.ra' => 'audio/x-realaudio',
+    '.ram' => 'audio/x-pn-realaudio',
+    '.ras' => 'application/x-cmu-raster',
+    '.ras' => 'image/cmu-raster',
+    '.ras' => 'image/x-cmu-raster',
+    '.rast' => 'image/cmu-raster',
+    '.rexx' => 'text/x-script.rexx',
+    '.rf' => 'image/vnd.rn-realflash',
+    '.rgb' => 'image/x-rgb',
+    '.rm' => 'application/vnd.rn-realmedia',
+    '.rm' => 'audio/x-pn-realaudio',
+    '.rmi' => 'audio/mid',
+    '.rmm' => 'audio/x-pn-realaudio',
+    '.rmp' => 'audio/x-pn-realaudio',
+    '.rmp' => 'audio/x-pn-realaudio-plugin',
+    '.rng' => 'application/ringing-tones',
+    '.rng' => 'application/vnd.nokia.ringing-tone',
+    '.rnx' => 'application/vnd.rn-realplayer',
+    '.roff' => 'application/x-troff',
+    '.rp' => 'image/vnd.rn-realpix',
+    '.rpm' => 'audio/x-pn-realaudio-plugin',
+    '.rt' => 'text/richtext',
+    '.rt' => 'text/vnd.rn-realtext',
+    '.rtf' => 'application/rtf',
+    '.rtf' => 'application/x-rtf',
+    '.rtf' => 'text/richtext',
+    '.rtx' => 'application/rtf',
+    '.rtx' => 'text/richtext',
+    '.rv' => 'video/vnd.rn-realvideo',
+    '.s' => 'text/x-asm',
+    '.s3m' => 'audio/s3m',
+    '.saveme' => 'aapplication/octet-stream',
+    '.sbk' => 'application/x-tbook',
+    '.scm' => 'application/x-lotusscreencam',
+    '.scm' => 'text/x-script.guile',
+    '.scm' => 'text/x-script.scheme',
+    '.scm' => 'video/x-scm',
+    '.sdml' => 'text/plain',
+    '.sdp' => 'application/sdp',
+    '.sdp' => 'application/x-sdp',
+    '.sdr' => 'application/sounder',
+    '.sea' => 'application/sea',
+    '.sea' => 'application/x-sea',
+    '.set' => 'application/set',
+    '.sgm' => 'text/sgml',
+    '.sgm' => 'text/x-sgml',
+    '.sgml' => 'text/sgml',
+    '.sgml' => 'text/x-sgml',
+    '.sh' => 'application/x-bsh',
+    '.sh' => 'application/x-sh',
+    '.sh' => 'application/x-shar',
+    '.sh' => 'text/x-script.sh',
+    '.shar' => 'application/x-bsh',
+    '.shar' => 'application/x-shar',
+    '.shtml' => 'text/html',
+    '.shtml' => 'text/x-server-parsed-html',
+    '.sid' => 'audio/x-psid',
+    '.sit' => 'application/x-sit',
+    '.sit' => 'application/x-stuffit',
+    '.skd' => 'application/x-koan',
+    '.skm' => 'application/x-koan',
+    '.skp' => 'application/x-koan',
+    '.skt' => 'application/x-koan',
+    '.sl' => 'application/x-seelogo',
+    '.smi' => 'application/smil',
+    '.smil' => 'application/smil',
+    '.snd' => 'audio/basic',
+    '.snd' => 'audio/x-adpcm',
+    '.sol' => 'application/solids',
+    '.spc' => 'application/x-pkcs7-certificates',
+    '.spc' => 'text/x-speech',
+    '.spl' => 'application/futuresplash',
+    '.spr' => 'application/x-sprite',
+    '.sprite' => 'application/x-sprite',
+    '.src' => 'application/x-wais-source',
+    '.ssi' => 'text/x-server-parsed-html',
+    '.ssm' => 'application/streamingmedia',
+    '.sst' => 'application/vnd.ms-pki.certstore',
+    '.step' => 'application/step',
+    '.stl' => 'application/sla',
+    '.stl' => 'application/vnd.ms-pki.stl',
+    '.stl' => 'application/x-navistyle',
+    '.stp' => 'application/step',
+    '.sv4cpio' => 'application/x-sv4cpio',
+    '.sv4crc' => 'application/x-sv4crc',
+    '.svf' => 'image/vnd.dwg',
+    '.svf' => 'image/x-dwg',
+    '.svr' => 'application/x-world',
+    '.svr' => 'x-world/x-svr',
+    '.swf' => 'application/x-shockwave-flash',
+    '.t' => 'application/x-troff',
+    '.talk' => 'text/x-speech',
+    '.tar' => 'application/x-tar',
+    '.tbk' => 'application/toolbook',
+    '.tbk' => 'application/x-tbook',
+    '.tcl' => 'application/x-tcl',
+    '.tcl' => 'text/x-script.tcl',
+    '.tcsh' => 'text/x-script.tcsh',
+    '.tex' => 'application/x-tex',
+    '.texi' => 'application/x-texinfo',
+    '.texinfo' => ' lication/x-texinfo',
+    '.text' => 'application/plain',
+    '.text' => 'text/plain',
+    '.tgz' => 'application/gnutar',
+    '.tgz' => 'application/x-compressed',
+    '.tif' => 'image/tiff',
+    '.tif' => 'image/x-tiff',
+    '.tiff' => 'image/tiff',
+    '.tiff' => 'image/x-tiff',
+    '.tr' => 'application/x-troff',
+    '.tsi' => 'audio/tsp-audio',
+    '.tsp' => 'application/dsptype',
+    '.tsp' => 'audio/tsplayer',
+    '.tsv' => 'text/tab-separated-values',
+    '.turbot' => 'image/florian',
+    '.txt' => 'text/plain',
+    '.uil' => 'text/x-uil',
+    '.uni' => 'text/uri-list',
+    '.unis' => 'text/uri-list',
+    '.unv' => 'application/i-deas',
+    '.uri' => 'text/uri-list',
+    '.uris' => 'text/uri-list',
+    '.ustar' => 'application/x-ustar',
+    '.ustar' => 'multipart/x-ustar',
+    '.uu' => 'application/octet-stream',
+    '.uu' => 'text/x-uuencode',
+    '.uue' => 'text/x-uuencode',
+    '.vcd' => 'application/x-cdlink',
+    '.vcs' => 'text/x-vcalendar',
+    '.vda' => 'application/vda',
+    '.vdo' => 'video/vdo',
+    '.vew' => 'application/groupwise',
+    '.viv' => 'video/vivo',
+    '.viv' => 'video/vnd.vivo',
+    '.vivo' => 'video/vivo',
+    '.vivo' => 'video/vnd.vivo',
+    '.vmd' => 'application/vocaltec-media-desc',
+    '.vmf' => 'application/vocaltec-media-file',
+    '.voc' => 'audio/voc',
+    '.voc' => 'audio/x-voc',
+    '.vos' => 'video/vosaic',
+    '.vox' => 'audio/voxware',
+    '.vqe' => 'audio/x-twinvq-plugin',
+    '.vqf' => 'audio/x-twinvq',
+    '.vql' => 'audio/x-twinvq-plugin',
+    '.vrml' => 'application/x-vrml',
+    '.vrml' => 'model/vrml',
+    '.vrml' => 'x-world/x-vrml',
+    '.vrt' => 'x-world/x-vrt',
+    '.vsd' => 'application/x-visio',
+    '.vst' => 'application/x-visio',
+    '.vsw' => 'application/x-visio',
+    '.w60' => 'application/wordperfect6.0',
+    '.w61' => 'application/wordperfect6.1',
+    '.w6w' => 'application/msword',
+    '.wav' => 'audio/wav',
+    '.wav' => 'audio/x-wav',
+    '.wb1' => 'application/x-qpro',
+    '.wbmp' => 'image/vnd.wap.wbmp',
+    '.web' => 'application/vnd.xara',
+    '.wiz' => 'application/msword',
+    '.wk1' => 'application/x-123',
+    '.wmf' => 'windows/metafile',
+    '.wml' => 'text/vnd.wap.wml',
+    '.wmlc' => 'application/vnd.wap.wmlc',
+    '.wmls' => 'text/vnd.wap.wmlscript',
+    '.wmlsc' => 'application/vnd.wap.wmlscriptc',
+    '.word' => 'application/msword',
+    '.wp' => 'application/wordperfect',
+    '.wp5' => 'application/wordperfect',
+    '.wp5' => 'application/wordperfect6.0',
+    '.wp6' => 'application/wordperfect',
+    '.wpd' => 'application/wordperfect',
+    '.wpd' => 'application/x-wpwin',
+    '.wq1' => 'application/x-lotus',
+    '.wri' => 'application/mswrite',
+    '.wri' => 'application/x-wri',
+    '.wrl' => 'application/x-world',
+    '.wrl' => 'model/vrml',
+    '.wrl' => 'x-world/x-vrml',
+    '.wrz' => 'model/vrml',
+    '.wrz' => 'x-world/x-vrml',
+    '.wsc' => 'text/scriplet',
+    '.wsrc' => 'application/x-wais-source',
+    '.wtk' => 'application/x-wintalk',
+    '.xbm' => 'image/x-xbitmap',
+    '.xbm' => 'image/x-xbm',
+    '.xbm' => 'image/xbm',
+    '.xdr' => 'video/x-amt-demorun',
+    '.xgz' => 'xgl/drawing',
+    '.xif' => 'image/vnd.xiff',
+    '.xl' => 'application/excel',
+    '.xla' => 'application/excel',
+    '.xla' => 'application/x-excel',
+    '.xla' => 'application/x-msexcel',
+    '.xlb' => 'application/excel',
+    '.xlb' => 'application/vnd.ms-excel',
+    '.xlb' => 'application/x-excel',
+    '.xlc' => 'application/excel',
+    '.xlc' => 'application/vnd.ms-excel',
+    '.xlc' => 'application/x-excel',
+    '.xld' => 'application/excel',
+    '.xld' => 'application/x-excel',
+    '.xlk' => 'application/excel',
+    '.xlk' => 'application/x-excel',
+    '.xll' => 'application/excel',
+    '.xll' => 'application/vnd.ms-excel',
+    '.xll' => 'application/x-excel',
+    '.xlm' => 'application/excel',
+    '.xlm' => 'application/vnd.ms-excel',
+    '.xlm' => 'application/x-excel',
+    '.xls' => 'application/excel',
+    '.xls' => 'application/vnd.ms-excel',
+    '.xls' => 'application/x-excel',
+    '.xls' => 'application/x-msexcel',
+    '.xlt' => 'application/excel',
+    '.xlt' => 'application/x-excel',
+    '.xlv' => 'application/excel',
+    '.xlv' => 'application/x-excel',
+    '.xlw' => 'application/excel',
+    '.xlw' => 'application/vnd.ms-excel',
+    '.xlw' => 'application/x-excel',
+    '.xlw' => 'application/x-msexcel',
+    '.xm' => 'audio/xm',
+    '.xml' => 'application/xml',
+    '.xml' => 'text/xml',
+    '.xmz' => 'xgl/movie',
+    '.xpix' => 'application/x-vnd.ls-xpix',
+    '.xpm' => 'image/x-xpixmap',
+    '.xpm' => 'image/xpm',
+    '.x-png' => 'image/png',
+    '.xsr' => 'video/x-amt-showrun',
+    '.xwd' => 'image/x-xwd',
+    '.xwd' => 'image/x-xwindowdump',
+    '.xyz' => 'chemical/x-pdb',
+    '.z' => 'application/x-compress',
+    '.z' => 'application/x-compressed',
+    '.zip' => 'application/x-compressed',
+    '.zip' => 'application/x-zip-compressed',
+    '.zip' => 'application/zip',
+    '.zip' => 'multipart/x-zip',
+    '.zoo' => 'application/octet-stream',
+    '.zsh' => 'text/x-script.zsh)'
+];
\ No newline at end of file
diff --git a/config/routes.php b/config/routes.php
index 2c62e92..43f813e 100755
--- a/config/routes.php
+++ b/config/routes.php
@@ -10,12 +10,10 @@
  */
 return 
 [
-    'path' => SS_PATH . 'routes' . '/',
-    'routes' => 
-    [
-        'web',
-        'api',
+    'path' => SS_PATH . '/routes' . '/',
+    'routes' => [
         'auth',
-        'hello'
+        'api',
+        'web'
     ]
 ];
\ No newline at end of file
diff --git a/index.php b/index.php
index 88ce425..252c825 100755
--- a/index.php
+++ b/index.php
@@ -29,7 +29,8 @@
 | bit)
 |
 */
-define('SS_PATH', realpath(dirname(__FILE__)) .'/');
+
+define('SS_PATH', realpath(dirname(__FILE__)));
 
 /*
 |--------------------------------------------------------------------------
@@ -42,7 +43,7 @@
 | as possible.
 |
 */
-require_once(SS_PATH.'app/autoloader.php');
+require_once(SS_PATH.'/app/autoloader.php');
 
 /*
 |--------------------------------------------------------------------------
@@ -53,4 +54,4 @@
 | manager and routing runs perfectly well.
 |
 */
-require_once(SS_PATH.'app/bootstrap.php');
\ No newline at end of file
+require_once(SS_PATH.'/app/bootstrap.php');
\ No newline at end of file
diff --git a/public/index.php b/public/index.php
new file mode 100755
index 0000000..cf83909
--- /dev/null
+++ b/public/index.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * StupidlySimple - A PHP Framework For Lazy Developers
+ *
+ * @package		StupidlySimple
+ * @author		Fariz Luqman <fariz.fnb@gmail.com>
+ * @copyright	2017 Fariz Luqman
+ * @license		MIT
+ * @link		https://stupidlysimple.github.io/
+ */
+
+/*
+|--------------------------------------------------------------------------
+| Track the Pre-Execution Time
+|--------------------------------------------------------------------------
+|
+| Get the time in microtime format for you to measure the awesomeness by
+| Damn Stupid Simple framework.
+|
+*/
+define('SS_START', microtime(true));
+
+/*
+|--------------------------------------------------------------------------
+| Use Full Paths for Better Performance
+|--------------------------------------------------------------------------
+|
+| The full path starting from the index.php file. Improves performance (a
+| bit)
+|
+*/
+define('SS_PATH', realpath(dirname(__FILE__).'/../'));
+
+/*
+|--------------------------------------------------------------------------
+| Include the Autoloader file
+|--------------------------------------------------------------------------
+|
+| In this file we will register the Autoloader from Composer. Environment
+| variables (that you set on config/env.php) will be registered this time. 
+| Our sweet debugging tool will also be loaded to track errors as earlier
+| as possible.
+|
+*/
+require_once(SS_PATH.'/app/autoloader.php');
+
+/*
+|--------------------------------------------------------------------------
+| Include the Bootstrap File
+|--------------------------------------------------------------------------
+|
+| The bootstrapper will make sure that every services, like database, cache
+| manager and routing runs perfectly well.
+|
+*/
+require_once(SS_PATH.'/app/bootstrap.php');
\ No newline at end of file
diff --git a/resources/views/admin/home.php b/resources/views/admin/home.tpl.php
similarity index 90%
rename from resources/views/admin/home.php
rename to resources/views/admin/home.tpl.php
index 173517d..024959b 100644
--- a/resources/views/admin/home.php
+++ b/resources/views/admin/home.tpl.php
@@ -5,18 +5,14 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = [ 'title' => 'StupidlySimple PHP | Home' ];
-Core\Viewer::file('../layouts/head.php', $data); ?>
+<?php Core\Viewer::file('../layouts/head', $data = [ 'title' => 'StupidlySimple PHP | Home' ]); ?>
 <body>
 <!-- Wrapper -->
 <div id="wrapper">
 
-    <?php
-    $top_data = ['is_admin' => true];
-    Viewer::file('../layouts/top.php', $top_data) ?>
+    <?php Viewer::file('layouts/top', $top_data = ['is_admin' => true]); ?>
 
-    <?php Viewer::file('../layouts/menu.php') ?>
+    <?php Viewer::file('layouts/menu') ?>
 
     <!-- Main -->
     <div id="main">
@@ -98,10 +94,10 @@
         </div>
     </div>
 
-    <?php Viewer::file('../layouts/footer.php') ?>
+    <?php Viewer::file('layouts/footer') ?>
 
 </div>
 
-<?php Viewer::file('../layouts/scripts.php') ?>
+<?php Viewer::file('layouts/scripts') ?>
 </body>
 </html>
\ No newline at end of file
diff --git a/resources/views/auth/login.php b/resources/views/auth/login.tpl.php
similarity index 91%
rename from resources/views/auth/login.php
rename to resources/views/auth/login.tpl.php
index 3e5969d..1230fcc 100755
--- a/resources/views/auth/login.php
+++ b/resources/views/auth/login.tpl.php
@@ -33,7 +33,11 @@
             </ul>
             <div class="tab-content tabs-login col-lg-12 col-md-12 col-sm-12 cols-xs-12">
                 <div id="login-access" class="tab-pane fade active in">
-                    <h2 class="logo"><img style="width:100px" src="resources/assets/images/logo.png"></h2>
+                    <h2 class="logo">
+                        <a href="./">
+                            <img style="width:100px" src="resources/assets/images/logo.png">
+                        </a>
+                    </h2>
                     <form method="post" accept-charset="utf-8" autocomplete="off" role="form" class="form-horizontal">
                         <div class="form-group ">
                             <?php
@@ -43,12 +47,12 @@
                                     </div>');
                             }
                             ?>
-                            <label for="login" class="sr-only">Email</label>
+                            <label for="login">Username/Email</label>
                             <input type="text" class="form-control" name="email" id="login_value"
                                    placeholder="Email" tabindex="1" value=""/>
                         </div>
                         <div class="form-group ">
-                            <label for="password" class="sr-only">Password</label>
+                            <label for="password">Password</label>
                             <input type="password" class="form-control" name="password" id="password"
                                    placeholder="Password" value="" tabindex="2"/>
                         </div>
diff --git a/resources/views/auth/register.php b/resources/views/auth/register.tpl.php
similarity index 89%
rename from resources/views/auth/register.php
rename to resources/views/auth/register.tpl.php
index a25c7b2..28aa020 100755
--- a/resources/views/auth/register.php
+++ b/resources/views/auth/register.tpl.php
@@ -32,7 +32,11 @@
             </ul>
             <div class="tab-content tabs-login col-lg-12 col-md-12 col-sm-12 cols-xs-12">
                 <div id="login-access" class="tab-pane fade active in">
-                    <h2 class="logo"><img style="width:100px" src="resources/assets/images/logo.png"></h2>
+                    <h2 class="logo">
+                        <a href="./">
+                            <img style="width:100px" src="resources/assets/images/logo.png">
+                        </a>
+                    </h2>
                     <form method="post" accept-charset="utf-8" autocomplete="off" role="form" class="form-horizontal">
                         <div class="form-group ">
                             <?php
@@ -42,18 +46,18 @@
                                     </div>');
                             }
                             ?>
-                            <label for="login" class="sr-only">Email</label>
+                            <label for="login">Username/Email</label>
                             <input type="text" class="form-control" name="email" id="login_value"
                                    placeholder="Email" tabindex="1" value=""/>
                         </div>
                         <div class="form-group ">
-                            <label for="password" class="sr-only">Password</label>
+                            <label for="password">Password</label>
                             <input type="password" class="form-control" name="password" id="password"
                                    placeholder="Password" value="" tabindex="2"/>
                         </div>
                         <br/>
                         <div class="form-group ">
-                            <button type="submit" id="submit" tabindex="5" class="btn btn-lg btn-primary">Login</button>
+                            <button type="submit" id="submit" tabindex="5" class="btn btn-lg btn-primary">Register</button>
                         </div>
                     </form>
                 </div>
diff --git a/resources/views/controller.php b/resources/views/controller.tpl.php
similarity index 92%
rename from resources/views/controller.php
rename to resources/views/controller.tpl.php
index 41d8f46..6eee85f 100644
--- a/resources/views/controller.php
+++ b/resources/views/controller.tpl.php
@@ -7,14 +7,14 @@
 <html>
 <?php
 $data = [ 'title' => 'StupidlySimple | Controller' ];
-Core\Viewer::file('layouts/head.php', $data); ?>
+Core\Viewer::file('layouts/head', $data); ?>
 <body>
 <!-- Wrapper -->
 <div id="wrapper">
 
-    <?php Viewer::file('layouts/top.php') ?>
+    <?php Viewer::file('layouts/top') ?>
 
-    <?php Viewer::file('layouts/menu.php') ?>
+    <?php Viewer::file('layouts/menu') ?>
 
     <!-- Main -->
     <div id="main">
@@ -71,10 +71,10 @@
         </div>
     </div>
 
-<?php Viewer::file('layouts/footer.php') ?>
+<?php Viewer::file('layouts/footer') ?>
 
 </div>
 
-<?php Viewer::file('layouts/scripts.php') ?>
+<?php Viewer::file('layouts/scripts') ?>
 </body>
 </html>
\ No newline at end of file
diff --git a/resources/views/hello.php b/resources/views/hello.tpl.php
similarity index 100%
rename from resources/views/hello.php
rename to resources/views/hello.tpl.php
diff --git a/resources/views/home.php b/resources/views/home.tpl.php
similarity index 93%
rename from resources/views/home.php
rename to resources/views/home.tpl.php
index b383ca8..cded768 100644
--- a/resources/views/home.php
+++ b/resources/views/home.tpl.php
@@ -6,15 +6,16 @@
 -->
 <html>
 <?php
-$data = [ 'title' => 'StupidlySimple PHP | Home' ];
-Core\Viewer::file('layouts/head.php', $data); ?>
+$data = ['title' => 'StupidlySimple PHP | Home'];
+Viewer::file('layouts/head', $data);
+?>
 <body>
 <!-- Wrapper -->
 <div id="wrapper">
 
-    <?php Viewer::file('layouts/top.php') ?>
+    <?php Viewer::file('layouts/top') ?>
 
-    <?php Viewer::file('layouts/menu.php') ?>
+    <?php Viewer::file('layouts/menu') ?>
 
     <!-- Main -->
     <div id="main">
@@ -25,6 +26,7 @@
                     from the root directory. You can read tutorials and documentations on <a target="_blank" href="https://stupidlysimple.github.io">our website</a>
                     or even from here.
                     Start coding today and get creative.</p>
+
             </header>
             <section class="tiles">
                 <article class="style1">
@@ -143,10 +145,11 @@
         </div>
     </div>
 
-<?php Viewer::file('layouts/footer.php') ?>
+<?php Viewer::file('layouts/footer') ?>
 
 </div>
 
-<?php Viewer::file('layouts/scripts.php') ?>
+<?php Viewer::file('layouts/scripts') ?>
+
 </body>
 </html>
\ No newline at end of file
diff --git a/resources/views/layouts/footer.php b/resources/views/layouts/footer.tpl.php
similarity index 100%
rename from resources/views/layouts/footer.php
rename to resources/views/layouts/footer.tpl.php
diff --git a/resources/views/layouts/head.php b/resources/views/layouts/head.tpl.php
similarity index 100%
rename from resources/views/layouts/head.php
rename to resources/views/layouts/head.tpl.php
diff --git a/resources/views/layouts/menu.php b/resources/views/layouts/menu.tpl.php
similarity index 100%
rename from resources/views/layouts/menu.php
rename to resources/views/layouts/menu.tpl.php
diff --git a/resources/views/layouts/scripts.php b/resources/views/layouts/scripts.tpl.php
similarity index 100%
rename from resources/views/layouts/scripts.php
rename to resources/views/layouts/scripts.tpl.php
diff --git a/resources/views/layouts/top.php b/resources/views/layouts/top.tpl.php
similarity index 100%
rename from resources/views/layouts/top.php
rename to resources/views/layouts/top.tpl.php
diff --git a/resources/views/model.php b/resources/views/model.tpl.php
similarity index 91%
rename from resources/views/model.php
rename to resources/views/model.tpl.php
index f68def8..d68d76c 100644
--- a/resources/views/model.php
+++ b/resources/views/model.tpl.php
@@ -7,14 +7,15 @@
 <html>
 <?php
 $data = [ 'title' => 'StupidlySimple PHP | Service' ];
-Core\Viewer::file('layouts/head.php', $data); ?>
+Core\Viewer::file('layouts/head', $data);
+?>
 <body>
 <!-- Wrapper -->
 <div id="wrapper">
 
-    <?php Viewer::file('layouts/top.php') ?>
+    <?php Viewer::file('layouts/top') ?>
 
-    <?php Viewer::file('layouts/menu.php') ?>
+    <?php Viewer::file('layouts/menu') ?>
 
     <!-- Main -->
     <div id="main">
@@ -71,10 +72,10 @@
         </div>
     </div>
 
-<?php Viewer::file('layouts/footer.php') ?>
+<?php Viewer::file('layouts/footer') ?>
 
 </div>
 
-<?php Viewer::file('layouts/scripts.php') ?>
+<?php Viewer::file('layouts/scripts') ?>
 </body>
 </html>
\ No newline at end of file
diff --git a/resources/views/routing.php b/resources/views/routing.tpl.php
similarity index 89%
rename from resources/views/routing.php
rename to resources/views/routing.tpl.php
index 16d3b4a..a70853e 100644
--- a/resources/views/routing.php
+++ b/resources/views/routing.tpl.php
@@ -7,14 +7,15 @@
 <html>
 <?php
 $data = [ 'title' => 'StupidlySimple PHP | Service' ];
-Core\Viewer::file('layouts/head.php', $data); ?>
+Core\Viewer::file('layouts/head', $data);
+?>
 <body>
 <!-- Wrapper -->
 <div id="wrapper">
 
-    <?php Viewer::file('layouts/top.php') ?>
+    <?php Viewer::file('layouts/top') ?>
 
-    <?php Viewer::file('layouts/menu.php') ?>
+    <?php Viewer::file('layouts/menu') ?>
 
     <!-- Main -->
     <div id="main">
@@ -47,10 +48,10 @@
         </div>
     </div>
 
-<?php Viewer::file('layouts/footer.php') ?>
+<?php Viewer::file('layouts/footer') ?>
 
 </div>
 
-<?php Viewer::file('layouts/scripts.php') ?>
+<?php Viewer::file('layouts/scripts') ?>
 </body>
 </html>
\ No newline at end of file
diff --git a/resources/views/service.php b/resources/views/service.tpl.php
similarity index 88%
rename from resources/views/service.php
rename to resources/views/service.tpl.php
index 1d53e83..cdb936e 100644
--- a/resources/views/service.php
+++ b/resources/views/service.tpl.php
@@ -7,14 +7,14 @@
 <html>
 <?php
 $data = [ 'title' => 'StupidlySimple PHP | Service' ];
-Core\Viewer::file('layouts/head.php', $data); ?>
+Core\Viewer::file('layouts/head', $data); ?>
 <body>
 <!-- Wrapper -->
 <div id="wrapper">
 
-    <?php Viewer::file('layouts/top.php') ?>
+    <?php Viewer::file('layouts/top') ?>
 
-    <?php Viewer::file('layouts/menu.php') ?>
+    <?php Viewer::file('layouts/menu') ?>
 
     <!-- Main -->
     <div id="main">
@@ -51,10 +51,10 @@
         </div>
     </div>
 
-<?php Viewer::file('layouts/footer.php') ?>
+<?php Viewer::file('layouts/footer') ?>
 
 </div>
 
-<?php Viewer::file('layouts/scripts.php') ?>
+<?php Viewer::file('layouts/scripts') ?>
 </body>
 </html>
\ No newline at end of file
diff --git a/resources/views/test.tpl.php b/resources/views/test.tpl.php
new file mode 100644
index 0000000..587cd4f
--- /dev/null
+++ b/resources/views/test.tpl.php
@@ -0,0 +1,2 @@
+<?php
+echo('Hello, World!');
\ No newline at end of file
diff --git a/routes/auth.php b/routes/auth.php
index 98c87d6..af8eca1 100755
--- a/routes/auth.php
+++ b/routes/auth.php
@@ -9,6 +9,17 @@
  * @link		https://stupidlysimple.github.io/
  */
 
+/*
+|--------------------------------------------------------------------------
+| Login and Registration Page
+|--------------------------------------------------------------------------
+|
+| This will display the login and register page respectively
+|
+*/
+Router::get('/login', 'auth/login');
+Router::get('/register', 'auth/register');
+
 /*
 |--------------------------------------------------------------------------
 | Login Controller Demonstration
@@ -17,9 +28,6 @@
 | This is to demonstrate using Controller to manage authentication
 |
 */
-Router::get('login', 'Controller\Auth@displayLoginPage');
-Router::post('login', 'Controller\Auth@doAuthenticate');
-Router::get('register', 'Controller\Auth@displayRegisterPage');
-Router::post('register', 'Controller\Auth@doRegister');
-Router::get('logout', 'Controller\Auth@doLogout');
-Router::get('admin', 'Controller\Admin@displayAdminPage');
\ No newline at end of file
+Router::post('/login', 'Controller\Auth@authenticate');
+Router::post('/register', 'Controller\Auth@register');
+Router::get('/logout', 'Controller\Auth@logout');
\ No newline at end of file
diff --git a/routes/hello.php b/routes/hello.php
deleted file mode 100755
index 7244cef..0000000
--- a/routes/hello.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * StupidlySimple - A PHP Framework For Lazy Developers
- *
- * @package		StupidlySimple
- * @author		Fariz Luqman <fariz.fnb@gmail.com>
- * @copyright	2017 Fariz Luqman
- * @license		MIT
- * @link		https://stupidlysimple.github.io/
- */
-
-/*
-|--------------------------------------------------------------------------
-| Controller Demonstration
-|--------------------------------------------------------------------------
-|
-| This is to demonstrate using Controller with Damn Stupid Simple framework
-| Try to go to /hello or /hello/yourname and see what it shows
-|
-*/
-Router::get('hello', function (){
-    Viewer::file('resources/views/hello.php');
-});
-Router::get('hello/(:any)', 'Controller\Hello@greetWithName');
-Router::post('hello', 'Controller\Hello@greetForm');
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 01edf70..151b93b 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -14,34 +14,67 @@
 | The Basic Routes - Route GET / into /home.php
 |--------------------------------------------------------------------------
 |
-| Requests from / will be served by the file /home.php. You can also put
-| view files (home.php) into any directory within the project.
+| Requests from / will be served by the file /home.view.php. You can also put
+| view files (home.view.php) into any directory within the project.
 |
 */
-Router::get('', function() {
-	Viewer::file('resources/views/home.php');
+Router::get('/', 'home');
+
+/*
+|--------------------------------------------------------------------------
+| Controller & HTTP Middleware Demonstration
+|--------------------------------------------------------------------------
+|
+| This is to demonstrate using Controller and Middleware with
+| StupidlySimple framework. Try to go to /hello or /hello/yourname and see
+| what it shows.
+|
+| Middleware is about how our application responds to incoming requests.
+| Middleware look into the incoming request, and make decisions based on
+| this request. We can build entire applications only using middleware.
+|
+| In this example, the hello middleware will demonstrate filtering a
+| request, which is the /route/to/be/filtered. Try to go to the url and
+| see what happen.
+|
+*/
+Router::group('Middleware\Hello@filter', function() {
+    Router::get('/hello', 'hello');
+    Router::get('/hello/(:any)', 'Controller\Hello@greetWithName');
+    Router::post('/hello', 'Controller\Hello@greetForm');
+    Router::get('/route/to/be/filtered', 'hello');
 });
 
 /*
 |--------------------------------------------------------------------------
-| Lazy Routing - Route GET /(:any) into /(:any).php
+| Administrator Demonstration
 |--------------------------------------------------------------------------
 |
-| This is to demonstrate wildcard routing, which allows you to route any
-| URI into any file.
+| This is to demonstrate using group with the authentication checker. The
+| middleware will intercept the HTTP request if the user is not logged in.
 |
 */
-Router::get('(:any)', function($match) {
-	Viewer::file('resources/views/' . $match);
+Router::group('Controller\Auth@check', function() {
+    Router::get('/admin', 'admin/home');
+    Router::post('/updateuser', 'Controller\User@editUser');
+    Router::get('/deleteuser', 'Controller\User@deleteUser');
 });
 
 /*
 |--------------------------------------------------------------------------
-| Basic Crud Demonstration
+| Lazy Routing - Route GET /(:any) into /resources/views/(:any).view.php
 |--------------------------------------------------------------------------
 |
-| This is to demonstrate posting form data and deleting into a controller
+| Ever wondered where's the rest of the routes is defined? It is in here,
+| the wildcard route.
+|
+| This is to demonstrate wildcard routing, which allows you to route any
+| URI into any of the view files.
+|
+| The lazy routing must be put at the end of the file or it will override
+| other route declarations.
 |
 */
-Router::post('updateuser', 'Controller\User@editUser');
-Router::get('deleteuser', 'Controller\User@deleteUser');
\ No newline at end of file
+Router::get('/(:any)', function($match) {
+	Viewer::file($match);
+});
\ No newline at end of file

From 793eabdce35931feabd3fe04b2e6630ec461cf4c Mon Sep 17 00:00:00 2001
From: farizluqman <fariz.fnb@gmail.com>
Date: Wed, 4 Oct 2017 19:19:32 +0800
Subject: [PATCH 12/34] Release candidate 0.5

---
 app/Controller/Admin.php | 33 ---------------------------------
 app/Controller/Web.php   | 21 +++++++++++++++++++++
 2 files changed, 21 insertions(+), 33 deletions(-)
 delete mode 100755 app/Controller/Admin.php
 create mode 100755 app/Controller/Web.php

diff --git a/app/Controller/Admin.php b/app/Controller/Admin.php
deleted file mode 100755
index a4089c9..0000000
--- a/app/Controller/Admin.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * StupidlySimple - A PHP Framework For Lazy Developers
- *
- * @package		StupidlySimple
- * @author		Fariz Luqman <fariz.fnb@gmail.com>
- * @copyright	2017 Fariz Luqman
- * @license		MIT
- * @link		https://stupidlysimple.github.io/
- */
-namespace Controller;
-
-use Sentry;
-use Viewer;
-use Response;
-
-class Admin {
-
-    public function __construct(){
-        if(Sentry::check() !== true){
-            Response::redirect('login');
-        }
-    }
-
-    public static function redirectToAdminHome(){
-        Response::redirect('admin');
-    }
-
-    public function displayAdminPage(){
-        Viewer::file('resources/views/admin/home');
-    }
-
-}
diff --git a/app/Controller/Web.php b/app/Controller/Web.php
new file mode 100755
index 0000000..d4aec01
--- /dev/null
+++ b/app/Controller/Web.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * StupidlySimple - A PHP Framework For Lazy Developers
+ *
+ * @package		StupidlySimple
+ * @author		Fariz Luqman <fariz.fnb@gmail.com>
+ * @copyright	2017 Fariz Luqman
+ * @license		MIT
+ * @link		https://stupidlysimple.github.io/
+ */
+namespace Controller;
+
+/**
+ * Class Web
+ * @package Controller
+ */
+class Web {
+    public function start(){
+        // do nothing
+    }
+}
\ No newline at end of file

From 585ab3a032e6466aa42aac230a4e62413a8691c1 Mon Sep 17 00:00:00 2001
From: farizluqman <fariz.fnb@gmail.com>
Date: Wed, 4 Oct 2017 19:25:59 +0800
Subject: [PATCH 13/34] Fix Travis-CI .yml and xml

---
 .travis.yml | 2 +-
 phpunit.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a631e4d..cdc518c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,4 +2,4 @@ language: php
 php:
 - 5.6
 before_script: composer update
-script: phpunit vendor/damnstupidsimple/core/tests/AppTest.php --colors=auto
+script: phpunit vendor/stupidlysimple/php-core/tests/AppTest.php --colors=auto
diff --git a/phpunit.xml b/phpunit.xml
index a7acf40..1b84158 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -7,5 +7,5 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-		 bootstrap="vendor/stupidlysimple/core/tests/bootstrap.php">
+		 bootstrap="vendor/stupidlysimple/php-core/tests/bootstrap.php">
 </phpunit>
\ No newline at end of file

From 421c312e2dbe4fce6525a863663711db930d9f41 Mon Sep 17 00:00:00 2001
From: Fariz Luqman <fariz.fnb@gmail.com>
Date: Thu, 5 Oct 2017 18:07:22 +0000
Subject: [PATCH 14/34] Apply fixes from StyleCI

---
 app/Controller/Auth.php               |  112 +--
 app/Controller/Hello.php              |   20 +-
 app/Controller/User.php               |   61 +-
 app/Controller/Web.php                |   16 +-
 app/Middleware/Hello.php              |   25 +-
 app/Model/Comment.php                 |   15 +-
 app/Model/Post.php                    |   16 +-
 app/Model/User.php                    |    9 +-
 app/Service/Test/TestService.php      |   19 +-
 app/autoloader.php                    |   12 +-
 app/bootstrap.php                     |    8 +-
 config/aliases.php                    |   32 +-
 config/cache.php                      |   28 +-
 config/database.php                   |    9 +-
 config/env.php                        |   32 +-
 config/mimetypes.php                  | 1282 ++++++++++++-------------
 config/routes.php                     |   14 +-
 config/services.php                   |    8 +-
 config/storage.php                    |    3 +-
 config/timetrackr.php                 |    8 +-
 index.php                             |   10 +-
 public/index.php                      |   10 +-
 resources/views/admin/home.tpl.php    |   42 +-
 resources/views/auth/login.tpl.php    |    6 +-
 resources/views/auth/register.tpl.php |    6 +-
 resources/views/controller.tpl.php    |    4 +-
 resources/views/hello.tpl.php         |    2 +-
 resources/views/home.tpl.php          |    6 +-
 resources/views/layouts/menu.tpl.php  |   10 +-
 resources/views/layouts/top.tpl.php   |    2 +-
 resources/views/model.tpl.php         |   20 +-
 resources/views/routing.tpl.php       |    6 +-
 resources/views/service.tpl.php       |    6 +-
 resources/views/test.tpl.php          |    2 +-
 routes/api.php                        |    4 +-
 routes/auth.php                       |    6 +-
 routes/web.php                        |   14 +-
 37 files changed, 928 insertions(+), 957 deletions(-)

diff --git a/app/Controller/Auth.php b/app/Controller/Auth.php
index af4b9a3..02cb058 100755
--- a/app/Controller/Auth.php
+++ b/app/Controller/Auth.php
@@ -1,146 +1,126 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
+
 namespace Controller;
 
-use Sentry;
-use Response;
 use Request;
-use Viewer;
+use Response;
+use Sentry;
 
 /**
- * Class Auth
- * @package Controller
+ * Class Auth.
  */
-class Auth {
+class Auth
+{
     private static $successRedirectURL = 'admin';
 
-    /**
-     *
-     */
     public static function check()
     {
-        if(Sentry::check() !== true){
+        if (Sentry::check() !== true) {
             Response::redirect('login');
         }
     }
 
-    /**
-     *
-     */
     public static function authenticate()
     {
         try {
             // Login credentials
-            $credentials = array(
+            $credentials = [
                 'email'    => Request::get('email'),
-                'password' => Request::get('password')
-            );
+                'password' => Request::get('password'),
+            ];
 
             // Authenticate the user
             $user = Sentry::authenticate($credentials, false);
-
         } catch (\Cartalyst\Sentry\Users\LoginRequiredException $e) {
             Response::redirect('login')->with([
-                'login_message'=>'Login credentials not supplied',
-                'type'         =>'alert-danger'
+                'login_message'=> 'Login credentials not supplied',
+                'type'         => 'alert-danger',
             ]);
-
         } catch (\Cartalyst\Sentry\Users\PasswordRequiredException $e) {
             Response::redirect('login')->with([
-                'login_message'=>'Password field is required',
-                'type'         =>'alert-danger'
+                'login_message'=> 'Password field is required',
+                'type'         => 'alert-danger',
             ]);
-
         } catch (\Cartalyst\Sentry\Users\WrongPasswordException $e) {
             Response::redirect('login')->with([
-                'login_message'=>'Wrong password, try again.',
-                'type'         =>'alert-danger'
+                'login_message'=> 'Wrong password, try again.',
+                'type'         => 'alert-danger',
             ]);
-
         } catch (\Cartalyst\Sentry\Users\UserNotFoundException $e) {
             Response::redirect('login')->with([
-                'login_message'=>'User not found.',
-                'type'         =>'alert-danger'
+                'login_message'=> 'User not found.',
+                'type'         => 'alert-danger',
             ]);
-
         } catch (\Cartalyst\Sentry\Users\UserNotActivatedException $e) {
             Response::redirect('login')->with([
-                'login_message'=>'User is not activated.',
-                'type'         =>'alert-danger'
+                'login_message'=> 'User is not activated.',
+                'type'         => 'alert-danger',
             ]);
-
         } finally {
-            if(Sentry::check() === true){
+            if (Sentry::check() === true) {
                 Response::redirect(self::$successRedirectURL)->with([
-                    'login_message'=>'Login successful.',
-                    'type'         =>'alert-success'
+                    'login_message'=> 'Login successful.',
+                    'type'         => 'alert-success',
                 ]);
-            }else{
+            } else {
                 Response::redirect('login')->with([
-                    'login_message'=>'Unable to login',
-                    'type'         =>'alert-danger'
+                    'login_message'=> 'Unable to login',
+                    'type'         => 'alert-danger',
                 ]);
             }
         }
     }
 
-    /**
-     *
-     */
     public static function register()
     {
         try {
-            $user = Sentry::register(array(
-                'email'    => Request::get('email'),
-                'password' => Request::get('password'),
+            $user = Sentry::register([
+                'email'      => Request::get('email'),
+                'password'   => Request::get('password'),
                 'first_name' => Request::get('first_name'),
-                'last_name' => Request::get('last_name')
-            ), $activate = true);
+                'last_name'  => Request::get('last_name'),
+            ], $activate = true);
         } catch (\Cartalyst\Sentry\Users\LoginRequiredException $e) {
             Response::redirect('register')->with([
-                'login_message'=>'Login credentials not supplied',
-                'type'         =>'alert-danger'
+                'login_message'=> 'Login credentials not supplied',
+                'type'         => 'alert-danger',
             ]);
         } catch (\Cartalyst\Sentry\Users\PasswordRequiredException $e) {
             Response::redirect('register')->with([
-                'login_message'=>'Password field is required',
-                'type'         =>'alert-danger'
+                'login_message'=> 'Password field is required',
+                'type'         => 'alert-danger',
             ]);
         } catch (\Cartalyst\Sentry\Users\UserExistsException $e) {
             Response::redirect('register')->with([
-                'login_message'=>'User with that login already exist.',
-                'type'         =>'alert-danger'
+                'login_message'=> 'User with that login already exist.',
+                'type'         => 'alert-danger',
             ]);
-        } catch(\Exception $e) {
-
+        } catch (\Exception $e) {
         } finally {
-            if($user){
+            if ($user) {
                 Response::redirect('login')->with([
-                    'login_message'=>'Registration successful. You can now login.',
-                    'type'         =>'alert-success'
+                    'login_message'=> 'Registration successful. You can now login.',
+                    'type'         => 'alert-success',
                 ]);
             }
         }
     }
 
-    /**
-     *
-     */
     public static function logout()
     {
         Sentry::logout();
         Response::redirect('login')->with([
-            'login_message'=>'Logout successful.',
-            'type'         =>'alert-success'
-        ]);;
+            'login_message'=> 'Logout successful.',
+            'type'         => 'alert-success',
+        ]);
     }
-
 }
diff --git a/app/Controller/Hello.php b/app/Controller/Hello.php
index 6406b95..6620e4f 100755
--- a/app/Controller/Hello.php
+++ b/app/Controller/Hello.php
@@ -1,32 +1,32 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
+
 namespace Controller;
 
-use Core\Response;
 use Core\Request;
 
-class Hello {
-
+class Hello
+{
     public function greetWithName($name)
     {
-        echo ('Hello, '. $name. '!');
+        echo 'Hello, '.$name.'!';
     }
 
     public function greetForm()
     {
         $name = Request::get('name');
-        if($name == ''){
+        if ($name == '') {
             echo 'How could you have no name :(';
-        }else{
-            echo ('Hello, '. $name. '!');
+        } else {
+            echo 'Hello, '.$name.'!';
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/Controller/User.php b/app/Controller/User.php
index 59f5524..f2cf0a4 100755
--- a/app/Controller/User.php
+++ b/app/Controller/User.php
@@ -1,52 +1,49 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
+
 namespace Controller;
 
-use Sentry;
-use Viewer;
-use Response;
 use Request;
+use Response;
+use Sentry;
 
-class User {
-
+class User
+{
     /**
      * User constructor.
      */
     public function __construct()
     {
         // Always check whether the user is logged in or not to do the action
-        if(Sentry::check() !== true){
+        if (Sentry::check() !== true) {
             Response::redirect('login');
         }
     }
 
-
-    /**
-     *
-     */
-    public function editUser(){
+    public function editUser()
+    {
         $id = Request::get('id');
         $first_name = Request::get('first_name');
         $last_name = Request::get('last_name');
         $password = Request::get('password');
-        try
-        {
-            if($password == ''){
+
+        try {
+            if ($password == '') {
                 // change first_name and last_name
                 $user = \Model\User::find($id);
                 $user->first_name = $first_name;
                 $user->last_name = $last_name;
                 $user->save();
                 Response::redirect('admin?edit=success');
-            }else{
+            } else {
                 // Find the user using the user id
                 $user = Sentry::findUserById($id);
 
@@ -54,11 +51,9 @@ public function editUser(){
                 $resetCode = $user->getResetPasswordCode();
 
                 // Check if the reset password code is valid
-                if ($user->checkResetPasswordCode($resetCode))
-                {
+                if ($user->checkResetPasswordCode($resetCode)) {
                     // Attempt to reset the user password
-                    if ($user->attemptResetPassword($resetCode, $password))
-                    {
+                    if ($user->attemptResetPassword($resetCode, $password)) {
                         // change first_name and last_name
                         $user = \Model\User::find($id);
                         $user->first_name = $first_name;
@@ -66,43 +61,33 @@ public function editUser(){
                         $user->save();
 
                         Response::redirect('admin?edit=success');
-                    }
-                    else
-                    {
+                    } else {
                         // Password reset failed
                         echo 'Password reset failed';
                     }
-                }
-                else
-                {
+                } else {
                     // The provided password reset code is Invalid
                     echo 'Invalid password reset code';
                 }
             }
-        }
-        catch (\Exception $e)
-        {
+        } catch (\Exception $e) {
             echo 'User was not found.';
         }
     }
 
-    /**
-     *
-     */
     public function deleteUser()
     {
         $id = Request::get('id');
-        try
-        {
+
+        try {
             $user = \Model\User::find($id);
 
-            if($user === null){
+            if ($user === null) {
                 Response::redirect('admin?delete=failed');
             }
 
             $user->delete();
-        }catch(\Exception $e)
-        {
+        } catch (\Exception $e) {
             Response::redirect('admin?delete=failed');
         }
 
diff --git a/app/Controller/Web.php b/app/Controller/Web.php
index d4aec01..13ef60c 100755
--- a/app/Controller/Web.php
+++ b/app/Controller/Web.php
@@ -1,21 +1,23 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
+
 namespace Controller;
 
 /**
- * Class Web
- * @package Controller
+ * Class Web.
  */
-class Web {
-    public function start(){
+class Web
+{
+    public function start()
+    {
         // do nothing
     }
-}
\ No newline at end of file
+}
diff --git a/app/Middleware/Hello.php b/app/Middleware/Hello.php
index 9ed7a40..34907ec 100644
--- a/app/Middleware/Hello.php
+++ b/app/Middleware/Hello.php
@@ -3,28 +3,27 @@
  * Created by PhpStorm.
  * User: farizluqman
  * Date: 30/09/2017
- * Time: 3:38 PM
+ * Time: 3:38 PM.
  */
+
 namespace Middleware;
 
-use Router;
 use Response;
+use Router;
 
 /**
- * Class Hello
- * @package Middleware
+ * Class Hello.
  */
-class Hello {
-    /**
-     *
-     */
-    public static function filter(){
+class Hello
+{
+    public static function filter()
+    {
         // Always redirect this route to /login
-        if(Router::getCurrentRoute() == '/route/to/be/filtered'){
+        if (Router::getCurrentRoute() == '/route/to/be/filtered') {
             Response::redirect('../../../login')->with([
-                'login_message'=>'This route have been filtered by the Hello middleware',
-                'type'         =>'alert-warning'
+                'login_message'=> 'This route have been filtered by the Hello middleware',
+                'type'         => 'alert-warning',
             ]);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/Model/Comment.php b/app/Model/Comment.php
index b94cd67..e8bc661 100755
--- a/app/Model/Comment.php
+++ b/app/Model/Comment.php
@@ -1,22 +1,25 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
+
 namespace Model;
 
 use Illuminate\Database\Eloquent\Model as Eloquent;
 
-class Comment extends Eloquent {
+class Comment extends Eloquent
+{
     /**
      * Get the post for the comment.
      */
-    public function comments() {
-        return $this->belongsTo('Model\Post','user_id');
+    public function comments()
+    {
+        return $this->belongsTo('Model\Post', 'user_id');
     }
-}
\ No newline at end of file
+}
diff --git a/app/Model/Post.php b/app/Model/Post.php
index aa858e8..2f35d2d 100755
--- a/app/Model/Post.php
+++ b/app/Model/Post.php
@@ -1,26 +1,30 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
+
 namespace Model;
 
 use Illuminate\Database\Eloquent\Model as Eloquent;
 
-class Post extends Eloquent{
+class Post extends Eloquent
+{
     /**
      * Get the comments for the Post.
      */
-    public function comments() {
+    public function comments()
+    {
         return $this->hasMany('Model\Comment');
     }
 
-    public function author(){
-        return $this->belongsTo('Model\User','author_id');
+    public function author()
+    {
+        return $this->belongsTo('Model\User', 'author_id');
     }
 }
diff --git a/app/Model/User.php b/app/Model/User.php
index fca17ac..97bb30e 100755
--- a/app/Model/User.php
+++ b/app/Model/User.php
@@ -1,17 +1,18 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
+
 namespace Model;
 
 use Illuminate\Database\Eloquent\Model as Eloquent;
 
-class User extends Eloquent{
-
+class User extends Eloquent
+{
 }
diff --git a/app/Service/Test/TestService.php b/app/Service/Test/TestService.php
index 8fcdf1c..7c21016 100644
--- a/app/Service/Test/TestService.php
+++ b/app/Service/Test/TestService.php
@@ -1,13 +1,14 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
+
 namespace Service\Test;
 
 use ServiceContainer;
@@ -21,19 +22,15 @@ public function hello()
 
     public function calculate($var1, $operation, $var2)
     {
-        if($operation == 'plus' || $operation == '+')
-        {
+        if ($operation == 'plus' || $operation == '+') {
             return $var1 + $var2;
-        }else if($operation == 'minus' || $operation == '-')
-        {
+        } elseif ($operation == 'minus' || $operation == '-') {
             return $var1 - $var2;
-        }else if($operation == 'multiply' || $operation == '*')
-        {
+        } elseif ($operation == 'multiply' || $operation == '*') {
             return $var1 * $var2;
-        }else if($operation == 'divide' || $operation == '/')
-        {
+        } elseif ($operation == 'divide' || $operation == '/') {
             return $var1 / $var2;
-        }else{
+        } else {
             return 'Invalid Operation';
         }
     }
diff --git a/app/autoloader.php b/app/autoloader.php
index 1c94ebb..8866e73 100755
--- a/app/autoloader.php
+++ b/app/autoloader.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
 
@@ -18,7 +18,7 @@
 | the autoloader very well. Good guy Composer.
 |
 */
-require __DIR__ . '/../vendor/autoload.php';
+require __DIR__.'/../vendor/autoload.php';
 
 /*
 |--------------------------------------------------------------------------
@@ -26,7 +26,7 @@
 |--------------------------------------------------------------------------
 |
 | Reads the config file (config/env.php) and register it in using the
-| putenv() function. Configurations are retreivable using the getenv() 
+| putenv() function. Configurations are retreivable using the getenv()
 | function everywhere in the project.
 |
 */
@@ -38,7 +38,7 @@
 |--------------------------------------------------------------------------
 |
 | The debugging tool will register the error handler based on your
-| configuration (located at config/env.php). 
+| configuration (located at config/env.php).
 |
 */
-Core\Debugger::start();
\ No newline at end of file
+Core\Debugger::start();
diff --git a/app/bootstrap.php b/app/bootstrap.php
index 28aa517..e73960f 100755
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
 
@@ -38,7 +38,7 @@
 | maintaining only one instantiation of a class.
 |
 */
-$app = new App;
+$app = new App();
 
 /*
 |--------------------------------------------------------------------------
@@ -103,6 +103,6 @@
 | config/env.php)
 |
 */
-if(getenv('SHOW_EXECUTION_TIME')){
+if (getenv('SHOW_EXECUTION_TIME')) {
     Debugger::exec_time();
 }
diff --git a/config/aliases.php b/config/aliases.php
index 1a2b319..302b2ab 100755
--- a/config/aliases.php
+++ b/config/aliases.php
@@ -1,26 +1,26 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
 return [
-	'Core\App' => 'App',
-	'Core\Cache' => 'Cache',
-	'Core\Config' => 'Config',
-	'Core\Database' => 'Database',
-	'Core\Debugger' => 'Debugger',
-	'Core\Router' => 'Router',
-    'Core\Request' => 'Request',
-	'Core\Response' => 'Response',
-	'Core\Sharer' => 'Sharer',
-	'Core\Viewer' => 'Viewer',
-	'Core\Service' => 'Service',
-	'Core\Service\ServiceContainer' => 'ServiceContainer',
-    'Core\TimeTrackr' => 'TimeTrackr',
-	'Cartalyst\Sentry\Facades\Native\Sentry' => 'Sentry'
+    'Core\App'                               => 'App',
+    'Core\Cache'                             => 'Cache',
+    'Core\Config'                            => 'Config',
+    'Core\Database'                          => 'Database',
+    'Core\Debugger'                          => 'Debugger',
+    'Core\Router'                            => 'Router',
+    'Core\Request'                           => 'Request',
+    'Core\Response'                          => 'Response',
+    'Core\Sharer'                            => 'Sharer',
+    'Core\Viewer'                            => 'Viewer',
+    'Core\Service'                           => 'Service',
+    'Core\Service\ServiceContainer'          => 'ServiceContainer',
+    'Core\TimeTrackr'                        => 'TimeTrackr',
+    'Cartalyst\Sentry\Facades\Native\Sentry' => 'Sentry',
 ];
diff --git a/config/cache.php b/config/cache.php
index b1f7a24..a41cf19 100755
--- a/config/cache.php
+++ b/config/cache.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
 return [
@@ -15,40 +15,40 @@
      * Default storage
      * if you set this storage => 'files', then $cache = phpFastCache(); <-- will be files cache
      */
-    'storage'       =>  'auto', // ssdb, predis, redis, mongodb , files, sqlite, auto, apc, wincache, xcache, memcache, memcached,
+    'storage'       => 'auto', // ssdb, predis, redis, mongodb , files, sqlite, auto, apc, wincache, xcache, memcache, memcached,
 
     /*
      * Default Path for Cache on HDD
      * Use full PATH like /home/username/cache
      * Keep it blank '', it will automatic setup for you
      */
-    'path'          =>  '' , // default path for files
-    'securityKey'   =>  '', // default will good. It will create a path by PATH/securityKey
+    'path'          => '', // default path for files
+    'securityKey'   => '', // default will good. It will create a path by PATH/securityKey
 
     /*
      * FallBack Driver
      * Example, in your code, you use memcached, apc..etc, but when you moved your web hosting
      * Until you setup your new server caching, use 'overwrite' => 'files'
      */
-    'overwrite'     =>  'files', // whatever caching will change to 'files' and you don't need to change ur code
+    'overwrite'     => 'files', // whatever caching will change to 'files' and you don't need to change ur code
 
     /*
      * .htaccess protect
      * default will be  true
      */
-    'htaccess'      =>  true,
+    'htaccess'      => true,
 
     /*
      * Default Memcache Server for all $cache = phpFastCache('memcache');
      */
     'server'        => [
-            array('127.0.0.1',11211,1),
+            ['127.0.0.1', 11211, 1],
     ],
 
     'memcache'      => [
-            array('127.0.0.1', 11211, 1),
+            ['127.0.0.1', 11211, 1],
     ],
-		
+
     'redis'         => [
             'host'      => '127.0.0.1',
             'port'      => '6379',
@@ -56,17 +56,17 @@
             'database'  => '',
             'timeout'   => '',
     ],
-		
+
     'ssdb'          => [
             'host'      => '127.0.0.1',
             'port'      => 8888,
             'password'  => '',
             'timeout'   => '',
     ],
-		
+
     /*
      * Use 1 as normal traditional, 2 = phpfastcache fastest as default, 3 = phpfastcache memory stable
      */
     'caching_method' => 2,
-  ]
-];
\ No newline at end of file
+  ],
+];
diff --git a/config/database.php b/config/database.php
index c4b3b3a..d24be6c 100755
--- a/config/database.php
+++ b/config/database.php
@@ -1,18 +1,17 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
 return
 [
   'enabled'   => true,
-  'settings'  =>
-  [
+  'settings'  => [
     'host'      => 'localhost',
     'driver'    => 'mysql',
     'database'  => 'stupidlysimple',
@@ -21,5 +20,5 @@
     'charset'   => 'utf8',
     'collation' => 'utf8_unicode_ci',
     'prefix'    => '',
-  ]
+  ],
 ];
diff --git a/config/env.php b/config/env.php
index 9002d29..7eb5686 100755
--- a/config/env.php
+++ b/config/env.php
@@ -1,25 +1,25 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
-return 
+return
 [
-	/*
-	 * Set debugging level
-	 * 0 - Turn off debugging. Show "Something went wrong" message ambiguously
-	 * 1 - Show simple error message, file and the line occured
-	 * 2 - Advanced debugging with code snippet, stack frames, and envionment details
-	 */
-	'DEBUG' => 1,
-	
-	/*
-	 * Display the time taken to complete current request. See the bootstrap.php file
-	 */
-	'SHOW_EXECUTION_TIME' => true
-];
\ No newline at end of file
+    /*
+     * Set debugging level
+     * 0 - Turn off debugging. Show "Something went wrong" message ambiguously
+     * 1 - Show simple error message, file and the line occured
+     * 2 - Advanced debugging with code snippet, stack frames, and envionment details
+     */
+    'DEBUG' => 1,
+
+    /*
+     * Display the time taken to complete current request. See the bootstrap.php file
+     */
+    'SHOW_EXECUTION_TIME' => true,
+];
diff --git a/config/mimetypes.php b/config/mimetypes.php
index 28005dd..add6e12 100644
--- a/config/mimetypes.php
+++ b/config/mimetypes.php
@@ -1,651 +1,651 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
 return [
-    '.3dm' => 'x-world/x-3dmf',
-    '.3dmf' => 'x-world/x-3dmf',
-    '.a' => 'application/octet-stream',
-    '.aab' => 'application/x-authorware-bin',
-    '.aam' => 'application/x-authorware-map',
-    '.aas' => 'application/x-authorware-seg',
-    '.abc' => 'text/vnd.abc',
-    '.acgi' => 'text/html',
-    '.afl' => 'video/animaflex',
-    '.ai' => 'application/postscript',
-    '.aif' => 'audio/aiff',
-    '.aif' => 'audio/x-aiff',
-    '.aifc' => 'audio/aiff',
-    '.aifc' => 'audio/x-aiff',
-    '.aiff' => 'audio/aiff',
-    '.aiff' => 'audio/x-aiff',
-    '.aim' => 'application/x-aim',
-    '.aip' => 'text/x-audiosoft-intra',
-    '.ani' => 'application/x-navi-animation',
-    '.aos' => 'application/x-nokia-9000-communicator-add-on-software',
-    '.aps' => 'application/mime',
-    '.arc' => 'application/octet-stream',
-    '.arj' => 'application/arj',
-    '.arj' => 'application/octet-stream',
-    '.art' => 'image/x-jg',
-    '.asf' => 'video/x-ms-asf',
-    '.asm' => 'text/x-asm',
-    '.asp' => 'text/asp',
-    '.asx' => 'application/x-mplayer2',
-    '.asx' => 'video/x-ms-asf',
-    '.asx' => 'video/x-ms-asf-plugin',
-    '.au' => 'audio/basic',
-    '.au' => 'audio/x-au',
-    '.avi' => 'application/x-troff-msvideo',
-    '.avi' => 'video/avi',
-    '.avi' => 'video/msvideo',
-    '.avi' => 'video/x-msvideo',
-    '.avs' => 'video/avs-video',
-    '.bcpio' => 'application/x-bcpio',
-    '.bin' => 'application/mac-binary',
-    '.bin' => 'application/macbinary',
-    '.bin' => 'application/octet-stream',
-    '.bin' => 'application/x-binary',
-    '.bin' => 'application/x-macbinary',
-    '.bm' => 'image/bmp',
-    '.bmp' => 'image/bmp',
-    '.bmp' => 'image/x-windows-bmp',
-    '.boo' => 'application/book',
-    '.book' => 'application/book',
-    '.boz' => 'application/x-bzip2',
-    '.bsh' => 'application/x-bsh',
-    '.bz' => 'application/x-bzip',
-    '.bz2' => 'application/x-bzip2',
-    '.c' => 'text/plain',
-    '.c++' => 'text/plain',
-    '.cat' => 'application/vnd.ms-pki.seccat',
-    '.cc' => 'text/plain',
-    '.cc' => 'text/x-c',
-    '.ccad' => 'application/clariscad',
-    '.cco' => 'application/x-cocoa',
-    '.cdf' => 'application/cdf',
-    '.cdf' => 'application/x-cdf',
-    '.cdf' => 'application/x-netcdf',
-    '.cer' => 'application/pkix-cert',
-    '.cer' => 'application/x-x509-ca-cert',
-    '.cha' => 'application/x-chat',
-    '.chat' => 'application/x-chat',
-    '.class' => 'application/java',
-    '.class' => 'application/java-byte-code',
-    '.class' => 'application/x-java-class',
-    '.com' => 'application/octet-stream',
-    '.com' => 'text/plain',
-    '.conf' => 'text/plain',
-    '.cpio' => 'application/x-cpio',
-    '.cpp' => 'text/x-c',
-    '.cpt' => 'application/mac-compactpro',
-    '.cpt' => 'application/x-compactpro',
-    '.cpt' => 'application/x-cpt',
-    '.crl' => 'application/pkcs-crl',
-    '.crl' => 'application/pkix-crl',
-    '.crt' => 'application/pkix-cert',
-    '.crt' => 'application/x-x509-ca-cert',
-    '.crt' => 'application/x-x509-user-cert',
-    '.csh' => 'application/x-csh',
-    '.csh' => 'text/x-script.csh',
-    '.css' => 'application/x-pointplus',
-    '.css' => 'text/css',
-    '.cxx' => 'text/plain',
-    '.dcr' => 'application/x-director',
-    '.deepv' => 'application/x-deepv',
-    '.def' => 'text/plain',
-    '.der' => 'application/x-x509-ca-cert',
-    '.dif' => 'video/x-dv',
-    '.dir' => 'application/x-director',
-    '.dl' => 'video/dl',
-    '.dl' => 'video/x-dl',
-    '.doc' => 'application/msword',
-    '.dot' => 'application/msword',
-    '.dp' => 'application/commonground',
-    '.drw' => 'application/drafting',
-    '.dump' => 'application/octet-stream',
-    '.dv' => 'video/x-dv',
-    '.dvi' => 'application/x-dvi',
-    '.dwf' => 'drawing/x-dwf (old)',
-    '.dwf' => 'model/vnd.dwf',
-    '.dwg' => 'application/acad',
-    '.dwg' => 'image/vnd.dwg',
-    '.dwg' => 'image/x-dwg',
-    '.dxf' => 'application/dxf',
-    '.dxf' => 'image/vnd.dwg',
-    '.dxf' => 'image/x-dwg',
-    '.dxr' => 'application/x-director',
-    '.el' => 'text/x-script.elisp',
-    '.elc' => 'application/x-bytecode.elisp (compiled elisp)',
-    '.elc' => 'application/x-elc',
-    '.env' => 'application/x-envoy',
-    '.eps' => 'application/postscript',
-    '.es' => 'application/x-esrehber',
-    '.etx' => 'text/x-setext',
-    '.evy' => 'application/envoy',
-    '.evy' => 'application/x-envoy',
-    '.exe' => 'application/octet-stream',
-    '.f' => 'text/plain',
-    '.f' => 'text/x-fortran',
-    '.f77' => 'text/x-fortran',
-    '.f90' => 'text/plain',
-    '.f90' => 'text/x-fortran',
-    '.fdf' => 'application/vnd.fdf',
-    '.fif' => 'application/fractals',
-    '.fif' => 'image/fif',
-    '.fli' => 'video/fli',
-    '.fli' => 'video/x-fli',
-    '.flo' => 'image/florian',
-    '.flx' => 'text/vnd.fmi.flexstor',
-    '.fmf' => 'video/x-atomic3d-feature',
-    '.for' => 'text/plain',
-    '.for' => 'text/x-fortran',
-    '.fpx' => 'image/vnd.fpx',
-    '.fpx' => 'image/vnd.net-fpx',
-    '.frl' => 'application/freeloader',
-    '.funk' => 'audio/make',
-    '.g' => 'text/plain',
-    '.g3' => 'image/g3fax',
-    '.gif' => 'image/gif',
-    '.gl' => 'video/gl',
-    '.gl' => 'video/x-gl',
-    '.gsd' => 'audio/x-gsm',
-    '.gsm' => 'audio/x-gsm',
-    '.gsp' => 'application/x-gsp',
-    '.gss' => 'application/x-gss',
-    '.gtar' => 'application/x-gtar',
-    '.gz' => 'application/x-compressed',
-    '.gz' => 'application/x-gzip',
-    '.gzip' => 'application/x-gzip',
-    '.gzip' => 'multipart/x-gzip',
-    '.h' => 'text/plain',
-    '.h' => 'text/x-h',
-    '.hdf' => 'application/x-hdf',
-    '.help' => 'application/x-helpfile',
-    '.hgl' => 'application/vnd.hp-hpgl',
-    '.hh' => 'text/plain',
-    '.hh' => 'text/x-h',
-    '.hlb' => 'text/x-script',
-    '.hlp' => 'application/hlp',
-    '.hlp' => 'application/x-helpfile',
-    '.hlp' => 'application/x-winhelp',
-    '.hpg' => 'application/vnd.hp-hpgl',
-    '.hpgl' => 'application/vnd.hp-hpgl',
-    '.hqx' => 'application/binhex',
-    '.hqx' => 'application/binhex4',
-    '.hqx' => 'application/mac-binhex',
-    '.hqx' => 'application/mac-binhex40',
-    '.hqx' => 'application/x-binhex40',
-    '.hqx' => 'application/x-mac-binhex40',
-    '.hta' => 'application/hta',
-    '.htc' => 'text/x-component',
-    '.htm' => 'text/html',
-    '.html' => 'text/html',
-    '.htmls' => 'text/html',
-    '.htt' => 'text/webviewhtml',
-    '.htx' => 'text/html',
-    '.ice' => 'x-conference/x-cooltalk',
-    '.ico' => 'image/x-icon',
-    '.idc' => 'text/plain',
-    '.ief' => 'image/ief',
-    '.iefs' => 'image/ief',
-    '.iges' => 'application/iges',
-    '.iges' => 'model/iges',
-    '.igs' => 'application/iges',
-    '.igs' => 'model/iges',
-    '.ima' => 'application/x-ima',
-    '.imap' => 'application/x-httpd-imap',
-    '.inf' => 'application/inf',
-    '.ins' => 'application/x-internett-signup',
-    '.ip' => 'application/x-ip2',
-    '.isu' => 'video/x-isvideo',
-    '.it' => 'audio/it',
-    '.iv' => 'application/x-inventor',
-    '.ivr' => 'i-world/i-vrml',
-    '.ivy' => 'application/x-livescreen',
-    '.jam' => 'audio/x-jam',
-    '.jav' => 'text/plain',
-    '.jav' => 'text/x-java-source',
-    '.java' => 'text/plain',
-    '.java' => 'text/x-java-source',
-    '.jcm' => 'application/x-java-commerce',
-    '.jfif' => 'image/jpeg',
-    '.jfif' => 'image/pjpeg',
+    '.3dm'       => 'x-world/x-3dmf',
+    '.3dmf'      => 'x-world/x-3dmf',
+    '.a'         => 'application/octet-stream',
+    '.aab'       => 'application/x-authorware-bin',
+    '.aam'       => 'application/x-authorware-map',
+    '.aas'       => 'application/x-authorware-seg',
+    '.abc'       => 'text/vnd.abc',
+    '.acgi'      => 'text/html',
+    '.afl'       => 'video/animaflex',
+    '.ai'        => 'application/postscript',
+    '.aif'       => 'audio/aiff',
+    '.aif'       => 'audio/x-aiff',
+    '.aifc'      => 'audio/aiff',
+    '.aifc'      => 'audio/x-aiff',
+    '.aiff'      => 'audio/aiff',
+    '.aiff'      => 'audio/x-aiff',
+    '.aim'       => 'application/x-aim',
+    '.aip'       => 'text/x-audiosoft-intra',
+    '.ani'       => 'application/x-navi-animation',
+    '.aos'       => 'application/x-nokia-9000-communicator-add-on-software',
+    '.aps'       => 'application/mime',
+    '.arc'       => 'application/octet-stream',
+    '.arj'       => 'application/arj',
+    '.arj'       => 'application/octet-stream',
+    '.art'       => 'image/x-jg',
+    '.asf'       => 'video/x-ms-asf',
+    '.asm'       => 'text/x-asm',
+    '.asp'       => 'text/asp',
+    '.asx'       => 'application/x-mplayer2',
+    '.asx'       => 'video/x-ms-asf',
+    '.asx'       => 'video/x-ms-asf-plugin',
+    '.au'        => 'audio/basic',
+    '.au'        => 'audio/x-au',
+    '.avi'       => 'application/x-troff-msvideo',
+    '.avi'       => 'video/avi',
+    '.avi'       => 'video/msvideo',
+    '.avi'       => 'video/x-msvideo',
+    '.avs'       => 'video/avs-video',
+    '.bcpio'     => 'application/x-bcpio',
+    '.bin'       => 'application/mac-binary',
+    '.bin'       => 'application/macbinary',
+    '.bin'       => 'application/octet-stream',
+    '.bin'       => 'application/x-binary',
+    '.bin'       => 'application/x-macbinary',
+    '.bm'        => 'image/bmp',
+    '.bmp'       => 'image/bmp',
+    '.bmp'       => 'image/x-windows-bmp',
+    '.boo'       => 'application/book',
+    '.book'      => 'application/book',
+    '.boz'       => 'application/x-bzip2',
+    '.bsh'       => 'application/x-bsh',
+    '.bz'        => 'application/x-bzip',
+    '.bz2'       => 'application/x-bzip2',
+    '.c'         => 'text/plain',
+    '.c++'       => 'text/plain',
+    '.cat'       => 'application/vnd.ms-pki.seccat',
+    '.cc'        => 'text/plain',
+    '.cc'        => 'text/x-c',
+    '.ccad'      => 'application/clariscad',
+    '.cco'       => 'application/x-cocoa',
+    '.cdf'       => 'application/cdf',
+    '.cdf'       => 'application/x-cdf',
+    '.cdf'       => 'application/x-netcdf',
+    '.cer'       => 'application/pkix-cert',
+    '.cer'       => 'application/x-x509-ca-cert',
+    '.cha'       => 'application/x-chat',
+    '.chat'      => 'application/x-chat',
+    '.class'     => 'application/java',
+    '.class'     => 'application/java-byte-code',
+    '.class'     => 'application/x-java-class',
+    '.com'       => 'application/octet-stream',
+    '.com'       => 'text/plain',
+    '.conf'      => 'text/plain',
+    '.cpio'      => 'application/x-cpio',
+    '.cpp'       => 'text/x-c',
+    '.cpt'       => 'application/mac-compactpro',
+    '.cpt'       => 'application/x-compactpro',
+    '.cpt'       => 'application/x-cpt',
+    '.crl'       => 'application/pkcs-crl',
+    '.crl'       => 'application/pkix-crl',
+    '.crt'       => 'application/pkix-cert',
+    '.crt'       => 'application/x-x509-ca-cert',
+    '.crt'       => 'application/x-x509-user-cert',
+    '.csh'       => 'application/x-csh',
+    '.csh'       => 'text/x-script.csh',
+    '.css'       => 'application/x-pointplus',
+    '.css'       => 'text/css',
+    '.cxx'       => 'text/plain',
+    '.dcr'       => 'application/x-director',
+    '.deepv'     => 'application/x-deepv',
+    '.def'       => 'text/plain',
+    '.der'       => 'application/x-x509-ca-cert',
+    '.dif'       => 'video/x-dv',
+    '.dir'       => 'application/x-director',
+    '.dl'        => 'video/dl',
+    '.dl'        => 'video/x-dl',
+    '.doc'       => 'application/msword',
+    '.dot'       => 'application/msword',
+    '.dp'        => 'application/commonground',
+    '.drw'       => 'application/drafting',
+    '.dump'      => 'application/octet-stream',
+    '.dv'        => 'video/x-dv',
+    '.dvi'       => 'application/x-dvi',
+    '.dwf'       => 'drawing/x-dwf (old)',
+    '.dwf'       => 'model/vnd.dwf',
+    '.dwg'       => 'application/acad',
+    '.dwg'       => 'image/vnd.dwg',
+    '.dwg'       => 'image/x-dwg',
+    '.dxf'       => 'application/dxf',
+    '.dxf'       => 'image/vnd.dwg',
+    '.dxf'       => 'image/x-dwg',
+    '.dxr'       => 'application/x-director',
+    '.el'        => 'text/x-script.elisp',
+    '.elc'       => 'application/x-bytecode.elisp (compiled elisp)',
+    '.elc'       => 'application/x-elc',
+    '.env'       => 'application/x-envoy',
+    '.eps'       => 'application/postscript',
+    '.es'        => 'application/x-esrehber',
+    '.etx'       => 'text/x-setext',
+    '.evy'       => 'application/envoy',
+    '.evy'       => 'application/x-envoy',
+    '.exe'       => 'application/octet-stream',
+    '.f'         => 'text/plain',
+    '.f'         => 'text/x-fortran',
+    '.f77'       => 'text/x-fortran',
+    '.f90'       => 'text/plain',
+    '.f90'       => 'text/x-fortran',
+    '.fdf'       => 'application/vnd.fdf',
+    '.fif'       => 'application/fractals',
+    '.fif'       => 'image/fif',
+    '.fli'       => 'video/fli',
+    '.fli'       => 'video/x-fli',
+    '.flo'       => 'image/florian',
+    '.flx'       => 'text/vnd.fmi.flexstor',
+    '.fmf'       => 'video/x-atomic3d-feature',
+    '.for'       => 'text/plain',
+    '.for'       => 'text/x-fortran',
+    '.fpx'       => 'image/vnd.fpx',
+    '.fpx'       => 'image/vnd.net-fpx',
+    '.frl'       => 'application/freeloader',
+    '.funk'      => 'audio/make',
+    '.g'         => 'text/plain',
+    '.g3'        => 'image/g3fax',
+    '.gif'       => 'image/gif',
+    '.gl'        => 'video/gl',
+    '.gl'        => 'video/x-gl',
+    '.gsd'       => 'audio/x-gsm',
+    '.gsm'       => 'audio/x-gsm',
+    '.gsp'       => 'application/x-gsp',
+    '.gss'       => 'application/x-gss',
+    '.gtar'      => 'application/x-gtar',
+    '.gz'        => 'application/x-compressed',
+    '.gz'        => 'application/x-gzip',
+    '.gzip'      => 'application/x-gzip',
+    '.gzip'      => 'multipart/x-gzip',
+    '.h'         => 'text/plain',
+    '.h'         => 'text/x-h',
+    '.hdf'       => 'application/x-hdf',
+    '.help'      => 'application/x-helpfile',
+    '.hgl'       => 'application/vnd.hp-hpgl',
+    '.hh'        => 'text/plain',
+    '.hh'        => 'text/x-h',
+    '.hlb'       => 'text/x-script',
+    '.hlp'       => 'application/hlp',
+    '.hlp'       => 'application/x-helpfile',
+    '.hlp'       => 'application/x-winhelp',
+    '.hpg'       => 'application/vnd.hp-hpgl',
+    '.hpgl'      => 'application/vnd.hp-hpgl',
+    '.hqx'       => 'application/binhex',
+    '.hqx'       => 'application/binhex4',
+    '.hqx'       => 'application/mac-binhex',
+    '.hqx'       => 'application/mac-binhex40',
+    '.hqx'       => 'application/x-binhex40',
+    '.hqx'       => 'application/x-mac-binhex40',
+    '.hta'       => 'application/hta',
+    '.htc'       => 'text/x-component',
+    '.htm'       => 'text/html',
+    '.html'      => 'text/html',
+    '.htmls'     => 'text/html',
+    '.htt'       => 'text/webviewhtml',
+    '.htx'       => 'text/html',
+    '.ice'       => 'x-conference/x-cooltalk',
+    '.ico'       => 'image/x-icon',
+    '.idc'       => 'text/plain',
+    '.ief'       => 'image/ief',
+    '.iefs'      => 'image/ief',
+    '.iges'      => 'application/iges',
+    '.iges'      => 'model/iges',
+    '.igs'       => 'application/iges',
+    '.igs'       => 'model/iges',
+    '.ima'       => 'application/x-ima',
+    '.imap'      => 'application/x-httpd-imap',
+    '.inf'       => 'application/inf',
+    '.ins'       => 'application/x-internett-signup',
+    '.ip'        => 'application/x-ip2',
+    '.isu'       => 'video/x-isvideo',
+    '.it'        => 'audio/it',
+    '.iv'        => 'application/x-inventor',
+    '.ivr'       => 'i-world/i-vrml',
+    '.ivy'       => 'application/x-livescreen',
+    '.jam'       => 'audio/x-jam',
+    '.jav'       => 'text/plain',
+    '.jav'       => 'text/x-java-source',
+    '.java'      => 'text/plain',
+    '.java'      => 'text/x-java-source',
+    '.jcm'       => 'application/x-java-commerce',
+    '.jfif'      => 'image/jpeg',
+    '.jfif'      => 'image/pjpeg',
     '.jfif-tbnl' => 'image/jpeg',
-    '.jpe' => 'image/jpeg',
-    '.jpe' => 'image/pjpeg',
-    '.jpeg' => 'image/jpeg',
-    '.jpeg' => 'image/pjpeg',
-    '.jpg' => 'image/jpeg',
-    '.jpg' => 'image/pjpeg',
-    '.jps' => 'image/x-jps',
-    '.js' => 'application/x-javascript',
-    '.jut' => 'image/jutvision',
-    '.kar' => 'audio/midi',
-    '.kar' => 'music/x-karaoke',
-    '.ksh' => 'application/x-ksh',
-    '.ksh' => 'text/x-script.ksh',
-    '.la' => 'audio/nspaudio',
-    '.la' => 'audio/x-nspaudio',
-    '.lam' => 'audio/x-liveaudio',
-    '.latex' => 'application/x-latex',
-    '.lha' => 'application/lha',
-    '.lha' => 'application/octet-stream',
-    '.lha' => 'application/x-lha',
-    '.lhx' => 'application/octet-stream',
-    '.list' => 'text/plain',
-    '.lma' => 'audio/nspaudio',
-    '.lma' => 'audio/x-nspaudio',
-    '.log' => 'text/plain',
-    '.lsp' => 'application/x-lisp',
-    '.lsp' => 'text/x-script.lisp',
-    '.lst' => 'text/plain',
-    '.lsx' => 'text/x-la-asf',
-    '.ltx' => 'application/x-latex',
-    '.lzh' => 'application/octet-stream',
-    '.lzh' => 'application/x-lzh',
-    '.lzx' => 'application/lzx',
-    '.lzx' => 'application/octet-stream',
-    '.lzx' => 'application/x-lzx',
-    '.m' => 'text/plain',
-    '.m' => 'text/x-m',
-    '.m1v' => 'video/mpeg',
-    '.m2a' => 'audio/mpeg',
-    '.m2v' => 'video/mpeg',
-    '.m3u' => 'audio/x-mpequrl',
-    '.man' => 'application/x-troff-man',
-    '.map' => 'application/x-navimap',
-    '.mar' => 'text/plain',
-    '.mbd' => 'application/mbedlet',
-    '.mc' => 'application/x-magic-cap-package-1.0',
-    '.mcd' => 'application/mcad',
-    '.mcd' => 'application/x-mathcad',
-    '.mcf' => 'image/vasa',
-    '.mcf' => 'text/mcf',
-    '.mcp' => 'application/netmc',
-    '.me' => 'application/x-troff-me',
-    '.mht' => 'message/rfc822',
-    '.mhtml' => 'message/rfc822',
-    '.mid' => 'application/x-midi',
-    '.mid' => 'audio/midi',
-    '.mid' => 'audio/x-mid',
-    '.mid' => 'audio/x-midi',
-    '.mid' => 'music/crescendo',
-    '.mid' => 'x-music/x-midi',
-    '.midi' => 'application/x-midi',
-    '.midi' => 'audio/midi',
-    '.midi' => 'audio/x-mid',
-    '.midi' => 'audio/x-midi',
-    '.midi' => 'music/crescendo',
-    '.midi' => 'x-music/x-midi',
-    '.mif' => 'application/x-frame',
-    '.mif' => 'application/x-mif',
-    '.mime' => 'message/rfc822',
-    '.mime' => 'www/mime',
-    '.mjf' => 'audio/x-vnd.audioexplosion.mjuicemediafile',
-    '.mjpg' => 'video/x-motion-jpeg',
-    '.mm' => 'application/base64',
-    '.mm' => 'application/x-meme',
-    '.mme' => 'application/base64',
-    '.mod' => 'audio/mod',
-    '.mod' => 'audio/x-mod',
-    '.moov' => 'video/quicktime',
-    '.mov' => 'video/quicktime',
-    '.movie' => 'video/x-sgi-movie',
-    '.mp2' => 'audio/mpeg',
-    '.mp2' => 'audio/x-mpeg',
-    '.mp2' => 'video/mpeg',
-    '.mp2' => 'video/x-mpeg',
-    '.mp2' => 'video/x-mpeq2a',
-    '.mp3' => 'audio/mpeg3',
-    '.mp3' => 'audio/x-mpeg-3',
-    '.mp3' => 'video/mpeg',
-    '.mp3' => 'video/x-mpeg',
-    '.mpa' => 'audio/mpeg',
-    '.mpa' => 'video/mpeg',
-    '.mpc' => 'application/x-project',
-    '.mpe' => 'video/mpeg',
-    '.mpeg' => 'video/mpeg',
-    '.mpg' => 'audio/mpeg',
-    '.mpg' => 'video/mpeg',
-    '.mpga' => 'audio/mpeg',
-    '.mpp' => 'application/vnd.ms-project',
-    '.mpt' => 'application/x-project',
-    '.mpv' => 'application/x-project',
-    '.mpx' => 'application/x-project',
-    '.mrc' => 'application/marc',
-    '.ms' => 'application/x-troff-ms',
-    '.mv' => 'video/x-sgi-movie',
-    '.my' => 'audio/make',
-    '.mzz' => 'application/x-vnd.audioexplosion.mzz',
-    '.nap' => 'image/naplps',
-    '.naplps' => 'image/naplps',
-    '.nc' => 'application/x-netcdf',
-    '.ncm' => 'application/vnd.nokia.configuration-message',
-    '.nif' => 'image/x-niff',
-    '.niff' => 'image/x-niff',
-    '.nix' => 'application/x-mix-transfer',
-    '.nsc' => 'application/x-conference',
-    '.nvd' => 'application/x-navidoc',
-    '.o' => 'application/octet-stream',
-    '.oda' => 'application/oda',
-    '.omc' => 'application/x-omc',
-    '.omcd' => 'application/x-omcdatamaker',
-    '.omcr' => 'application/x-omcregerator',
-    '.p' => 'text/x-pascal',
-    '.p10' => 'application/pkcs10',
-    '.p10' => 'application/x-pkcs10',
-    '.p12' => 'application/pkcs-12',
-    '.p12' => 'application/x-pkcs12',
-    '.p7a' => 'application/x-pkcs7-signature',
-    '.p7c' => 'application/pkcs7-mime',
-    '.p7c' => 'application/x-pkcs7-mime',
-    '.p7m' => 'application/pkcs7-mime',
-    '.p7m' => 'application/x-pkcs7-mime',
-    '.p7r' => 'application/x-pkcs7-certreqresp',
-    '.p7s' => 'application/pkcs7-signature',
-    '.part' => 'application/pro_eng',
-    '.pas' => 'text/pascal',
-    '.pbm' => 'image/x-portable-bitmap',
-    '.pcl' => 'application/vnd.hp-pcl',
-    '.pcl' => 'application/x-pcl',
-    '.pct' => 'image/x-pict',
-    '.pcx' => 'image/x-pcx',
-    '.pdb' => 'chemical/x-pdb',
-    '.pdf' => 'application/pdf',
-    '.pfunk' => 'audio/make',
-    '.pgm' => 'image/x-portable-greymap',
-    '.pic' => 'image/pict',
-    '.pict' => 'image/pict',
-    '.pkg' => 'application/x-newton-compatible-pkg',
-    '.pko' => 'application/vnd.ms-pki.pko',
-    '.pl' => 'text/plain',
-    '.pl' => 'text/x-script.perl',
-    '.plx' => 'application/x-pixclscript',
-    '.pm' => 'image/x-xpixmap',
-    '.pm' => 'text/x-script.perl-module',
-    '.pm4' => 'application/x-pagemaker',
-    '.pm5' => 'application/x-pagemaker',
-    '.png' => 'image/png',
-    '.pnm' => 'application/x-portable-anymap',
-    '.pnm' => 'image/x-portable-anymap',
-    '.pot' => 'application/mspowerpoint',
-    '.pot' => 'application/vnd.ms-powerpoint',
-    '.pov' => 'model/x-pov',
-    '.ppa' => 'application/vnd.ms-powerpoint',
-    '.ppm' => 'image/x-portable-pixmap',
-    '.pps' => 'application/mspowerpoint',
-    '.pps' => 'application/vnd.ms-powerpoint',
-    '.ppt' => 'application/mspowerpoint',
-    '.ppt' => 'application/powerpoint',
-    '.ppt' => 'application/vnd.ms-powerpoint',
-    '.ppt' => 'application/x-mspowerpoint',
-    '.ppz' => 'application/mspowerpoint',
-    '.pre' => 'application/x-freelance',
-    '.prt' => 'application/pro_eng',
-    '.ps' => 'application/postscript',
-    '.psd' => 'application/octet-stream',
-    '.pvu' => 'paleovu/x-pv',
-    '.pwz' => 'application/vnd.ms-powerpoint',
-    '.py' => 'text/x-script.phyton',
-    '.pyc' => 'applicaiton/x-bytecode.python',
-    '.qcp' => 'audio/vnd.qcelp',
-    '.qd3' => 'x-world/x-3dmf',
-    '.qd3d' => 'x-world/x-3dmf',
-    '.qif' => 'image/x-quicktime',
-    '.qt' => 'video/quicktime',
-    '.qtc' => 'video/x-qtc',
-    '.qti' => 'image/x-quicktime',
-    '.qtif' => 'image/x-quicktime',
-    '.ra' => 'audio/x-pn-realaudio',
-    '.ra' => 'audio/x-pn-realaudio-plugin',
-    '.ra' => 'audio/x-realaudio',
-    '.ram' => 'audio/x-pn-realaudio',
-    '.ras' => 'application/x-cmu-raster',
-    '.ras' => 'image/cmu-raster',
-    '.ras' => 'image/x-cmu-raster',
-    '.rast' => 'image/cmu-raster',
-    '.rexx' => 'text/x-script.rexx',
-    '.rf' => 'image/vnd.rn-realflash',
-    '.rgb' => 'image/x-rgb',
-    '.rm' => 'application/vnd.rn-realmedia',
-    '.rm' => 'audio/x-pn-realaudio',
-    '.rmi' => 'audio/mid',
-    '.rmm' => 'audio/x-pn-realaudio',
-    '.rmp' => 'audio/x-pn-realaudio',
-    '.rmp' => 'audio/x-pn-realaudio-plugin',
-    '.rng' => 'application/ringing-tones',
-    '.rng' => 'application/vnd.nokia.ringing-tone',
-    '.rnx' => 'application/vnd.rn-realplayer',
-    '.roff' => 'application/x-troff',
-    '.rp' => 'image/vnd.rn-realpix',
-    '.rpm' => 'audio/x-pn-realaudio-plugin',
-    '.rt' => 'text/richtext',
-    '.rt' => 'text/vnd.rn-realtext',
-    '.rtf' => 'application/rtf',
-    '.rtf' => 'application/x-rtf',
-    '.rtf' => 'text/richtext',
-    '.rtx' => 'application/rtf',
-    '.rtx' => 'text/richtext',
-    '.rv' => 'video/vnd.rn-realvideo',
-    '.s' => 'text/x-asm',
-    '.s3m' => 'audio/s3m',
-    '.saveme' => 'aapplication/octet-stream',
-    '.sbk' => 'application/x-tbook',
-    '.scm' => 'application/x-lotusscreencam',
-    '.scm' => 'text/x-script.guile',
-    '.scm' => 'text/x-script.scheme',
-    '.scm' => 'video/x-scm',
-    '.sdml' => 'text/plain',
-    '.sdp' => 'application/sdp',
-    '.sdp' => 'application/x-sdp',
-    '.sdr' => 'application/sounder',
-    '.sea' => 'application/sea',
-    '.sea' => 'application/x-sea',
-    '.set' => 'application/set',
-    '.sgm' => 'text/sgml',
-    '.sgm' => 'text/x-sgml',
-    '.sgml' => 'text/sgml',
-    '.sgml' => 'text/x-sgml',
-    '.sh' => 'application/x-bsh',
-    '.sh' => 'application/x-sh',
-    '.sh' => 'application/x-shar',
-    '.sh' => 'text/x-script.sh',
-    '.shar' => 'application/x-bsh',
-    '.shar' => 'application/x-shar',
-    '.shtml' => 'text/html',
-    '.shtml' => 'text/x-server-parsed-html',
-    '.sid' => 'audio/x-psid',
-    '.sit' => 'application/x-sit',
-    '.sit' => 'application/x-stuffit',
-    '.skd' => 'application/x-koan',
-    '.skm' => 'application/x-koan',
-    '.skp' => 'application/x-koan',
-    '.skt' => 'application/x-koan',
-    '.sl' => 'application/x-seelogo',
-    '.smi' => 'application/smil',
-    '.smil' => 'application/smil',
-    '.snd' => 'audio/basic',
-    '.snd' => 'audio/x-adpcm',
-    '.sol' => 'application/solids',
-    '.spc' => 'application/x-pkcs7-certificates',
-    '.spc' => 'text/x-speech',
-    '.spl' => 'application/futuresplash',
-    '.spr' => 'application/x-sprite',
-    '.sprite' => 'application/x-sprite',
-    '.src' => 'application/x-wais-source',
-    '.ssi' => 'text/x-server-parsed-html',
-    '.ssm' => 'application/streamingmedia',
-    '.sst' => 'application/vnd.ms-pki.certstore',
-    '.step' => 'application/step',
-    '.stl' => 'application/sla',
-    '.stl' => 'application/vnd.ms-pki.stl',
-    '.stl' => 'application/x-navistyle',
-    '.stp' => 'application/step',
-    '.sv4cpio' => 'application/x-sv4cpio',
-    '.sv4crc' => 'application/x-sv4crc',
-    '.svf' => 'image/vnd.dwg',
-    '.svf' => 'image/x-dwg',
-    '.svr' => 'application/x-world',
-    '.svr' => 'x-world/x-svr',
-    '.swf' => 'application/x-shockwave-flash',
-    '.t' => 'application/x-troff',
-    '.talk' => 'text/x-speech',
-    '.tar' => 'application/x-tar',
-    '.tbk' => 'application/toolbook',
-    '.tbk' => 'application/x-tbook',
-    '.tcl' => 'application/x-tcl',
-    '.tcl' => 'text/x-script.tcl',
-    '.tcsh' => 'text/x-script.tcsh',
-    '.tex' => 'application/x-tex',
-    '.texi' => 'application/x-texinfo',
-    '.texinfo' => ' lication/x-texinfo',
-    '.text' => 'application/plain',
-    '.text' => 'text/plain',
-    '.tgz' => 'application/gnutar',
-    '.tgz' => 'application/x-compressed',
-    '.tif' => 'image/tiff',
-    '.tif' => 'image/x-tiff',
-    '.tiff' => 'image/tiff',
-    '.tiff' => 'image/x-tiff',
-    '.tr' => 'application/x-troff',
-    '.tsi' => 'audio/tsp-audio',
-    '.tsp' => 'application/dsptype',
-    '.tsp' => 'audio/tsplayer',
-    '.tsv' => 'text/tab-separated-values',
-    '.turbot' => 'image/florian',
-    '.txt' => 'text/plain',
-    '.uil' => 'text/x-uil',
-    '.uni' => 'text/uri-list',
-    '.unis' => 'text/uri-list',
-    '.unv' => 'application/i-deas',
-    '.uri' => 'text/uri-list',
-    '.uris' => 'text/uri-list',
-    '.ustar' => 'application/x-ustar',
-    '.ustar' => 'multipart/x-ustar',
-    '.uu' => 'application/octet-stream',
-    '.uu' => 'text/x-uuencode',
-    '.uue' => 'text/x-uuencode',
-    '.vcd' => 'application/x-cdlink',
-    '.vcs' => 'text/x-vcalendar',
-    '.vda' => 'application/vda',
-    '.vdo' => 'video/vdo',
-    '.vew' => 'application/groupwise',
-    '.viv' => 'video/vivo',
-    '.viv' => 'video/vnd.vivo',
-    '.vivo' => 'video/vivo',
-    '.vivo' => 'video/vnd.vivo',
-    '.vmd' => 'application/vocaltec-media-desc',
-    '.vmf' => 'application/vocaltec-media-file',
-    '.voc' => 'audio/voc',
-    '.voc' => 'audio/x-voc',
-    '.vos' => 'video/vosaic',
-    '.vox' => 'audio/voxware',
-    '.vqe' => 'audio/x-twinvq-plugin',
-    '.vqf' => 'audio/x-twinvq',
-    '.vql' => 'audio/x-twinvq-plugin',
-    '.vrml' => 'application/x-vrml',
-    '.vrml' => 'model/vrml',
-    '.vrml' => 'x-world/x-vrml',
-    '.vrt' => 'x-world/x-vrt',
-    '.vsd' => 'application/x-visio',
-    '.vst' => 'application/x-visio',
-    '.vsw' => 'application/x-visio',
-    '.w60' => 'application/wordperfect6.0',
-    '.w61' => 'application/wordperfect6.1',
-    '.w6w' => 'application/msword',
-    '.wav' => 'audio/wav',
-    '.wav' => 'audio/x-wav',
-    '.wb1' => 'application/x-qpro',
-    '.wbmp' => 'image/vnd.wap.wbmp',
-    '.web' => 'application/vnd.xara',
-    '.wiz' => 'application/msword',
-    '.wk1' => 'application/x-123',
-    '.wmf' => 'windows/metafile',
-    '.wml' => 'text/vnd.wap.wml',
-    '.wmlc' => 'application/vnd.wap.wmlc',
-    '.wmls' => 'text/vnd.wap.wmlscript',
-    '.wmlsc' => 'application/vnd.wap.wmlscriptc',
-    '.word' => 'application/msword',
-    '.wp' => 'application/wordperfect',
-    '.wp5' => 'application/wordperfect',
-    '.wp5' => 'application/wordperfect6.0',
-    '.wp6' => 'application/wordperfect',
-    '.wpd' => 'application/wordperfect',
-    '.wpd' => 'application/x-wpwin',
-    '.wq1' => 'application/x-lotus',
-    '.wri' => 'application/mswrite',
-    '.wri' => 'application/x-wri',
-    '.wrl' => 'application/x-world',
-    '.wrl' => 'model/vrml',
-    '.wrl' => 'x-world/x-vrml',
-    '.wrz' => 'model/vrml',
-    '.wrz' => 'x-world/x-vrml',
-    '.wsc' => 'text/scriplet',
-    '.wsrc' => 'application/x-wais-source',
-    '.wtk' => 'application/x-wintalk',
-    '.xbm' => 'image/x-xbitmap',
-    '.xbm' => 'image/x-xbm',
-    '.xbm' => 'image/xbm',
-    '.xdr' => 'video/x-amt-demorun',
-    '.xgz' => 'xgl/drawing',
-    '.xif' => 'image/vnd.xiff',
-    '.xl' => 'application/excel',
-    '.xla' => 'application/excel',
-    '.xla' => 'application/x-excel',
-    '.xla' => 'application/x-msexcel',
-    '.xlb' => 'application/excel',
-    '.xlb' => 'application/vnd.ms-excel',
-    '.xlb' => 'application/x-excel',
-    '.xlc' => 'application/excel',
-    '.xlc' => 'application/vnd.ms-excel',
-    '.xlc' => 'application/x-excel',
-    '.xld' => 'application/excel',
-    '.xld' => 'application/x-excel',
-    '.xlk' => 'application/excel',
-    '.xlk' => 'application/x-excel',
-    '.xll' => 'application/excel',
-    '.xll' => 'application/vnd.ms-excel',
-    '.xll' => 'application/x-excel',
-    '.xlm' => 'application/excel',
-    '.xlm' => 'application/vnd.ms-excel',
-    '.xlm' => 'application/x-excel',
-    '.xls' => 'application/excel',
-    '.xls' => 'application/vnd.ms-excel',
-    '.xls' => 'application/x-excel',
-    '.xls' => 'application/x-msexcel',
-    '.xlt' => 'application/excel',
-    '.xlt' => 'application/x-excel',
-    '.xlv' => 'application/excel',
-    '.xlv' => 'application/x-excel',
-    '.xlw' => 'application/excel',
-    '.xlw' => 'application/vnd.ms-excel',
-    '.xlw' => 'application/x-excel',
-    '.xlw' => 'application/x-msexcel',
-    '.xm' => 'audio/xm',
-    '.xml' => 'application/xml',
-    '.xml' => 'text/xml',
-    '.xmz' => 'xgl/movie',
-    '.xpix' => 'application/x-vnd.ls-xpix',
-    '.xpm' => 'image/x-xpixmap',
-    '.xpm' => 'image/xpm',
-    '.x-png' => 'image/png',
-    '.xsr' => 'video/x-amt-showrun',
-    '.xwd' => 'image/x-xwd',
-    '.xwd' => 'image/x-xwindowdump',
-    '.xyz' => 'chemical/x-pdb',
-    '.z' => 'application/x-compress',
-    '.z' => 'application/x-compressed',
-    '.zip' => 'application/x-compressed',
-    '.zip' => 'application/x-zip-compressed',
-    '.zip' => 'application/zip',
-    '.zip' => 'multipart/x-zip',
-    '.zoo' => 'application/octet-stream',
-    '.zsh' => 'text/x-script.zsh)'
-];
\ No newline at end of file
+    '.jpe'       => 'image/jpeg',
+    '.jpe'       => 'image/pjpeg',
+    '.jpeg'      => 'image/jpeg',
+    '.jpeg'      => 'image/pjpeg',
+    '.jpg'       => 'image/jpeg',
+    '.jpg'       => 'image/pjpeg',
+    '.jps'       => 'image/x-jps',
+    '.js'        => 'application/x-javascript',
+    '.jut'       => 'image/jutvision',
+    '.kar'       => 'audio/midi',
+    '.kar'       => 'music/x-karaoke',
+    '.ksh'       => 'application/x-ksh',
+    '.ksh'       => 'text/x-script.ksh',
+    '.la'        => 'audio/nspaudio',
+    '.la'        => 'audio/x-nspaudio',
+    '.lam'       => 'audio/x-liveaudio',
+    '.latex'     => 'application/x-latex',
+    '.lha'       => 'application/lha',
+    '.lha'       => 'application/octet-stream',
+    '.lha'       => 'application/x-lha',
+    '.lhx'       => 'application/octet-stream',
+    '.list'      => 'text/plain',
+    '.lma'       => 'audio/nspaudio',
+    '.lma'       => 'audio/x-nspaudio',
+    '.log'       => 'text/plain',
+    '.lsp'       => 'application/x-lisp',
+    '.lsp'       => 'text/x-script.lisp',
+    '.lst'       => 'text/plain',
+    '.lsx'       => 'text/x-la-asf',
+    '.ltx'       => 'application/x-latex',
+    '.lzh'       => 'application/octet-stream',
+    '.lzh'       => 'application/x-lzh',
+    '.lzx'       => 'application/lzx',
+    '.lzx'       => 'application/octet-stream',
+    '.lzx'       => 'application/x-lzx',
+    '.m'         => 'text/plain',
+    '.m'         => 'text/x-m',
+    '.m1v'       => 'video/mpeg',
+    '.m2a'       => 'audio/mpeg',
+    '.m2v'       => 'video/mpeg',
+    '.m3u'       => 'audio/x-mpequrl',
+    '.man'       => 'application/x-troff-man',
+    '.map'       => 'application/x-navimap',
+    '.mar'       => 'text/plain',
+    '.mbd'       => 'application/mbedlet',
+    '.mc'        => 'application/x-magic-cap-package-1.0',
+    '.mcd'       => 'application/mcad',
+    '.mcd'       => 'application/x-mathcad',
+    '.mcf'       => 'image/vasa',
+    '.mcf'       => 'text/mcf',
+    '.mcp'       => 'application/netmc',
+    '.me'        => 'application/x-troff-me',
+    '.mht'       => 'message/rfc822',
+    '.mhtml'     => 'message/rfc822',
+    '.mid'       => 'application/x-midi',
+    '.mid'       => 'audio/midi',
+    '.mid'       => 'audio/x-mid',
+    '.mid'       => 'audio/x-midi',
+    '.mid'       => 'music/crescendo',
+    '.mid'       => 'x-music/x-midi',
+    '.midi'      => 'application/x-midi',
+    '.midi'      => 'audio/midi',
+    '.midi'      => 'audio/x-mid',
+    '.midi'      => 'audio/x-midi',
+    '.midi'      => 'music/crescendo',
+    '.midi'      => 'x-music/x-midi',
+    '.mif'       => 'application/x-frame',
+    '.mif'       => 'application/x-mif',
+    '.mime'      => 'message/rfc822',
+    '.mime'      => 'www/mime',
+    '.mjf'       => 'audio/x-vnd.audioexplosion.mjuicemediafile',
+    '.mjpg'      => 'video/x-motion-jpeg',
+    '.mm'        => 'application/base64',
+    '.mm'        => 'application/x-meme',
+    '.mme'       => 'application/base64',
+    '.mod'       => 'audio/mod',
+    '.mod'       => 'audio/x-mod',
+    '.moov'      => 'video/quicktime',
+    '.mov'       => 'video/quicktime',
+    '.movie'     => 'video/x-sgi-movie',
+    '.mp2'       => 'audio/mpeg',
+    '.mp2'       => 'audio/x-mpeg',
+    '.mp2'       => 'video/mpeg',
+    '.mp2'       => 'video/x-mpeg',
+    '.mp2'       => 'video/x-mpeq2a',
+    '.mp3'       => 'audio/mpeg3',
+    '.mp3'       => 'audio/x-mpeg-3',
+    '.mp3'       => 'video/mpeg',
+    '.mp3'       => 'video/x-mpeg',
+    '.mpa'       => 'audio/mpeg',
+    '.mpa'       => 'video/mpeg',
+    '.mpc'       => 'application/x-project',
+    '.mpe'       => 'video/mpeg',
+    '.mpeg'      => 'video/mpeg',
+    '.mpg'       => 'audio/mpeg',
+    '.mpg'       => 'video/mpeg',
+    '.mpga'      => 'audio/mpeg',
+    '.mpp'       => 'application/vnd.ms-project',
+    '.mpt'       => 'application/x-project',
+    '.mpv'       => 'application/x-project',
+    '.mpx'       => 'application/x-project',
+    '.mrc'       => 'application/marc',
+    '.ms'        => 'application/x-troff-ms',
+    '.mv'        => 'video/x-sgi-movie',
+    '.my'        => 'audio/make',
+    '.mzz'       => 'application/x-vnd.audioexplosion.mzz',
+    '.nap'       => 'image/naplps',
+    '.naplps'    => 'image/naplps',
+    '.nc'        => 'application/x-netcdf',
+    '.ncm'       => 'application/vnd.nokia.configuration-message',
+    '.nif'       => 'image/x-niff',
+    '.niff'      => 'image/x-niff',
+    '.nix'       => 'application/x-mix-transfer',
+    '.nsc'       => 'application/x-conference',
+    '.nvd'       => 'application/x-navidoc',
+    '.o'         => 'application/octet-stream',
+    '.oda'       => 'application/oda',
+    '.omc'       => 'application/x-omc',
+    '.omcd'      => 'application/x-omcdatamaker',
+    '.omcr'      => 'application/x-omcregerator',
+    '.p'         => 'text/x-pascal',
+    '.p10'       => 'application/pkcs10',
+    '.p10'       => 'application/x-pkcs10',
+    '.p12'       => 'application/pkcs-12',
+    '.p12'       => 'application/x-pkcs12',
+    '.p7a'       => 'application/x-pkcs7-signature',
+    '.p7c'       => 'application/pkcs7-mime',
+    '.p7c'       => 'application/x-pkcs7-mime',
+    '.p7m'       => 'application/pkcs7-mime',
+    '.p7m'       => 'application/x-pkcs7-mime',
+    '.p7r'       => 'application/x-pkcs7-certreqresp',
+    '.p7s'       => 'application/pkcs7-signature',
+    '.part'      => 'application/pro_eng',
+    '.pas'       => 'text/pascal',
+    '.pbm'       => 'image/x-portable-bitmap',
+    '.pcl'       => 'application/vnd.hp-pcl',
+    '.pcl'       => 'application/x-pcl',
+    '.pct'       => 'image/x-pict',
+    '.pcx'       => 'image/x-pcx',
+    '.pdb'       => 'chemical/x-pdb',
+    '.pdf'       => 'application/pdf',
+    '.pfunk'     => 'audio/make',
+    '.pgm'       => 'image/x-portable-greymap',
+    '.pic'       => 'image/pict',
+    '.pict'      => 'image/pict',
+    '.pkg'       => 'application/x-newton-compatible-pkg',
+    '.pko'       => 'application/vnd.ms-pki.pko',
+    '.pl'        => 'text/plain',
+    '.pl'        => 'text/x-script.perl',
+    '.plx'       => 'application/x-pixclscript',
+    '.pm'        => 'image/x-xpixmap',
+    '.pm'        => 'text/x-script.perl-module',
+    '.pm4'       => 'application/x-pagemaker',
+    '.pm5'       => 'application/x-pagemaker',
+    '.png'       => 'image/png',
+    '.pnm'       => 'application/x-portable-anymap',
+    '.pnm'       => 'image/x-portable-anymap',
+    '.pot'       => 'application/mspowerpoint',
+    '.pot'       => 'application/vnd.ms-powerpoint',
+    '.pov'       => 'model/x-pov',
+    '.ppa'       => 'application/vnd.ms-powerpoint',
+    '.ppm'       => 'image/x-portable-pixmap',
+    '.pps'       => 'application/mspowerpoint',
+    '.pps'       => 'application/vnd.ms-powerpoint',
+    '.ppt'       => 'application/mspowerpoint',
+    '.ppt'       => 'application/powerpoint',
+    '.ppt'       => 'application/vnd.ms-powerpoint',
+    '.ppt'       => 'application/x-mspowerpoint',
+    '.ppz'       => 'application/mspowerpoint',
+    '.pre'       => 'application/x-freelance',
+    '.prt'       => 'application/pro_eng',
+    '.ps'        => 'application/postscript',
+    '.psd'       => 'application/octet-stream',
+    '.pvu'       => 'paleovu/x-pv',
+    '.pwz'       => 'application/vnd.ms-powerpoint',
+    '.py'        => 'text/x-script.phyton',
+    '.pyc'       => 'applicaiton/x-bytecode.python',
+    '.qcp'       => 'audio/vnd.qcelp',
+    '.qd3'       => 'x-world/x-3dmf',
+    '.qd3d'      => 'x-world/x-3dmf',
+    '.qif'       => 'image/x-quicktime',
+    '.qt'        => 'video/quicktime',
+    '.qtc'       => 'video/x-qtc',
+    '.qti'       => 'image/x-quicktime',
+    '.qtif'      => 'image/x-quicktime',
+    '.ra'        => 'audio/x-pn-realaudio',
+    '.ra'        => 'audio/x-pn-realaudio-plugin',
+    '.ra'        => 'audio/x-realaudio',
+    '.ram'       => 'audio/x-pn-realaudio',
+    '.ras'       => 'application/x-cmu-raster',
+    '.ras'       => 'image/cmu-raster',
+    '.ras'       => 'image/x-cmu-raster',
+    '.rast'      => 'image/cmu-raster',
+    '.rexx'      => 'text/x-script.rexx',
+    '.rf'        => 'image/vnd.rn-realflash',
+    '.rgb'       => 'image/x-rgb',
+    '.rm'        => 'application/vnd.rn-realmedia',
+    '.rm'        => 'audio/x-pn-realaudio',
+    '.rmi'       => 'audio/mid',
+    '.rmm'       => 'audio/x-pn-realaudio',
+    '.rmp'       => 'audio/x-pn-realaudio',
+    '.rmp'       => 'audio/x-pn-realaudio-plugin',
+    '.rng'       => 'application/ringing-tones',
+    '.rng'       => 'application/vnd.nokia.ringing-tone',
+    '.rnx'       => 'application/vnd.rn-realplayer',
+    '.roff'      => 'application/x-troff',
+    '.rp'        => 'image/vnd.rn-realpix',
+    '.rpm'       => 'audio/x-pn-realaudio-plugin',
+    '.rt'        => 'text/richtext',
+    '.rt'        => 'text/vnd.rn-realtext',
+    '.rtf'       => 'application/rtf',
+    '.rtf'       => 'application/x-rtf',
+    '.rtf'       => 'text/richtext',
+    '.rtx'       => 'application/rtf',
+    '.rtx'       => 'text/richtext',
+    '.rv'        => 'video/vnd.rn-realvideo',
+    '.s'         => 'text/x-asm',
+    '.s3m'       => 'audio/s3m',
+    '.saveme'    => 'aapplication/octet-stream',
+    '.sbk'       => 'application/x-tbook',
+    '.scm'       => 'application/x-lotusscreencam',
+    '.scm'       => 'text/x-script.guile',
+    '.scm'       => 'text/x-script.scheme',
+    '.scm'       => 'video/x-scm',
+    '.sdml'      => 'text/plain',
+    '.sdp'       => 'application/sdp',
+    '.sdp'       => 'application/x-sdp',
+    '.sdr'       => 'application/sounder',
+    '.sea'       => 'application/sea',
+    '.sea'       => 'application/x-sea',
+    '.set'       => 'application/set',
+    '.sgm'       => 'text/sgml',
+    '.sgm'       => 'text/x-sgml',
+    '.sgml'      => 'text/sgml',
+    '.sgml'      => 'text/x-sgml',
+    '.sh'        => 'application/x-bsh',
+    '.sh'        => 'application/x-sh',
+    '.sh'        => 'application/x-shar',
+    '.sh'        => 'text/x-script.sh',
+    '.shar'      => 'application/x-bsh',
+    '.shar'      => 'application/x-shar',
+    '.shtml'     => 'text/html',
+    '.shtml'     => 'text/x-server-parsed-html',
+    '.sid'       => 'audio/x-psid',
+    '.sit'       => 'application/x-sit',
+    '.sit'       => 'application/x-stuffit',
+    '.skd'       => 'application/x-koan',
+    '.skm'       => 'application/x-koan',
+    '.skp'       => 'application/x-koan',
+    '.skt'       => 'application/x-koan',
+    '.sl'        => 'application/x-seelogo',
+    '.smi'       => 'application/smil',
+    '.smil'      => 'application/smil',
+    '.snd'       => 'audio/basic',
+    '.snd'       => 'audio/x-adpcm',
+    '.sol'       => 'application/solids',
+    '.spc'       => 'application/x-pkcs7-certificates',
+    '.spc'       => 'text/x-speech',
+    '.spl'       => 'application/futuresplash',
+    '.spr'       => 'application/x-sprite',
+    '.sprite'    => 'application/x-sprite',
+    '.src'       => 'application/x-wais-source',
+    '.ssi'       => 'text/x-server-parsed-html',
+    '.ssm'       => 'application/streamingmedia',
+    '.sst'       => 'application/vnd.ms-pki.certstore',
+    '.step'      => 'application/step',
+    '.stl'       => 'application/sla',
+    '.stl'       => 'application/vnd.ms-pki.stl',
+    '.stl'       => 'application/x-navistyle',
+    '.stp'       => 'application/step',
+    '.sv4cpio'   => 'application/x-sv4cpio',
+    '.sv4crc'    => 'application/x-sv4crc',
+    '.svf'       => 'image/vnd.dwg',
+    '.svf'       => 'image/x-dwg',
+    '.svr'       => 'application/x-world',
+    '.svr'       => 'x-world/x-svr',
+    '.swf'       => 'application/x-shockwave-flash',
+    '.t'         => 'application/x-troff',
+    '.talk'      => 'text/x-speech',
+    '.tar'       => 'application/x-tar',
+    '.tbk'       => 'application/toolbook',
+    '.tbk'       => 'application/x-tbook',
+    '.tcl'       => 'application/x-tcl',
+    '.tcl'       => 'text/x-script.tcl',
+    '.tcsh'      => 'text/x-script.tcsh',
+    '.tex'       => 'application/x-tex',
+    '.texi'      => 'application/x-texinfo',
+    '.texinfo'   => ' lication/x-texinfo',
+    '.text'      => 'application/plain',
+    '.text'      => 'text/plain',
+    '.tgz'       => 'application/gnutar',
+    '.tgz'       => 'application/x-compressed',
+    '.tif'       => 'image/tiff',
+    '.tif'       => 'image/x-tiff',
+    '.tiff'      => 'image/tiff',
+    '.tiff'      => 'image/x-tiff',
+    '.tr'        => 'application/x-troff',
+    '.tsi'       => 'audio/tsp-audio',
+    '.tsp'       => 'application/dsptype',
+    '.tsp'       => 'audio/tsplayer',
+    '.tsv'       => 'text/tab-separated-values',
+    '.turbot'    => 'image/florian',
+    '.txt'       => 'text/plain',
+    '.uil'       => 'text/x-uil',
+    '.uni'       => 'text/uri-list',
+    '.unis'      => 'text/uri-list',
+    '.unv'       => 'application/i-deas',
+    '.uri'       => 'text/uri-list',
+    '.uris'      => 'text/uri-list',
+    '.ustar'     => 'application/x-ustar',
+    '.ustar'     => 'multipart/x-ustar',
+    '.uu'        => 'application/octet-stream',
+    '.uu'        => 'text/x-uuencode',
+    '.uue'       => 'text/x-uuencode',
+    '.vcd'       => 'application/x-cdlink',
+    '.vcs'       => 'text/x-vcalendar',
+    '.vda'       => 'application/vda',
+    '.vdo'       => 'video/vdo',
+    '.vew'       => 'application/groupwise',
+    '.viv'       => 'video/vivo',
+    '.viv'       => 'video/vnd.vivo',
+    '.vivo'      => 'video/vivo',
+    '.vivo'      => 'video/vnd.vivo',
+    '.vmd'       => 'application/vocaltec-media-desc',
+    '.vmf'       => 'application/vocaltec-media-file',
+    '.voc'       => 'audio/voc',
+    '.voc'       => 'audio/x-voc',
+    '.vos'       => 'video/vosaic',
+    '.vox'       => 'audio/voxware',
+    '.vqe'       => 'audio/x-twinvq-plugin',
+    '.vqf'       => 'audio/x-twinvq',
+    '.vql'       => 'audio/x-twinvq-plugin',
+    '.vrml'      => 'application/x-vrml',
+    '.vrml'      => 'model/vrml',
+    '.vrml'      => 'x-world/x-vrml',
+    '.vrt'       => 'x-world/x-vrt',
+    '.vsd'       => 'application/x-visio',
+    '.vst'       => 'application/x-visio',
+    '.vsw'       => 'application/x-visio',
+    '.w60'       => 'application/wordperfect6.0',
+    '.w61'       => 'application/wordperfect6.1',
+    '.w6w'       => 'application/msword',
+    '.wav'       => 'audio/wav',
+    '.wav'       => 'audio/x-wav',
+    '.wb1'       => 'application/x-qpro',
+    '.wbmp'      => 'image/vnd.wap.wbmp',
+    '.web'       => 'application/vnd.xara',
+    '.wiz'       => 'application/msword',
+    '.wk1'       => 'application/x-123',
+    '.wmf'       => 'windows/metafile',
+    '.wml'       => 'text/vnd.wap.wml',
+    '.wmlc'      => 'application/vnd.wap.wmlc',
+    '.wmls'      => 'text/vnd.wap.wmlscript',
+    '.wmlsc'     => 'application/vnd.wap.wmlscriptc',
+    '.word'      => 'application/msword',
+    '.wp'        => 'application/wordperfect',
+    '.wp5'       => 'application/wordperfect',
+    '.wp5'       => 'application/wordperfect6.0',
+    '.wp6'       => 'application/wordperfect',
+    '.wpd'       => 'application/wordperfect',
+    '.wpd'       => 'application/x-wpwin',
+    '.wq1'       => 'application/x-lotus',
+    '.wri'       => 'application/mswrite',
+    '.wri'       => 'application/x-wri',
+    '.wrl'       => 'application/x-world',
+    '.wrl'       => 'model/vrml',
+    '.wrl'       => 'x-world/x-vrml',
+    '.wrz'       => 'model/vrml',
+    '.wrz'       => 'x-world/x-vrml',
+    '.wsc'       => 'text/scriplet',
+    '.wsrc'      => 'application/x-wais-source',
+    '.wtk'       => 'application/x-wintalk',
+    '.xbm'       => 'image/x-xbitmap',
+    '.xbm'       => 'image/x-xbm',
+    '.xbm'       => 'image/xbm',
+    '.xdr'       => 'video/x-amt-demorun',
+    '.xgz'       => 'xgl/drawing',
+    '.xif'       => 'image/vnd.xiff',
+    '.xl'        => 'application/excel',
+    '.xla'       => 'application/excel',
+    '.xla'       => 'application/x-excel',
+    '.xla'       => 'application/x-msexcel',
+    '.xlb'       => 'application/excel',
+    '.xlb'       => 'application/vnd.ms-excel',
+    '.xlb'       => 'application/x-excel',
+    '.xlc'       => 'application/excel',
+    '.xlc'       => 'application/vnd.ms-excel',
+    '.xlc'       => 'application/x-excel',
+    '.xld'       => 'application/excel',
+    '.xld'       => 'application/x-excel',
+    '.xlk'       => 'application/excel',
+    '.xlk'       => 'application/x-excel',
+    '.xll'       => 'application/excel',
+    '.xll'       => 'application/vnd.ms-excel',
+    '.xll'       => 'application/x-excel',
+    '.xlm'       => 'application/excel',
+    '.xlm'       => 'application/vnd.ms-excel',
+    '.xlm'       => 'application/x-excel',
+    '.xls'       => 'application/excel',
+    '.xls'       => 'application/vnd.ms-excel',
+    '.xls'       => 'application/x-excel',
+    '.xls'       => 'application/x-msexcel',
+    '.xlt'       => 'application/excel',
+    '.xlt'       => 'application/x-excel',
+    '.xlv'       => 'application/excel',
+    '.xlv'       => 'application/x-excel',
+    '.xlw'       => 'application/excel',
+    '.xlw'       => 'application/vnd.ms-excel',
+    '.xlw'       => 'application/x-excel',
+    '.xlw'       => 'application/x-msexcel',
+    '.xm'        => 'audio/xm',
+    '.xml'       => 'application/xml',
+    '.xml'       => 'text/xml',
+    '.xmz'       => 'xgl/movie',
+    '.xpix'      => 'application/x-vnd.ls-xpix',
+    '.xpm'       => 'image/x-xpixmap',
+    '.xpm'       => 'image/xpm',
+    '.x-png'     => 'image/png',
+    '.xsr'       => 'video/x-amt-showrun',
+    '.xwd'       => 'image/x-xwd',
+    '.xwd'       => 'image/x-xwindowdump',
+    '.xyz'       => 'chemical/x-pdb',
+    '.z'         => 'application/x-compress',
+    '.z'         => 'application/x-compressed',
+    '.zip'       => 'application/x-compressed',
+    '.zip'       => 'application/x-zip-compressed',
+    '.zip'       => 'application/zip',
+    '.zip'       => 'multipart/x-zip',
+    '.zoo'       => 'application/octet-stream',
+    '.zsh'       => 'text/x-script.zsh)',
+];
diff --git a/config/routes.php b/config/routes.php
index 43f813e..813ba87 100755
--- a/config/routes.php
+++ b/config/routes.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
-return 
+return
 [
-    'path' => SS_PATH . '/routes' . '/',
+    'path'   => SS_PATH.'/routes'.'/',
     'routes' => [
         'auth',
         'api',
-        'web'
-    ]
-];
\ No newline at end of file
+        'web',
+    ],
+];
diff --git a/config/services.php b/config/services.php
index cddfc44..1776d53 100644
--- a/config/services.php
+++ b/config/services.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
 return [
-    'Service\Test\TestService' => 'test'
-];
\ No newline at end of file
+    'Service\Test\TestService' => 'test',
+];
diff --git a/config/storage.php b/config/storage.php
index 5a07475..e39297e 100644
--- a/config/storage.php
+++ b/config/storage.php
@@ -1,5 +1,6 @@
 <?php
+
 // storage configurations, nothing here yet
 return [
 
-];
\ No newline at end of file
+];
diff --git a/config/timetrackr.php b/config/timetrackr.php
index 08eb375..d4b3d07 100644
--- a/config/timetrackr.php
+++ b/config/timetrackr.php
@@ -1,14 +1,14 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
 return
 [
-  'timezone' => 'Asia/Kuala_Lumpur'
-];
\ No newline at end of file
+  'timezone' => 'Asia/Kuala_Lumpur',
+];
diff --git a/index.php b/index.php
index 252c825..d5d6f51 100755
--- a/index.php
+++ b/index.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
 
@@ -38,12 +38,12 @@
 |--------------------------------------------------------------------------
 |
 | In this file we will register the Autoloader from Composer. Environment
-| variables (that you set on config/env.php) will be registered this time. 
+| variables (that you set on config/env.php) will be registered this time.
 | Our sweet debugging tool will also be loaded to track errors as earlier
 | as possible.
 |
 */
-require_once(SS_PATH.'/app/autoloader.php');
+require_once SS_PATH.'/app/autoloader.php';
 
 /*
 |--------------------------------------------------------------------------
@@ -54,4 +54,4 @@
 | manager and routing runs perfectly well.
 |
 */
-require_once(SS_PATH.'/app/bootstrap.php');
\ No newline at end of file
+require_once SS_PATH.'/app/bootstrap.php';
diff --git a/public/index.php b/public/index.php
index cf83909..458bd20 100755
--- a/public/index.php
+++ b/public/index.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
 
@@ -37,12 +37,12 @@
 |--------------------------------------------------------------------------
 |
 | In this file we will register the Autoloader from Composer. Environment
-| variables (that you set on config/env.php) will be registered this time. 
+| variables (that you set on config/env.php) will be registered this time.
 | Our sweet debugging tool will also be loaded to track errors as earlier
 | as possible.
 |
 */
-require_once(SS_PATH.'/app/autoloader.php');
+require_once SS_PATH.'/app/autoloader.php';
 
 /*
 |--------------------------------------------------------------------------
@@ -53,4 +53,4 @@
 | manager and routing runs perfectly well.
 |
 */
-require_once(SS_PATH.'/app/bootstrap.php');
\ No newline at end of file
+require_once SS_PATH.'/app/bootstrap.php';
diff --git a/resources/views/admin/home.tpl.php b/resources/views/admin/home.tpl.php
index 024959b..4de89df 100644
--- a/resources/views/admin/home.tpl.php
+++ b/resources/views/admin/home.tpl.php
@@ -5,7 +5,7 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php Core\Viewer::file('../layouts/head', $data = [ 'title' => 'StupidlySimple PHP | Home' ]); ?>
+<?php Core\Viewer::file('../layouts/head', $data = ['title' => 'StupidlySimple PHP | Home']); ?>
 <body>
 <!-- Wrapper -->
 <div id="wrapper">
@@ -21,17 +21,17 @@
                 <h1>Welcome to the Admin Area</h1>
                 <p>A very fresh start for the MVC framework with some basic CRUD functions</p>
 
-                <?php
-                if(Core\Request::get('delete') === 'success'){
-                    echo '<p class="alert alert-success">User successfully deleted</p>';
-                }else if(Core\Request::get('edit') === 'success'){
-                    echo '<p class="alert alert-success">User successfully updated</p>';
-                }else if(Core\Request::get('delete') === 'failed'){
-                    echo '<p class="alert alert-danger">Failed to delete</p>';
-                }else if(Core\Request::get('edit') === 'failed'){
-                    echo '<p class="alert alert-danger">Failed to update</p>';
-                }
-
+                <?php
+                if (Core\Request::get('delete') === 'success') {
+                    echo '<p class="alert alert-success">User successfully deleted</p>';
+                } elseif (Core\Request::get('edit') === 'success') {
+                    echo '<p class="alert alert-success">User successfully updated</p>';
+                } elseif (Core\Request::get('delete') === 'failed') {
+                    echo '<p class="alert alert-danger">Failed to delete</p>';
+                } elseif (Core\Request::get('edit') === 'failed') {
+                    echo '<p class="alert alert-danger">Failed to update</p>';
+                }
+
                 ?>
 
                 <ul class="nav nav-tabs" style="margin-top: 20px">
@@ -52,15 +52,15 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <?php
-                                foreach($service->test->getRegisteredUsers() as $user){
-                                    echo '<tr>';
-                                    echo '<td>'.$user->first_name.'</td>';
-                                    echo '<td>'.$user->last_name.'</td>';
-                                    echo '<td>'.$user->email.'</td>';
-                                    echo '<td><a onclick="return confirm(\'Are you sure?\');" href="deleteuser?id='.$user->id.'" class="btn btn-danger">Delete</a></td>';
-                                    echo '</tr>';
-                                }
+                                <?php
+                                foreach ($service->test->getRegisteredUsers() as $user) {
+                                    echo '<tr>';
+                                    echo '<td>'.$user->first_name.'</td>';
+                                    echo '<td>'.$user->last_name.'</td>';
+                                    echo '<td>'.$user->email.'</td>';
+                                    echo '<td><a onclick="return confirm(\'Are you sure?\');" href="deleteuser?id='.$user->id.'" class="btn btn-danger">Delete</a></td>';
+                                    echo '</tr>';
+                                }
                                 ?>
                                 </tbody>
                             </table>
diff --git a/resources/views/auth/login.tpl.php b/resources/views/auth/login.tpl.php
index 1230fcc..ef62e18 100755
--- a/resources/views/auth/login.tpl.php
+++ b/resources/views/auth/login.tpl.php
@@ -41,10 +41,10 @@
                     <form method="post" accept-charset="utf-8" autocomplete="off" role="form" class="form-horizontal">
                         <div class="form-group ">
                             <?php
-                            if(Request::get('login_message') !== null){
-                              echo('<div class="alert '.Request::get('type').'">
+                            if (Request::get('login_message') !== null) {
+                                echo '<div class="alert '.Request::get('type').'">
                                         '.Request::get('login_message').'
-                                    </div>');
+                                    </div>';
                             }
                             ?>
                             <label for="login">Username/Email</label>
diff --git a/resources/views/auth/register.tpl.php b/resources/views/auth/register.tpl.php
index 28aa020..b401198 100755
--- a/resources/views/auth/register.tpl.php
+++ b/resources/views/auth/register.tpl.php
@@ -40,10 +40,10 @@
                     <form method="post" accept-charset="utf-8" autocomplete="off" role="form" class="form-horizontal">
                         <div class="form-group ">
                             <?php
-                            if(Request::get('login_message') !== null){
-                                echo('<div class="alert '.Request::get('type').'">
+                            if (Request::get('login_message') !== null) {
+                                echo '<div class="alert '.Request::get('type').'">
                                         '.Request::get('login_message').'
-                                    </div>');
+                                    </div>';
                             }
                             ?>
                             <label for="login">Username/Email</label>
diff --git a/resources/views/controller.tpl.php b/resources/views/controller.tpl.php
index 6eee85f..a25c256 100644
--- a/resources/views/controller.tpl.php
+++ b/resources/views/controller.tpl.php
@@ -5,8 +5,8 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = [ 'title' => 'StupidlySimple | Controller' ];
+<?php
+$data = ['title' => 'StupidlySimple | Controller'];
 Core\Viewer::file('layouts/head', $data); ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/hello.tpl.php b/resources/views/hello.tpl.php
index 587cd4f..b75d24e 100644
--- a/resources/views/hello.tpl.php
+++ b/resources/views/hello.tpl.php
@@ -1,2 +1,2 @@
 <?php
-echo('Hello, World!');
\ No newline at end of file
+echo 'Hello, World!';
diff --git a/resources/views/home.tpl.php b/resources/views/home.tpl.php
index cded768..76f685c 100644
--- a/resources/views/home.tpl.php
+++ b/resources/views/home.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Home'];
-Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Home'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/layouts/menu.tpl.php b/resources/views/layouts/menu.tpl.php
index 3d5a5e4..090926d 100644
--- a/resources/views/layouts/menu.tpl.php
+++ b/resources/views/layouts/menu.tpl.php
@@ -8,11 +8,11 @@
         <li><a href="service">Services</a></li>
         <li><a href="model">Models</a></li>
         <?php
-        if(Sentry::check()){
-            echo('<li><a href="admin">Admin Page </a></li>');
-            echo('<li><a href="logout">Logout </a></li>');
-        }else{
-            echo('<li><a href="login">Login</a></li>');
+        if (Sentry::check()) {
+            echo '<li><a href="admin">Admin Page </a></li>';
+            echo '<li><a href="logout">Logout </a></li>';
+        } else {
+            echo '<li><a href="login">Login</a></li>';
         }?>
     </ul>
 </nav>
\ No newline at end of file
diff --git a/resources/views/layouts/top.tpl.php b/resources/views/layouts/top.tpl.php
index 035e6bb..5cab3ed 100644
--- a/resources/views/layouts/top.tpl.php
+++ b/resources/views/layouts/top.tpl.php
@@ -1,5 +1,5 @@
 <!-- Header -->
-<header id="header" class="<?= (isset($is_admin))?('admin'):('') ?>">
+<header id="header" class="<?= (isset($is_admin)) ? ('admin') : ('') ?>">
     <div class="inner">
 
         <!-- Logo -->
diff --git a/resources/views/model.tpl.php b/resources/views/model.tpl.php
index d68d76c..2a097eb 100644
--- a/resources/views/model.tpl.php
+++ b/resources/views/model.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = [ 'title' => 'StupidlySimple PHP | Service' ];
-Core\Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Service'];
+Core\Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
@@ -35,17 +35,17 @@
                 <h3>Load all Post </h3>
                 <p>Load the whole post with <code>Model\Post::all()</code> </p>
                 <p>
-                    <?php
-                    $i = 1;
-                    foreach(Model\Post::all() as $post){
-                        echo('
+                    <?php
+                    $i = 1;
+                    foreach (Model\Post::all() as $post) {
+                        echo '
                         <div class="alert alert-info">
                             
                             <b><?= $first_post->'.$post->title.'</b><br>
                             <span><?= $first_post->'.$post->content.'</span>
-                        </div>');
-                    }
-                    echo 'There are: '. Model\Post::all()->count() . ' posts.';
+                        </div>';
+                    }
+                    echo 'There are: '.Model\Post::all()->count().' posts.';
                     ?>
                 </p>
 
diff --git a/resources/views/routing.tpl.php b/resources/views/routing.tpl.php
index a70853e..2b1b109 100644
--- a/resources/views/routing.tpl.php
+++ b/resources/views/routing.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = [ 'title' => 'StupidlySimple PHP | Service' ];
-Core\Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Service'];
+Core\Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/service.tpl.php b/resources/views/service.tpl.php
index cdb936e..80f1b83 100644
--- a/resources/views/service.tpl.php
+++ b/resources/views/service.tpl.php
@@ -5,8 +5,8 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = [ 'title' => 'StupidlySimple PHP | Service' ];
+<?php
+$data = ['title' => 'StupidlySimple PHP | Service'];
 Core\Viewer::file('layouts/head', $data); ?>
 <body>
 <!-- Wrapper -->
@@ -45,7 +45,7 @@
                     <code>echo $service->test->calculate(1,'+',2);</code>
                 </p>
                 <p>Output:<br>
-                    <code><?php echo $service->test->calculate(1,'+',2); ?></code>
+                    <code><?php echo $service->test->calculate(1, '+', 2); ?></code>
                 </p>
             </div>
         </div>
diff --git a/resources/views/test.tpl.php b/resources/views/test.tpl.php
index 587cd4f..b75d24e 100644
--- a/resources/views/test.tpl.php
+++ b/resources/views/test.tpl.php
@@ -1,2 +1,2 @@
 <?php
-echo('Hello, World!');
\ No newline at end of file
+echo 'Hello, World!';
diff --git a/routes/api.php b/routes/api.php
index 1631594..b833d1d 100755
--- a/routes/api.php
+++ b/routes/api.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/*
  * StupidlySimple - A PHP Framework For Lazy Developers
  *
  * @package		StupidlySimple
@@ -7,4 +7,4 @@
  * @copyright	2017 Fariz Luqman
  * @license		MIT
  * @link		https://stupidlysimple.github.io/
- */
\ No newline at end of file
+ */
diff --git a/routes/auth.php b/routes/auth.php
index af8eca1..6c59ee9 100755
--- a/routes/auth.php
+++ b/routes/auth.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
 
@@ -30,4 +30,4 @@
 */
 Router::post('/login', 'Controller\Auth@authenticate');
 Router::post('/register', 'Controller\Auth@register');
-Router::get('/logout', 'Controller\Auth@logout');
\ No newline at end of file
+Router::get('/logout', 'Controller\Auth@logout');
diff --git a/routes/web.php b/routes/web.php
index 151b93b..1b5ad0a 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,11 +1,11 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
 
@@ -38,7 +38,7 @@
 | see what happen.
 |
 */
-Router::group('Middleware\Hello@filter', function() {
+Router::group('Middleware\Hello@filter', function () {
     Router::get('/hello', 'hello');
     Router::get('/hello/(:any)', 'Controller\Hello@greetWithName');
     Router::post('/hello', 'Controller\Hello@greetForm');
@@ -54,7 +54,7 @@
 | middleware will intercept the HTTP request if the user is not logged in.
 |
 */
-Router::group('Controller\Auth@check', function() {
+Router::group('Controller\Auth@check', function () {
     Router::get('/admin', 'admin/home');
     Router::post('/updateuser', 'Controller\User@editUser');
     Router::get('/deleteuser', 'Controller\User@deleteUser');
@@ -75,6 +75,6 @@
 | other route declarations.
 |
 */
-Router::get('/(:any)', function($match) {
-	Viewer::file($match);
-});
\ No newline at end of file
+Router::get('/(:any)', function ($match) {
+    Viewer::file($match);
+});

From 7ea059b0484081542c9d7e02c18e1bc4e9ad819b Mon Sep 17 00:00:00 2001
From: farizluqman <fariz.fnb@gmail.com>
Date: Fri, 6 Oct 2017 02:16:48 +0800
Subject: [PATCH 15/34] Edit database.php and .htaccess

---
 .htaccess           | 34 +++++++++++++++++-----------------
 config/database.php | 24 ++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/.htaccess b/.htaccess
index 35b72bf..e3e820a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,17 +1,17 @@
-#<Files *.php>
-#Order Deny,Allow
-#Deny from all
-#Allow from 127.0.0.1
-#</Files>
-#
-#<Files index.php>
-#Order Allow,Deny
-#Allow from all
-#</Files>
-#
-#Options +FollowSymLinks
-#RewriteEngine On
-#
-#RewriteCond %{REQUEST_FILENAME} !-d
-#RewriteCond %{REQUEST_FILENAME} !-f
-#RewriteRule ^ index.php [L]
\ No newline at end of file
+<Files *.php>
+Order Deny,Allow
+Deny from all
+Allow from 127.0.0.1
+</Files>
+
+<Files index.php>
+Order Allow,Deny
+Allow from all
+</Files>
+
+Options +FollowSymLinks
+RewriteEngine On
+
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^ index.php [L]
\ No newline at end of file
diff --git a/config/database.php b/config/database.php
index d24be6c..31f7890 100755
--- a/config/database.php
+++ b/config/database.php
@@ -2,6 +2,7 @@
 /**
  * StupidlySimple - A PHP Framework For Lazy Developers.
  *
+<<<<<<< Updated upstream
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
@@ -22,3 +23,26 @@
     'prefix'    => '',
   ],
 ];
+=======
+ * @package        StupidlySimple
+ * @author        Fariz Luqman <fariz.fnb@gmail.com>
+ * @copyright    2017 Fariz Luqman
+ * @license        MIT
+ * @link        https://stupidlysimple.github.io/
+ */
+return
+    [
+        'enabled' => true,
+        'settings' =>
+            [
+                'host' => 'localhost',
+                'driver' => 'mysql',
+                'database' => 'stupidlysimple',
+                'username' => 'root',
+                'password' => 'root',
+                'charset' => 'utf8',
+                'collation' => 'utf8_unicode_ci',
+                'prefix' => '',
+            ]
+    ];
+>>>>>>> Stashed changes

From f511a2cee932a1555ed7927c1679dd70164712ea Mon Sep 17 00:00:00 2001
From: farizluqman <fariz.fnb@gmail.com>
Date: Fri, 6 Oct 2017 02:19:16 +0800
Subject: [PATCH 16/34] Fix database.php

---
 config/database.php | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/config/database.php b/config/database.php
index 31f7890..7bb9ec0 100755
--- a/config/database.php
+++ b/config/database.php
@@ -2,7 +2,6 @@
 /**
  * StupidlySimple - A PHP Framework For Lazy Developers.
  *
-<<<<<<< Updated upstream
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
@@ -22,27 +21,4 @@
     'collation' => 'utf8_unicode_ci',
     'prefix'    => '',
   ],
-];
-=======
- * @package        StupidlySimple
- * @author        Fariz Luqman <fariz.fnb@gmail.com>
- * @copyright    2017 Fariz Luqman
- * @license        MIT
- * @link        https://stupidlysimple.github.io/
- */
-return
-    [
-        'enabled' => true,
-        'settings' =>
-            [
-                'host' => 'localhost',
-                'driver' => 'mysql',
-                'database' => 'stupidlysimple',
-                'username' => 'root',
-                'password' => 'root',
-                'charset' => 'utf8',
-                'collation' => 'utf8_unicode_ci',
-                'prefix' => '',
-            ]
-    ];
->>>>>>> Stashed changes
+];
\ No newline at end of file

From 59c7ef70dcf44bfbf8b7b8e72c0d1a2e4ba5f714 Mon Sep 17 00:00:00 2001
From: Fariz Luqman <fariz.fnb@gmail.com>
Date: Thu, 5 Oct 2017 18:21:38 +0000
Subject: [PATCH 17/34] Apply fixes from StyleCI

---
 config/database.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/database.php b/config/database.php
index 7bb9ec0..d24be6c 100755
--- a/config/database.php
+++ b/config/database.php
@@ -21,4 +21,4 @@
     'collation' => 'utf8_unicode_ci',
     'prefix'    => '',
   ],
-];
\ No newline at end of file
+];

From d1c71c7e450a938bd4f7ccd3b892dd3307d75440 Mon Sep 17 00:00:00 2001
From: Fariz Luqman <fariz.fnb@gmail.com>
Date: Sat, 7 Oct 2017 06:34:29 +0800
Subject: [PATCH 18/34] Update README.md

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 0f7ad9e..3c18d40 100755
--- a/README.md
+++ b/README.md
@@ -2,10 +2,9 @@
 
 Follow us on [Facebook](https://www.facebook.com/stupidlysimpleframework).
 
-[![Join the chat at https://gitter.im/stupidlysimpleframework](https://badges.gitter.im/stupidlysimple/php.svg)](https://gitter.im/stupidlysimpleframework?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![PHP version](https://badge.fury.io/ph/stupidlysimple%2Fphp.svg)](https://badge.fury.io/ph/stupidlysimple%2Fphp) [![Join the chat at https://gitter.im/stupidlysimpleframework](https://badges.gitter.im/stupidlysimple/php.svg)](https://gitter.im/stupidlysimpleframework?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)  
 
-[![PHP version](https://badge.fury.io/ph/stupidlysimple%2Fphp.svg)](https://badge.fury.io/ph/stupidlysimple%2Fphp) [![Build](https://api.travis-ci.org/stupidlysimple/php.svg)](https://travis-ci.org/stupidlysimple/php)
-[![Total Downloads](https://poser.pugx.org/stupidlysimple/php/downloads)](https://packagist.org/packages/stupidlysimple/php)
+[![Build](https://api.travis-ci.org/stupidlysimple/php.svg)](https://travis-ci.org/stupidlysimple/php) [![Style-CI](https://styleci.io/repos/62019007/shield?branch=nightly)](https://styleci.io/repos/62019007)  [![Scrutinizer-CI](https://scrutinizer-ci.com/g/stupidlysimple/php/badges/quality-score.png?b=nightly)](https://scrutinizer-ci.com/g/stupidlysimple/php/)  [![Total Downloads](https://poser.pugx.org/stupidlysimple/php/downloads)](https://packagist.org/packages/stupidlysimple/php)
 [![composer.lock](https://poser.pugx.org/stupidlysimple/php/composerlock)](https://packagist.org/packages/stupidlysimple/php)
 [![License](https://img.shields.io/:license-mit-blue.svg)](https://github.com/stupidlysimple/php/blob/master/LICENSE)
 [![Made In](https://img.shields.io/badge/made%20in-Malaysia-red.svg)](https://www.google.com/search?q=malaysia)

From 5eac644b615201fb9a8639a3e6add468ce6e3b34 Mon Sep 17 00:00:00 2001
From: farizluqman <fariz.fnb@gmail.com>
Date: Sat, 7 Oct 2017 06:37:26 +0800
Subject: [PATCH 19/34] Release candidate 0.5 (need to review changes)

---
 app/Controller/Auth.php            |   6 +-
 app/autoloader.php                 |   4 +-
 app/bootstrap.php                  |  33 ++++++---
 composer.json                      |  16 ++++-
 config/aliases.php                 |  33 +++++----
 config/cache.php                   | 108 ++++++++++++++---------------
 config/env.php                     |   2 +-
 index.php                          |   4 +-
 resources/views/admin/home.tpl.php |  42 +++++------
 resources/views/controller.tpl.php |   6 +-
 resources/views/hello.tpl.php      |   2 +-
 resources/views/home.tpl.php       |   6 +-
 resources/views/model.tpl.php      |  18 ++---
 resources/views/routing.tpl.php    |   6 +-
 resources/views/service.tpl.php    |   6 +-
 15 files changed, 159 insertions(+), 133 deletions(-)

diff --git a/app/Controller/Auth.php b/app/Controller/Auth.php
index 02cb058..5e7873c 100755
--- a/app/Controller/Auth.php
+++ b/app/Controller/Auth.php
@@ -11,9 +11,9 @@
 
 namespace Controller;
 
-use Request;
-use Response;
-use Sentry;
+use Simplyfier\Http\Request;
+use Simplyfier\Http\Response;
+use Cartalyst\Sentry\Facades\Native\Sentry;
 
 /**
  * Class Auth.
diff --git a/app/autoloader.php b/app/autoloader.php
index 8866e73..ac38c99 100755
--- a/app/autoloader.php
+++ b/app/autoloader.php
@@ -30,7 +30,7 @@
 | function everywhere in the project.
 |
 */
-Core\Config::setEnv();
+Simplyfier\Config::setEnv();
 
 /*
 |--------------------------------------------------------------------------
@@ -41,4 +41,4 @@
 | configuration (located at config/env.php).
 |
 */
-Core\Debugger::start();
+Simplyfier\Debugger::start();
diff --git a/app/bootstrap.php b/app/bootstrap.php
index e73960f..5d0c1bb 100755
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -9,6 +9,16 @@
  * @link		https://stupidlysimple.github.io/
  */
 
+use Simplyfier\Alias;
+use Simplyfier\Cache;
+use Simplyfier\TimeTrackr;
+use Simplyfier\Database;
+use Simplyfier\DI\Container;
+use Simplyfier\DI\Sharer;
+use Simplyfier\Debugger;
+use Simplyfier\Service;
+use Simplyfier\Http\Router;
+
 /*
 |--------------------------------------------------------------------------
 | Setup Aliases
@@ -17,7 +27,7 @@
 | Reads the configuration file (config/aliases.php) and create aliases
 |
 */
-Core\Alias::init();
+Alias::loadAliases();
 
 /*
 |--------------------------------------------------------------------------
@@ -27,18 +37,19 @@
 | Reads the configuration file (config/datetime.php) and set timezone
 |
 */
-TimeTrackr::init();
+TimeTrackr::applyConfig();
 
 /*
 |--------------------------------------------------------------------------
-| Creating the Singleton
+| Creating the App Container
 |--------------------------------------------------------------------------
 |
-| Damn Stupid Simple uses the Singleton to simplify coordination, while
-| maintaining only one instantiation of a class.
+| Create an app container to simplify coordination, while maintaining only
+| one instantiation of a class. The app container is usable inside view
+| files.
 |
 */
-$app = new App();
+$app = new Container();
 
 /*
 |--------------------------------------------------------------------------
@@ -48,7 +59,7 @@
 | Connect the database for only once. Save the planet.
 |
 */
-$app->link('database', Database::connect());
+$app->put('database', Database::connect());
 
 /*
 |--------------------------------------------------------------------------
@@ -59,7 +70,7 @@
 | capabilities.
 |
 */
-$app->link('cachemanager', Cache::init());
+$app->put('cachemanager', Cache::initialize());
 
 /*
 |--------------------------------------------------------------------------
@@ -72,11 +83,11 @@
 $service = Service::loadServices();
 /*
 |--------------------------------------------------------------------------
-| Share the Singleton $app and $service
+| Store $app and $service into a hive accessible in the view files
 |--------------------------------------------------------------------------
 |
-| Eliminate complexity, get the job done. Our Dependency Injection (DI) is
-| here!
+| Eliminate complexity, get the job done. Our Dependency Injection (DI) for
+| the view files in here!
 |
 */
 Sharer::share('app', $app);
diff --git a/composer.json b/composer.json
index 704252a..e90440e 100755
--- a/composer.json
+++ b/composer.json
@@ -34,7 +34,21 @@
   },
   "autoload": {
     "psr-4": {
-      "Core\\": "app/Core"
+      "Simplyfier\\": [
+        "vendor/simplyfier/alias",
+        "vendor/simplyfier/config",
+        "vendor/simplyfier/database",
+        "vendor/simplyfier/timetrackr",
+        "vendor/simplyfier/debugger",
+        "vendor/simplyfier/service",
+        "vendor/simplyfier/viewer",
+        "vendor/simplyfier/cache"
+      ],
+      "Simplyfier\\Database\\Factories\\": "vendor/simplyfier/database/factories",
+      "Simplyfier\\Cache\\Factories\\": "vendor/simplyfier/cache/factories",
+      "Simplyfier\\Debugger\\Providers\\": "vendor/simplyfier/debugger/providers",
+      "Simplyfier\\DI\\": "vendor/simplyfier/di",
+      "Simplyfier\\Http\\": "vendor/simplyfier/http"
     },
     "classmap": [
       "app/Model",
diff --git a/config/aliases.php b/config/aliases.php
index 302b2ab..467c826 100755
--- a/config/aliases.php
+++ b/config/aliases.php
@@ -2,25 +2,24 @@
 /**
  * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @author		Fariz Luqman <fariz.fnb@gmail.com>
- * @copyright	2017 Fariz Luqman
- * @license		MIT
+ * @author        Fariz Luqman <fariz.fnb@gmail.com>
+ * @copyright    2017 Fariz Luqman
+ * @license        MIT
  *
- * @link		https://stupidlysimple.github.io/
+ * @link        https://stupidlysimple.github.io/
  */
 return [
-    'Core\App'                               => 'App',
-    'Core\Cache'                             => 'Cache',
-    'Core\Config'                            => 'Config',
-    'Core\Database'                          => 'Database',
-    'Core\Debugger'                          => 'Debugger',
-    'Core\Router'                            => 'Router',
-    'Core\Request'                           => 'Request',
-    'Core\Response'                          => 'Response',
-    'Core\Sharer'                            => 'Sharer',
-    'Core\Viewer'                            => 'Viewer',
-    'Core\Service'                           => 'Service',
-    'Core\Service\ServiceContainer'          => 'ServiceContainer',
-    'Core\TimeTrackr'                        => 'TimeTrackr',
+    'Simplyfier\Cache' => 'Cache',
+    'Simplyfier\Config' => 'Config',
+    'Simplyfier\Database' => 'Database',
+    'Simplyfier\Debugger' => 'Debugger',
+    'Simplyfier\Http\Router' => 'Router',
+    'Simplyfier\Http\Request' => 'Request',
+    'Simplyfier\Http\Response' => 'Response',
+    'Simplyfier\DI\Sharer' => 'Sharer',
+    'Simplyfier\Viewer' => 'Viewer',
+    'Simplyfier\Service' => 'Service',
+    'Simplyfier\Service\ServiceContainer' => 'ServiceContainer',
+    'Simplyfier\TimeTrackr' => 'TimeTrackr',
     'Cartalyst\Sentry\Facades\Native\Sentry' => 'Sentry',
 ];
diff --git a/config/cache.php b/config/cache.php
index a41cf19..d23f638 100755
--- a/config/cache.php
+++ b/config/cache.php
@@ -2,71 +2,71 @@
 /**
  * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @author		Fariz Luqman <fariz.fnb@gmail.com>
- * @copyright	2017 Fariz Luqman
- * @license		MIT
+ * @author        Fariz Luqman <fariz.fnb@gmail.com>
+ * @copyright    2017 Fariz Luqman
+ * @license        MIT
  *
- * @link		https://stupidlysimple.github.io/
+ * @link        https://stupidlysimple.github.io/
  */
 return [
-  'enabled'   => false,
-  'settings'  => [
-    /*
-     * Default storage
-     * if you set this storage => 'files', then $cache = phpFastCache(); <-- will be files cache
-     */
-    'storage'       => 'auto', // ssdb, predis, redis, mongodb , files, sqlite, auto, apc, wincache, xcache, memcache, memcached,
+    'enabled' => true,
+    'settings' => [
+        /*
+         * Default storage
+         * if you set this storage => 'files', then $cache = phpFastCache(); <-- will be files cache
+         */
+        'storage' => 'auto', // ssdb, predis, redis, mongodb , files, sqlite, auto, apc, wincache, xcache, memcache, memcached,
 
-    /*
-     * Default Path for Cache on HDD
-     * Use full PATH like /home/username/cache
-     * Keep it blank '', it will automatic setup for you
-     */
-    'path'          => '', // default path for files
-    'securityKey'   => '', // default will good. It will create a path by PATH/securityKey
+        /*
+         * Default Path for Cache on HDD
+         * Use full PATH like /home/username/cache
+         * Keep it blank '', it will automatic setup for you
+         */
+        'path' => '', // default path for files
+        'securityKey' => '', // default will good. It will create a path by PATH/securityKey
 
-    /*
-     * FallBack Driver
-     * Example, in your code, you use memcached, apc..etc, but when you moved your web hosting
-     * Until you setup your new server caching, use 'overwrite' => 'files'
-     */
-    'overwrite'     => 'files', // whatever caching will change to 'files' and you don't need to change ur code
+        /*
+         * FallBack Driver
+         * Example, in your code, you use memcached, apc..etc, but when you moved your web hosting
+         * Until you setup your new server caching, use 'overwrite' => 'files'
+         */
+        'overwrite' => 'files', // whatever caching will change to 'files' and you don't need to change ur code
 
-    /*
-     * .htaccess protect
-     * default will be  true
-     */
-    'htaccess'      => true,
+        /*
+         * .htaccess protect
+         * default will be  true
+         */
+        'htaccess' => true,
 
-    /*
-     * Default Memcache Server for all $cache = phpFastCache('memcache');
-     */
-    'server'        => [
+        /*
+         * Default Memcache Server for all $cache = phpFastCache('memcache');
+         */
+        'server' => [
             ['127.0.0.1', 11211, 1],
-    ],
+        ],
 
-    'memcache'      => [
+        'memcache' => [
             ['127.0.0.1', 11211, 1],
-    ],
+        ],
 
-    'redis'         => [
-            'host'      => '127.0.0.1',
-            'port'      => '6379',
-            'password'  => '',
-            'database'  => '',
-            'timeout'   => '',
-    ],
+        'redis' => [
+            'host' => '127.0.0.1',
+            'port' => '6379',
+            'password' => '',
+            'database' => '',
+            'timeout' => '',
+        ],
 
-    'ssdb'          => [
-            'host'      => '127.0.0.1',
-            'port'      => 8888,
-            'password'  => '',
-            'timeout'   => '',
-    ],
+        'ssdb' => [
+            'host' => '127.0.0.1',
+            'port' => 8888,
+            'password' => '',
+            'timeout' => '',
+        ],
 
-    /*
-     * Use 1 as normal traditional, 2 = phpfastcache fastest as default, 3 = phpfastcache memory stable
-     */
-    'caching_method' => 2,
-  ],
+        /*
+         * Use 1 as normal traditional, 2 = phpfastcache fastest as default, 3 = phpfastcache memory stable
+         */
+        'caching_method' => 2,
+    ],
 ];
diff --git a/config/env.php b/config/env.php
index 7eb5686..976988d 100755
--- a/config/env.php
+++ b/config/env.php
@@ -16,7 +16,7 @@
      * 1 - Show simple error message, file and the line occured
      * 2 - Advanced debugging with code snippet, stack frames, and envionment details
      */
-    'DEBUG' => 1,
+    'DEBUG' => 2,
 
     /*
      * Display the time taken to complete current request. See the bootstrap.php file
diff --git a/index.php b/index.php
index d5d6f51..fa438d1 100755
--- a/index.php
+++ b/index.php
@@ -8,7 +8,9 @@
  *
  * @link		https://stupidlysimple.github.io/
  */
-
+ini_set('display_errors', 1);
+ini_set('display_startup_errors', 1);
+error_reporting(E_ALL);
 /*
 |--------------------------------------------------------------------------
 | Track the Pre-Execution Time
diff --git a/resources/views/admin/home.tpl.php b/resources/views/admin/home.tpl.php
index 4de89df..d5cd0f0 100644
--- a/resources/views/admin/home.tpl.php
+++ b/resources/views/admin/home.tpl.php
@@ -5,7 +5,7 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php Core\Viewer::file('../layouts/head', $data = ['title' => 'StupidlySimple PHP | Home']); ?>
+<?php Viewer::file('../layouts/head', $data = ['title' => 'StupidlySimple PHP | Home']); ?>
 <body>
 <!-- Wrapper -->
 <div id="wrapper">
@@ -21,17 +21,17 @@
                 <h1>Welcome to the Admin Area</h1>
                 <p>A very fresh start for the MVC framework with some basic CRUD functions</p>
 
-                <?php
-                if (Core\Request::get('delete') === 'success') {
-                    echo '<p class="alert alert-success">User successfully deleted</p>';
-                } elseif (Core\Request::get('edit') === 'success') {
-                    echo '<p class="alert alert-success">User successfully updated</p>';
-                } elseif (Core\Request::get('delete') === 'failed') {
-                    echo '<p class="alert alert-danger">Failed to delete</p>';
-                } elseif (Core\Request::get('edit') === 'failed') {
-                    echo '<p class="alert alert-danger">Failed to update</p>';
-                }
-
+                <?php
+                if (Core\Request::get('delete') === 'success') {
+                    echo '<p class="alert alert-success">User successfully deleted</p>';
+                } elseif (Core\Request::get('edit') === 'success') {
+                    echo '<p class="alert alert-success">User successfully updated</p>';
+                } elseif (Core\Request::get('delete') === 'failed') {
+                    echo '<p class="alert alert-danger">Failed to delete</p>';
+                } elseif (Core\Request::get('edit') === 'failed') {
+                    echo '<p class="alert alert-danger">Failed to update</p>';
+                }
+
                 ?>
 
                 <ul class="nav nav-tabs" style="margin-top: 20px">
@@ -52,15 +52,15 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <?php
-                                foreach ($service->test->getRegisteredUsers() as $user) {
-                                    echo '<tr>';
-                                    echo '<td>'.$user->first_name.'</td>';
-                                    echo '<td>'.$user->last_name.'</td>';
-                                    echo '<td>'.$user->email.'</td>';
-                                    echo '<td><a onclick="return confirm(\'Are you sure?\');" href="deleteuser?id='.$user->id.'" class="btn btn-danger">Delete</a></td>';
-                                    echo '</tr>';
-                                }
+                                <?php
+                                foreach ($service->test->getRegisteredUsers() as $user) {
+                                    echo '<tr>';
+                                    echo '<td>'.$user->first_name.'</td>';
+                                    echo '<td>'.$user->last_name.'</td>';
+                                    echo '<td>'.$user->email.'</td>';
+                                    echo '<td><a onclick="return confirm(\'Are you sure?\');" href="deleteuser?id='.$user->id.'" class="btn btn-danger">Delete</a></td>';
+                                    echo '</tr>';
+                                }
                                 ?>
                                 </tbody>
                             </table>
diff --git a/resources/views/controller.tpl.php b/resources/views/controller.tpl.php
index a25c256..d893479 100644
--- a/resources/views/controller.tpl.php
+++ b/resources/views/controller.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple | Controller'];
-Core\Viewer::file('layouts/head', $data); ?>
+<?php
+$data = ['title' => 'StupidlySimple | Controller'];
+Viewer::file('layouts/head', $data); ?>
 <body>
 <!-- Wrapper -->
 <div id="wrapper">
diff --git a/resources/views/hello.tpl.php b/resources/views/hello.tpl.php
index b75d24e..a813e22 100644
--- a/resources/views/hello.tpl.php
+++ b/resources/views/hello.tpl.php
@@ -1,2 +1,2 @@
 <?php
-echo 'Hello, World!';
+echo 'Hello, World!';
\ No newline at end of file
diff --git a/resources/views/home.tpl.php b/resources/views/home.tpl.php
index 76f685c..cded768 100644
--- a/resources/views/home.tpl.php
+++ b/resources/views/home.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Home'];
-Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Home'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/model.tpl.php b/resources/views/model.tpl.php
index 2a097eb..6500d5c 100644
--- a/resources/views/model.tpl.php
+++ b/resources/views/model.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Service'];
-Core\Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Service'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
@@ -35,17 +35,17 @@
                 <h3>Load all Post </h3>
                 <p>Load the whole post with <code>Model\Post::all()</code> </p>
                 <p>
-                    <?php
-                    $i = 1;
-                    foreach (Model\Post::all() as $post) {
+                    <?php
+                    $i = 1;
+                    foreach (Model\Post::all() as $post) {
                         echo '
                         <div class="alert alert-info">
                             
                             <b><?= $first_post->'.$post->title.'</b><br>
                             <span><?= $first_post->'.$post->content.'</span>
-                        </div>';
-                    }
-                    echo 'There are: '.Model\Post::all()->count().' posts.';
+                        </div>';
+                    }
+                    echo 'There are: '.Model\Post::all()->count().' posts.';
                     ?>
                 </p>
 
diff --git a/resources/views/routing.tpl.php b/resources/views/routing.tpl.php
index 2b1b109..513a86a 100644
--- a/resources/views/routing.tpl.php
+++ b/resources/views/routing.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Service'];
-Core\Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Service'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/service.tpl.php b/resources/views/service.tpl.php
index 80f1b83..3d14bcd 100644
--- a/resources/views/service.tpl.php
+++ b/resources/views/service.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Service'];
-Core\Viewer::file('layouts/head', $data); ?>
+<?php
+$data = ['title' => 'StupidlySimple PHP | Service'];
+Viewer::file('layouts/head', $data); ?>
 <body>
 <!-- Wrapper -->
 <div id="wrapper">

From ece84509a23e3abd9197bfc9174976f62abf3292 Mon Sep 17 00:00:00 2001
From: Fariz Luqman <fariz.fnb@gmail.com>
Date: Fri, 6 Oct 2017 22:37:59 +0000
Subject: [PATCH 20/34] Apply fixes from StyleCI

---
 app/Controller/Auth.php            |  2 +-
 app/bootstrap.php                  |  7 +++---
 config/aliases.php                 | 24 +++++++++---------
 config/cache.php                   | 16 ++++++------
 resources/views/admin/home.tpl.php | 40 +++++++++++++++---------------
 resources/views/controller.tpl.php |  4 +--
 resources/views/hello.tpl.php      |  2 +-
 resources/views/home.tpl.php       |  6 ++---
 resources/views/model.tpl.php      | 18 +++++++-------
 resources/views/routing.tpl.php    |  6 ++---
 resources/views/service.tpl.php    |  4 +--
 resources/views/test.tpl.php       |  1 +
 12 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/app/Controller/Auth.php b/app/Controller/Auth.php
index 5e7873c..81abbf3 100755
--- a/app/Controller/Auth.php
+++ b/app/Controller/Auth.php
@@ -11,9 +11,9 @@
 
 namespace Controller;
 
+use Cartalyst\Sentry\Facades\Native\Sentry;
 use Simplyfier\Http\Request;
 use Simplyfier\Http\Response;
-use Cartalyst\Sentry\Facades\Native\Sentry;
 
 /**
  * Class Auth.
diff --git a/app/bootstrap.php b/app/bootstrap.php
index 5d0c1bb..b980d23 100755
--- a/app/bootstrap.php
+++ b/app/bootstrap.php
@@ -8,16 +8,15 @@
  *
  * @link		https://stupidlysimple.github.io/
  */
-
 use Simplyfier\Alias;
 use Simplyfier\Cache;
-use Simplyfier\TimeTrackr;
 use Simplyfier\Database;
+use Simplyfier\Debugger;
 use Simplyfier\DI\Container;
 use Simplyfier\DI\Sharer;
-use Simplyfier\Debugger;
-use Simplyfier\Service;
 use Simplyfier\Http\Router;
+use Simplyfier\Service;
+use Simplyfier\TimeTrackr;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/config/aliases.php b/config/aliases.php
index 467c826..0d75c6a 100755
--- a/config/aliases.php
+++ b/config/aliases.php
@@ -9,17 +9,17 @@
  * @link        https://stupidlysimple.github.io/
  */
 return [
-    'Simplyfier\Cache' => 'Cache',
-    'Simplyfier\Config' => 'Config',
-    'Simplyfier\Database' => 'Database',
-    'Simplyfier\Debugger' => 'Debugger',
-    'Simplyfier\Http\Router' => 'Router',
-    'Simplyfier\Http\Request' => 'Request',
-    'Simplyfier\Http\Response' => 'Response',
-    'Simplyfier\DI\Sharer' => 'Sharer',
-    'Simplyfier\Viewer' => 'Viewer',
-    'Simplyfier\Service' => 'Service',
-    'Simplyfier\Service\ServiceContainer' => 'ServiceContainer',
-    'Simplyfier\TimeTrackr' => 'TimeTrackr',
+    'Simplyfier\Cache'                       => 'Cache',
+    'Simplyfier\Config'                      => 'Config',
+    'Simplyfier\Database'                    => 'Database',
+    'Simplyfier\Debugger'                    => 'Debugger',
+    'Simplyfier\Http\Router'                 => 'Router',
+    'Simplyfier\Http\Request'                => 'Request',
+    'Simplyfier\Http\Response'               => 'Response',
+    'Simplyfier\DI\Sharer'                   => 'Sharer',
+    'Simplyfier\Viewer'                      => 'Viewer',
+    'Simplyfier\Service'                     => 'Service',
+    'Simplyfier\Service\ServiceContainer'    => 'ServiceContainer',
+    'Simplyfier\TimeTrackr'                  => 'TimeTrackr',
     'Cartalyst\Sentry\Facades\Native\Sentry' => 'Sentry',
 ];
diff --git a/config/cache.php b/config/cache.php
index d23f638..f0ceca4 100755
--- a/config/cache.php
+++ b/config/cache.php
@@ -9,7 +9,7 @@
  * @link        https://stupidlysimple.github.io/
  */
 return [
-    'enabled' => true,
+    'enabled'  => true,
     'settings' => [
         /*
          * Default storage
@@ -22,7 +22,7 @@
          * Use full PATH like /home/username/cache
          * Keep it blank '', it will automatic setup for you
          */
-        'path' => '', // default path for files
+        'path'        => '', // default path for files
         'securityKey' => '', // default will good. It will create a path by PATH/securityKey
 
         /*
@@ -50,18 +50,18 @@
         ],
 
         'redis' => [
-            'host' => '127.0.0.1',
-            'port' => '6379',
+            'host'     => '127.0.0.1',
+            'port'     => '6379',
             'password' => '',
             'database' => '',
-            'timeout' => '',
+            'timeout'  => '',
         ],
 
         'ssdb' => [
-            'host' => '127.0.0.1',
-            'port' => 8888,
+            'host'     => '127.0.0.1',
+            'port'     => 8888,
             'password' => '',
-            'timeout' => '',
+            'timeout'  => '',
         ],
 
         /*
diff --git a/resources/views/admin/home.tpl.php b/resources/views/admin/home.tpl.php
index d5cd0f0..e0a2a8e 100644
--- a/resources/views/admin/home.tpl.php
+++ b/resources/views/admin/home.tpl.php
@@ -21,17 +21,17 @@
                 <h1>Welcome to the Admin Area</h1>
                 <p>A very fresh start for the MVC framework with some basic CRUD functions</p>
 
-                <?php
-                if (Core\Request::get('delete') === 'success') {
-                    echo '<p class="alert alert-success">User successfully deleted</p>';
-                } elseif (Core\Request::get('edit') === 'success') {
-                    echo '<p class="alert alert-success">User successfully updated</p>';
-                } elseif (Core\Request::get('delete') === 'failed') {
-                    echo '<p class="alert alert-danger">Failed to delete</p>';
-                } elseif (Core\Request::get('edit') === 'failed') {
-                    echo '<p class="alert alert-danger">Failed to update</p>';
-                }
-
+                <?php
+                if (Core\Request::get('delete') === 'success') {
+                    echo '<p class="alert alert-success">User successfully deleted</p>';
+                } elseif (Core\Request::get('edit') === 'success') {
+                    echo '<p class="alert alert-success">User successfully updated</p>';
+                } elseif (Core\Request::get('delete') === 'failed') {
+                    echo '<p class="alert alert-danger">Failed to delete</p>';
+                } elseif (Core\Request::get('edit') === 'failed') {
+                    echo '<p class="alert alert-danger">Failed to update</p>';
+                }
+
                 ?>
 
                 <ul class="nav nav-tabs" style="margin-top: 20px">
@@ -52,15 +52,15 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <?php
-                                foreach ($service->test->getRegisteredUsers() as $user) {
-                                    echo '<tr>';
-                                    echo '<td>'.$user->first_name.'</td>';
-                                    echo '<td>'.$user->last_name.'</td>';
-                                    echo '<td>'.$user->email.'</td>';
-                                    echo '<td><a onclick="return confirm(\'Are you sure?\');" href="deleteuser?id='.$user->id.'" class="btn btn-danger">Delete</a></td>';
-                                    echo '</tr>';
-                                }
+                                <?php
+                                foreach ($service->test->getRegisteredUsers() as $user) {
+                                    echo '<tr>';
+                                    echo '<td>'.$user->first_name.'</td>';
+                                    echo '<td>'.$user->last_name.'</td>';
+                                    echo '<td>'.$user->email.'</td>';
+                                    echo '<td><a onclick="return confirm(\'Are you sure?\');" href="deleteuser?id='.$user->id.'" class="btn btn-danger">Delete</a></td>';
+                                    echo '</tr>';
+                                }
                                 ?>
                                 </tbody>
                             </table>
diff --git a/resources/views/controller.tpl.php b/resources/views/controller.tpl.php
index d893479..f02dff0 100644
--- a/resources/views/controller.tpl.php
+++ b/resources/views/controller.tpl.php
@@ -5,8 +5,8 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple | Controller'];
+<?php
+$data = ['title' => 'StupidlySimple | Controller'];
 Viewer::file('layouts/head', $data); ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/hello.tpl.php b/resources/views/hello.tpl.php
index a813e22..b75d24e 100644
--- a/resources/views/hello.tpl.php
+++ b/resources/views/hello.tpl.php
@@ -1,2 +1,2 @@
 <?php
-echo 'Hello, World!';
\ No newline at end of file
+echo 'Hello, World!';
diff --git a/resources/views/home.tpl.php b/resources/views/home.tpl.php
index cded768..76f685c 100644
--- a/resources/views/home.tpl.php
+++ b/resources/views/home.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Home'];
-Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Home'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/model.tpl.php b/resources/views/model.tpl.php
index 6500d5c..4ac5604 100644
--- a/resources/views/model.tpl.php
+++ b/resources/views/model.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Service'];
-Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Service'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
@@ -35,17 +35,17 @@
                 <h3>Load all Post </h3>
                 <p>Load the whole post with <code>Model\Post::all()</code> </p>
                 <p>
-                    <?php
-                    $i = 1;
-                    foreach (Model\Post::all() as $post) {
+                    <?php
+                    $i = 1;
+                    foreach (Model\Post::all() as $post) {
                         echo '
                         <div class="alert alert-info">
                             
                             <b><?= $first_post->'.$post->title.'</b><br>
                             <span><?= $first_post->'.$post->content.'</span>
-                        </div>';
-                    }
-                    echo 'There are: '.Model\Post::all()->count().' posts.';
+                        </div>';
+                    }
+                    echo 'There are: '.Model\Post::all()->count().' posts.';
                     ?>
                 </p>
 
diff --git a/resources/views/routing.tpl.php b/resources/views/routing.tpl.php
index 513a86a..326ade2 100644
--- a/resources/views/routing.tpl.php
+++ b/resources/views/routing.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Service'];
-Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Service'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/service.tpl.php b/resources/views/service.tpl.php
index 3d14bcd..2b1d273 100644
--- a/resources/views/service.tpl.php
+++ b/resources/views/service.tpl.php
@@ -5,8 +5,8 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Service'];
+<?php
+$data = ['title' => 'StupidlySimple PHP | Service'];
 Viewer::file('layouts/head', $data); ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/test.tpl.php b/resources/views/test.tpl.php
index b75d24e..881af89 100644
--- a/resources/views/test.tpl.php
+++ b/resources/views/test.tpl.php
@@ -1,2 +1,3 @@
 <?php
+
 echo 'Hello, World!';

From d92c71cc7b944ef67e1901d17a7c48c6d348e380 Mon Sep 17 00:00:00 2001
From: farizluqman <fariz.fnb@gmail.com>
Date: Sat, 7 Oct 2017 07:09:34 +0800
Subject: [PATCH 21/34] Add minimum stability to dev (for nightly)

---
 composer.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/composer.json b/composer.json
index e90440e..876ebe6 100755
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,7 @@
   "config": {
     "vendor-dir": "vendor"
   },
+  "minimum-stability": "dev",
   "require": {
     "php": ">=5.4.0",
     "filp/whoops": "^2.1",

From 2bd36f4f0b6dfab181fb981e4aeb97a214190713 Mon Sep 17 00:00:00 2001
From: farizluqman <fariz.fnb@gmail.com>
Date: Tue, 10 Oct 2017 12:37:49 +0800
Subject: [PATCH 22/34] Release candidate 0.5.0-dev

---
 composer.json |  29 +-
 composer.lock | 991 ++++++++++++++++++++++++++++++++++++++------------
 2 files changed, 762 insertions(+), 258 deletions(-)

diff --git a/composer.json b/composer.json
index 876ebe6..0fb7efc 100755
--- a/composer.json
+++ b/composer.json
@@ -24,32 +24,27 @@
   "require": {
     "php": ">=5.4.0",
     "filp/whoops": "^2.1",
-    "stupidlysimple/php-core": "dev-nightly",
     "symfony/var-dumper": "^3.1",
     "phpFastCache/phpFastCache": "^4.3",
     "illuminate/database": "5.2.*",
-    "cartalyst/sentry": "2.1.*"
+    "cartalyst/sentry": "2.1.*",
+    "simplyfier/alias": "dev-master",
+    "simplyfier/config": "dev-master",
+    "simplyfier/cache": "dev-master",
+    "simplyfier/http": "dev-master",
+    "simplyfier/di": "dev-master",
+    "simplyfier/debugger": "dev-master",
+    "simplyfier/timetrackr": "dev-master",
+    "simplyfier/viewer": "dev-master",
+    "simplyfier/database": "dev-master",
+    "simplyfier/service": "dev-master"
   },
   "require-dev": {
     "phpunit/phpunit": "5.4.*"
   },
   "autoload": {
     "psr-4": {
-      "Simplyfier\\": [
-        "vendor/simplyfier/alias",
-        "vendor/simplyfier/config",
-        "vendor/simplyfier/database",
-        "vendor/simplyfier/timetrackr",
-        "vendor/simplyfier/debugger",
-        "vendor/simplyfier/service",
-        "vendor/simplyfier/viewer",
-        "vendor/simplyfier/cache"
-      ],
-      "Simplyfier\\Database\\Factories\\": "vendor/simplyfier/database/factories",
-      "Simplyfier\\Cache\\Factories\\": "vendor/simplyfier/cache/factories",
-      "Simplyfier\\Debugger\\Providers\\": "vendor/simplyfier/debugger/providers",
-      "Simplyfier\\DI\\": "vendor/simplyfier/di",
-      "Simplyfier\\Http\\": "vendor/simplyfier/http"
+
     },
     "classmap": [
       "app/Model",
diff --git a/composer.lock b/composer.lock
index 7728b08..ed9342b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "9a8bcbb5a80f058cbb66ecc17eca28a0",
+    "content-hash": "592f3c47af3ed3c92c373aff660edaef",
     "packages": [
         {
             "name": "cartalyst/sentry",
-            "version": "v2.1.6",
+            "version": "2.1.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/cartalyst/sentry.git",
-                "reference": "fc70d46ad77aae599ac1f6f1571b4517d0783fc8"
+                "reference": "c679730b8848686f59125cd821bf94946fb16a94"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/cartalyst/sentry/zipball/fc70d46ad77aae599ac1f6f1571b4517d0783fc8",
-                "reference": "fc70d46ad77aae599ac1f6f1571b4517d0783fc8",
+                "url": "https://api.github.com/repos/cartalyst/sentry/zipball/c679730b8848686f59125cd821bf94946fb16a94",
+                "reference": "c679730b8848686f59125cd821bf94946fb16a94",
                 "shasum": ""
             },
             "require": {
@@ -104,37 +104,37 @@
                 "laravel",
                 "security"
             ],
-            "time": "2015-11-26T01:19:39+00:00"
+            "time": "2016-09-05 00:18:34"
         },
         {
             "name": "doctrine/inflector",
-            "version": "v1.1.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/inflector.git",
-                "reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
+                "reference": "40daa067a3e5fb95572236a346a8290e4445778f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae",
-                "reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
+                "url": "https://api.github.com/repos/doctrine/inflector/zipball/40daa067a3e5fb95572236a346a8290e4445778f",
+                "reference": "40daa067a3e5fb95572236a346a8290e4445778f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.2"
+                "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "4.*"
+                "phpunit/phpunit": "^6.2"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.3.x-dev"
                 }
             },
             "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Inflector\\": "lib/"
+                "psr-4": {
+                    "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -171,24 +171,25 @@
                 "singularize",
                 "string"
             ],
-            "time": "2015-11-06T14:35:42+00:00"
+            "time": "2017-10-04 05:38:52"
         },
         {
             "name": "filp/whoops",
-            "version": "2.1.5",
+            "version": "2.1.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/filp/whoops.git",
-                "reference": "2abce9d956589122c6443d6265f01cf7e9388e3c"
+                "reference": "ffbbd2c06c64b08fb47974eed5dbce4ca2bb0eec"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/filp/whoops/zipball/2abce9d956589122c6443d6265f01cf7e9388e3c",
-                "reference": "2abce9d956589122c6443d6265f01cf7e9388e3c",
+                "url": "https://api.github.com/repos/filp/whoops/zipball/ffbbd2c06c64b08fb47974eed5dbce4ca2bb0eec",
+                "reference": "ffbbd2c06c64b08fb47974eed5dbce4ca2bb0eec",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.5.9 || ^7.0"
+                "php": "^5.5.9 || ^7.0",
+                "psr/log": "^1.0.1"
             },
             "require-dev": {
                 "mockery/mockery": "0.9.*",
@@ -231,11 +232,11 @@
                 "whoops",
                 "zf2"
             ],
-            "time": "2016-12-26T16:13:31+00:00"
+            "time": "2017-08-03T18:23:40+00:00"
         },
         {
             "name": "illuminate/container",
-            "version": "v5.2.45",
+            "version": "5.2.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/container.git",
@@ -274,20 +275,20 @@
             ],
             "description": "The Illuminate Container package.",
             "homepage": "http://laravel.com",
-            "time": "2016-08-01T13:49:14+00:00"
+            "time": "2016-08-01 13:49:14"
         },
         {
             "name": "illuminate/contracts",
-            "version": "v5.2.45",
+            "version": "5.2.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
-                "reference": "22bde7b048a33c702d9737fc1446234fff9b1363"
+                "reference": "66eb2baef315664740c9f87d6f3f5b7347a05da9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/22bde7b048a33c702d9737fc1446234fff9b1363",
-                "reference": "22bde7b048a33c702d9737fc1446234fff9b1363",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/66eb2baef315664740c9f87d6f3f5b7347a05da9",
+                "reference": "66eb2baef315664740c9f87d6f3f5b7347a05da9",
                 "shasum": ""
             },
             "require": {
@@ -316,20 +317,20 @@
             ],
             "description": "The Illuminate Contracts package.",
             "homepage": "http://laravel.com",
-            "time": "2016-08-08T11:46:08+00:00"
+            "time": "2017-08-12 11:45:44"
         },
         {
             "name": "illuminate/database",
-            "version": "v5.2.45",
+            "version": "5.2.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/database.git",
-                "reference": "4a70c0598ed41d18a99f23c12be4e22b5006d30a"
+                "reference": "3fcbb875ff345307579182ca0eb0fffe17132350"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/database/zipball/4a70c0598ed41d18a99f23c12be4e22b5006d30a",
-                "reference": "4a70c0598ed41d18a99f23c12be4e22b5006d30a",
+                "url": "https://api.github.com/repos/illuminate/database/zipball/3fcbb875ff345307579182ca0eb0fffe17132350",
+                "reference": "3fcbb875ff345307579182ca0eb0fffe17132350",
                 "shasum": ""
             },
             "require": {
@@ -376,20 +377,20 @@
                 "orm",
                 "sql"
             ],
-            "time": "2016-08-25T07:01:20+00:00"
+            "time": "2017-08-12 11:45:44"
         },
         {
             "name": "illuminate/support",
-            "version": "v5.2.45",
+            "version": "5.2.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "510230ab62a7d85dc70203f4fdca6fb71a19e08a"
+                "reference": "ba979ee49a0be1a694bebecc4e7b35df03cedda9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/510230ab62a7d85dc70203f4fdca6fb71a19e08a",
-                "reference": "510230ab62a7d85dc70203f4fdca6fb71a19e08a",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/ba979ee49a0be1a694bebecc4e7b35df03cedda9",
+                "reference": "ba979ee49a0be1a694bebecc4e7b35df03cedda9",
                 "shasum": ""
             },
             "require": {
@@ -435,20 +436,20 @@
             ],
             "description": "The Illuminate Support package.",
             "homepage": "http://laravel.com",
-            "time": "2016-08-05T14:49:58+00:00"
+            "time": "2016-12-03 18:52:25"
         },
         {
             "name": "nesbot/carbon",
-            "version": "1.22.1",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc"
+                "reference": "926aee5ab38c2868816aa760f862a85ad01cb61a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc",
-                "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/926aee5ab38c2868816aa760f862a85ad01cb61a",
+                "reference": "926aee5ab38c2868816aa760f862a85ad01cb61a",
                 "shasum": ""
             },
             "require": {
@@ -488,20 +489,20 @@
                 "datetime",
                 "time"
             ],
-            "time": "2017-01-16T07:55:07+00:00"
+            "time": "2017-02-06 22:02:47"
         },
         {
             "name": "paragonie/random_compat",
-            "version": "v1.4.1",
+            "version": "v1.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "c7e26a21ba357863de030f0b9e701c7d04593774"
+                "reference": "965cdeb01fdcab7653253aa81d40441d261f1e66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/c7e26a21ba357863de030f0b9e701c7d04593774",
-                "reference": "c7e26a21ba357863de030f0b9e701c7d04593774",
+                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/965cdeb01fdcab7653253aa81d40441d261f1e66",
+                "reference": "965cdeb01fdcab7653253aa81d40441d261f1e66",
                 "shasum": ""
             },
             "require": {
@@ -536,11 +537,11 @@
                 "pseudorandom",
                 "random"
             ],
-            "time": "2016-03-18T20:34:03+00:00"
+            "time": "2017-03-13 16:22:52"
         },
         {
             "name": "phpfastcache/phpfastcache",
-            "version": "4.3.18",
+            "version": "v4.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPSocialNetwork/phpfastcache.git",
@@ -607,29 +608,417 @@
                 "redis",
                 "wincache"
             ],
-            "time": "2017-01-24T00:38:01+00:00"
+            "time": "2017-01-24 00:38:01"
         },
         {
-            "name": "stupidlysimple/php-core",
-            "version": "dev-nightly",
+            "name": "psr/log",
+            "version": "dev-master",
             "source": {
                 "type": "git",
-                "url": "https://github.com/stupidlysimple/php-core.git",
-                "reference": "7017cafb57143f678ba53cae341b69165a4000de"
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/stupidlysimple/php-core/zipball/7017cafb57143f678ba53cae341b69165a4000de",
-                "reference": "7017cafb57143f678ba53cae341b69165a4000de",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.4.0"
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "Psr/Log/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "time": "2016-10-10 12:19:37"
+        },
+        {
+            "name": "simplyfier/alias",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/simplyfier/alias.git",
+                "reference": "ed6775e49783756f6286be8e2977ad93b6165d71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/simplyfier/alias/zipball/ed6775e49783756f6286be8e2977ad93b6165d71",
+                "reference": "ed6775e49783756f6286be8e2977ad93b6165d71",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "project",
+            "autoload": {
+                "psr-4": {
+                    "Simplyfier\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fariz Luqman",
+                    "email": "fariz.fnb@gmail.com",
+                    "homepage": "https://stupidlysimple.github.io",
+                    "role": "Developer"
+                }
+            ],
+            "description": "The alias manager",
+            "keywords": [
+                "alias manager",
+                "hhvm",
+                "lazy",
+                "micro framework",
+                "php 7",
+                "php essentials",
+                "php framework",
+                "stupidly simple"
+            ],
+            "time": "2017-10-10 03:56:25"
+        },
+        {
+            "name": "simplyfier/cache",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/simplyfier/cache.git",
+                "reference": "4e32cd3a80839fa03ec74cb0a2a3c430ab993ae4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/simplyfier/cache/zipball/4e32cd3a80839fa03ec74cb0a2a3c430ab993ae4",
+                "reference": "4e32cd3a80839fa03ec74cb0a2a3c430ab993ae4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "project",
+            "autoload": {
+                "psr-4": {
+                    "Simplyfier\\": "",
+                    "Simplyfier\\Cache\\Factories\\": "factories",
+                    "Simplyfier\\Cache\\Facades\\": "facades"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fariz Luqman",
+                    "email": "fariz.fnb@gmail.com",
+                    "homepage": "https://stupidlysimple.github.io",
+                    "role": "Developer"
+                }
+            ],
+            "description": "The Cache manager from various providers",
+            "keywords": [
+                "cache manager",
+                "hhvm",
+                "lazy",
+                "micro framework",
+                "php 7",
+                "php framework",
+                "stupidly simple"
+            ],
+            "time": "2017-10-10 03:57:05"
+        },
+        {
+            "name": "simplyfier/config",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/simplyfier/config.git",
+                "reference": "df987c28446bcf2eccdd8597bc5a19375405353a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/simplyfier/config/zipball/df987c28446bcf2eccdd8597bc5a19375405353a",
+                "reference": "df987c28446bcf2eccdd8597bc5a19375405353a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "project",
+            "autoload": {
+                "psr-4": {
+                    "Simplyfier\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fariz Luqman",
+                    "email": "fariz.fnb@gmail.com",
+                    "homepage": "https://stupidlysimple.github.io",
+                    "role": "Developer"
+                }
+            ],
+            "description": "The configuration loader",
+            "keywords": [
+                "configuration loader",
+                "hhvm",
+                "lazy",
+                "micro framework",
+                "php 7",
+                "php framework",
+                "stupidly simple"
+            ],
+            "time": "2017-10-10 04:07:43"
+        },
+        {
+            "name": "simplyfier/database",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/simplyfier/database.git",
+                "reference": "8e367d7c622cb385e5e2ceef477e0ff9fe7a99a9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/simplyfier/database/zipball/8e367d7c622cb385e5e2ceef477e0ff9fe7a99a9",
+                "reference": "8e367d7c622cb385e5e2ceef477e0ff9fe7a99a9",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "project",
+            "autoload": {
+                "psr-4": {
+                    "Simplyfier\\": "",
+                    "Simplyfier\\Database\\Factories\\": "factories",
+                    "Simplyfier\\Database\\Facades\\": "facades"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fariz Luqman",
+                    "email": "fariz.fnb@gmail.com",
+                    "homepage": "https://stupidlysimple.github.io",
+                    "role": "Developer"
+                }
+            ],
+            "description": "The Database manager from various providers",
+            "keywords": [
+                "database manager",
+                "hhvm",
+                "lazy",
+                "micro framework",
+                "php 7",
+                "php framework",
+                "stupidly simple"
+            ],
+            "time": "2017-10-10 04:06:39"
+        },
+        {
+            "name": "simplyfier/debugger",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/simplyfier/debugger.git",
+                "reference": "3cc499482b79fa8723d341a323050be3041cdcc3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/simplyfier/debugger/zipball/3cc499482b79fa8723d341a323050be3041cdcc3",
+                "reference": "3cc499482b79fa8723d341a323050be3041cdcc3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "project",
+            "autoload": {
+                "psr-4": {
+                    "Simplyfier\\": "",
+                    "Simplyfier\\Debugger\\Providers\\": "providers"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fariz Luqman",
+                    "email": "fariz.fnb@gmail.com",
+                    "homepage": "https://stupidlysimple.github.io",
+                    "role": "Developer"
+                }
+            ],
+            "description": "The Debugger for StupidlySimple framework",
+            "keywords": [
+                "debugger",
+                "flip",
+                "hhvm",
+                "lazy",
+                "micro framework",
+                "php 7",
+                "php framework",
+                "stupidly simple",
+                "whoops"
+            ],
+            "time": "2017-10-10 04:05:22"
+        },
+        {
+            "name": "simplyfier/di",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/simplyfier/di.git",
+                "reference": "674c3251ab2d8836ef4704d5f2e9529183e1aae4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/simplyfier/di/zipball/674c3251ab2d8836ef4704d5f2e9529183e1aae4",
+                "reference": "674c3251ab2d8836ef4704d5f2e9529183e1aae4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "project",
+            "autoload": {
+                "psr-4": {
+                    "Simplyfier\\DI\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fariz Luqman",
+                    "email": "fariz.fnb@gmail.com",
+                    "homepage": "https://stupidlysimple.github.io",
+                    "role": "Developer"
+                }
+            ],
+            "description": "The Dependency Injection (DI) for StupidlySimple framework",
+            "keywords": [
+                "dependency injection",
+                "di",
+                "hhvm",
+                "lazy",
+                "micro framework",
+                "php 7",
+                "php framework",
+                "stupidly simple"
+            ],
+            "time": "2017-10-10 04:04:41"
+        },
+        {
+            "name": "simplyfier/http",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/simplyfier/http.git",
+                "reference": "ba4289370de31323c00a06b5fec5f3441926b255"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/simplyfier/http/zipball/ba4289370de31323c00a06b5fec5f3441926b255",
+                "reference": "ba4289370de31323c00a06b5fec5f3441926b255",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "project",
+            "autoload": {
+                "psr-4": {
+                    "Simplyfier\\Http\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fariz Luqman",
+                    "email": "fariz.fnb@gmail.com",
+                    "homepage": "https://stupidlysimple.github.io",
+                    "role": "Developer"
+                }
+            ],
+            "description": "The HTTP and Router package for StupidlySimple framework",
+            "keywords": [
+                "hhvm",
+                "http",
+                "lazy",
+                "micro framework",
+                "php 7",
+                "php framework",
+                "request",
+                "response",
+                "router",
+                "stupidly simple"
+            ],
+            "time": "2017-10-10 04:02:14"
+        },
+        {
+            "name": "simplyfier/service",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/simplyfier/service.git",
+                "reference": "5aa1dbf16183c712728e1541628e35fc146fbe70"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/simplyfier/service/zipball/5aa1dbf16183c712728e1541628e35fc146fbe70",
+                "reference": "5aa1dbf16183c712728e1541628e35fc146fbe70",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
             },
             "type": "project",
             "autoload": {
                 "psr-4": {
-                    "Core\\": "src"
+                    "Simplyfier\\": ""
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -644,8 +1033,9 @@
                     "role": "Developer"
                 }
             ],
-            "description": "The core package for Stupidly Simple framework",
+            "description": "The Service manager for Stupidly Simple framework",
             "keywords": [
+                "Service Manager",
                 "hhvm",
                 "lazy",
                 "micro framework",
@@ -653,20 +1043,114 @@
                 "php framework",
                 "stupidly simple"
             ],
-            "time": "2017-02-15 18:06:17"
+            "time": "2017-10-10 04:01:22"
+        },
+        {
+            "name": "simplyfier/timetrackr",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/simplyfier/timetrackr.git",
+                "reference": "41ad6aa6b8df2e959f36c25967cd9c9a17ff27b6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/simplyfier/timetrackr/zipball/41ad6aa6b8df2e959f36c25967cd9c9a17ff27b6",
+                "reference": "41ad6aa6b8df2e959f36c25967cd9c9a17ff27b6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "project",
+            "autoload": {
+                "psr-4": {
+                    "Simplyfier\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fariz Luqman",
+                    "email": "fariz.fnb@gmail.com",
+                    "homepage": "https://stupidlysimple.github.io",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Manage everything related to Date and Time",
+            "keywords": [
+                "hhvm",
+                "lazy",
+                "micro framework",
+                "php 7",
+                "php framework",
+                "stupidly simple",
+                "time tracking"
+            ],
+            "time": "2017-10-10 03:59:08"
+        },
+        {
+            "name": "simplyfier/viewer",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/simplyfier/viewer.git",
+                "reference": "5baf5635f57c01bc9b5a6a348ab240f6f9d76024"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/simplyfier/viewer/zipball/5baf5635f57c01bc9b5a6a348ab240f6f9d76024",
+                "reference": "5baf5635f57c01bc9b5a6a348ab240f6f9d76024",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "type": "project",
+            "autoload": {
+                "psr-4": {
+                    "Simplyfier\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fariz Luqman",
+                    "email": "fariz.fnb@gmail.com",
+                    "homepage": "https://stupidlysimple.github.io",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Manage everything related to Date and Time",
+            "keywords": [
+                "hhvm",
+                "lazy",
+                "micro framework",
+                "php 7",
+                "php framework",
+                "stupidly simple",
+                "time tracking"
+            ],
+            "time": "2017-10-10 03:58:13"
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.3.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4"
+                "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/e79d363049d1c2128f133a2667e4f4190904f7f4",
-                "reference": "e79d363049d1c2128f133a2667e4f4190904f7f4",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
+                "reference": "7c8fae0ac1d216eb54349e6a8baa57d515fe8803",
                 "shasum": ""
             },
             "require": {
@@ -678,7 +1162,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3-dev"
+                    "dev-master": "1.5-dev"
                 }
             },
             "autoload": {
@@ -712,34 +1196,38 @@
                 "portable",
                 "shim"
             ],
-            "time": "2016-11-14T01:06:16+00:00"
+            "time": "2017-06-14 15:44:48"
         },
         {
             "name": "symfony/translation",
-            "version": "v3.2.3",
+            "version": "3.4.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "ca032cc56976d88b85e7386b17020bc6dc95dbc5"
+                "reference": "5c94827634a3fcde98ea78b5a011f3228b343269"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/ca032cc56976d88b85e7386b17020bc6dc95dbc5",
-                "reference": "ca032cc56976d88b85e7386b17020bc6dc95dbc5",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/5c94827634a3fcde98ea78b5a011f3228b343269",
+                "reference": "5c94827634a3fcde98ea78b5a011f3228b343269",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",
                 "symfony/polyfill-mbstring": "~1.0"
             },
             "conflict": {
-                "symfony/config": "<2.8"
+                "symfony/config": "<2.8",
+                "symfony/dependency-injection": "<3.4",
+                "symfony/yaml": "<3.4"
             },
             "require-dev": {
                 "psr/log": "~1.0",
-                "symfony/config": "~2.8|~3.0",
-                "symfony/intl": "~2.8|~3.0",
-                "symfony/yaml": "~2.8|~3.0"
+                "symfony/config": "~2.8|~3.0|~4.0",
+                "symfony/dependency-injection": "~3.4|~4.0",
+                "symfony/finder": "~2.8|~3.0|~4.0",
+                "symfony/intl": "^2.8.18|^3.2.5|~4.0",
+                "symfony/yaml": "~3.4|~4.0"
             },
             "suggest": {
                 "psr/log": "To use logging capability in translator",
@@ -749,7 +1237,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -776,36 +1264,42 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-21T17:06:35+00:00"
+            "time": "2017-10-05 10:20:28"
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v3.2.3",
+            "version": "3.4.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "5bb4435a03a4f05c211f4a9a8ee2756965924511"
+                "reference": "8f3ebf7e6f7f5634f088c49f97f2708ca218aae4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/5bb4435a03a4f05c211f4a9a8ee2756965924511",
-                "reference": "5bb4435a03a4f05c211f4a9a8ee2756965924511",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/8f3ebf7e6f7f5634f088c49f97f2708ca218aae4",
+                "reference": "8f3ebf7e6f7f5634f088c49f97f2708ca218aae4",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9",
+                "php": "^5.5.9|>=7.0.8",
                 "symfony/polyfill-mbstring": "~1.0"
             },
+            "conflict": {
+                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
+            },
             "require-dev": {
-                "twig/twig": "~1.20|~2.0"
+                "ext-iconv": "*",
+                "twig/twig": "~1.34|~2.4"
             },
             "suggest": {
+                "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).",
+                "ext-intl": "To show region name in time zone dump",
                 "ext-symfony_debug": ""
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -839,38 +1333,36 @@
                 "debug",
                 "dump"
             ],
-            "time": "2017-01-24T12:58:58+00:00"
+            "time": "2017-10-05 12:34:03"
         }
     ],
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.0.5",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+                "reference": "7af8066e48b8a4cbd90849bbe9234ab444057968"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/7af8066e48b8a4cbd90849bbe9234ab444057968",
+                "reference": "7af8066e48b8a4cbd90849bbe9234ab444057968",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3,<8.0-DEV"
+                "php": "^7.1"
             },
             "require-dev": {
-                "athletic/athletic": "~0.1.8",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
+                "phpunit/phpunit": "^6.2.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
@@ -895,20 +1387,20 @@
                 "constructor",
                 "instantiate"
             ],
-            "time": "2015-06-14T21:17:01+00:00"
+            "time": "2017-09-19 12:41:22"
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.6.0",
+            "version": "1.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe"
+                "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/5a5a9fc8025a08d8919be87d6884d5a92520cefe",
-                "reference": "5a5a9fc8025a08d8919be87d6884d5a92520cefe",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/8e6e04167378abf1ddb4d3522d8755c5fd90d102",
+                "reference": "8e6e04167378abf1ddb4d3522d8755c5fd90d102",
                 "shasum": ""
             },
             "require": {
@@ -937,20 +1429,20 @@
                 "object",
                 "object graph"
             ],
-            "time": "2017-01-26T22:05:40+00:00"
+            "time": "2017-04-12 18:52:22"
         },
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "1.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
-                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
+                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
                 "shasum": ""
             },
             "require": {
@@ -991,26 +1483,26 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2015-12-27T11:43:31+00:00"
+            "time": "2017-09-11 18:02:19"
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "3.1.1",
+            "version": "4.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e"
+                "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/8331b5efe816ae05461b7ca1e721c01b46bafb3e",
-                "reference": "8331b5efe816ae05461b7ca1e721c01b46bafb3e",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/2d3d238c433cf69caeb4842e97a3223a116f94b2",
+                "reference": "2d3d238c433cf69caeb4842e97a3223a116f94b2",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5",
+                "php": "^7.0",
                 "phpdocumentor/reflection-common": "^1.0@dev",
-                "phpdocumentor/type-resolver": "^0.2.0",
+                "phpdocumentor/type-resolver": "^0.4.0",
                 "webmozart/assert": "^1.0"
             },
             "require-dev": {
@@ -1036,24 +1528,24 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2016-09-30T07:12:33+00:00"
+            "time": "2017-08-30T18:51:59+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "0.2.1",
+            "version": "0.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb"
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
-                "reference": "e224fb2ea2fba6d3ad6fdaef91cd09a172155ccb",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
+                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5",
+                "php": "^5.5 || ^7.0",
                 "phpdocumentor/reflection-common": "^1.0"
             },
             "require-dev": {
@@ -1083,37 +1575,37 @@
                     "email": "me@mikevanriel.com"
                 }
             ],
-            "time": "2016-11-25T06:54:22+00:00"
+            "time": "2017-07-14T14:27:02+00:00"
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.6.2",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "6c52c2722f8460122f96f86346600e1077ce22cb"
+                "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/6c52c2722f8460122f96f86346600e1077ce22cb",
-                "reference": "6c52c2722f8460122f96f86346600e1077ce22cb",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
+                "reference": "c9b8c6088acd19d769d4cc0ffa60a9fe34344bd6",
                 "shasum": ""
             },
             "require": {
                 "doctrine/instantiator": "^1.0.2",
                 "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
-                "sebastian/comparator": "^1.1",
-                "sebastian/recursion-context": "^1.0|^2.0"
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
+                "sebastian/comparator": "^1.1|^2.0",
+                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
             },
             "require-dev": {
-                "phpspec/phpspec": "^2.0",
+                "phpspec/phpspec": "^2.5|^3.2",
                 "phpunit/phpunit": "^4.8 || ^5.6.5"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.6.x-dev"
+                    "dev-master": "1.7.x-dev"
                 }
             },
             "autoload": {
@@ -1146,39 +1638,39 @@
                 "spy",
                 "stub"
             ],
-            "time": "2016-11-21T14:58:47+00:00"
+            "time": "2017-09-04 11:05:03"
         },
         {
             "name": "phpunit/php-code-coverage",
-            "version": "4.0.5",
+            "version": "4.0.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "c19cfc7cbb0e9338d8c469c7eedecc2a428b0971"
+                "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c19cfc7cbb0e9338d8c469c7eedecc2a428b0971",
-                "reference": "c19cfc7cbb0e9338d8c469c7eedecc2a428b0971",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
+                "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d",
                 "shasum": ""
             },
             "require": {
+                "ext-dom": "*",
+                "ext-xmlwriter": "*",
                 "php": "^5.6 || ^7.0",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "^1.4.2",
-                "sebastian/code-unit-reverse-lookup": "~1.0",
+                "phpunit/php-file-iterator": "^1.3",
+                "phpunit/php-text-template": "^1.2",
+                "phpunit/php-token-stream": "^1.4.2 || ^2.0",
+                "sebastian/code-unit-reverse-lookup": "^1.0",
                 "sebastian/environment": "^1.3.2 || ^2.0",
-                "sebastian/version": "~1.0|~2.0"
+                "sebastian/version": "^1.0 || ^2.0"
             },
             "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "^5.4"
+                "ext-xdebug": "^2.1.4",
+                "phpunit/phpunit": "^5.7"
             },
             "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.4.0",
-                "ext-xmlwriter": "*"
+                "ext-xdebug": "^2.5.1"
             },
             "type": "library",
             "extra": {
@@ -1209,11 +1701,11 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2017-01-20T15:06:43+00:00"
+            "time": "2017-04-02 07:44:40"
         },
         {
             "name": "phpunit/php-file-iterator",
-            "version": "1.4.2",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
@@ -1256,7 +1748,7 @@
                 "filesystem",
                 "iterator"
             ],
-            "time": "2016-10-03T07:40:28+00:00"
+            "time": "2016-10-03 07:40:28"
         },
         {
             "name": "phpunit/php-text-template",
@@ -1301,25 +1793,30 @@
         },
         {
             "name": "phpunit/php-timer",
-            "version": "1.0.8",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
+                "reference": "d107f347d368dd8a384601398280c7c608390ab7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
-                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/d107f347d368dd8a384601398280c7c608390ab7",
+                "reference": "d107f347d368dd8a384601398280c7c608390ab7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4|~5"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
             "autoload": {
                 "classmap": [
                     "src/"
@@ -1341,33 +1838,33 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2016-05-12T18:03:57+00:00"
+            "time": "2017-03-07 15:42:04"
         },
         {
             "name": "phpunit/php-token-stream",
-            "version": "1.4.9",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b"
+                "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3b402f65a4cc90abf6e1104e388b896ce209631b",
-                "reference": "3b402f65a4cc90abf6e1104e388b896ce209631b",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/9a02332089ac48e704c70f6cefed30c224e3c0b0",
+                "reference": "9a02332089ac48e704c70f6cefed30c224e3c0b0",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": ">=5.3.3"
+                "php": "^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.2"
+                "phpunit/phpunit": "^6.2.4"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.4-dev"
+                    "dev-master": "2.0-dev"
                 }
             },
             "autoload": {
@@ -1390,20 +1887,20 @@
             "keywords": [
                 "tokenizer"
             ],
-            "time": "2016-11-15T14:06:22+00:00"
+            "time": "2017-08-20 05:47:52"
         },
         {
             "name": "phpunit/phpunit",
-            "version": "5.4.8",
+            "version": "5.4.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "3132365e1430c091f208e120b8845d39c25f20e6"
+                "reference": "53951b4c305322d089cf5c02023eee5d7afa155f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3132365e1430c091f208e120b8845d39c25f20e6",
-                "reference": "3132365e1430c091f208e120b8845d39c25f20e6",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/53951b4c305322d089cf5c02023eee5d7afa155f",
+                "reference": "53951b4c305322d089cf5c02023eee5d7afa155f",
                 "shasum": ""
             },
             "require": {
@@ -1415,12 +1912,12 @@
                 "myclabs/deep-copy": "~1.3",
                 "php": "^5.6 || ^7.0",
                 "phpspec/prophecy": "^1.3.1",
-                "phpunit/php-code-coverage": "^4.0.1",
+                "phpunit/php-code-coverage": "^4.0.4",
                 "phpunit/php-file-iterator": "~1.4",
                 "phpunit/php-text-template": "~1.2",
                 "phpunit/php-timer": "^1.0.6",
                 "phpunit/phpunit-mock-objects": "^3.2",
-                "sebastian/comparator": "~1.1",
+                "sebastian/comparator": "~1.2.2",
                 "sebastian/diff": "~1.2",
                 "sebastian/environment": "^1.3 || ^2.0",
                 "sebastian/exporter": "~1.2",
@@ -1468,20 +1965,20 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2016-07-26T14:48:00+00:00"
+            "time": "2017-02-02 11:33:56"
         },
         {
             "name": "phpunit/phpunit-mock-objects",
-            "version": "3.4.3",
+            "version": "3.4.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24"
+                "reference": "a23b761686d50a560cc56233b9ecf49597cc9118"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
-                "reference": "3ab72b65b39b491e0c011e2e09bb2206c2aa8e24",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118",
+                "reference": "a23b761686d50a560cc56233b9ecf49597cc9118",
                 "shasum": ""
             },
             "require": {
@@ -1527,27 +2024,27 @@
                 "mock",
                 "xunit"
             ],
-            "time": "2016-12-08T20:27:08+00:00"
+            "time": "2017-06-30 09:13:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe"
+                "reference": "3488be0a7b346cd6e5361510ed07e88f9bea2e88"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
-                "reference": "c36f5e7cfce482fde5bf8d10d41a53591e0198fe",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/3488be0a7b346cd6e5361510ed07e88f9bea2e88",
+                "reference": "3488be0a7b346cd6e5361510ed07e88f9bea2e88",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6"
+                "php": "^5.6 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~5"
+                "phpunit/phpunit": "^5.7 || ^6.0"
             },
             "type": "library",
             "extra": {
@@ -1572,20 +2069,20 @@
             ],
             "description": "Looks up which function or method a line of code belongs to",
             "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2016-02-13T06:45:14+00:00"
+            "time": "2017-03-04 10:23:55"
         },
         {
             "name": "sebastian/comparator",
-            "version": "1.2.4",
+            "version": "1.2.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
+                "reference": "18a5d97c25f408f48acaf6d1b9f4079314c5996a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/18a5d97c25f408f48acaf6d1b9f4079314c5996a",
+                "reference": "18a5d97c25f408f48acaf6d1b9f4079314c5996a",
                 "shasum": ""
             },
             "require": {
@@ -1636,27 +2133,27 @@
                 "compare",
                 "equality"
             ],
-            "time": "2017-01-29T09:50:25+00:00"
+            "time": "2017-03-07 10:34:43"
         },
         {
             "name": "sebastian/diff",
-            "version": "1.4.1",
+            "version": "1.4.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
-                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
+                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "php": "^5.3.3 || ^7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.8"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
             },
             "type": "library",
             "extra": {
@@ -1688,11 +2185,11 @@
             "keywords": [
                 "diff"
             ],
-            "time": "2015-12-08T07:14:41+00:00"
+            "time": "2017-05-22 07:24:03"
         },
         {
             "name": "sebastian/environment",
-            "version": "2.0.0",
+            "version": "2.0.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
@@ -1738,34 +2235,34 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2016-11-26T07:53:53+00:00"
+            "time": "2016-11-26 07:53:53"
         },
         {
             "name": "sebastian/exporter",
-            "version": "1.2.2",
+            "version": "1.2.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
+                "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/dcd43bcc0fd3551bd2ede0081882d549bb78225d",
+                "reference": "dcd43bcc0fd3551bd2ede0081882d549bb78225d",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
+                "php": "^5.3.3 || ^7.0",
+                "sebastian/recursion-context": "^1.0"
             },
             "require-dev": {
                 "ext-mbstring": "*",
-                "phpunit/phpunit": "~4.4"
+                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3.x-dev"
+                    "dev-master": "1.2.x-dev"
                 }
             },
             "autoload": {
@@ -1805,27 +2302,27 @@
                 "export",
                 "exporter"
             ],
-            "time": "2016-06-17T09:04:28+00:00"
+            "time": "2017-02-26 13:09:30"
         },
         {
             "name": "sebastian/global-state",
-            "version": "1.1.1",
+            "version": "1.1.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+                "reference": "cea85a84b00f2795341ebbbca4fa396347f2494e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/cea85a84b00f2795341ebbbca4fa396347f2494e",
+                "reference": "cea85a84b00f2795341ebbbca4fa396347f2494e",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.2"
+                "phpunit/phpunit": "~4.2|~5.0"
             },
             "suggest": {
                 "ext-uopz": "*"
@@ -1856,20 +2353,20 @@
             "keywords": [
                 "global state"
             ],
-            "time": "2015-10-12T03:26:01+00:00"
+            "time": "2017-02-23 14:11:06"
         },
         {
             "name": "sebastian/object-enumerator",
-            "version": "1.0.0",
+            "version": "1.0.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "d4ca2fb70344987502567bc50081c03e6192fb26"
+                "reference": "1a7e888dce73bd3c1deedb345fce00329c75b065"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/d4ca2fb70344987502567bc50081c03e6192fb26",
-                "reference": "d4ca2fb70344987502567bc50081c03e6192fb26",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1a7e888dce73bd3c1deedb345fce00329c75b065",
+                "reference": "1a7e888dce73bd3c1deedb345fce00329c75b065",
                 "shasum": ""
             },
             "require": {
@@ -1902,20 +2399,20 @@
             ],
             "description": "Traverses array structures and object graphs to enumerate all referenced objects",
             "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2016-01-28T13:25:10+00:00"
+            "time": "2016-10-03 07:42:27"
         },
         {
             "name": "sebastian/recursion-context",
-            "version": "1.0.2",
+            "version": "1.0.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
-                "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
+                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
                 "shasum": ""
             },
             "require": {
@@ -1955,20 +2452,20 @@
             ],
             "description": "Provides functionality to recursively process PHP variables",
             "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2015-11-11T19:50:13+00:00"
+            "time": "2016-10-03 07:41:43"
         },
         {
             "name": "sebastian/resource-operations",
-            "version": "1.0.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
+                "reference": "fadc83f7c41fb2924e542635fea47ae546816ece"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/fadc83f7c41fb2924e542635fea47ae546816ece",
+                "reference": "fadc83f7c41fb2924e542635fea47ae546816ece",
                 "shasum": ""
             },
             "require": {
@@ -1997,11 +2494,11 @@
             ],
             "description": "Provides a list of PHP built-in functions that operate on resources",
             "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2015-07-28T20:34:47+00:00"
+            "time": "2016-10-03 07:43:09"
         },
         {
             "name": "sebastian/version",
-            "version": "2.0.1",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/version.git",
@@ -2040,27 +2537,30 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03T07:35:21+00:00"
+            "time": "2016-10-03 07:35:21"
         },
         {
             "name": "symfony/yaml",
-            "version": "v3.2.3",
+            "version": "3.4.x-dev",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/yaml.git",
-                "reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b"
+                "reference": "e99024f324a7fa927c3a7992ed6f359e3a5ccc3b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/e1718c6bf57e1efbb8793ada951584b2ab27775b",
-                "reference": "e1718c6bf57e1efbb8793ada951584b2ab27775b",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/e99024f324a7fa927c3a7992ed6f359e3a5ccc3b",
+                "reference": "e99024f324a7fa927c3a7992ed6f359e3a5ccc3b",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.5.9"
+                "php": "^5.5.9|>=7.0.8"
+            },
+            "conflict": {
+                "symfony/console": "<3.4"
             },
             "require-dev": {
-                "symfony/console": "~2.8|~3.0"
+                "symfony/console": "~3.4|~4.0"
             },
             "suggest": {
                 "symfony/console": "For validating YAML files using the lint command"
@@ -2068,7 +2568,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.2-dev"
+                    "dev-master": "3.4-dev"
                 }
             },
             "autoload": {
@@ -2095,20 +2595,20 @@
             ],
             "description": "Symfony Yaml Component",
             "homepage": "https://symfony.com",
-            "time": "2017-01-21T17:06:35+00:00"
+            "time": "2017-10-09 14:52:13"
         },
         {
             "name": "webmozart/assert",
-            "version": "1.2.0",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "https://github.com/webmozart/assert.git",
-                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f"
+                "reference": "4a8bf11547e139e77b651365113fc12850c43d9a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f",
-                "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/4a8bf11547e139e77b651365113fc12850c43d9a",
+                "reference": "4a8bf11547e139e77b651365113fc12850c43d9a",
                 "shasum": ""
             },
             "require": {
@@ -2145,13 +2645,22 @@
                 "check",
                 "validate"
             ],
-            "time": "2016-11-23T20:04:58+00:00"
+            "time": "2016-11-23 20:04:41"
         }
     ],
     "aliases": [],
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "stability-flags": {
-        "stupidlysimple/php-core": 20
+        "simplyfier/alias": 20,
+        "simplyfier/config": 20,
+        "simplyfier/cache": 20,
+        "simplyfier/http": 20,
+        "simplyfier/di": 20,
+        "simplyfier/debugger": 20,
+        "simplyfier/timetrackr": 20,
+        "simplyfier/viewer": 20,
+        "simplyfier/database": 20,
+        "simplyfier/service": 20
     },
     "prefer-stable": false,
     "prefer-lowest": false,

From 351bbd9859844d100943f1576f33dc1f35e47f0c Mon Sep 17 00:00:00 2001
From: farizluqman <fariz.fnb@gmail.com>
Date: Mon, 16 Oct 2017 09:10:27 +0800
Subject: [PATCH 23/34] Release candidate 0.5-beta2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add SwaggerPHP for documentation
- Fixes some bug on the admin page
- Create the directory structure page
- … more to come
---
 composer.json                        |   3 +-
 composer.lock                        | 235 ++++++++++++++++++++++++++-
 resources/views/admin/home.tpl.php   |  40 ++---
 resources/views/directory.tpl.php    |  57 +++++++
 resources/views/home.tpl.php         |  28 ++--
 resources/views/layouts/menu.tpl.php |   4 +-
 6 files changed, 330 insertions(+), 37 deletions(-)
 create mode 100644 resources/views/directory.tpl.php

diff --git a/composer.json b/composer.json
index 0fb7efc..9444347 100755
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,8 @@
     "simplyfier/timetrackr": "dev-master",
     "simplyfier/viewer": "dev-master",
     "simplyfier/database": "dev-master",
-    "simplyfier/service": "dev-master"
+    "simplyfier/service": "dev-master",
+    "zircote/swagger-php": "^2.0"
   },
   "require-dev": {
     "phpunit/phpunit": "5.4.*"
diff --git a/composer.lock b/composer.lock
index ed9342b..734b3b5 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "592f3c47af3ed3c92c373aff660edaef",
+    "content-hash": "e0356f390b6b376732cc50418ef276cc",
     "packages": [
         {
             "name": "cartalyst/sentry",
@@ -106,6 +106,74 @@
             ],
             "time": "2016-09-05 00:18:34"
         },
+        {
+            "name": "doctrine/annotations",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/annotations.git",
+                "reference": "ff479e64fc3e3c91e947349a06c628b5bac31c27"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/annotations/zipball/ff479e64fc3e3c91e947349a06c628b5bac31c27",
+                "reference": "ff479e64fc3e3c91e947349a06c628b5bac31c27",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "1.*",
+                "php": "^7.1"
+            },
+            "require-dev": {
+                "doctrine/cache": "1.*",
+                "phpunit/phpunit": "^5.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Jonathan Wage",
+                    "email": "jonwage@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Docblock Annotations Parser",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "parser"
+            ],
+            "time": "2017-10-08 08:05:29"
+        },
         {
             "name": "doctrine/inflector",
             "version": "dev-master",
@@ -173,6 +241,60 @@
             ],
             "time": "2017-10-04 05:38:52"
         },
+        {
+            "name": "doctrine/lexer",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "cc709ba91eee09540091ad5a5f2616727662e41b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/cc709ba91eee09540091ad5a5f2616727662e41b",
+                "reference": "cc709ba91eee09540091ad5a5f2616727662e41b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "http://www.doctrine-project.org",
+            "keywords": [
+                "lexer",
+                "parser"
+            ],
+            "time": "2017-07-24 09:37:08"
+        },
         {
             "name": "filp/whoops",
             "version": "2.1.10",
@@ -1139,6 +1261,55 @@
             ],
             "time": "2017-10-10 03:58:13"
         },
+        {
+            "name": "symfony/finder",
+            "version": "3.4.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "6db4a8ddcd86146761130989eb348451de03de74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/6db4a8ddcd86146761130989eb348451de03de74",
+                "reference": "6db4a8ddcd86146761130989eb348451de03de74",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5.9|>=7.0.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "https://symfony.com",
+            "time": "2017-10-02 06:49:52"
+        },
         {
             "name": "symfony/polyfill-mbstring",
             "version": "dev-master",
@@ -1334,6 +1505,68 @@
                 "dump"
             ],
             "time": "2017-10-05 12:34:03"
+        },
+        {
+            "name": "zircote/swagger-php",
+            "version": "2.0.11",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/zircote/swagger-php.git",
+                "reference": "d010ab67536784f8b578cb4ba7d15c906f3e1a45"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/zircote/swagger-php/zipball/d010ab67536784f8b578cb4ba7d15c906f3e1a45",
+                "reference": "d010ab67536784f8b578cb4ba7d15c906f3e1a45",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/annotations": "*",
+                "php": ">=5.6",
+                "symfony/finder": "*"
+            },
+            "require-dev": {
+                "phpunit/phpunit": ">=4.8 <=5.6",
+                "squizlabs/php_codesniffer": ">=2.7",
+                "zendframework/zend-form": "<2.8"
+            },
+            "bin": [
+                "bin/swagger"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Swagger\\": "src"
+                },
+                "files": [
+                    "src/functions.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache2"
+            ],
+            "authors": [
+                {
+                    "name": "Robert Allen",
+                    "email": "zircote@gmail.com",
+                    "homepage": "http://www.zircote.com"
+                },
+                {
+                    "name": "Bob Fanger",
+                    "email": "bfanger@gmail.com",
+                    "homepage": "http://bfanger.nl"
+                }
+            ],
+            "description": "Swagger-PHP - Generate interactive documentation for your RESTful API using phpdoc annotations",
+            "homepage": "https://github.com/zircote/swagger-php/",
+            "keywords": [
+                "api",
+                "json",
+                "rest",
+                "service discovery"
+            ],
+            "time": "2017-08-16T08:32:59+00:00"
         }
     ],
     "packages-dev": [
diff --git a/resources/views/admin/home.tpl.php b/resources/views/admin/home.tpl.php
index e0a2a8e..039455c 100644
--- a/resources/views/admin/home.tpl.php
+++ b/resources/views/admin/home.tpl.php
@@ -21,17 +21,17 @@
                 <h1>Welcome to the Admin Area</h1>
                 <p>A very fresh start for the MVC framework with some basic CRUD functions</p>
 
-                <?php
-                if (Core\Request::get('delete') === 'success') {
-                    echo '<p class="alert alert-success">User successfully deleted</p>';
-                } elseif (Core\Request::get('edit') === 'success') {
-                    echo '<p class="alert alert-success">User successfully updated</p>';
-                } elseif (Core\Request::get('delete') === 'failed') {
-                    echo '<p class="alert alert-danger">Failed to delete</p>';
-                } elseif (Core\Request::get('edit') === 'failed') {
-                    echo '<p class="alert alert-danger">Failed to update</p>';
-                }
-
+                <?php
+                if (Request::get('delete') === 'success') {
+                    echo '<p class="alert alert-success">User successfully deleted</p>';
+                } elseif (Request::get('edit') === 'success') {
+                    echo '<p class="alert alert-success">User successfully updated</p>';
+                } elseif (Request::get('delete') === 'failed') {
+                    echo '<p class="alert alert-danger">Failed to delete</p>';
+                } elseif (Request::get('edit') === 'failed') {
+                    echo '<p class="alert alert-danger">Failed to update</p>';
+                }
+
                 ?>
 
                 <ul class="nav nav-tabs" style="margin-top: 20px">
@@ -52,15 +52,15 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <?php
-                                foreach ($service->test->getRegisteredUsers() as $user) {
-                                    echo '<tr>';
-                                    echo '<td>'.$user->first_name.'</td>';
-                                    echo '<td>'.$user->last_name.'</td>';
-                                    echo '<td>'.$user->email.'</td>';
-                                    echo '<td><a onclick="return confirm(\'Are you sure?\');" href="deleteuser?id='.$user->id.'" class="btn btn-danger">Delete</a></td>';
-                                    echo '</tr>';
-                                }
+                                <?php
+                                foreach ($service->test->getRegisteredUsers() as $user) {
+                                    echo '<tr>';
+                                    echo '<td>'.$user->first_name.'</td>';
+                                    echo '<td>'.$user->last_name.'</td>';
+                                    echo '<td>'.$user->email.'</td>';
+                                    echo '<td><a onclick="return confirm(\'Are you sure?\');" href="deleteuser?id='.$user->id.'" class="btn btn-danger">Delete</a></td>';
+                                    echo '</tr>';
+                                }
                                 ?>
                                 </tbody>
                             </table>
diff --git a/resources/views/directory.tpl.php b/resources/views/directory.tpl.php
new file mode 100644
index 0000000..326ade2
--- /dev/null
+++ b/resources/views/directory.tpl.php
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML>
+<!--
+	Phantom by HTML5 UP
+	html5up.net | @ajlkn
+	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html>
+<?php
+$data = ['title' => 'StupidlySimple PHP | Service'];
+Viewer::file('layouts/head', $data);
+?>
+<body>
+<!-- Wrapper -->
+<div id="wrapper">
+
+    <?php Viewer::file('layouts/top') ?>
+
+    <?php Viewer::file('layouts/menu') ?>
+
+    <!-- Main -->
+    <div id="main">
+        <div class="inner">
+            <div class="contents">
+                <h1>Introduction to Routing</h1>
+                <p>The Router is responsible for mapping incoming browser requests to particular MVC controller actions.
+                    For example, the Router will map the uri <b>/home</b> to a HTML file called <b>myhomepage.html</b>. See?</p>
+                <p>The Router is among the important part in MVC frameworks. Routes are defined in the directory <code>/routes</code>
+                    in the root of the StupidlySimple framework. We have several route groups defined in the folder, which is:
+                    <code>api.php</code> for the use of RESTful APIs, <code>auth.php</code> for authentication related routes,
+                    <code>web.php</code> for general routes and <code>hello.php</code> simply for this tutorial.
+                </p>
+                <p>Check out on how we define the web routes <a target="_blank" href="https://github.com/stupidlysimple/framework/blob/master/routes/web.php">on GitHub</a>.</p>
+
+                <h1>Router Demonstration</h1>
+                <p>We have a couple of example on how routing on StupidlySimple works:</p>
+
+                <h2>1) Remove .php from routes (View on <a target="_blank" href="https://github.com/stupidlysimple/framework/blob/master/routes/web.php#L24">GitHub</a>)</h2>
+                <p><a href="./routing" class="button">Go to /routing</a><br>
+                    (Isn't it the same? Duh! But, you got the point?)</p>
+
+                <h2>2) The Hello World (View on <a target="_blank" href="https://github.com/stupidlysimple/framework/blob/master/routes/hello.php#L21">GitHub</a>)</h2>
+                <p><a href="./hello" class="button">Go to /hello</a></p>
+
+                <h2>3) Route /hello/yourname (View on <a target="_blank" href="https://github.com/stupidlysimple/framework/blob/master/routes/hello.php#L24">GitHub</a>)</h2>
+                <p><a href="./hello/Adam" class="button">Go to /hello/Adam</a><br>
+                    (See <a href="controller">Controller</a> to understand how this works)</p>
+            </div>
+        </div>
+    </div>
+
+<?php Viewer::file('layouts/footer') ?>
+
+</div>
+
+<?php Viewer::file('layouts/scripts') ?>
+</body>
+</html>
\ No newline at end of file
diff --git a/resources/views/home.tpl.php b/resources/views/home.tpl.php
index 76f685c..51b6d52 100644
--- a/resources/views/home.tpl.php
+++ b/resources/views/home.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Home'];
-Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Home'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
@@ -29,6 +29,17 @@
 
             </header>
             <section class="tiles">
+                <article class="">
+                    <span class="image">
+                        <img src="resources/assets/images/pic5.jpg" alt=""/>
+                    </span>
+                    <a href="directory">
+                        <h2>Directory Structure</h2>
+                        <div class="content">
+                            <p>See the directory structure of the StupidlySimple PHP framework</p>
+                        </div>
+                    </a>
+                </article>
                 <article class="style1">
                     <span class="image">
                         <img src="resources/assets/images/pic1.jpg" alt=""/>
@@ -74,17 +85,6 @@
                         </div>
                     </a>
                 </article>
-                <article class="">
-                    <span class="image">
-                        <img src="resources/assets/images/pic5.jpg" alt=""/>
-                    </span>
-                    <a href="directory_structure">
-                        <h2>Directory Structure</h2>
-                        <div class="content">
-                            <p>See the directory structure of the StupidlySimple PHP framework</p>
-                        </div>
-                    </a>
-                </article>
                 <article class="">
                     <span class="image">
                         <img src="resources/assets/images/pic6.jpg" alt=""/>
diff --git a/resources/views/layouts/menu.tpl.php b/resources/views/layouts/menu.tpl.php
index 090926d..4df98c6 100644
--- a/resources/views/layouts/menu.tpl.php
+++ b/resources/views/layouts/menu.tpl.php
@@ -3,6 +3,7 @@
     <h2>Menu</h2>
     <ul>
         <li><a href="home">Home</a></li>
+        <li><a href="directory">Directory Structure</a></li>
         <li><a href="routing">Routing</a></li>
         <li><a href="controller">Controllers</a></li>
         <li><a href="service">Services</a></li>
@@ -13,6 +14,7 @@
             echo '<li><a href="logout">Logout </a></li>';
         } else {
             echo '<li><a href="login">Login</a></li>';
-        }?>
+        }
+        ?>
     </ul>
 </nav>
\ No newline at end of file

From 125ba2923f2fec8664b5bb0194d1d7f2df92cc1d Mon Sep 17 00:00:00 2001
From: farizluqman <fariz.fnb@gmail.com>
Date: Mon, 16 Oct 2017 15:06:56 +0800
Subject: [PATCH 24/34] Add php unit testing

---
 app/Service/Test/TestService.php | 21 ++++++++-
 phpunit.xml                      |  2 +-
 tests/AppTest.php                | 80 ++++++++++++++++++++++++++++++++
 tests/bootstrap.php              | 19 ++++++++
 4 files changed, 119 insertions(+), 3 deletions(-)
 create mode 100755 tests/AppTest.php
 create mode 100755 tests/bootstrap.php

diff --git a/app/Service/Test/TestService.php b/app/Service/Test/TestService.php
index 7c21016..12f61ba 100644
--- a/app/Service/Test/TestService.php
+++ b/app/Service/Test/TestService.php
@@ -11,15 +11,29 @@
 
 namespace Service\Test;
 
-use ServiceContainer;
+use Model\User;
+use Simplyfier\Service\ServiceContainer;
 
+/**
+ * Class TestService
+ * @package Service\Test
+ */
 class TestService extends ServiceContainer
 {
+    /**
+     * @return string
+     */
     public function hello()
     {
         return 'Hello';
     }
 
+    /**
+     * @param $var1
+     * @param $operation
+     * @param $var2
+     * @return float|int|string
+     */
     public function calculate($var1, $operation, $var2)
     {
         if ($operation == 'plus' || $operation == '+') {
@@ -35,8 +49,11 @@ public function calculate($var1, $operation, $var2)
         }
     }
 
+    /**
+     * @return \Illuminate\Database\Eloquent\Collection|static[]
+     */
     public function getRegisteredUsers()
     {
-        return \Model\User::all();
+        return User::all();
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
index 1b84158..404041a 100755
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -7,5 +7,5 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-		 bootstrap="vendor/stupidlysimple/php-core/tests/bootstrap.php">
+		 bootstrap="tests/bootstrap.php">
 </phpunit>
\ No newline at end of file
diff --git a/tests/AppTest.php b/tests/AppTest.php
new file mode 100755
index 0000000..2fe722a
--- /dev/null
+++ b/tests/AppTest.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * StupidlySimple - A PHP Framework For Lazy Developers
+ *
+ * @package        StupidlySimple
+ * @author        Fariz Luqman <fariz.fnb@gmail.com>
+ * @copyright    2017 Fariz Luqman
+ * @license        MIT
+ * @link        https://stupidlysimple.github.io/
+ */
+
+/**
+ * PHP Unit Testing
+ */
+
+use PHPUnit\Framework\TestCase;
+
+use Simplyfier\DI\Container;
+use Simplyfier\DI\Sharer;
+use Simplyfier\Database;
+use Simplyfier\Cache;
+use Simplyfier\Service;
+use Simplyfier\TimeTrackr;
+
+/**
+ * Class AppTest
+ */
+class AppTest extends TestCase
+{
+    /**
+     * @return string
+     */
+    public function testDependencies()
+    {
+        try {
+            echo "\n";
+            echo "Creating a new container...";
+            $app = new Container;
+            self::displayOK();
+
+            echo "Load TimeTrackr config...";
+            TimeTrackr::applyConfig();
+            self::displayOK();
+
+            echo "Connecting to the database...";
+            Database::loadConfig();
+            $app->put('database', Database::getInstance());
+            self::displayOK();
+
+            echo "Instantiate cachemanager... ";
+            Cache::loadConfig();
+            $app->put('cachemanager', Cache::getInstance());
+            self::displayOK();
+
+            echo "Instantiate service manager and load all services...";
+            $app->put('service', Service::loadServices());
+            self::displayOK();
+
+            echo "Sharing the app...";
+            Sharer::share('app', $app);
+            self::displayOK();
+        } catch (\Exception $exception) {
+            self::displayFailed();
+            static::assertTrue(false);
+            return 'first';
+        }
+        static::assertTrue(true);
+        return 'first';
+    }
+
+    public function displayOK()
+    {
+        echo "     OK \n";
+    }
+
+    public function displayFailed()
+    {
+        echo "     FAILED \n";
+    }
+}
\ No newline at end of file
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
new file mode 100755
index 0000000..3c7cec3
--- /dev/null
+++ b/tests/bootstrap.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * StupidlySimple - A PHP Framework For Lazy Developers
+ *
+ * @package		StupidlySimple
+ * @author		Fariz Luqman <fariz.fnb@gmail.com>
+ * @copyright	2017 Fariz Luqman
+ * @license		MIT
+ * @link		https://stupidlysimple.github.io/
+ */
+ini_set('display_errors', 1);
+ini_set('display_startup_errors', 1);
+error_reporting(E_ALL);
+
+/**
+ * PHP Unit Testing
+ */
+define('SS_PATH', realpath(dirname(__FILE__)) .'/../');
+require SS_PATH . 'vendor/autoload.php';
\ No newline at end of file

From 56aa5f5bb96d7bc12eb920ce3a8165e9bbbeb1d2 Mon Sep 17 00:00:00 2001
From: farizluqman <fariz.fnb@gmail.com>
Date: Mon, 16 Oct 2017 15:10:01 +0800
Subject: [PATCH 25/34] Change directory of test files

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cdc518c..0034b18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,4 +2,4 @@ language: php
 php:
 - 5.6
 before_script: composer update
-script: phpunit vendor/stupidlysimple/php-core/tests/AppTest.php --colors=auto
+script: phpunit tests/AppTest.php --colors=auto

From 8a25ed47d6b50333f6703e4315802667850cdbdb Mon Sep 17 00:00:00 2001
From: Fariz Luqman <fariz.fnb@gmail.com>
Date: Mon, 16 Oct 2017 07:11:28 +0000
Subject: [PATCH 26/34] Apply fixes from StyleCI

---
 app/Service/Test/TestService.php   |  4 +--
 resources/views/admin/home.tpl.php | 40 +++++++++++++++---------------
 resources/views/home.tpl.php       |  6 ++---
 tests/AppTest.php                  | 32 ++++++++++++------------
 tests/bootstrap.php                | 10 ++++----
 5 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/app/Service/Test/TestService.php b/app/Service/Test/TestService.php
index 12f61ba..66b0bf3 100644
--- a/app/Service/Test/TestService.php
+++ b/app/Service/Test/TestService.php
@@ -15,8 +15,7 @@
 use Simplyfier\Service\ServiceContainer;
 
 /**
- * Class TestService
- * @package Service\Test
+ * Class TestService.
  */
 class TestService extends ServiceContainer
 {
@@ -32,6 +31,7 @@ public function hello()
      * @param $var1
      * @param $operation
      * @param $var2
+     *
      * @return float|int|string
      */
     public function calculate($var1, $operation, $var2)
diff --git a/resources/views/admin/home.tpl.php b/resources/views/admin/home.tpl.php
index 039455c..e18d000 100644
--- a/resources/views/admin/home.tpl.php
+++ b/resources/views/admin/home.tpl.php
@@ -21,17 +21,17 @@
                 <h1>Welcome to the Admin Area</h1>
                 <p>A very fresh start for the MVC framework with some basic CRUD functions</p>
 
-                <?php
-                if (Request::get('delete') === 'success') {
-                    echo '<p class="alert alert-success">User successfully deleted</p>';
-                } elseif (Request::get('edit') === 'success') {
-                    echo '<p class="alert alert-success">User successfully updated</p>';
-                } elseif (Request::get('delete') === 'failed') {
-                    echo '<p class="alert alert-danger">Failed to delete</p>';
-                } elseif (Request::get('edit') === 'failed') {
-                    echo '<p class="alert alert-danger">Failed to update</p>';
-                }
-
+                <?php
+                if (Request::get('delete') === 'success') {
+                    echo '<p class="alert alert-success">User successfully deleted</p>';
+                } elseif (Request::get('edit') === 'success') {
+                    echo '<p class="alert alert-success">User successfully updated</p>';
+                } elseif (Request::get('delete') === 'failed') {
+                    echo '<p class="alert alert-danger">Failed to delete</p>';
+                } elseif (Request::get('edit') === 'failed') {
+                    echo '<p class="alert alert-danger">Failed to update</p>';
+                }
+
                 ?>
 
                 <ul class="nav nav-tabs" style="margin-top: 20px">
@@ -52,15 +52,15 @@
                                 </tr>
                                 </thead>
                                 <tbody>
-                                <?php
-                                foreach ($service->test->getRegisteredUsers() as $user) {
-                                    echo '<tr>';
-                                    echo '<td>'.$user->first_name.'</td>';
-                                    echo '<td>'.$user->last_name.'</td>';
-                                    echo '<td>'.$user->email.'</td>';
-                                    echo '<td><a onclick="return confirm(\'Are you sure?\');" href="deleteuser?id='.$user->id.'" class="btn btn-danger">Delete</a></td>';
-                                    echo '</tr>';
-                                }
+                                <?php
+                                foreach ($service->test->getRegisteredUsers() as $user) {
+                                    echo '<tr>';
+                                    echo '<td>'.$user->first_name.'</td>';
+                                    echo '<td>'.$user->last_name.'</td>';
+                                    echo '<td>'.$user->email.'</td>';
+                                    echo '<td><a onclick="return confirm(\'Are you sure?\');" href="deleteuser?id='.$user->id.'" class="btn btn-danger">Delete</a></td>';
+                                    echo '</tr>';
+                                }
                                 ?>
                                 </tbody>
                             </table>
diff --git a/resources/views/home.tpl.php b/resources/views/home.tpl.php
index 51b6d52..836c359 100644
--- a/resources/views/home.tpl.php
+++ b/resources/views/home.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Home'];
-Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Home'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
diff --git a/tests/AppTest.php b/tests/AppTest.php
index 2fe722a..6d4e968 100755
--- a/tests/AppTest.php
+++ b/tests/AppTest.php
@@ -1,29 +1,27 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package        StupidlySimple
  * @author        Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright    2017 Fariz Luqman
  * @license        MIT
+ *
  * @link        https://stupidlysimple.github.io/
  */
 
 /**
- * PHP Unit Testing
+ * PHP Unit Testing.
  */
-
 use PHPUnit\Framework\TestCase;
-
+use Simplyfier\Cache;
+use Simplyfier\Database;
 use Simplyfier\DI\Container;
 use Simplyfier\DI\Sharer;
-use Simplyfier\Database;
-use Simplyfier\Cache;
 use Simplyfier\Service;
 use Simplyfier\TimeTrackr;
 
 /**
- * Class AppTest
+ * Class AppTest.
  */
 class AppTest extends TestCase
 {
@@ -34,37 +32,39 @@ public function testDependencies()
     {
         try {
             echo "\n";
-            echo "Creating a new container...";
-            $app = new Container;
+            echo 'Creating a new container...';
+            $app = new Container();
             self::displayOK();
 
-            echo "Load TimeTrackr config...";
+            echo 'Load TimeTrackr config...';
             TimeTrackr::applyConfig();
             self::displayOK();
 
-            echo "Connecting to the database...";
+            echo 'Connecting to the database...';
             Database::loadConfig();
             $app->put('database', Database::getInstance());
             self::displayOK();
 
-            echo "Instantiate cachemanager... ";
+            echo 'Instantiate cachemanager... ';
             Cache::loadConfig();
             $app->put('cachemanager', Cache::getInstance());
             self::displayOK();
 
-            echo "Instantiate service manager and load all services...";
+            echo 'Instantiate service manager and load all services...';
             $app->put('service', Service::loadServices());
             self::displayOK();
 
-            echo "Sharing the app...";
+            echo 'Sharing the app...';
             Sharer::share('app', $app);
             self::displayOK();
         } catch (\Exception $exception) {
             self::displayFailed();
             static::assertTrue(false);
+
             return 'first';
         }
         static::assertTrue(true);
+
         return 'first';
     }
 
@@ -77,4 +77,4 @@ public function displayFailed()
     {
         echo "     FAILED \n";
     }
-}
\ No newline at end of file
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 3c7cec3..f4313ec 100755
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -1,19 +1,19 @@
 <?php
 /**
- * StupidlySimple - A PHP Framework For Lazy Developers
+ * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @package		StupidlySimple
  * @author		Fariz Luqman <fariz.fnb@gmail.com>
  * @copyright	2017 Fariz Luqman
  * @license		MIT
+ *
  * @link		https://stupidlysimple.github.io/
  */
 ini_set('display_errors', 1);
 ini_set('display_startup_errors', 1);
 error_reporting(E_ALL);
 
-/**
+/*
  * PHP Unit Testing
  */
-define('SS_PATH', realpath(dirname(__FILE__)) .'/../');
-require SS_PATH . 'vendor/autoload.php';
\ No newline at end of file
+define('SS_PATH', realpath(dirname(__FILE__)).'/../');
+require SS_PATH.'vendor/autoload.php';

From 8226920aee28d8fc8c0f86df817d6b6b19b4990a Mon Sep 17 00:00:00 2001
From: Fariz Luqman <fariz.fnb@gmail.com>
Date: Mon, 16 Oct 2017 16:09:21 +0800
Subject: [PATCH 27/34] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3c18d40..a1c324e 100755
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 
 Follow us on [Facebook](https://www.facebook.com/stupidlysimpleframework).
 
-[![PHP version](https://badge.fury.io/ph/stupidlysimple%2Fphp.svg)](https://badge.fury.io/ph/stupidlysimple%2Fphp) [![Join the chat at https://gitter.im/stupidlysimpleframework](https://badges.gitter.im/stupidlysimple/php.svg)](https://gitter.im/stupidlysimpleframework?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)  
+[![Chat with Discord](https://i.imgur.com/3mg28jY.jpg)](https://badge.fury.io/ph/stupidlysimple%2Fphp)
 
-[![Build](https://api.travis-ci.org/stupidlysimple/php.svg)](https://travis-ci.org/stupidlysimple/php) [![Style-CI](https://styleci.io/repos/62019007/shield?branch=nightly)](https://styleci.io/repos/62019007)  [![Scrutinizer-CI](https://scrutinizer-ci.com/g/stupidlysimple/php/badges/quality-score.png?b=nightly)](https://scrutinizer-ci.com/g/stupidlysimple/php/)  [![Total Downloads](https://poser.pugx.org/stupidlysimple/php/downloads)](https://packagist.org/packages/stupidlysimple/php)
+[![PHP version](https://badge.fury.io/ph/stupidlysimple%2Fphp.svg)](https://badge.fury.io/ph/stupidlysimple%2Fphp) [![Build](https://api.travis-ci.org/stupidlysimple/php.svg)](https://travis-ci.org/stupidlysimple/php) [![Style-CI](https://styleci.io/repos/62019007/shield?branch=nightly)](https://styleci.io/repos/62019007)  [![Scrutinizer-CI](https://scrutinizer-ci.com/g/stupidlysimple/php/badges/quality-score.png?b=nightly)](https://scrutinizer-ci.com/g/stupidlysimple/php/)  [![Total Downloads](https://poser.pugx.org/stupidlysimple/php/downloads)](https://packagist.org/packages/stupidlysimple/php)
 [![composer.lock](https://poser.pugx.org/stupidlysimple/php/composerlock)](https://packagist.org/packages/stupidlysimple/php)
 [![License](https://img.shields.io/:license-mit-blue.svg)](https://github.com/stupidlysimple/php/blob/master/LICENSE)
 [![Made In](https://img.shields.io/badge/made%20in-Malaysia-red.svg)](https://www.google.com/search?q=malaysia)

From 667bd2836b8c71bacc6c2226fd50039a05c6b16d Mon Sep 17 00:00:00 2001
From: Fariz Luqman <fariz.fnb@gmail.com>
Date: Mon, 16 Oct 2017 16:11:08 +0800
Subject: [PATCH 28/34] Add DIscord invite link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a1c324e..98616bc 100755
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Follow us on [Facebook](https://www.facebook.com/stupidlysimpleframework).
 
-[![Chat with Discord](https://i.imgur.com/3mg28jY.jpg)](https://badge.fury.io/ph/stupidlysimple%2Fphp)
+[![Chat with Discord](https://i.imgur.com/3mg28jY.jpg)](https://discord.gg/EQ4w9Cs)
 
 [![PHP version](https://badge.fury.io/ph/stupidlysimple%2Fphp.svg)](https://badge.fury.io/ph/stupidlysimple%2Fphp) [![Build](https://api.travis-ci.org/stupidlysimple/php.svg)](https://travis-ci.org/stupidlysimple/php) [![Style-CI](https://styleci.io/repos/62019007/shield?branch=nightly)](https://styleci.io/repos/62019007)  [![Scrutinizer-CI](https://scrutinizer-ci.com/g/stupidlysimple/php/badges/quality-score.png?b=nightly)](https://scrutinizer-ci.com/g/stupidlysimple/php/)  [![Total Downloads](https://poser.pugx.org/stupidlysimple/php/downloads)](https://packagist.org/packages/stupidlysimple/php)
 [![composer.lock](https://poser.pugx.org/stupidlysimple/php/composerlock)](https://packagist.org/packages/stupidlysimple/php)

From bc3cc78eed2cc7a3b7fbf447f24330cd34726815 Mon Sep 17 00:00:00 2001
From: Fariz Luqman <fariz.fnb@gmail.com>
Date: Mon, 16 Oct 2017 16:15:47 +0800
Subject: [PATCH 29/34] Add DIscord chat icon and link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 98616bc..3961507 100755
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Follow us on [Facebook](https://www.facebook.com/stupidlysimpleframework).
 
-[![Chat with Discord](https://i.imgur.com/3mg28jY.jpg)](https://discord.gg/EQ4w9Cs)
+[![Chat with Discord](https://i.imgur.com/imbJExE.jpg)](https://discord.gg/EQ4w9Cs)
 
 [![PHP version](https://badge.fury.io/ph/stupidlysimple%2Fphp.svg)](https://badge.fury.io/ph/stupidlysimple%2Fphp) [![Build](https://api.travis-ci.org/stupidlysimple/php.svg)](https://travis-ci.org/stupidlysimple/php) [![Style-CI](https://styleci.io/repos/62019007/shield?branch=nightly)](https://styleci.io/repos/62019007)  [![Scrutinizer-CI](https://scrutinizer-ci.com/g/stupidlysimple/php/badges/quality-score.png?b=nightly)](https://scrutinizer-ci.com/g/stupidlysimple/php/)  [![Total Downloads](https://poser.pugx.org/stupidlysimple/php/downloads)](https://packagist.org/packages/stupidlysimple/php)
 [![composer.lock](https://poser.pugx.org/stupidlysimple/php/composerlock)](https://packagist.org/packages/stupidlysimple/php)

From 234bca75514087d31899ed7b4521d9cd90a1be91 Mon Sep 17 00:00:00 2001
From: farizluqman <fariz.fnb@gmail.com>
Date: Tue, 24 Oct 2017 11:00:06 +0800
Subject: [PATCH 30/34] Add support for various templating engine / renderer

---
 app/Controller/Auth.php                       |  21 +-
 app/Controller/Hello.php                      |   2 +-
 composer.json                                 |   6 +-
 composer.lock                                 | 114 ++++++++++-
 config/env.php                                |   7 +
 ...ac1fe0b8a125daa60abac0b11e08d66577dea9.php | 190 ++++++++++++++++++
 ...cce5812a9def724c13610a9a3862f2192b9c00.php |  38 ++++
 resources/views/controller.tpl.php            |   4 +-
 resources/views/directory.tpl.php             |   6 +-
 resources/views/model.tpl.php                 |  18 +-
 resources/views/routing.tpl.php               |   6 +-
 resources/views/service.tpl.php               |   4 +-
 resources/views/twig.tpl.php                  |   3 +
 routes/web.php                                |  11 +-
 14 files changed, 395 insertions(+), 35 deletions(-)
 create mode 100644 resources/storage/cache/twig/ba/baf6056aaf7b192ab1a4946d7eac1fe0b8a125daa60abac0b11e08d66577dea9.php
 create mode 100644 resources/storage/cache/twig/df/df1006847e329e89367afe4f44cce5812a9def724c13610a9a3862f2192b9c00.php
 create mode 100644 resources/views/twig.tpl.php

diff --git a/app/Controller/Auth.php b/app/Controller/Auth.php
index 81abbf3..0b98f39 100755
--- a/app/Controller/Auth.php
+++ b/app/Controller/Auth.php
@@ -11,6 +11,7 @@
 
 namespace Controller;
 
+use Cartalyst\Sentry\Users;
 use Cartalyst\Sentry\Facades\Native\Sentry;
 use Simplyfier\Http\Request;
 use Simplyfier\Http\Response;
@@ -40,27 +41,27 @@ public static function authenticate()
 
             // Authenticate the user
             $user = Sentry::authenticate($credentials, false);
-        } catch (\Cartalyst\Sentry\Users\LoginRequiredException $e) {
+        } catch (Users\LoginRequiredException $e) {
             Response::redirect('login')->with([
                 'login_message'=> 'Login credentials not supplied',
                 'type'         => 'alert-danger',
             ]);
-        } catch (\Cartalyst\Sentry\Users\PasswordRequiredException $e) {
+        } catch (Users\PasswordRequiredException $e) {
             Response::redirect('login')->with([
                 'login_message'=> 'Password field is required',
                 'type'         => 'alert-danger',
             ]);
-        } catch (\Cartalyst\Sentry\Users\WrongPasswordException $e) {
+        } catch (Users\WrongPasswordException $e) {
             Response::redirect('login')->with([
                 'login_message'=> 'Wrong password, try again.',
                 'type'         => 'alert-danger',
             ]);
-        } catch (\Cartalyst\Sentry\Users\UserNotFoundException $e) {
+        } catch (Users\UserNotFoundException $e) {
             Response::redirect('login')->with([
                 'login_message'=> 'User not found.',
                 'type'         => 'alert-danger',
             ]);
-        } catch (\Cartalyst\Sentry\Users\UserNotActivatedException $e) {
+        } catch (Users\UserNotActivatedException $e) {
             Response::redirect('login')->with([
                 'login_message'=> 'User is not activated.',
                 'type'         => 'alert-danger',
@@ -89,22 +90,26 @@ public static function register()
                 'first_name' => Request::get('first_name'),
                 'last_name'  => Request::get('last_name'),
             ], $activate = true);
-        } catch (\Cartalyst\Sentry\Users\LoginRequiredException $e) {
+        } catch (Users\LoginRequiredException $e) {
             Response::redirect('register')->with([
                 'login_message'=> 'Login credentials not supplied',
                 'type'         => 'alert-danger',
             ]);
-        } catch (\Cartalyst\Sentry\Users\PasswordRequiredException $e) {
+        } catch (Users\PasswordRequiredException $e) {
             Response::redirect('register')->with([
                 'login_message'=> 'Password field is required',
                 'type'         => 'alert-danger',
             ]);
-        } catch (\Cartalyst\Sentry\Users\UserExistsException $e) {
+        } catch (Users\UserExistsException $e) {
             Response::redirect('register')->with([
                 'login_message'=> 'User with that login already exist.',
                 'type'         => 'alert-danger',
             ]);
         } catch (\Exception $e) {
+            Response::redirect('register')->with([
+                'login_message'=> 'Login is not successful.',
+                'type'         => 'alert-danger',
+            ]);
         } finally {
             if ($user) {
                 Response::redirect('login')->with([
diff --git a/app/Controller/Hello.php b/app/Controller/Hello.php
index 6620e4f..6f1921f 100755
--- a/app/Controller/Hello.php
+++ b/app/Controller/Hello.php
@@ -11,7 +11,7 @@
 
 namespace Controller;
 
-use Core\Request;
+use Simplyfier\Http\Request;
 
 class Hello
 {
diff --git a/composer.json b/composer.json
index 9444347..54a5f4f 100755
--- a/composer.json
+++ b/composer.json
@@ -38,14 +38,16 @@
     "simplyfier/viewer": "dev-master",
     "simplyfier/database": "dev-master",
     "simplyfier/service": "dev-master",
-    "zircote/swagger-php": "^2.0"
+    "zircote/swagger-php": "^2.0",
+    "mustache/mustache": "~2.5",
+    "twig/twig": "^2.0"
   },
   "require-dev": {
     "phpunit/phpunit": "5.4.*"
   },
   "autoload": {
     "psr-4": {
-
+      "Simplyfier\\Viewer\\Providers\\": "vendor/simplyfier/viewer/Providers"
     },
     "classmap": [
       "app/Model",
diff --git a/composer.lock b/composer.lock
index 734b3b5..992af1b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "e0356f390b6b376732cc50418ef276cc",
+    "content-hash": "3ebdadedb050266f8fe7169fecf42ec1",
     "packages": [
         {
             "name": "cartalyst/sentry",
@@ -560,6 +560,52 @@
             "homepage": "http://laravel.com",
             "time": "2016-12-03 18:52:25"
         },
+        {
+            "name": "mustache/mustache",
+            "version": "v2.12.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/bobthecow/mustache.php.git",
+                "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/bobthecow/mustache.php/zipball/fe8fe72e9d580591854de404cc59a1b83ca4d19e",
+                "reference": "fe8fe72e9d580591854de404cc59a1b83ca4d19e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.4"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "~1.11",
+                "phpunit/phpunit": "~3.7|~4.0|~5.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-0": {
+                    "Mustache": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Justin Hileman",
+                    "email": "justin@justinhileman.info",
+                    "homepage": "http://justinhileman.com"
+                }
+            ],
+            "description": "A Mustache implementation in PHP.",
+            "homepage": "https://github.com/bobthecow/mustache.php",
+            "keywords": [
+                "mustache",
+                "templating"
+            ],
+            "time": "2017-07-11T12:54:05+00:00"
+        },
         {
             "name": "nesbot/carbon",
             "version": "dev-master",
@@ -1506,6 +1552,72 @@
             ],
             "time": "2017-10-05 12:34:03"
         },
+        {
+            "name": "twig/twig",
+            "version": "2.x-dev",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/Twig.git",
+                "reference": "d8d888e2ae694c8057d6b0201b7b8f6f07d430cc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/d8d888e2ae694c8057d6b0201b7b8f6f07d430cc",
+                "reference": "d8d888e2ae694c8057d6b0201b7b8f6f07d430cc",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "require-dev": {
+                "psr/container": "^1.0",
+                "symfony/debug": "~2.7",
+                "symfony/phpunit-bridge": "~3.3@dev"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Twig_": "lib/"
+                },
+                "psr-4": {
+                    "Twig\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Armin Ronacher",
+                    "email": "armin.ronacher@active-4.com",
+                    "role": "Project Founder"
+                },
+                {
+                    "name": "Twig Team",
+                    "homepage": "http://twig.sensiolabs.org/contributors",
+                    "role": "Contributors"
+                }
+            ],
+            "description": "Twig, the flexible, fast, and secure template language for PHP",
+            "homepage": "http://twig.sensiolabs.org",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2017-09-27 18:11:00"
+        },
         {
             "name": "zircote/swagger-php",
             "version": "2.0.11",
diff --git a/config/env.php b/config/env.php
index 976988d..1198f29 100755
--- a/config/env.php
+++ b/config/env.php
@@ -10,6 +10,13 @@
  */
 return
 [
+    /**
+     * Set the running environment
+     * development - The system is running development mode
+     * production - The system is running in production mode
+     */
+    'ENVIRONMENT' => 'development',
+
     /*
      * Set debugging level
      * 0 - Turn off debugging. Show "Something went wrong" message ambiguously
diff --git a/resources/storage/cache/twig/ba/baf6056aaf7b192ab1a4946d7eac1fe0b8a125daa60abac0b11e08d66577dea9.php b/resources/storage/cache/twig/ba/baf6056aaf7b192ab1a4946d7eac1fe0b8a125daa60abac0b11e08d66577dea9.php
new file mode 100644
index 0000000..433cd5e
--- /dev/null
+++ b/resources/storage/cache/twig/ba/baf6056aaf7b192ab1a4946d7eac1fe0b8a125daa60abac0b11e08d66577dea9.php
@@ -0,0 +1,190 @@
+<?php
+
+/* home.tpl.php */
+class __TwigTemplate_c6cacab278eb561c8bd51847884e3c9e9aa7627b74d3b43ff943f98fb71c8713 extends Twig_Template
+{
+    public function __construct(Twig_Environment $env)
+    {
+        parent::__construct($env);
+
+        $this->parent = false;
+
+        $this->blocks = array(
+        );
+    }
+
+    protected function doDisplay(array $context, array $blocks = array())
+    {
+        // line 1
+        echo "<!DOCTYPE HTML>
+<!--
+\tPhantom by HTML5 UP
+\thtml5up.net | @ajlkn
+\tFree for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html>
+<?php
+\$data = ['title' => 'StupidlySimple PHP | Home'];
+Viewer::file('layouts/head', \$data);
+?>
+<body>
+<!-- Wrapper -->
+<div id=\"wrapper\">
+
+    <?php Viewer::file('layouts/top') ?>
+
+    <?php Viewer::file('layouts/menu') ?>
+
+    <!-- Main -->
+    <div id=\"main\">
+        <div class=\"inner\">
+            <header>
+                <h1>Fully baked PHP micro-framework<br>ready to be served.</h1>
+                <p>This is your very fresh homepage. All template files are located in <code>/resources/views</code>
+                    from the root directory. You can read tutorials and documentations on <a target=\"_blank\" href=\"https://stupidlysimple.github.io\">our website</a>
+                    or even from here.
+                    Start coding today and get creative.</p>
+
+            </header>
+            <section class=\"tiles\">
+                <article class=\"\">
+                    <span class=\"image\">
+                        <img src=\"resources/assets/images/pic5.jpg\" alt=\"\"/>
+                    </span>
+                    <a href=\"directory\">
+                        <h2>Directory Structure</h2>
+                        <div class=\"content\">
+                            <p>See the directory structure of the StupidlySimple PHP framework</p>
+                        </div>
+                    </a>
+                </article>
+                <article class=\"style1\">
+                    <span class=\"image\">
+                        <img src=\"resources/assets/images/pic1.jpg\" alt=\"\"/>
+                    </span>
+                    <a href=\"routing\">
+                        <h2>Routing</h2>
+                        <div class=\"content\">
+                            <p>Back in the days, we all used to route the web directly to our .html or .php files.
+                            Nowadays on MVC frameworks, we do it quite differently.</p>
+                        </div>
+                    </a>
+                </article>
+                <article class=\"style2\">
+                    <span class=\"image\">
+                        <img src=\"resources/assets/images/pic2.jpg\" alt=\"\"/>
+                    </span>
+                    <a href=\"controller\">
+                        <h2>Controllers</h2>
+                        <div class=\"content\">
+                            <p>See how controller works in the Framework.</p>
+                        </div>
+                    </a>
+                </article>
+                <article class=\"style3\">
+                    <span class=\"image\">
+                        <img src=\"resources/assets/images/pic3.jpg\" alt=\"\"/>
+                    </span>
+                    <a href=\"service\">
+                        <h2>Services</h2>
+                        <div class=\"content\">
+                            <p>See how service works in StupidlySimple Framework.</p>
+                        </div>
+                    </a>
+                </article>
+                <article class=\"style4\">
+                    <span class=\"image\">
+                        <img src=\"resources/assets/images/pic4.jpg\" alt=\"\"/>
+                    </span>
+                    <a href=\"model\">
+                        <h2>Models</h2>
+                        <div class=\"content\">
+                            <p>Provides easy access to your data. Models are powered by <code>Eloquent ORM</code></p>
+                        </div>
+                    </a>
+                </article>
+                <article class=\"\">
+                    <span class=\"image\">
+                        <img src=\"resources/assets/images/pic6.jpg\" alt=\"\"/>
+                    </span>
+                    <a href=\"https://stupidlysimple.github.io\">
+                        <h2>And More!</h2>
+                        <div class=\"content\">
+                            <p>More documentations are available on <code>stupidlysimple.github.io</code></p>
+                        </div>
+                    </a>
+                </article>
+            </section>
+        </div>
+    </div>
+
+    <!-- Second -->
+    <div id=\"second\">
+        <div class=\"inner\">
+            <header>
+                <h2>Example Applications</h2>
+                <p>StupidlySimple in the real world. See how StupidlySimple can be used in various applications / projects.</p>
+            </header>
+            <section class=\"tiles tiles-smaller\">
+                <article>
+                    <span class=\"image\">
+                        <img src=\"resources/assets/images/pic8.jpg\" alt=\"\"/>
+                    </span>
+                    <a href=\"blogging/home\">
+                        <h2>Blogging</h2>
+                        <div class=\"content\">
+                            <p>StupidlySimple does blogging</p>
+                        </div>
+                    </a>
+                </article>
+                <article>
+                    <span class=\"image\">
+                        <img src=\"resources/assets/images/pic8.jpg\" alt=\"\"/>
+                    </span>
+                    <a href=\"costing/home\">
+                        <h2>Product Costing</h2>
+                        <div class=\"content\">
+                            <p>Simple application to manage products and costing</p>
+                        </div>
+                    </a>
+                </article>
+                <article>
+                    <span class=\"image\">
+                        <img src=\"resources/assets/images/pic8.jpg\" alt=\"\"/>
+                    </span>
+                    <a href=\"costing/home\">
+                        <h2>Project Management</h2>
+                        <div class=\"content\">
+                            <p>Basic project management app</p>
+                        </div>
+                    </a>
+                </article>
+            </section>
+        </div>
+    </div>
+
+<?php Viewer::file('layouts/footer') ?>
+
+</div>
+
+<?php Viewer::file('layouts/scripts') ?>
+
+</body>
+</html>";
+    }
+
+    public function getTemplateName()
+    {
+        return "home.tpl.php";
+    }
+
+    public function getDebugInfo()
+    {
+        return array (  19 => 1,);
+    }
+
+    public function getSourceContext()
+    {
+        return new Twig_Source("", "home.tpl.php", "/Applications/MAMP/htdocs/github/php/resources/views/home.tpl.php");
+    }
+}
diff --git a/resources/storage/cache/twig/df/df1006847e329e89367afe4f44cce5812a9def724c13610a9a3862f2192b9c00.php b/resources/storage/cache/twig/df/df1006847e329e89367afe4f44cce5812a9def724c13610a9a3862f2192b9c00.php
new file mode 100644
index 0000000..c9fdb68
--- /dev/null
+++ b/resources/storage/cache/twig/df/df1006847e329e89367afe4f44cce5812a9def724c13610a9a3862f2192b9c00.php
@@ -0,0 +1,38 @@
+<?php
+
+/* twig.tpl.php */
+class __TwigTemplate_b74764bc57e636349e631606420726c873fa876c7fff82e52576d03e441a8206 extends Twig_Template
+{
+    public function __construct(Twig_Environment $env)
+    {
+        parent::__construct($env);
+
+        $this->parent = false;
+
+        $this->blocks = array(
+        );
+    }
+
+    protected function doDisplay(array $context, array $blocks = array())
+    {
+        // line 1
+        echo "<html>
+<h1>This is twig!!!</h1>
+</html>";
+    }
+
+    public function getTemplateName()
+    {
+        return "twig.tpl.php";
+    }
+
+    public function getDebugInfo()
+    {
+        return array (  19 => 1,);
+    }
+
+    public function getSourceContext()
+    {
+        return new Twig_Source("", "twig.tpl.php", "/Applications/MAMP/htdocs/github/php/resources/views/twig.tpl.php");
+    }
+}
diff --git a/resources/views/controller.tpl.php b/resources/views/controller.tpl.php
index f02dff0..d893479 100644
--- a/resources/views/controller.tpl.php
+++ b/resources/views/controller.tpl.php
@@ -5,8 +5,8 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple | Controller'];
+<?php
+$data = ['title' => 'StupidlySimple | Controller'];
 Viewer::file('layouts/head', $data); ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/directory.tpl.php b/resources/views/directory.tpl.php
index 326ade2..b0c30b4 100644
--- a/resources/views/directory.tpl.php
+++ b/resources/views/directory.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Service'];
-Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Directory'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/model.tpl.php b/resources/views/model.tpl.php
index 4ac5604..c83d873 100644
--- a/resources/views/model.tpl.php
+++ b/resources/views/model.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Service'];
-Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Model'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
@@ -35,17 +35,17 @@
                 <h3>Load all Post </h3>
                 <p>Load the whole post with <code>Model\Post::all()</code> </p>
                 <p>
-                    <?php
-                    $i = 1;
-                    foreach (Model\Post::all() as $post) {
+                    <?php
+                    $i = 1;
+                    foreach (Model\Post::all() as $post) {
                         echo '
                         <div class="alert alert-info">
                             
                             <b><?= $first_post->'.$post->title.'</b><br>
                             <span><?= $first_post->'.$post->content.'</span>
-                        </div>';
-                    }
-                    echo 'There are: '.Model\Post::all()->count().' posts.';
+                        </div>';
+                    }
+                    echo 'There are: '.Model\Post::all()->count().' posts.';
                     ?>
                 </p>
 
diff --git a/resources/views/routing.tpl.php b/resources/views/routing.tpl.php
index 326ade2..581c935 100644
--- a/resources/views/routing.tpl.php
+++ b/resources/views/routing.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Service'];
-Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Routing'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/service.tpl.php b/resources/views/service.tpl.php
index 2b1d273..3d14bcd 100644
--- a/resources/views/service.tpl.php
+++ b/resources/views/service.tpl.php
@@ -5,8 +5,8 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Service'];
+<?php
+$data = ['title' => 'StupidlySimple PHP | Service'];
 Viewer::file('layouts/head', $data); ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/twig.tpl.php b/resources/views/twig.tpl.php
new file mode 100644
index 0000000..8bf225b
--- /dev/null
+++ b/resources/views/twig.tpl.php
@@ -0,0 +1,3 @@
+<html>
+<h1>This is twig!!!</h1>
+</html>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 1b5ad0a..0ca7874 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -2,13 +2,16 @@
 /**
  * StupidlySimple - A PHP Framework For Lazy Developers.
  *
- * @author		Fariz Luqman <fariz.fnb@gmail.com>
- * @copyright	2017 Fariz Luqman
- * @license		MIT
+ * @author        Fariz Luqman <fariz.fnb@gmail.com>
+ * @copyright    2017 Fariz Luqman
+ * @license        MIT
  *
- * @link		https://stupidlysimple.github.io/
+ * @link        https://stupidlysimple.github.io/
  */
 
+use Simplyfier\Http\Router;
+use Simplyfier\Viewer;
+
 /*
 |--------------------------------------------------------------------------
 | The Basic Routes - Route GET / into /home.php

From 49b980d154693a3e9f315fffd90913cc9a814239 Mon Sep 17 00:00:00 2001
From: farizluqman <fariz.fnb@gmail.com>
Date: Wed, 25 Oct 2017 20:16:28 +0800
Subject: [PATCH 31/34] Added platform configuration on composer.json

---
 composer.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 54a5f4f..71d9d5a 100755
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,10 @@
     }
   ],
   "config": {
-    "vendor-dir": "vendor"
+    "vendor-dir": "vendor",
+    "platform": {
+      "php": "5.6.19"
+    }
   },
   "minimum-stability": "dev",
   "require": {

From 334ce89525d3333c68b25b517e3f27a84d64932c Mon Sep 17 00:00:00 2001
From: farizluqman <fariz.fnb@gmail.com>
Date: Wed, 25 Oct 2017 20:18:33 +0800
Subject: [PATCH 32/34] Change version 5.6.19 to 5.6

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 71d9d5a..0a1a514 100755
--- a/composer.json
+++ b/composer.json
@@ -20,7 +20,7 @@
   "config": {
     "vendor-dir": "vendor",
     "platform": {
-      "php": "5.6.19"
+      "php": "5.6"
     }
   },
   "minimum-stability": "dev",

From 12b27b32d04b0481f9721d6f40fb2e7177ce9560 Mon Sep 17 00:00:00 2001
From: farizluqman <fariz.fnb@gmail.com>
Date: Wed, 25 Oct 2017 20:21:10 +0800
Subject: [PATCH 33/34] Add --ignore-platform-reqs in travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0034b18..18d60fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: php
 php:
 - 5.6
-before_script: composer update
+before_script: composer update --ignore-platform-reqs
 script: phpunit tests/AppTest.php --colors=auto

From 74454ad47a90b1d494c29983301bbd30ca0cac31 Mon Sep 17 00:00:00 2001
From: Fariz Luqman <fariz.fnb@gmail.com>
Date: Wed, 25 Oct 2017 12:23:43 +0000
Subject: [PATCH 34/34] Apply fixes from StyleCI

---
 app/Controller/Auth.php            |  2 +-
 config/env.php                     |  2 +-
 resources/views/controller.tpl.php |  4 ++--
 resources/views/directory.tpl.php  |  6 +++---
 resources/views/model.tpl.php      | 18 +++++++++---------
 resources/views/routing.tpl.php    |  6 +++---
 resources/views/service.tpl.php    |  4 ++--
 routes/web.php                     |  1 -
 8 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/app/Controller/Auth.php b/app/Controller/Auth.php
index 0b98f39..6586207 100755
--- a/app/Controller/Auth.php
+++ b/app/Controller/Auth.php
@@ -11,8 +11,8 @@
 
 namespace Controller;
 
-use Cartalyst\Sentry\Users;
 use Cartalyst\Sentry\Facades\Native\Sentry;
+use Cartalyst\Sentry\Users;
 use Simplyfier\Http\Request;
 use Simplyfier\Http\Response;
 
diff --git a/config/env.php b/config/env.php
index 1198f29..f9ded1d 100755
--- a/config/env.php
+++ b/config/env.php
@@ -10,7 +10,7 @@
  */
 return
 [
-    /**
+    /*
      * Set the running environment
      * development - The system is running development mode
      * production - The system is running in production mode
diff --git a/resources/views/controller.tpl.php b/resources/views/controller.tpl.php
index d893479..f02dff0 100644
--- a/resources/views/controller.tpl.php
+++ b/resources/views/controller.tpl.php
@@ -5,8 +5,8 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple | Controller'];
+<?php
+$data = ['title' => 'StupidlySimple | Controller'];
 Viewer::file('layouts/head', $data); ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/directory.tpl.php b/resources/views/directory.tpl.php
index b0c30b4..1fc3d5f 100644
--- a/resources/views/directory.tpl.php
+++ b/resources/views/directory.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Directory'];
-Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Directory'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/model.tpl.php b/resources/views/model.tpl.php
index c83d873..6d2ef1b 100644
--- a/resources/views/model.tpl.php
+++ b/resources/views/model.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Model'];
-Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Model'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
@@ -35,17 +35,17 @@
                 <h3>Load all Post </h3>
                 <p>Load the whole post with <code>Model\Post::all()</code> </p>
                 <p>
-                    <?php
-                    $i = 1;
-                    foreach (Model\Post::all() as $post) {
+                    <?php
+                    $i = 1;
+                    foreach (Model\Post::all() as $post) {
                         echo '
                         <div class="alert alert-info">
                             
                             <b><?= $first_post->'.$post->title.'</b><br>
                             <span><?= $first_post->'.$post->content.'</span>
-                        </div>';
-                    }
-                    echo 'There are: '.Model\Post::all()->count().' posts.';
+                        </div>';
+                    }
+                    echo 'There are: '.Model\Post::all()->count().' posts.';
                     ?>
                 </p>
 
diff --git a/resources/views/routing.tpl.php b/resources/views/routing.tpl.php
index 581c935..a3471e2 100644
--- a/resources/views/routing.tpl.php
+++ b/resources/views/routing.tpl.php
@@ -5,9 +5,9 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Routing'];
-Viewer::file('layouts/head', $data);
+<?php
+$data = ['title' => 'StupidlySimple PHP | Routing'];
+Viewer::file('layouts/head', $data);
 ?>
 <body>
 <!-- Wrapper -->
diff --git a/resources/views/service.tpl.php b/resources/views/service.tpl.php
index 3d14bcd..2b1d273 100644
--- a/resources/views/service.tpl.php
+++ b/resources/views/service.tpl.php
@@ -5,8 +5,8 @@
 	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
 -->
 <html>
-<?php
-$data = ['title' => 'StupidlySimple PHP | Service'];
+<?php
+$data = ['title' => 'StupidlySimple PHP | Service'];
 Viewer::file('layouts/head', $data); ?>
 <body>
 <!-- Wrapper -->
diff --git a/routes/web.php b/routes/web.php
index 0ca7874..d38b542 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -8,7 +8,6 @@
  *
  * @link        https://stupidlysimple.github.io/
  */
-
 use Simplyfier\Http\Router;
 use Simplyfier\Viewer;