Typehint middlewares

Closes #1478
This commit is contained in:
James Brooks
2016-02-11 11:35:40 +00:00
parent d812485386
commit 45843a2c89
10 changed files with 20 additions and 10 deletions

View File

@@ -12,6 +12,7 @@
namespace CachetHQ\Cachet\Http\Middleware; namespace CachetHQ\Cachet\Http\Middleware;
use Closure; use Closure;
use Illuminate\Http\Request;
use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException; use Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException;
class Acceptable class Acceptable
@@ -25,7 +26,7 @@ class Acceptable
* *
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next, $type = null) public function handle(Request $request, Closure $next, $type = null)
{ {
if (!$request->accepts($type ?: 'accept:application/json')) { if (!$request->accepts($type ?: 'accept:application/json')) {
throw new NotAcceptableHttpException(); throw new NotAcceptableHttpException();

View File

@@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Http\Middleware;
use Closure; use Closure;
use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\Guard;
use Illuminate\Http\Request;
use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\HttpException;
class Admin class Admin
@@ -44,7 +45,7 @@ class Admin
* *
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next) public function handle(Request $request, Closure $next)
{ {
if (!$this->auth->check() || ($this->auth->check() && !$this->auth->user()->isAdmin)) { if (!$this->auth->check() || ($this->auth->check() && !$this->auth->user()->isAdmin)) {
throw new HttpException(401); throw new HttpException(401);

View File

@@ -15,6 +15,7 @@ use CachetHQ\Cachet\Models\User;
use Closure; use Closure;
use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\Guard;
use Illuminate\Database\Eloquent\ModelNotFoundException; use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Http\Request;
use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\HttpException;
class ApiAuthentication class ApiAuthentication
@@ -47,7 +48,7 @@ class ApiAuthentication
* *
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next, $required = false) public function handle(Request $request, Closure $next, $required = false)
{ {
if ($this->auth->guest()) { if ($this->auth->guest()) {
if ($apiToken = $request->header('X-Cachet-Token')) { if ($apiToken = $request->header('X-Cachet-Token')) {

View File

@@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Http\Middleware;
use Closure; use Closure;
use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\Guard;
use Illuminate\Http\Request;
use Symfony\Component\HttpKernel\Exception\HttpException; use Symfony\Component\HttpKernel\Exception\HttpException;
class Authenticate class Authenticate
@@ -44,7 +45,7 @@ class Authenticate
* *
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next) public function handle(Request $request, Closure $next)
{ {
if ($this->auth->guest()) { if ($this->auth->guest()) {
throw new HttpException(401); throw new HttpException(401);

View File

@@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Http\Middleware;
use Closure; use Closure;
use Illuminate\Config\Repository; use Illuminate\Config\Repository;
use Illuminate\Http\Request;
use Jenssegers\Date\Date; use Jenssegers\Date\Date;
class Localize class Localize
@@ -52,7 +53,7 @@ class Localize
* *
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next) public function handle(Request $request, Closure $next)
{ {
$supportedLanguages = $request->getLanguages(); $supportedLanguages = $request->getLanguages();
$userLanguage = $this->config->get('app.locale'); $userLanguage = $this->config->get('app.locale');

View File

@@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Http\Middleware;
use Closure; use Closure;
use Exception; use Exception;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\Redirect;
@@ -26,7 +27,7 @@ class ReadyForUse
* *
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next) public function handle(Request $request, Closure $next)
{ {
try { try {
if (!Config::get('setting.app_name')) { if (!Config::get('setting.app_name')) {

View File

@@ -14,6 +14,7 @@ namespace CachetHQ\Cachet\Http\Middleware;
use Closure; use Closure;
use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\Guard;
use Illuminate\Http\RedirectResponse; use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
class RedirectIfAuthenticated class RedirectIfAuthenticated
{ {
@@ -44,7 +45,7 @@ class RedirectIfAuthenticated
* *
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next) public function handle(Request $request, Closure $next)
{ {
if ($this->auth->check()) { if ($this->auth->check()) {
return new RedirectResponse(route('dashboard.index')); return new RedirectResponse(route('dashboard.index'));

View File

@@ -12,6 +12,7 @@
namespace CachetHQ\Cachet\Http\Middleware; namespace CachetHQ\Cachet\Http\Middleware;
use Closure; use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\Redirect;
@@ -25,7 +26,7 @@ class SetupAlreadyCompleted
* *
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next) public function handle(Request $request, Closure $next)
{ {
if (Config::get('setting.app_name')) { if (Config::get('setting.app_name')) {
return Redirect::to('dashboard'); return Redirect::to('dashboard');

View File

@@ -12,6 +12,7 @@
namespace CachetHQ\Cachet\Http\Middleware; namespace CachetHQ\Cachet\Http\Middleware;
use Closure; use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Redirect; use Illuminate\Support\Facades\Redirect;
class SubscribersConfigured class SubscribersConfigured
@@ -24,7 +25,7 @@ class SubscribersConfigured
* *
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next) public function handle(Request $request, Closure $next)
{ {
if (!subscribers_enabled()) { if (!subscribers_enabled()) {
return Redirect::route('status-page'); return Redirect::route('status-page');

View File

@@ -13,6 +13,7 @@ namespace CachetHQ\Cachet\Http\Middleware;
use Closure; use Closure;
use Illuminate\Contracts\Config\Repository; use Illuminate\Contracts\Config\Repository;
use Illuminate\Http\Request;
class Timezone class Timezone
{ {
@@ -43,7 +44,7 @@ class Timezone
* *
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next) public function handle(Request $request, Closure $next)
{ {
if ($tz = $request->header('Time-Zone')) { if ($tz = $request->header('Time-Zone')) {
$this->config->set('cachet.timezone', $tz); $this->config->set('cachet.timezone', $tz);