Prepares to merge nightly into master.

.gitignore

@@ -1,2 +1,4 @@
 vendor/*
 .idea/*
+
+.zedstate

.travis.yml

@@ -1,5 +1,5 @@
 language: php
 php:
 - 5.6
-before_script: composer update
-script: phpunit vendor/damnstupidsimple/core/tests/AppTest.php --colors=auto
+before_script: composer update --ignore-platform-reqs
+script: phpunit tests/AppTest.php --colors=auto

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)
+[![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)
-[![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)
@@ -92,8 +91,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)

app/Controller/Auth.php

@@ -1,130 +1,131 @@
 <?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;
+namespace Controller;
 
-class Auth {
-    public function __construct()
-    {
-    }
+use Cartalyst\Sentry\Facades\Native\Sentry;
+use Cartalyst\Sentry\Users;
+use Simplyfier\Http\Request;
+use Simplyfier\Http\Response;
 
-    public function displayRegisterPage()
-    {
-        Viewer::file('resources/views/auth/register');
-    }
+/**
+ * Class Auth.
+ */
+class Auth
+{
+    private static $successRedirectURL = 'admin';
 
-    public function displayLoginPage()
+    public static function check()
     {
-        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(
+            $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){
+        } catch (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){
+        } catch (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){
+        } catch (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){
+        } catch (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){
+        } catch (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){
-                Admin::redirectToAdminHome();
-            }else{
+        } finally {
+            if (Sentry::check() === true) {
+                Response::redirect(self::$successRedirectURL)->with([
+                    'login_message'=> 'Login successful.',
+                    'type'         => 'alert-success',
+                ]);
+            } else {
                 Response::redirect('login')->with([
-                    'login_message'=>'Unable to login',
-                    'type'         =>'alert-danger'
+                    'login_message'=> 'Unable to login',
+                    'type'         => 'alert-danger',
                 ]);
             }
         }
     }
 
-    public function doRegister(){
-        try{
-            $user = Sentry::register(array(
-                'email'    => Request::get('email'),
-                'password' => Request::get('password'),
+    public static function register()
+    {
+        try {
+            $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);
-
-        }catch (\Cartalyst\Sentry\Users\LoginRequiredException $e){
+                'last_name'  => Request::get('last_name'),
+            ], $activate = true);
+        } catch (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){
+        } catch (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){
+        } catch (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){
-
-        }finally{
-            if($user){
+        } catch (\Exception $e) {
+            Response::redirect('register')->with([
+                'login_message'=> 'Login is not successful.',
+                'type'         => 'alert-danger',
+            ]);
+        } finally {
+            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 function doLogout(){
+    public static function logout()
+    {
         Sentry::logout();
-        Response::redirect('login');
+        Response::redirect('login')->with([
+            'login_message'=> 'Logout successful.',
+            'type'         => 'alert-success',
+        ]);
     }
-
 }

app/Controller/Hello.php

@@ -1,28 +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;
+use Simplyfier\Http\Request;
 
-class Hello {
-    public function greetWithName($name){
-        echo ('Hello, '. $name. '!');
+class Hello
+{
+    public function greetWithName($name)
+    {
+        echo 'Hello, '.$name.'!';
     }
-    public function greetForm(){
+
+    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.'!';
         }
     }
-}
+}