Skip to content

Directive 'asp_tags' is no longer available in PHP #3952

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 232 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
232 commits
Select commit Hold shift + click to select a range
84c7435
Updated for 5.3
GrahamCampbell Dec 27, 2015
6cccc9c
Merge branch 'master' into develop
GrahamCampbell Jan 14, 2016
e18a57c
Merge branch 'master' into develop
GrahamCampbell Jan 29, 2016
6654309
Merge branch 'master' into develop
GrahamCampbell Feb 5, 2016
8aa5af7
Merge branch 'master' into develop
taylorotwell Mar 7, 2016
703197e
Allow passing multiple gaurds to the auth middleware
JosephSilber Mar 15, 2016
4f4d378
Merge pull request #3685 from JosephSilber/multi-auth
taylorotwell Mar 21, 2016
f7d05cb
Set the default driver from the Authenticate middleware
JosephSilber Mar 28, 2016
b1b524d
Merge pull request #3718 from JosephSilber/default-auth-driver
taylorotwell Mar 28, 2016
0909dc2
Merge branch 'master' into develop
GrahamCampbell Mar 30, 2016
020bf23
Merge branch 'master' into develop
GrahamCampbell Apr 27, 2016
e3d2b68
Merge branch 'master' into develop
taylorotwell Apr 27, 2016
749528d
remove unneeded trait
taylorotwell Apr 28, 2016
da662e4
working on broadcasting
taylorotwell Apr 30, 2016
9dc2d60
Add config for new Memcached features
tomcastleman Apr 29, 2016
3173f1c
Merge pull request #3768 from tomcastleman/patch-1
taylorotwell May 1, 2016
b358fe4
spacing
taylorotwell May 1, 2016
d68d4dc
adds configuration for session cache store
tomcastleman May 2, 2016
81aea74
Merge branch 'master' into develop
taylorotwell May 4, 2016
26ef471
Merge branch 'feature/session-store-config' of https://github.com/tom…
taylorotwell May 4, 2016
a97b9e0
fix comment
taylorotwell May 4, 2016
59f2d49
stub out commands method in console kernel
taylorotwell May 9, 2016
f237656
Enabled MySQL "strict" mode by default
Adam14Four May 10, 2016
6f4c333
Merge pull request #3777 from Adam14Four/develop
taylorotwell May 11, 2016
8fc0df1
Add "sslmode" setting for PostgreSQL connection
scrubmx May 12, 2016
37ce8b5
Merge pull request #3778 from scrubmx/patch-3
taylorotwell May 12, 2016
e7ff2bf
update method
taylorotwell May 13, 2016
332731f
Added the new bindings middleware
GrahamCampbell May 13, 2016
728151f
Applied fixes from StyleCI
GrahamCampbell May 13, 2016
e98a270
Merge pull request #3780 from laravel/analysis-8LZ3WJ
taylorotwell May 13, 2016
6dfc022
Make the Authenticate middleware throw an AuthenticationException
JosephSilber May 22, 2016
b069ff0
update exception handler with AuthenticationException
JosephSilber May 22, 2016
d26314d
Move the full response logic into the unauthenticated method
JosephSilber May 25, 2016
2ed45eb
Merge pull request #3781 from laravel/bindings
taylorotwell May 25, 2016
c332ad9
fix typo
taylorotwell May 25, 2016
3ddaf3f
Merge pull request #3783 from JosephSilber/authenticate
taylorotwell May 26, 2016
cedde2d
cleaning up
taylorotwell May 26, 2016
9450525
Use the Authenticate middleware from core
JosephSilber May 26, 2016
233c93f
Merge pull request #3787 from JosephSilber/core-authenticate
taylorotwell May 26, 2016
19f8537
fix namespace
taylorotwell May 26, 2016
4f01815
Update can middleware to new namespace
JosephSilber May 30, 2016
f95f384
Merge pull request #3791 from JosephSilber/authorize-namespace
taylorotwell May 30, 2016
b6bd185
Merge branch 'master' into develop
GrahamCampbell May 30, 2016
edc5cee
Merge branch 'master' into develop
taylorotwell Jun 4, 2016
e5dfb05
message updates
taylorotwell Jun 7, 2016
07c9596
Use proper PDO fetch style
vlakoff Jun 19, 2016
bd358bd
Merge pull request #3815 from vlakoff/pdo-fetch-style
taylorotwell Jun 19, 2016
8e7672f
Return JSON for unauthenticated AJAX requests
JosephSilber Jun 22, 2016
51addd6
Merge pull request #3817 from JosephSilber/unauthenticated-json
taylorotwell Jun 22, 2016
b787586
expects json
taylorotwell Jun 22, 2016
737b5eb
stub notifications
taylorotwell Jun 22, 2016
9575714
Add notifiable trait to default user.
taylorotwell Jun 30, 2016
34eb11f
[5.3] Password broker would always use notifications::email view.
crynobone Jun 30, 2016
c0898cc
Merge pull request #3823 from crynobone/feature/notification
taylorotwell Jun 30, 2016
d72e3f3
fix conflicts
taylorotwell Jul 9, 2016
9ecfa9c
specify middleware directly
taylorotwell Jul 10, 2016
4a44a0d
no longer need this trait out of the box
taylorotwell Jul 10, 2016
e169620
consistency
taylorotwell Jul 10, 2016
9c817e7
use new auth features
taylorotwell Jul 10, 2016
b5a8c27
add files
taylorotwell Jul 10, 2016
173e0ef
add variables file
taylorotwell Jul 10, 2016
677c1bd
import class
taylorotwell Jul 10, 2016
15e1abd
tweak package file
taylorotwell Jul 10, 2016
05d0058
elixir version
taylorotwell Jul 10, 2016
eb24741
Default JS file.
taylorotwell Jul 11, 2016
ebc1be0
update color
taylorotwell Jul 11, 2016
2b05ce3
Just use facades in service providers.
taylorotwell Jul 11, 2016
7ec26ce
Tweak location of routes files.
taylorotwell Jul 14, 2016
5183501
Applied fixes from StyleCI
taylorotwell Jul 14, 2016
db5d228
Merge pull request #3831 from laravel/analysis-XW6KOy
taylorotwell Jul 14, 2016
e7a03b4
Stop aliasing a bunch of classes by default.
taylorotwell Jul 14, 2016
4507429
Merge branch 'master' into develop
GrahamCampbell Jul 14, 2016
dc3d82f
Add aliases.
taylorotwell Jul 14, 2016
5ccd086
Remove aliases.
taylorotwell Jul 14, 2016
203d79f
Use rollup by default instead of web pack.
taylorotwell Jul 15, 2016
cdbbe86
Jeffrey says stay with web pack.
taylorotwell Jul 15, 2016
76f9ea7
[5.3] Remove register() from BroadcastServiceProvider
KennedyTedesco Jul 16, 2016
517d8d4
Remove web config by default.
taylorotwell Jul 16, 2016
e34ac8c
Merge pull request #3833 from KennedyTedesco/5.3-provider
taylorotwell Jul 16, 2016
93cdacf
remove word
taylorotwell Jul 18, 2016
1cc411d
remove directories. let them be jit created.
taylorotwell Jul 20, 2016
7337515
Merge remote-tracking branch 'origin/develop' into develop
taylorotwell Jul 20, 2016
ea52a96
Remove mandrill as a default configuration since it's fallen out of p…
taylorotwell Jul 21, 2016
3cc0388
Use expire for consistency.
taylorotwell Jul 22, 2016
fd569a3
Name this option "retry_after" for clarity.
taylorotwell Jul 22, 2016
3f19733
bootstrap vue in app.js
taylorotwell Jul 23, 2016
0699994
add files
taylorotwell Jul 23, 2016
eb289b4
tweak js bootstrapping
taylorotwell Jul 23, 2016
e9fe020
sample js component
taylorotwell Jul 23, 2016
3f5da4f
Include the font in the Sass.
taylorotwell Jul 23, 2016
592b7a2
add compiled assets
taylorotwell Jul 23, 2016
24766d4
redirect to home if authed
taylorotwell Jul 23, 2016
f41a400
Tweak a few variables.
taylorotwell Jul 23, 2016
abe35a0
working on sass
taylorotwell Jul 23, 2016
467e00d
working on sass
taylorotwell Jul 23, 2016
e5cb0a3
working on sass
taylorotwell Jul 23, 2016
6f2541f
new welcome page
taylorotwell Jul 23, 2016
1cbbf41
Remove some unneeded variables.
taylorotwell Jul 24, 2016
cfb5a68
work on default styling
taylorotwell Jul 24, 2016
40ae681
tweak variables
taylorotwell Jul 24, 2016
c309b4f
add forge to links
taylorotwell Jul 24, 2016
ff70fac
Fix test.
taylorotwell Jul 24, 2016
7bb44a2
Tweak variables.
taylorotwell Jul 25, 2016
eedac02
Slim down examples.
taylorotwell Jul 25, 2016
8f66f4b
Tweak default files.
taylorotwell Jul 25, 2016
e2b297b
Tweak marketing text.
taylorotwell Jul 25, 2016
9659e8d
Example component.
taylorotwell Jul 25, 2016
4cc3022
Tweak stub width.
taylorotwell Jul 25, 2016
41e2efb
update package json
taylorotwell Jul 25, 2016
0cfc40e
Make use of Bootstrap 3.3.7 with jQuery 3 support
Jul 26, 2016
9cce61b
Merge pull request #3839 from PascaleBeier/develop
taylorotwell Jul 26, 2016
2a8c38a
compile assets
taylorotwell Jul 26, 2016
0203d5d
Merge branch 'master' into develop
GrahamCampbell Jul 28, 2016
813c941
fix wrong spelling
ac1982 Jul 30, 2016
288e361
Remove removed routes file
spyric Jul 30, 2016
42930ed
sort by name
mayoz Jul 30, 2016
9f93004
Merge pull request #3842 from spyric/develop
GrahamCampbell Jul 30, 2016
4c6abcd
Merge pull request #3845 from mayoz/patch-3
taylorotwell Aug 1, 2016
133bd9d
Merge pull request #3841 from ac1982/patch-1
taylorotwell Aug 1, 2016
ca7c973
fix length
taylorotwell Aug 1, 2016
7f24b91
working on landing page
taylorotwell Aug 1, 2016
bcf3935
Wrap .env.example variable values in quotes
philbates35 Aug 1, 2016
66946dc
Removes padding on html/body to kill the scrollbar
jackmcdade Aug 3, 2016
b7d684e
Compliance with commonly used phpmd rules
Aug 3, 2016
ab453a7
Add default address in mail config.
taylorotwell Aug 3, 2016
d0f90f9
Merge branch 'master' into develop
taylorotwell Aug 4, 2016
f89a244
Applied fixes from StyleCI
taylorotwell Aug 4, 2016
dfb33e2
Merge pull request #3857 from laravel/analysis-qMe1Y4
taylorotwell Aug 4, 2016
5d0ecde
get rid of space
taylorotwell Aug 4, 2016
054bb04
resolve conflicts
taylorotwell Aug 4, 2016
3b2f29e
Merge pull request #3853 from jackmcdade/develop
taylorotwell Aug 4, 2016
196c267
resolve conflicts and clean up file
taylorotwell Aug 4, 2016
3807819
Applied fixes from StyleCI
taylorotwell Aug 4, 2016
a39c52c
remove test code
taylorotwell Aug 4, 2016
6709c69
Merge pull request #3858 from laravel/analysis-XV0reP
taylorotwell Aug 4, 2016
64ae3d5
fix cons
taylorotwell Aug 4, 2016
88e55f4
Revert "Removes padding on html/body to kill the scrollbar"
taylorotwell Aug 4, 2016
6e91cc6
Merge pull request #3861 from laravel/revert-3853-develop
taylorotwell Aug 4, 2016
4c271f0
Removes padding on html/body to kill the scrollbar and top right link…
Aug 4, 2016
4c2e1ed
working on welcome page
taylorotwell Aug 5, 2016
89a4343
fix cons
taylorotwell Aug 5, 2016
de80aad
Merge pull request #3854 from jhoff/phpmd_compliance
taylorotwell Aug 5, 2016
41c0eec
tweak broadcast service provider
taylorotwell Aug 5, 2016
5fad376
Merge remote-tracking branch 'origin/develop' into develop
taylorotwell Aug 5, 2016
9df814e
Tweak a few broadcasting configurations.
taylorotwell Aug 5, 2016
30a9cbf
Applied fixes from StyleCI
taylorotwell Aug 5, 2016
1426bdd
Merge pull request #3864 from laravel/analysis-8KgoeQ
taylorotwell Aug 5, 2016
51113bd
Default broadcasting driver to null.
taylorotwell Aug 5, 2016
727eda7
fix missing word in docblock
svenluijten Aug 6, 2016
5833718
Vue is a library, not a framework
svenluijten Aug 7, 2016
1b126d0
Merge pull request #3865 from svenluijten/javascript-docblock-missing…
taylorotwell Aug 7, 2016
e6cc603
add notification facade
taylorotwell Aug 8, 2016
9c02782
simplify csrf token retrieval. remove package.
taylorotwell Aug 10, 2016
54d3f32
change header
taylorotwell Aug 10, 2016
24d0102
recompile
taylorotwell Aug 10, 2016
7b1ab65
Delete app/Http/Requests directory
JosephSilber Aug 10, 2016
7e41c61
rename method
taylorotwell Aug 10, 2016
530c818
Use double quotes; Remove un-used fonts
tillkruss Aug 10, 2016
b69e85c
Merge pull request #3868 from tillkruss/patch-3
taylorotwell Aug 11, 2016
8a9f89d
fix wording
taylorotwell Aug 11, 2016
47c0b45
Merge remote-tracking branch 'origin/develop' into develop
taylorotwell Aug 11, 2016
655dbad
tweaking default setup
taylorotwell Aug 11, 2016
43c2d8e
tweak variable
taylorotwell Aug 11, 2016
e49c8ae
Merge pull request #3867 from JosephSilber/remove-requests
taylorotwell Aug 12, 2016
788a648
match order to website
taylorotwell Aug 12, 2016
afb3e1c
Use arrow functions instead of functions
diogoazevedos Aug 12, 2016
6d21a74
Use const instead of var in require
diogoazevedos Aug 12, 2016
7bb7ade
Merge pull request #3870 from diogoazevedos/arrow-functions
taylorotwell Aug 12, 2016
e79c0d2
Merge pull request #3871 from diogoazevedos/use-const
taylorotwell Aug 12, 2016
4ee5172
Use const instead of var in Vue instance
donnes Aug 12, 2016
583fd4e
Merge pull request #3872 from donnes/patch-1
taylorotwell Aug 12, 2016
3415bea
GitIgnore PHPStorm's config directory from
balping Aug 14, 2016
40e9d60
Merge pull request #3877 from balping/patch-1
taylorotwell Aug 14, 2016
f111704
Fix order
tillkruss Aug 14, 2016
86676aa
Merge pull request #3878 from tillkruss/patch-4
taylorotwell Aug 14, 2016
97fde5b
Update email address
BrandonSurowiec Aug 16, 2016
6f055a9
Update server.php email address
BrandonSurowiec Aug 16, 2016
9fb8af1
Merge pull request #3881 from BrandonSurowiec/patch-4
taylorotwell Aug 16, 2016
57b57bf
Merge pull request #3880 from BrandonSurowiec/patch-2
taylorotwell Aug 16, 2016
c7a1c7d
Ship a console routes file by default. 🌊
taylorotwell Aug 17, 2016
7571f2b
Use module name instead of path
adriaanzon Aug 18, 2016
ffd7ad9
Revert recent changes to env file.
taylorotwell Aug 19, 2016
e596cef
Merge pull request #3889 from adriaanzon/patch-1
taylorotwell Aug 19, 2016
8998cf5
Add BROADCAST_DRIVER on .env
socieboy Aug 19, 2016
d84c499
Merge pull request #3891 from socieboy/develop
taylorotwell Aug 19, 2016
2689538
fix order
taylorotwell Aug 19, 2016
c0b9523
Remove defalut auth:api middleware
themsaid Aug 20, 2016
aed59d9
remove brackets
themsaid Aug 20, 2016
b041a03
Use precomputed hash instead of bcrypt in ModelFactory
adamwathan Aug 21, 2016
792dcd4
Compute hash only once and store in static variable
adamwathan Aug 21, 2016
3435710
Use implicit null instead of explicit
adamwathan Aug 21, 2016
a2c075b
Merge pull request #3894 from adamwathan/53-precomputed-hash
taylorotwell Aug 21, 2016
cf0875a
move middleware to route
taylorotwell Aug 21, 2016
b05598b
Merge remote-tracking branch 'origin/develop' into develop
taylorotwell Aug 21, 2016
a14dc56
Fix order
heruputra Aug 22, 2016
e959c22
Merge pull request #3899 from heruputra/patch-1
taylorotwell Aug 22, 2016
6f68519
fix conflicts
taylorotwell Aug 23, 2016
99de565
change composer file
taylorotwell Aug 23, 2016
f5dfa20
fix typo
taylorotwell Aug 23, 2016
82357a5
Remove extra whitespace in config/cache.php
scrubmx Aug 24, 2016
362383d
Merge pull request #3904 from scrubmx/patch-5
taylorotwell Aug 24, 2016
9c7fad2
Change .env PUSHER_* params order
greabock Aug 24, 2016
de81dd3
Merge pull request #3906 from greabock/patch-1
taylorotwell Aug 24, 2016
f19c16c
Sorted the Application Service Providers alphabetically
Rkallenkoot Aug 25, 2016
63e0cdc
Merge pull request #3909 from Rkallenkoot/patch-1
taylorotwell Aug 26, 2016
366f8ab
Add web.config
restoreddev Aug 26, 2016
1cb19ac
Merge pull request #3910 from restored18/master
taylorotwell Aug 26, 2016
8fc2e7e
Add fallback sans-serif font in case the custom font fails to load
ngyikp Aug 28, 2016
330a9aa
Adding description for default inspire command
dersvenhesse Aug 28, 2016
d7fb66c
Merge pull request #3914 from dersvenhesse/patch-1
taylorotwell Aug 28, 2016
07360db
Merge pull request #3913 from ngyikp/master
taylorotwell Aug 28, 2016
d09efa2
remove irrelevant comment
taylorotwell Sep 1, 2016
537b628
Add missing translation for `mimetypes` validation
Sep 1, 2016
c92c724
Merge pull request #3921 from jackmu95/add-mimetypes-translation
taylorotwell Sep 1, 2016
41b0560
Environment configuration for HTTPS only cookie
jasonmccreary Sep 2, 2016
dd1e64a
Changing order
fernandobandeira Sep 2, 2016
a70dd56
Merge pull request #3923 from fernandobandeira/patch-1
taylorotwell Sep 2, 2016
a4b53b3
Merge pull request #3922 from jasonmccreary/https-only-cookie-env
taylorotwell Sep 2, 2016
1562407
add langiage line for uploaded validation rule
themsaid Sep 2, 2016
7da6edf
working on message
taylorotwell Sep 2, 2016
78f4e85
Map API routes before Web routes
bryceadams Sep 5, 2016
7f06559
Merge pull request #3929 from bryceadams/patch-map-api-before-web
taylorotwell Sep 5, 2016
30d0e2d
fix comments
pakogn Sep 6, 2016
31fce5c
change wording
taylorotwell Sep 7, 2016
d829d75
Rename variables.scss to _variables.scss
ramondejonge Sep 14, 2016
93d92bb
Merge pull request #3942 from ramondj/patch-1
taylorotwell Sep 14, 2016
65e73f3
Merge branch 'develop'
taylorotwell Sep 14, 2016
49a4810
different default name
taylorotwell Sep 14, 2016
dcf9718
Add unique modifier
krienow Sep 20, 2016
f777e89
Merge pull request #3951 from krienow/patch-d57d11
taylorotwell Sep 20, 2016
a80e5bc
add bus alias
taylorotwell Sep 20, 2016
4eeec60
Merge remote-tracking branch 'origin/master'
taylorotwell Sep 20, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ DB_DATABASE=homestead
DB_USERNAME=homestead
DB_PASSWORD=secret

BROADCAST_DRIVER=log
CACHE_DRIVER=file
SESSION_DRIVER=file
QUEUE_DRIVER=sync
Expand All @@ -25,3 +26,7 @@ MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null

PUSHER_APP_ID=
PUSHER_KEY=
PUSHER_SECRET=
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/vendor
/node_modules
/public/storage
Homestead.yaml
/vendor
/.idea
Homestead.json
Homestead.yaml
.env
33 changes: 0 additions & 33 deletions app/Console/Commands/Inspire.php

This file was deleted.

12 changes: 11 additions & 1 deletion app/Console/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class Kernel extends ConsoleKernel
* @var array
*/
protected $commands = [
// Commands\Inspire::class,
//
];

/**
Expand All @@ -27,4 +27,14 @@ protected function schedule(Schedule $schedule)
// $schedule->command('inspire')
// ->hourly();
}

/**
* Register the Closure based commands for the application.
*
* @return void
*/
protected function commands()
{
require base_path('routes/console.php');
}
}
8 changes: 0 additions & 8 deletions app/Events/Event.php

This file was deleted.

45 changes: 29 additions & 16 deletions app/Exceptions/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,7 @@
namespace App\Exceptions;

use Exception;
use Illuminate\Session\TokenMismatchException;
use Illuminate\Validation\ValidationException;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Symfony\Component\HttpKernel\Exception\HttpException;
use Illuminate\Auth\AuthenticationException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;

class Handler extends ExceptionHandler
Expand All @@ -18,35 +14,52 @@ class Handler extends ExceptionHandler
* @var array
*/
protected $dontReport = [
AuthorizationException::class,
HttpException::class,
ModelNotFoundException::class,
TokenMismatchException::class,
ValidationException::class,
\Illuminate\Auth\AuthenticationException::class,
\Illuminate\Auth\Access\AuthorizationException::class,
\Symfony\Component\HttpKernel\Exception\HttpException::class,
\Illuminate\Database\Eloquent\ModelNotFoundException::class,
\Illuminate\Session\TokenMismatchException::class,
\Illuminate\Validation\ValidationException::class,
];

/**
* Report or log an exception.
*
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
*
* @param \Exception $e
* @param \Exception $exception
* @return void
*/
public function report(Exception $e)
public function report(Exception $exception)
{
parent::report($e);
parent::report($exception);
}

/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $e
* @param \Exception $exception
* @return \Illuminate\Http\Response
*/
public function render($request, Exception $e)
public function render($request, Exception $exception)
{
return parent::render($request, $e);
return parent::render($request, $exception);
}

/**
* Convert an authentication exception into an unauthenticated response.
*
* @param \Illuminate\Http\Request $request
* @param \Illuminate\Auth\AuthenticationException $exception
* @return \Illuminate\Http\Response
*/
protected function unauthenticated($request, AuthenticationException $exception)
{
if ($request->expectsJson()) {
return response()->json(['error' => 'Unauthenticated.'], 401);
}

return redirect()->guest('login');
}
}
32 changes: 32 additions & 0 deletions app/Http/Controllers/Auth/ForgotPasswordController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<?php

namespace App\Http\Controllers\Auth;

use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails;

class ForgotPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
| Password Reset Controller
|--------------------------------------------------------------------------
|
| This controller is responsible for handling password reset emails and
| includes a trait which assists in sending these notifications from
| your application to your users. Feel free to explore this trait.
|
*/

use SendsPasswordResetEmails;

/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
}
39 changes: 39 additions & 0 deletions app/Http/Controllers/Auth/LoginController.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?php

namespace App\Http\Controllers\Auth;

use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\AuthenticatesUsers;

class LoginController extends Controller
{
/*
|--------------------------------------------------------------------------
| Login Controller
|--------------------------------------------------------------------------
|
| This controller handles authenticating users for the application and
| redirecting them to your home screen. The controller uses a trait
| to conveniently provide its functionality to your applications.
|
*/

use AuthenticatesUsers;

/**
* Where to redirect users after login.
*
* @var string
*/
protected $redirectTo = '/home';

/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest', ['except' => 'logout']);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,39 +5,38 @@
use App\User;
use Validator;
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ThrottlesLogins;
use Illuminate\Foundation\Auth\AuthenticatesAndRegistersUsers;
use Illuminate\Foundation\Auth\RegistersUsers;

class AuthController extends Controller
class RegisterController extends Controller
{
/*
|--------------------------------------------------------------------------
| Registration & Login Controller
| Register Controller
|--------------------------------------------------------------------------
|
| This controller handles the registration of new users, as well as the
| authentication of existing users. By default, this controller uses
| a simple trait to add these behaviors. Why don't you explore it?
| This controller handles the registration of new users as well as their
| validation and creation. By default this controller uses a trait to
| provide this functionality without requiring any additional code.
|
*/

use AuthenticatesAndRegistersUsers, ThrottlesLogins;
use RegistersUsers;

/**
* Where to redirect users after login / registration.
*
* @var string
*/
protected $redirectTo = '/';
protected $redirectTo = '/home';

/**
* Create a new authentication controller instance.
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware($this->guestMiddleware(), ['except' => 'logout']);
$this->middleware('guest');
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\ResetsPasswords;

class PasswordController extends Controller
class ResetPasswordController extends Controller
{
/*
|--------------------------------------------------------------------------
Expand All @@ -21,12 +21,12 @@ class PasswordController extends Controller
use ResetsPasswords;

/**
* Create a new password controller instance.
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware($this->guestMiddleware());
$this->middleware('guest');
}
}
3 changes: 1 addition & 2 deletions app/Http/Controllers/Controller.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
use Illuminate\Routing\Controller as BaseController;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Auth\Access\AuthorizesResources;

class Controller extends BaseController
{
use AuthorizesRequests, AuthorizesResources, DispatchesJobs, ValidatesRequests;
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
}
7 changes: 5 additions & 2 deletions app/Http/Kernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@ class Kernel extends HttpKernel
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
],

'api' => [
'throttle:60,1',
'bindings',
],
];

Expand All @@ -44,9 +46,10 @@ class Kernel extends HttpKernel
* @var array
*/
protected $routeMiddleware = [
'auth' => \App\Http\Middleware\Authenticate::class,
'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'can' => \Illuminate\Foundation\Http\Middleware\Authorize::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
];
Expand Down
30 changes: 0 additions & 30 deletions app/Http/Middleware/Authenticate.php

This file was deleted.

2 changes: 1 addition & 1 deletion app/Http/Middleware/RedirectIfAuthenticated.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class RedirectIfAuthenticated
public function handle($request, Closure $next, $guard = null)
{
if (Auth::guard($guard)->check()) {
return redirect('/');
return redirect('/home');
}

return $next($request);
Expand Down
Loading