Merge branch 'feature/refactor_madness' into development

jboy1009 · Sep 16, 2015 · a39cef6 · a39cef6
2 parents f4ef543 + 06a8fbe
commit a39cef6
Show file tree

Hide file tree

Showing 62 changed files with 409 additions and 288 deletions.
diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -11,7 +11,7 @@ class Kernel extends ConsoleKernel {
 	 * @var array
 	 */
 	protected $commands = [
-		//'App\Console\Commands\Inspire',
+		'App\Console\Commands\Inspire',
 	];
 
 	/**
@@ -22,6 +22,6 @@ class Kernel extends ConsoleKernel {
 	 */
 	protected function schedule(Schedule $schedule)
 	{
-		//$schedule->command('inspire')->hourly();
+		$schedule->command('inspire')->hourly();
 	}
 }
diff --git a/app/Http/Controllers/Backend/Access/PermissionController.php b/app/Http/Controllers/Backend/Access/PermissionController.php
@@ -16,6 +16,7 @@ class PermissionController extends Controller {
 	 * @var RoleRepositoryContract
 	 */
 	protected $roles;
+
 	/**
 	 * @var PermissionRepositoryContract
 	 */
@@ -25,9 +26,7 @@ class PermissionController extends Controller {
 	 * @param RoleRepositoryContract $roles
 	 * @param PermissionRepositoryContract $permissions
 	 */
-	public function __construct(
-		RoleRepositoryContract $roles,
-		PermissionRepositoryContract $permissions) {
+	public function __construct(RoleRepositoryContract $roles, PermissionRepositoryContract $permissions) {
 		$this->roles = $roles;
 		$this->permissions = $permissions;
 	}

diff --git a/app/Http/Controllers/Backend/Access/RoleController.php b/app/Http/Controllers/Backend/Access/RoleController.php
@@ -2,9 +2,9 @@
 
 use App\Http\Controllers\Controller;
 use App\Repositories\Backend\Role\RoleRepositoryContract;
-use App\Repositories\Backend\Permission\PermissionRepositoryContract;
 use App\Http\Requests\Backend\Access\Role\CreateRoleRequest;
 use App\Http\Requests\Backend\Access\Role\UpdateRoleRequest;
+use App\Repositories\Backend\Permission\PermissionRepositoryContract;
 
 /**
  * Class RoleController
@@ -16,6 +16,7 @@ class RoleController extends Controller {
 	 * @var RoleRepositoryContract
 	 */
 	protected $roles;
+
 	/**
 	 * @var PermissionRepositoryContract
 	 */
@@ -25,9 +26,7 @@ class RoleController extends Controller {
 	 * @param RoleRepositoryContract $roles
 	 * @param PermissionRepositoryContract $permissions
 	 */
-	public function __construct(
-		RoleRepositoryContract $roles,
-		PermissionRepositoryContract $permissions) {
+	public function __construct(RoleRepositoryContract $roles, PermissionRepositoryContract $permissions) {
 		$this->roles = $roles;
 		$this->permissions = $permissions;
 	}

diff --git a/app/Http/Controllers/Backend/Access/UserController.php b/app/Http/Controllers/Backend/Access/UserController.php
@@ -3,11 +3,11 @@
 use App\Http\Controllers\Controller;
 use App\Repositories\Backend\User\UserContract;
 use App\Repositories\Backend\Role\RoleRepositoryContract;
-use App\Repositories\Backend\Permission\PermissionRepositoryContract;
+use App\Repositories\Frontend\Auth\AuthenticationContract;
 use App\Http\Requests\Backend\Access\User\CreateUserRequest;
 use App\Http\Requests\Backend\Access\User\UpdateUserRequest;
 use App\Http\Requests\Backend\Access\User\UpdateUserPasswordRequest;
-use App\Repositories\Frontend\Auth\AuthenticationContract;
+use App\Repositories\Backend\Permission\PermissionRepositoryContract;
 
 /**
  * Class UserController
@@ -18,6 +18,7 @@ class UserController extends Controller {
 	 * @var UserContract
 	 */
 	protected $users;
+
 	/**
 	 * @var RoleRepositoryContract
 	 */
@@ -33,10 +34,7 @@ class UserController extends Controller {
 	 * @param RoleRepositoryContract $roles
 	 * @param PermissionRepositoryContract $permissions
 	 */
-	public function __construct(
-		UserContract $users,
-		RoleRepositoryContract $roles,
-		PermissionRepositoryContract $permissions) {
+	public function __construct(UserContract $users, RoleRepositoryContract $roles, PermissionRepositoryContract $permissions) {
 		$this->users = $users;
 		$this->roles = $roles;
 		$this->permissions = $permissions;

diff --git a/app/Http/Controllers/Backend/DashboardController.php b/app/Http/Controllers/Backend/DashboardController.php
@@ -7,6 +7,7 @@
  * @package App\Http\Controllers\Backend
  */
 class DashboardController extends Controller {
+
 	/**
 	 * @return \Illuminate\View\View
 	 */

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -4,8 +4,11 @@
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 
+/**
+ * Class Controller
+ * @package App\Http\Controllers
+ */
 abstract class Controller extends BaseController {
 
-	use  DispatchesJobs, ValidatesRequests;
-
+	use DispatchesJobs, ValidatesRequests;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ @@
      * @package App\Http\Controllers\Backend
      */
     class DashboardController extends Controller {
     	/**
     	 * @return \Illuminate\View\View
     	 */
@@ Expand Down @@