Merge branch 'master' into 87-mysql-ssl-support

.gitignore

@@ -2,4 +2,6 @@
 .env
 installed.lock
 database.sqlite
-.htaccess
+.htaccess
+.editorconfig
+.idea/*

application/app/Http/Controllers/Auth/AuthController.php

@@ -1,8 +1,8 @@
 <?php namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Contracts\Auth\Registrar;
+use App\User;
+use Validator;
 use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
 
 class AuthController extends Controller {
@@ -23,16 +23,41 @@ class AuthController extends Controller {
 	/**
 	 * Create a new authentication controller instance.
 	 *
-	 * @param  \Illuminate\Contracts\Auth\Guard  $auth
-	 * @param  \Illuminate\Contracts\Auth\Registrar  $registrar
 	 * @return void
 	 */
-	public function __construct(Guard $auth, Registrar $registrar)
+	public function __construct()
 	{
-		$this->auth = $auth;
-		$this->registrar = $registrar;
-
 		$this->middleware('guest', ['except' => 'getLogout']);
 	}
 
+	/**
+	 * Get a validator for an incoming registration request.
+	 *
+	 * @param  array  $data
+	 * @return \Illuminate\Contracts\Validation\Validator
+	 */
+	public function validator(array $data)
+	{
+		return Validator::make($data, [
+			'name' => 'required|max:255',
+			'email' => 'required|email|max:255|unique:users',
+			'password' => 'required|confirmed|min:6',
+		]);
+	}
+
+	/**
+	 * Create a new user instance after a valid registration.
+	 *
+	 * @param  array  $data
+	 * @return User
+	 */
+	public function create(array $data)
+	{
+		return User::create([
+			'name' => $data['name'],
+			'email' => $data['email'],
+			'password' => bcrypt($data['password']),
+		]);
+	}
+
 }

application/app/Http/Controllers/Auth/PasswordController.php

@@ -1,8 +1,6 @@
 <?php namespace App\Http\Controllers\Auth;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Contracts\Auth\Guard;
-use Illuminate\Contracts\Auth\PasswordBroker;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 
 class PasswordController extends Controller {
@@ -27,11 +25,8 @@ class PasswordController extends Controller {
 	 * @param  \Illuminate\Contracts\Auth\PasswordBroker  $passwords
 	 * @return void
 	 */
-	public function __construct(Guard $auth, PasswordBroker $passwords)
+	public function __construct()
 	{
-		$this->auth = $auth;
-		$this->passwords = $passwords;
-
 		$this->middleware('guest');
 	}
 

application/app/Http/Controllers/UserController.php

@@ -92,7 +92,7 @@ public function update($id)
 		$rules = array(
 			'name'       => 'required|min:3|max:255',
 			'role'      => 'required|numeric|role',
-			'email'		=> 'required|email|max:255|unique:users,'.$id,
+			'email'		=> 'required|email|max:255|unique:users,email,'.$id ,
 			'password' => 'confirmed|min:6'
 		);
 

application/bootstrap/autoload.php

@@ -27,7 +27,7 @@
 |
 */
 
-if (file_exists($compiledPath = __DIR__.'/../vendor/compiled.php'))
+if (file_exists($compiledPath = __DIR__.'/cache/compiled.php'))
 {
 	require $compiledPath;
 }

application/bootstrap/cache/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

application/composer.json

@@ -5,8 +5,8 @@
 	"license": "cc-by-nc-sa 4.0",
 	"type": "project",
 	"require": {
-		"laravel/framework": "5.0.*",
-		"illuminate/html": "~5.0"
+		"laravel/framework": "5.1.*",
+		"laravelcollective/html": "5.1.*"
 	},
 	"autoload": {
 		"classmap": [
@@ -32,5 +32,7 @@
 	},
 	"config": {
 		"preferred-install": "dist"
+	},
+	"require-dev": {
 	}
 }