diff --git a/app/Http/Controllers/RegisterController.php b/app/Http/Controllers/RegisterController.php index 6038d9b66..8a6bcdd0e 100644 --- a/app/Http/Controllers/RegisterController.php +++ b/app/Http/Controllers/RegisterController.php @@ -2,13 +2,14 @@ namespace App\Http\Controllers; +use App\User; use App\Http\Requests\User\StoreUserRequest; use App\Http\Resources\UserResource as UserResource; -use App\User; class RegisterController extends Controller { - public function register(StoreUserRequest $request) { + public function register(StoreUserRequest $request) + { $user = new User; $user->name = $request->name; $user->email = $request->email; diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 1437ed058..9c71be423 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; +use App\User; +use App\Http\Resources\UserResource; use App\Http\Requests\User\StoreUserRequest; use App\Http\Requests\User\UpdateUserRequest; -use App\Http\Resources\UserResource; -use App\User; class UserController extends Controller { @@ -77,7 +77,7 @@ public function destroy($id) User::find($id)->delete(); return response([ - 'message' => 'success delete user : ' . $user->name + 'message' => 'success delete user : '.$user->name, ]); } } diff --git a/app/Http/Requests/User/StoreUserRequest.php b/app/Http/Requests/User/StoreUserRequest.php index 496aa4550..6ebf1cb3b 100644 --- a/app/Http/Requests/User/StoreUserRequest.php +++ b/app/Http/Requests/User/StoreUserRequest.php @@ -26,7 +26,7 @@ public function rules() return [ 'name' => 'required|max:255|unique:users', 'email' => 'required|email|max:255|unique:users', - 'password' => 'required|min:8|max:255' + 'password' => 'required|min:8|max:255', ]; } } diff --git a/app/Http/Requests/User/UpdateUserRequest.php b/app/Http/Requests/User/UpdateUserRequest.php index 1c0c44743..73689c311 100644 --- a/app/Http/Requests/User/UpdateUserRequest.php +++ b/app/Http/Requests/User/UpdateUserRequest.php @@ -24,8 +24,8 @@ public function authorize() public function rules() { return [ - 'name' => 'required|max:255|unique:users,id,' . $this->id, - 'email' => 'required|email|max:255|unique:users,id,' . $this->id + 'name' => 'required|max:255|unique:users,id,'.$this->id, + 'email' => 'required|email|max:255|unique:users,id,'.$this->id, ]; } } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 16013ac10..6870976f8 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -2,10 +2,9 @@ namespace App\Providers; -use Illuminate\Support\Facades\Gate; -use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; -use Illuminate\Support\Facades\Route; use Laravel\Passport\Passport; +use Illuminate\Support\Facades\Route; +use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider; class AuthServiceProvider extends ServiceProvider { @@ -27,7 +26,7 @@ public function boot() { $this->registerPolicies(); - Route::group(['prefix' => 'api/v1'], function() { + Route::group(['prefix' => 'api/v1'], function () { Passport::routes(); }); } diff --git a/app/User.php b/app/User.php index 38c69c257..dc394c194 100644 --- a/app/User.php +++ b/app/User.php @@ -2,9 +2,9 @@ namespace App; +use Laravel\Passport\HasApiTokens; use Illuminate\Notifications\Notifiable; use Illuminate\Foundation\Auth\User as Authenticatable; -use Laravel\Passport\HasApiTokens; class User extends Authenticatable { diff --git a/public/index.php b/public/index.php index 4584cbcd6..2b5641b4c 100644 --- a/public/index.php +++ b/public/index.php @@ -1,12 +1,10 @@ */ - define('LARAVEL_START', microtime(true)); /* diff --git a/server.php b/server.php index 5fb6379e7..20bc389f0 100644 --- a/server.php +++ b/server.php @@ -1,12 +1,10 @@ */ - $uri = urldecode( parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) ); diff --git a/tests/Feature/RegisterationTest.php b/tests/Feature/RegisterationTest.php index 40b628395..e4ca85770 100644 --- a/tests/Feature/RegisterationTest.php +++ b/tests/Feature/RegisterationTest.php @@ -2,8 +2,8 @@ namespace Tests\Feature; -use Illuminate\Foundation\Testing\RefreshDatabase; use Tests\TestCase; +use Illuminate\Foundation\Testing\RefreshDatabase; class RegisterationTest extends TestCase { @@ -15,10 +15,10 @@ public function user_can_register() $response = $this->json('POST', 'api/v1/register', [ 'name' => 'John', 'email' => 'john.doe@gmail.com', - 'password' => 'secret-password' + 'password' => 'secret-password', ], [ 'Accept' => 'application/json', - 'Content-Type' => 'application/json' + 'Content-Type' => 'application/json', ]); $response->assertStatus(201); diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php index fa09494c7..aebae30da 100644 --- a/tests/Feature/UserTest.php +++ b/tests/Feature/UserTest.php @@ -3,9 +3,9 @@ namespace Tests\Feature; use App\User; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Laravel\Passport\Passport; use Tests\TestCase; +use Laravel\Passport\Passport; +use Illuminate\Foundation\Testing\RefreshDatabase; class UserTest extends TestCase { @@ -26,7 +26,7 @@ public function user_can_create_user() $this->json('POST', 'api/v1/user', [ 'name' => 'John', 'email' => 'john.doe@gmail.com', - 'password' => 'secret-password' + 'password' => 'secret-password', ], [$this->header])->assertStatus(201); $this->assertInstanceOf(User::class, $this->user); @@ -35,14 +35,14 @@ public function user_can_create_user() /** @test */ public function user_can_read_single_user() { - $this->json('GET', 'api/v1/user/' . $this->user->id, [], [$this->header])->assertJson([ - "data" => [ - "id" => $this->user->id, - "name" => $this->user->name, - "email" => $this->user->email, - "created_at" => $this->user->created_at, - "updated_at" => $this->user->updated_at, - ] + $this->json('GET', 'api/v1/user/'.$this->user->id, [], [$this->header])->assertJson([ + 'data' => [ + 'id' => $this->user->id, + 'name' => $this->user->name, + 'email' => $this->user->email, + 'created_at' => $this->user->created_at, + 'updated_at' => $this->user->updated_at, + ], ]); } @@ -57,17 +57,17 @@ public function user_can_read_all_user() /** @test */ public function user_can_update_user() { - $response = $this->json('PUT', 'api/v1/user/' . $this->user->id, [ - "name" => "another name", - "email" => "another@email.com", + $response = $this->json('PUT', 'api/v1/user/'.$this->user->id, [ + 'name' => 'another name', + 'email' => 'another@email.com', ], [$this->header])->assertJson([ - "data" => [ - "id" => $this->user->id, - "name" => "another name", - "email" => "another@email.com", - "created_at" => $this->user->created_at, - "updated_at" => $this->user->updated_at, - ] + 'data' => [ + 'id' => $this->user->id, + 'name' => 'another name', + 'email' => 'another@email.com', + 'created_at' => $this->user->created_at, + 'updated_at' => $this->user->updated_at, + ], ]); $response->assertStatus(200); @@ -76,6 +76,6 @@ public function user_can_update_user() /** @test */ public function user_can_delete_user() { - $this->json('DELETE', 'api/v1/user/' . $this->user->id, [], [$this->header])->assertStatus(200); + $this->json('DELETE', 'api/v1/user/'.$this->user->id, [], [$this->header])->assertStatus(200); } } diff --git a/tests/TestCase.php b/tests/TestCase.php index fe6b96f9c..769218454 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -9,7 +9,7 @@ abstract class TestCase extends BaseTestCase use CreatesApplication; /** - * Set up the test + * Set up the test. */ public function setUp() { @@ -21,8 +21,7 @@ public function setUp() $this->header = [ 'Accept' => 'application/json', - 'Content-Type' => 'application/json' + 'Content-Type' => 'application/json', ]; } - } diff --git a/tests/Unit/UserTest.php b/tests/Unit/UserTest.php index be2293635..ee310d46f 100644 --- a/tests/Unit/UserTest.php +++ b/tests/Unit/UserTest.php @@ -3,9 +3,9 @@ namespace Tests\Unit; use App\User; -use Illuminate\Foundation\Testing\RefreshDatabase; -use Laravel\Passport\Passport; use Tests\TestCase; +use Laravel\Passport\Passport; +use Illuminate\Foundation\Testing\RefreshDatabase; class UserTest extends TestCase { @@ -37,10 +37,10 @@ public function name_should_be_unique() $response = $this->json('POST', 'api/v1/user', [ 'name' => 'John', 'email' => 'john.doe@gmail.com', - 'password' => 'secret-password' + 'password' => 'secret-password', ], [ 'Accept' => 'application/json', - 'Content-Type' => 'application/json' + 'Content-Type' => 'application/json', ]); $response->assertStatus(201); @@ -48,10 +48,10 @@ public function name_should_be_unique() $response = $this->json('POST', 'api/v1/user', [ 'name' => 'John', 'email' => 'john.moe@gmail.com', - 'password' => 'secret-password' + 'password' => 'secret-password', ], [ 'Accept' => 'application/json', - 'Content-Type' => 'application/json' + 'Content-Type' => 'application/json', ]); $response->assertStatus(422); @@ -63,10 +63,10 @@ public function email_should_be_unique() $response = $this->json('POST', 'api/v1/user', [ 'name' => 'John Doe', 'email' => 'john@gmail.com', - 'password' => 'secret-password' + 'password' => 'secret-password', ], [ 'Accept' => 'application/json', - 'Content-Type' => 'application/json' + 'Content-Type' => 'application/json', ]); $response->assertStatus(201); @@ -74,13 +74,12 @@ public function email_should_be_unique() $response = $this->json('POST', 'api/v1/user', [ 'name' => 'John Moe', 'email' => 'john@gmail.com', - 'password' => 'secret-password' + 'password' => 'secret-password', ], [ 'Accept' => 'application/json', - 'Content-Type' => 'application/json' + 'Content-Type' => 'application/json', ]); $response->assertStatus(422); } - }