jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Update the app to Laravel 5.5

Browse source 
Squashed commit of the following:

commit 070f46bbacd91855730d467cc2806183441791ae
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Sep 4 18:06:04 2017 +0100

    Now we now how the laravel IoC conatiner works, no need to be newing class dependencies

commit 57eeacdef178532a681f774f8c6738950d40c964
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Sep 4 17:59:28 2017 +0100

    Get json test working again

commit 81c3cfc9b432241d8a4df7f1e0511a50ea4f9b90
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Sep 4 14:38:10 2017 +0100

    Can’t use RefreshDatabase yet

commit 4ba5ff724d50ca86b3fa90c7bb4e71ad9e4dad79
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Sep 4 14:10:33 2017 +0100

    Initial attempt at updating to Laravel 5.5
This commit is contained in:
Jonny Barnes 2017-09-04 19:34:39 +01:00
parent 9f3375c478
commit 3f15291d16
48 changed files with 947 additions and 587 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/Console/Kernel.php
View file

@ -32,12 +32,14 @@ class Kernel extends ConsoleKernel
}
/**
* Register the Closure based commands for the application.
* Register the commands for the application.
*
* @return void
*/
protected function commands()
{
$this->load(__DIR__.'/Commands');
require base_path('routes/console.php');
}
}

36
app/Exceptions/Handler.php
View file

@ -4,24 +4,28 @@ namespace App\Exceptions;
use Exception;
use Illuminate\Support\Facades\Route;
use Illuminate\Auth\AuthenticationException;
use Illuminate\Session\TokenMismatchException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
class Handler extends ExceptionHandler
{
/**
* A list of the exception types that should not be reported.
* A list of the exception types that are not reported.
*
* @var array
*/
protected $dontReport = [
\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,
//
];
/**
* A list of the inputs that are never flashed for validation exceptions.
*
* @var array
*/
protected $dontFlash = [
'password',
'password_confirmation',
];
/**
@ -52,20 +56,4 @@ class Handler extends ExceptionHandler
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');
}
}

4
app/Http/Controllers/Admin/NotesController.php
View file

@ -13,9 +13,9 @@ class NotesController extends Controller
{
protected $noteService;
public function __construct(NoteService $noteService = null)
public function __construct(NoteService $noteService)
{
$this->noteService = $noteService ?? new NoteService();
$this->noteService = $noteService;
}
/**

4
app/Http/Controllers/Admin/PlacesController.php
View file

@ -12,9 +12,9 @@ class PlacesController extends Controller
{
protected $placeService;
public function __construct(PlaceService $placeService = null)
public function __construct(PlaceService $placeService)
{
$this->placeService = $placeService ?? new PlaceService();
$this->placeService = $placeService;
}
/**

2
app/Http/Controllers/Auth/RegisterController.php
View file

@ -58,7 +58,7 @@ class RegisterController extends Controller
* Create a new user instance after a valid registration.
*
* @param array $data
* @return User
* @return \App\User
*/
protected function create(array $data)
{

4
app/Http/Controllers/IndieAuthController.php
View file

@ -19,9 +19,9 @@ class IndieAuthController extends Controller
* @param \IndieAuth\Client $client
* @return void
*/
public function __construct(Client $client = null)
public function __construct(Client $client)
{
$this->client = $client ?? new Client();
$this->client = $client;
}
/**

8
app/Http/Controllers/MicropubClientController.php
View file

@ -14,11 +14,11 @@ class MicropubClientController extends Controller
* Inject the dependencies.
*/
public function __construct(
IndieClient $indieClient = null,
GuzzleClient $guzzleClient = null
IndieClient $indieClient,
GuzzleClient $guzzleClient
) {
$this->guzzleClient = $guzzleClient ?? new GuzzleClient();
$this->indieClient = $indieClient ?? new IndieClient();
$this->indieClient = $indieClient;
$this->guzzleClient = $guzzleClient;
}
/**

12
app/Http/Controllers/MicropubController.php
View file

@ -34,13 +34,13 @@ class MicropubController extends Controller
* Inject the dependencies.
*/
public function __construct(
TokenService $tokenService = null,
NoteService $noteService = null,
PlaceService $placeService = null
TokenService $tokenService,
NoteService $noteService,
PlaceService $placeService
) {
$this->tokenService = $tokenService ?? new TokenService();
$this->noteService = $noteService ?? new NoteService();
$this->placeService = $placeService ?? new PlaceService();
$this->tokenService = $tokenService;
$this->noteService = $noteService;
$this->placeService = $placeService;
}
/**

8
app/Http/Controllers/TokenEndpointController.php
View file

@ -26,11 +26,11 @@ class TokenEndpointController extends Controller
* @return void
*/
public function __construct(
Client $client = null,
TokenService $tokenService = null
Client $client,
TokenService $tokenService
) {
$this->client = $client ?? new Client();
$this->tokenService = $tokenService ?? new TokenService();
$this->client = $client;
$this->tokenService = $tokenService;
}
/**

1
app/Http/Kernel.php
View file

@ -18,6 +18,7 @@ class Kernel extends HttpKernel
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\App\Http\Middleware\TrustProxies::class,
];
/**

4
app/Http/Middleware/EncryptCookies.php
View file

@ -2,9 +2,9 @@
namespace App\Http\Middleware;
use Illuminate\Cookie\Middleware\EncryptCookies as BaseEncrypter;
use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
class EncryptCookies extends BaseEncrypter
class EncryptCookies extends Middleware
{
/**
* The names of the cookies that should not be encrypted.

4
app/Http/Middleware/TrimStrings.php
View file

@ -2,9 +2,9 @@
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\TrimStrings as BaseTrimmer;
use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
class TrimStrings extends BaseTrimmer
class TrimStrings extends Middleware
{
/**
* The names of the attributes that should not be trimmed.

29
app/Http/Middleware/TrustProxies.php Normal file
View file

@ -0,0 +1,29 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Http\Request;
use Fideloper\Proxy\TrustProxies as Middleware;
class TrustProxies extends Middleware
{
/**
* The trusted proxies for this application.
*
* @var array
*/
protected $proxies;
/**
* The current proxy header mappings.
*
* @var array
*/
protected $headers = [
Request::HEADER_FORWARDED => 'FORWARDED',
Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
];
}

4
app/Http/Middleware/VerifyCsrfToken.php
View file

@ -2,9 +2,9 @@
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier;
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
class VerifyCsrfToken extends BaseVerifier
class VerifyCsrfToken extends Middleware
{
/**
* The URIs that should be excluded from CSRF verification.