Skip to content

Commit 892d555

Browse files
hop onto the Laravel 5.2 train
1 parent 4ecf3eb commit 892d555

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+899
-681
lines changed

Diff for: .gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
* text=auto
22
*.css linguist-vendored
3-
*.less linguist-vendored
3+
*.scss linguist-vendored

Diff for: .gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,7 @@ nbproject/private
1717
/app/storage/sessions/
1818
/app/storage/views/
1919
/app/storage/meta/
20+
21+
/public/storage
22+
Homestead.yaml
23+
Homestead.json

Diff for: app/Console/Commands/Inspire.php

+23-23
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,29 @@
55
use Illuminate\Console\Command;
66
use Illuminate\Foundation\Inspiring;
77

8-
class Inspire extends Command {
8+
class Inspire extends Command
9+
{
10+
/**
11+
* The name and signature of the console command.
12+
*
13+
* @var string
14+
*/
15+
protected $signature = 'inspire';
916

10-
/**
11-
* The name and signature of the console command.
12-
*
13-
* @var string
14-
*/
15-
protected $signature = 'inspire';
16-
17-
/**
18-
* The console command description.
19-
*
20-
* @var string
21-
*/
22-
protected $description = 'Display an inspiring quote';
23-
24-
/**
25-
* Execute the console command.
26-
*
27-
* @return mixed
28-
*/
29-
public function handle() {
30-
$this->comment(PHP_EOL . Inspiring::quote() . PHP_EOL);
31-
}
17+
/**
18+
* The console command description.
19+
*
20+
* @var string
21+
*/
22+
protected $description = 'Display an inspiring quote';
3223

24+
/**
25+
* Execute the console command.
26+
*
27+
* @return mixed
28+
*/
29+
public function handle()
30+
{
31+
$this->comment(PHP_EOL.Inspiring::quote().PHP_EOL);
32+
}
3333
}

Diff for: app/Console/Kernel.php

+21-21
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
use Illuminate\Console\Scheduling\Schedule;
66
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
77

8-
class Kernel extends ConsoleKernel {
9-
10-
/**
11-
* The Artisan commands provided by your application.
12-
*
13-
* @var array
14-
*/
15-
protected $commands = [
16-
\App\Console\Commands\Inspire::class,
17-
];
18-
19-
/**
20-
* Define the application's command schedule.
21-
*
22-
* @param \Illuminate\Console\Scheduling\Schedule $schedule
23-
* @return void
24-
*/
25-
protected function schedule(Schedule $schedule) {
26-
$schedule->command('inspire')
27-
->hourly();
28-
}
8+
class Kernel extends ConsoleKernel
9+
{
10+
/**
11+
* The Artisan commands provided by your application.
12+
*
13+
* @var array
14+
*/
15+
protected $commands = [
16+
// Commands\Inspire::class,
17+
];
2918

19+
/**
20+
* Define the application's command schedule.
21+
*
22+
* @param \Illuminate\Console\Scheduling\Schedule $schedule
23+
* @return void
24+
*/
25+
protected function schedule(Schedule $schedule)
26+
{
27+
// $schedule->command('inspire')
28+
// ->hourly();
29+
}
3030
}

Diff for: app/Events/Event.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Events;
44

5-
abstract class Event {
6-
//
5+
abstract class Event
6+
{
7+
//
78
}

Diff for: app/Exceptions/Handler.php

+40-32
Original file line numberDiff line numberDiff line change
@@ -3,40 +3,48 @@
33
namespace App\Exceptions;
44

55
use Exception;
6+
use Illuminate\Validation\ValidationException;
7+
use Illuminate\Auth\Access\AuthorizationException;
8+
use Illuminate\Database\Eloquent\ModelNotFoundException;
9+
use Symfony\Component\HttpKernel\Exception\HttpException;
610
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
711

8-
class Handler extends ExceptionHandler {
12+
class Handler extends ExceptionHandler
13+
{
14+
/**
15+
* A list of the exception types that should not be reported.
16+
*
17+
* @var array
18+
*/
19+
protected $dontReport = [
20+
AuthorizationException::class,
21+
HttpException::class,
22+
ModelNotFoundException::class,
23+
ValidationException::class,
24+
];
925

10-
/**
11-
* A list of the exception types that should not be reported.
12-
*
13-
* @var array
14-
*/
15-
protected $dontReport = [
16-
\Symfony\Component\HttpKernel\Exception\HttpException::class,
17-
];
18-
19-
/**
20-
* Report or log an exception.
21-
*
22-
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
23-
*
24-
* @param \Exception $e
25-
* @return void
26-
*/
27-
public function report(Exception $e) {
28-
return parent::report($e);
29-
}
30-
31-
/**
32-
* Render an exception into an HTTP response.
33-
*
34-
* @param \Illuminate\Http\Request $request
35-
* @param \Exception $e
36-
* @return \Illuminate\Http\Response
37-
*/
38-
public function render($request, Exception $e) {
39-
return parent::render($request, $e);
40-
}
26+
/**
27+
* Report or log an exception.
28+
*
29+
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
30+
*
31+
* @param \Exception $e
32+
* @return void
33+
*/
34+
public function report(Exception $e)
35+
{
36+
parent::report($e);
37+
}
4138

39+
/**
40+
* Render an exception into an HTTP response.
41+
*
42+
* @param \Illuminate\Http\Request $request
43+
* @param \Exception $e
44+
* @return \Illuminate\Http\Response
45+
*/
46+
public function render($request, Exception $e)
47+
{
48+
return parent::render($request, $e);
49+
}
4250
}

Diff for: app/Http/Controllers/Auth/AuthController.php

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?php
2+
3+
namespace App\Http\Controllers\Auth;
4+
5+
use App\User;
6+
use Validator;
7+
use App\Http\Controllers\Controller;
8+
use Illuminate\Foundation\Auth\ThrottlesLogins;
9+
use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
10+
11+
class AuthController extends Controller
12+
{
13+
/*
14+
|--------------------------------------------------------------------------
15+
| Registration & Login Controller
16+
|--------------------------------------------------------------------------
17+
|
18+
| This controller handles the registration of new users, as well as the
19+
| authentication of existing users. By default, this controller uses
20+
| a simple trait to add these behaviors. Why don't you explore it?
21+
|
22+
*/
23+
24+
use AuthenticatesAndRegistersUsers, ThrottlesLogins;
25+
26+
/**
27+
* Where to redirect users after login / registration.
28+
*
29+
* @var string
30+
*/
31+
protected $redirectTo = '/';
32+
33+
/**
34+
* Create a new authentication controller instance.
35+
*
36+
* @return void
37+
*/
38+
public function __construct()
39+
{
40+
$this->middleware($this->guestMiddleware(), ['except' => 'logout']);
41+
}
42+
43+
/**
44+
* Get a validator for an incoming registration request.
45+
*
46+
* @param array $data
47+
* @return \Illuminate\Contracts\Validation\Validator
48+
*/
49+
protected function validator(array $data)
50+
{
51+
return Validator::make($data, [
52+
'name' => 'required|max:255',
53+
'email' => 'required|email|max:255|unique:users',
54+
'password' => 'required|min:6|confirmed',
55+
]);
56+
}
57+
58+
/**
59+
* Create a new user instance after a valid registration.
60+
*
61+
* @param array $data
62+
* @return User
63+
*/
64+
protected function create(array $data)
65+
{
66+
return User::create([
67+
'name' => $data['name'],
68+
'email' => $data['email'],
69+
'password' => bcrypt($data['password']),
70+
]);
71+
}
72+
}

Diff for: app/Http/Controllers/Auth/PasswordController.php

+22-21
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,28 @@
55
use App\Http\Controllers\Controller;
66
use Illuminate\Foundation\Auth\ResetsPasswords;
77

8-
class PasswordController extends Controller {
9-
/*
10-
|--------------------------------------------------------------------------
11-
| Password Reset Controller
12-
|--------------------------------------------------------------------------
13-
|
14-
| This controller is responsible for handling password reset requests
15-
| and uses a simple trait to include this behavior. You're free to
16-
| explore this trait and override any methods you wish to tweak.
17-
|
18-
*/
8+
class PasswordController extends Controller
9+
{
10+
/*
11+
|--------------------------------------------------------------------------
12+
| Password Reset Controller
13+
|--------------------------------------------------------------------------
14+
|
15+
| This controller is responsible for handling password reset requests
16+
| and uses a simple trait to include this behavior. You're free to
17+
| explore this trait and override any methods you wish to tweak.
18+
|
19+
*/
1920

20-
use ResetsPasswords;
21-
22-
/**
23-
* Create a new password controller instance.
24-
*
25-
* @return void
26-
*/
27-
public function __construct() {
28-
$this->middleware('guest');
29-
}
21+
use ResetsPasswords;
3022

23+
/**
24+
* Create a new password controller instance.
25+
*
26+
* @return void
27+
*/
28+
public function __construct()
29+
{
30+
$this->middleware($this->guestMiddleware());
31+
}
3132
}

0 commit comments

Comments
 (0)