Browse Source

Added laravel 5.4 middlewares and fixed to pass all test suites

pull/1/head
Nafies Luthfi 9 years ago
parent
commit
5651e4e155
  1. 3
      app/Http/Kernel.php
  2. 18
      app/Http/Middleware/TrimStrings.php
  3. 14
      app/Http/Requests/Projects/CreateRequest.php
  4. 10
      app/Http/Requests/Users/UpdateRequest.php
  5. 16
      routes/channels.php

3
app/Http/Kernel.php

@ -15,6 +15,9 @@ class Kernel extends HttpKernel
*/
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
];
/**

18
app/Http/Middleware/TrimStrings.php

@ -0,0 +1,18 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\TrimStrings as BaseTrimmer;
class TrimStrings extends BaseTrimmer
{
/**
* The names of the attributes that should not be trimmed.
*
* @var array
*/
protected $except = [
'password',
'password_confirmation',
];
}

14
app/Http/Requests/Projects/CreateRequest.php

@ -24,13 +24,13 @@ class CreateRequest extends Request {
public function rules()
{
return [
'name' => 'required|max:50',
'proposal_date' => 'date|date_format:Y-m-d',
'proposal_value' => 'numeric',
'customer_id' => 'numeric',
'customer_name' => 'required_without:customer_id|max:60',
'customer_email' => 'required_without:customer_id|email|unique:users,email',
'description' => 'max:255',
'name' => 'required|max:50',
'proposal_date' => 'nullable|date|date_format:Y-m-d',
'proposal_value' => 'nullable|numeric',
'customer_id' => 'nullable|numeric',
'customer_name' => 'nullable|required_without:customer_id|max:60',
'customer_email' => 'nullable|required_without:customer_id|email|unique:users,email',
'description' => 'nullable|max:255',
];
}

10
app/Http/Requests/Users/UpdateRequest.php

@ -24,11 +24,11 @@ class UpdateRequest extends Request
public function rules()
{
return [
'name' => 'required|min:5',
'username' => 'required|alpha_dash|min:4|unique:users,username,' . $this->segment(2),
'email' => 'required|email|unique:users,email,' . $this->segment(2),
'role' => 'required|array',
'password' => 'required_with:password_confirmation|between:6,15|confirmed',
'name' => 'required|min:5',
'username' => 'required|alpha_dash|min:4|unique:users,username,' . $this->segment(2),
'email' => 'required|email|unique:users,email,' . $this->segment(2),
'role' => 'required|array',
'password' => 'nullable|required_with:password_confirmation|between:6,15|confirmed',
'password_confirmation' => 'required_with:password',
];
}

16
routes/channels.php

@ -0,0 +1,16 @@
<?php
/*
|--------------------------------------------------------------------------
| Broadcast Channels
|--------------------------------------------------------------------------
|
| Here you may register all of the event broadcasting channels that your
| application supports. The given channel authorization callbacks are
| used to check if an authenticated user can listen to the channel.
|
*/
Broadcast::channel('App.User.{id}', function ($user, $id) {
return (int) $user->id === (int) $id;
});
Loading…
Cancel
Save