Master synchronization

bestmomo · Jan 6, 2015 · 234244f · 234244f
1 parent 999d54b
commit 234244f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 12 deletions.
diff --git a/app/Http/Middleware/App.php b/app/Http/Middleware/App.php
@@ -1,9 +1,8 @@
 <?php namespace App\Http\Middleware;
 
 use Closure, Session, Auth;
-use Illuminate\Contracts\Routing\Middleware;
 
-class App implements Middleware {
+class App {
 
 	/**
 	 * The availables languages.

diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php
@@ -2,9 +2,8 @@
 
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Contracts\Routing\Middleware;
 
-class Authenticate implements Middleware {
+class Authenticate {
 
 	/**
 	 * The Guard implementation.

diff --git a/app/Http/Middleware/IsAdmin.php b/app/Http/Middleware/IsAdmin.php
@@ -1,11 +1,10 @@
 <?php namespace App\Http\Middleware;
 
 use Closure;
-use Illuminate\Contracts\Routing\Middleware;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Http\RedirectResponse;
 
-class IsAdmin implements Middleware {
+class IsAdmin {
 
 	/**
 	 * The Guard implementation.

diff --git a/app/Http/Middleware/IsRedactor.php b/app/Http/Middleware/IsRedactor.php
@@ -1,11 +1,10 @@
 <?php namespace App\Http\Middleware;
 
 use Closure;
-use Illuminate\Contracts\Routing\Middleware;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Http\RedirectResponse;
 
-class IsRedactor implements Middleware {
+class IsRedactor {
 
 	/**
 	 * The Guard implementation.

diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php
@@ -3,9 +3,8 @@
 use Closure;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Http\RedirectResponse;
-use Illuminate\Contracts\Routing\Middleware;
 
-class RedirectIfAuthenticated implements Middleware {
+class RedirectIfAuthenticated {
 
 	/**
 	 * The Guard implementation.

diff --git a/config/view.php b/config/view.php
@@ -13,7 +13,7 @@
 	|
 	*/
 
-	'paths' => [base_path('resources/templates')],
+	'paths' => [base_path('resources/views')],
 
 	/*
 	|--------------------------------------------------------------------------
@@ -26,6 +26,6 @@
 	|
 	*/
 
-	'compiled' => storage_path().'/framework/templates',
+	'compiled' => storage_path().'/framework/views',
 
 ];
diff --git a/storage/framework/templates/.gitignore → storage/framework/views/.gitignore b/storage/framework/templates/.gitignore → storage/framework/views/.gitignore