Merge pull request #10 from specialtactics/analysis-86P2nl

Apply fixes from StyleCI

app/Exceptions/ApiExceptionHandler.php

@@ -8,7 +8,6 @@
  * This class extends the Dingo API Exception Handler, and can be used to modify it's functionality, if required
  *
  * Class ApiHandler
- * @package App\Exceptions
  */
 class ApiExceptionHandler extends RestfulApiExceptionHandler
 {

app/Models/BaseModel.php

@@ -6,7 +6,7 @@
 
 class BaseModel extends RestfulModel
 {
-    /**
+    /*
      * Add your own base customisation here
      */
 }

app/Models/User.php

@@ -37,7 +37,7 @@ class User extends BaseModel implements
      * @var array
      */
     protected $fillable = [
-        'name', 'email', 'password', 'primary_role'
+        'name', 'email', 'password', 'primary_role',
     ];
 
     /**
@@ -69,7 +69,8 @@ public static function boot()
      *
      * @return array Rules
      */
-    public function getValidationRules() {
+    public function getValidationRules()
+    {
         return [
             'email' => 'email|max:255|unique:users',
             'name'  => 'required|min:3',
@@ -82,7 +83,8 @@ public function getValidationRules() {
      *
      * @return \Illuminate\Database\Eloquent\Relations\belongsTo
      */
-    public function primaryRole() {
+    public function primaryRole()
+    {
         return $this->belongsTo(Role::class, 'primary_role');
     }
 
@@ -91,14 +93,16 @@ public function primaryRole() {
      *
      * @return \Illuminate\Database\Eloquent\Relations\belongsToMany
      */
-    public function roles() {
+    public function roles()
+    {
         return $this->belongsToMany(Role::class, 'user_roles', 'user_id', 'role_id');
     }
 
     /**
      * Get all user's roles
      */
-    public function getRoles() {
+    public function getRoles()
+    {
         $allRoles = array_merge(
             [
                 $this->primaryRole->name,
@@ -114,7 +118,8 @@ public function getRoles() {
      *
      * @return bool
      */
-    public function isAdmin() {
+    public function isAdmin()
+    {
         return $this->primaryRole->name == Role::ROLE_ADMIN;
     }
 
@@ -142,7 +147,7 @@ public function getJWTCustomClaims()
                 'id' => $this->getKey(),
                 'name' => $this->name,
                 'primaryRole' => $this->primaryRole->name,
-            ]
+            ],
         ];
     }
 

app/Services/RestfulService.php

@@ -2,16 +2,13 @@
 
 namespace App\Services;
 
-use \Specialtactics\L5Api\Services\RestfulService as VendorRestfulService;
+use Specialtactics\L5Api\Services\RestfulService as VendorRestfulService;
 
 /**
  * Class RestfulService
  *
  * Your can extend the RestfulService functionality here
- *
- * @package App\Services
  */
 class RestfulService extends VendorRestfulService
 {
-
-}
+}

app/Transformers/BaseTransformer.php

@@ -6,5 +6,4 @@
 
 class BaseTransformer extends RestfulTransformer
 {
-
-}
+}

config/api.php

@@ -226,7 +226,7 @@
             'indent_style' => env('API_JSON_FORMAT_INDENT_STYLE', 'space'),
             'indent_size' => env('API_JSON_FORMAT_INDENT_SIZE', 2),
         ],
-        'caseType' => env ('API_CASE_TYPE', 'camel-case'),
+        'caseType' => env('API_CASE_TYPE', 'camel-case'),
     ],
 
 ];

database/seeds/BaseSeeder.php

@@ -2,7 +2,8 @@
 
 use Illuminate\Database\Seeder;
 
-class BaseSeeder extends Seeder {
+class BaseSeeder extends Seeder
+{
     /**
      * @var null Faker instance
      */
@@ -41,38 +42,43 @@ public function run()
      *
      * @return void
      */
-    public function runFake() {
+    public function runFake()
+    {
     }
 
     /**
      * Run seeds to be ran only on production environments
      *
      * @return void
      */
-    public function runProduction() {
+    public function runProduction()
+    {
     }
 
     /**
      * Run seeds to be ran on every environment (including production)
      *
      * @return void
      */
-    public function runAlways() {
+    public function runAlways()
+    {
     }
 
     /**
      * Run before all any seeding
      *
      * @return void
      */
-    public function before() {
+    public function before()
+    {
     }
 
     /**
      * Run after all seeding
      *
      * @return void
      */
-    public function after() {
+    public function after()
+    {
     }
 }

database/seeds/RoleTableSeeder.php

@@ -4,14 +4,16 @@
 
 class RoleTableSeeder extends BaseSeeder
 {
-    public function runAlways() {
+    public function runAlways()
+    {
         Role::firstOrCreate([
             'name' => 'admin',
             'description' => 'Administrator Users',
         ]);
     }
 
-    public function runFake() {
+    public function runFake()
+    {
         for ($i = 0; $i < 10; ++$i) {
             Role::firstOrCreate([
                 'name' => $this->faker->unique()->word(),
@@ -27,7 +29,8 @@ public function runFake() {
      * @param $count int How many roles to get
      * @return Illuminate\Support\Collection
      */
-    public static function getRandomRoles($count) {
+    public static function getRandomRoles($count)
+    {
         $roles = Role::all();
 
         $fakeRoles = [];

database/seeds/UserStorySeeder.php

@@ -5,7 +5,8 @@
 
 class UserStorySeeder extends BaseSeeder
 {
-    public function runFake() {
+    public function runFake()
+    {
         // Grab all roles for reference
         $roles = Role::all();
 
@@ -30,6 +31,5 @@ public function runFake() {
                 $user->roles()->save($fakeRolesToAssign->shift());
             }
         }
-
     }
 }

public/index.php

@@ -3,10 +3,8 @@
 /**
  * Laravel - A PHP Framework For Web Artisans
  *
- * @package  Laravel
  * @author   Taylor Otwell <[email protected]>
  */
-
 define('LARAVEL_START', microtime(true));
 
 /*

routes/api.php

@@ -17,20 +17,19 @@
     return $request->user();
 });
 
-/**
+/*
  * Welcome route - link to any public API documentation here
  */
 Route::get('/', function () {
     echo 'Welcome to our API';
 });
 
-
 /**
  * @var $api \Dingo\Api\Routing\Router
  */
 $api = app('Dingo\Api\Routing\Router');
 $api->version('v1', ['middleware' => ['api']], function ($api) {
-    /**
+    /*
      * Authentication
      */
     $api->group(['prefix' => 'auth'], function ($api) {
@@ -39,11 +38,11 @@
         });
     });
 
-    /**
+    /*
      * Authenticated routes
      */
     $api->group(['middleware' => ['api.auth']], function ($api) {
-        /**
+        /*
          * Authentication
          */
         $api->group(['prefix' => 'auth'], function ($api) {
@@ -55,7 +54,7 @@
             $api->get('/me', 'App\Http\Controllers\Auth\AuthController@getUser');
         });
 
-        /**
+        /*
          * Users
          */
         $api->group(['prefix' => 'users', 'middleware' => 'check_role:admin'], function ($api) {
@@ -67,7 +66,7 @@
             $api->delete('/{uuid}', 'App\Http\Controllers\UserController@delete');
         });
 
-        /**
+        /*
          * Roles
          */
         $api->group(['prefix' => 'roles'], function ($api) {

routes/web.php

@@ -10,4 +10,3 @@
 | contains the "web" middleware group. Now create something great!
 |
 */
-

server.php

@@ -3,10 +3,8 @@
 /**
  * Laravel - A PHP Framework For Web Artisans
  *
- * @package  Laravel
  * @author   Taylor Otwell <[email protected]>
  */
-
 $uri = urldecode(
     parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
 );