Merge pull request #359 from viralsolani/analysis-zGj4LA

Apply fixes from StyleCI

config/app.php

@@ -214,51 +214,51 @@ return [
     */
 
     'aliases' => [
-        'App' => Illuminate\Support\Facades\App::class,
-        'Artisan' => Illuminate\Support\Facades\Artisan::class,
-        'Auth' => Illuminate\Support\Facades\Auth::class,
-        'Blade' => Illuminate\Support\Facades\Blade::class,
-        'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
-        'Bus' => Illuminate\Support\Facades\Bus::class,
-        'Cache' => Illuminate\Support\Facades\Cache::class,
-        'Config' => Illuminate\Support\Facades\Config::class,
-        'Cookie' => Illuminate\Support\Facades\Cookie::class,
-        'Crypt' => Illuminate\Support\Facades\Crypt::class,
-        'DB' => Illuminate\Support\Facades\DB::class,
-        'Eloquent' => Illuminate\Database\Eloquent\Model::class,
-        'Event' => Illuminate\Support\Facades\Event::class,
-        'File' => Illuminate\Support\Facades\File::class,
-        'Gate' => Illuminate\Support\Facades\Gate::class,
-        'Hash' => Illuminate\Support\Facades\Hash::class,
-        'Lang' => Illuminate\Support\Facades\Lang::class,
-        'Log' => Illuminate\Support\Facades\Log::class,
-        'Mail' => Illuminate\Support\Facades\Mail::class,
+        'App'          => Illuminate\Support\Facades\App::class,
+        'Artisan'      => Illuminate\Support\Facades\Artisan::class,
+        'Auth'         => Illuminate\Support\Facades\Auth::class,
+        'Blade'        => Illuminate\Support\Facades\Blade::class,
+        'Broadcast'    => Illuminate\Support\Facades\Broadcast::class,
+        'Bus'          => Illuminate\Support\Facades\Bus::class,
+        'Cache'        => Illuminate\Support\Facades\Cache::class,
+        'Config'       => Illuminate\Support\Facades\Config::class,
+        'Cookie'       => Illuminate\Support\Facades\Cookie::class,
+        'Crypt'        => Illuminate\Support\Facades\Crypt::class,
+        'DB'           => Illuminate\Support\Facades\DB::class,
+        'Eloquent'     => Illuminate\Database\Eloquent\Model::class,
+        'Event'        => Illuminate\Support\Facades\Event::class,
+        'File'         => Illuminate\Support\Facades\File::class,
+        'Gate'         => Illuminate\Support\Facades\Gate::class,
+        'Hash'         => Illuminate\Support\Facades\Hash::class,
+        'Lang'         => Illuminate\Support\Facades\Lang::class,
+        'Log'          => Illuminate\Support\Facades\Log::class,
+        'Mail'         => Illuminate\Support\Facades\Mail::class,
         'Notification' => Illuminate\Support\Facades\Notification::class,
-        'Password' => Illuminate\Support\Facades\Password::class,
-        'Queue' => Illuminate\Support\Facades\Queue::class,
-        'Redirect' => Illuminate\Support\Facades\Redirect::class,
-        'Redis' => Illuminate\Support\Facades\Redis::class,
-        'Request' => Illuminate\Support\Facades\Request::class,
-        'Response' => Illuminate\Support\Facades\Response::class,
-        'Route' => Illuminate\Support\Facades\Route::class,
-        'Schema' => Illuminate\Support\Facades\Schema::class,
-        'Session' => Illuminate\Support\Facades\Session::class,
-        'Storage' => Illuminate\Support\Facades\Storage::class,
-        'URL' => Illuminate\Support\Facades\URL::class,
-        'Validator' => Illuminate\Support\Facades\Validator::class,
-        'View' => Illuminate\Support\Facades\View::class,
+        'Password'     => Illuminate\Support\Facades\Password::class,
+        'Queue'        => Illuminate\Support\Facades\Queue::class,
+        'Redirect'     => Illuminate\Support\Facades\Redirect::class,
+        'Redis'        => Illuminate\Support\Facades\Redis::class,
+        'Request'      => Illuminate\Support\Facades\Request::class,
+        'Response'     => Illuminate\Support\Facades\Response::class,
+        'Route'        => Illuminate\Support\Facades\Route::class,
+        'Schema'       => Illuminate\Support\Facades\Schema::class,
+        'Session'      => Illuminate\Support\Facades\Session::class,
+        'Storage'      => Illuminate\Support\Facades\Storage::class,
+        'URL'          => Illuminate\Support\Facades\URL::class,
+        'Validator'    => Illuminate\Support\Facades\Validator::class,
+        'View'         => Illuminate\Support\Facades\View::class,
 
         /*
          * Third Party Aliases
          */
-        'Active' => HieuLe\Active\Facades\Active::class,
+        'Active'      => HieuLe\Active\Facades\Active::class,
         'Breadcrumbs' => DaveJamesMiller\Breadcrumbs\Facade::class,
-        'Captcha' => Arcanedev\NoCaptcha\Facades\NoCaptcha::class,
-        'Form' => Collective\Html\FormFacade::class,
-        'Gravatar' => Creativeorange\Gravatar\Facades\Gravatar::class,
-        'Html' => Collective\Html\HtmlFacade::class,
-        'Socialite' => Laravel\Socialite\Facades\Socialite::class,
-        'JWTAuth' => Tymon\JWTAuth\Facades\JWTAuth::class,
+        'Captcha'     => Arcanedev\NoCaptcha\Facades\NoCaptcha::class,
+        'Form'        => Collective\Html\FormFacade::class,
+        'Gravatar'    => Creativeorange\Gravatar\Facades\Gravatar::class,
+        'Html'        => Collective\Html\HtmlFacade::class,
+        'Socialite'   => Laravel\Socialite\Facades\Socialite::class,
+        'JWTAuth'     => Tymon\JWTAuth\Facades\JWTAuth::class,
         //'Datatables' => Yajra\DataTables\Facades\DataTables::class
     ],
 ];

tests/Feature/Api/V1/PageTest.php

@@ -19,7 +19,7 @@ class PageTest extends TestCase
         $this->user = User::find(1);
 
         $this->token = JWTAuth::fromUser($this->user);
-        $this->headers = ['Authorization' => 'Bearer ' . $this->token];
+        $this->headers = ['Authorization' => 'Bearer '.$this->token];
     }
 
     /**
@@ -66,16 +66,16 @@ class PageTest extends TestCase
     {
         $page = create(Page::class);
         $payload = [];
-        $response = $this->json('GET', '/api/v1/pages/' . $page->id, $payload, $this->headers);
+        $response = $this->json('GET', '/api/v1/pages/'.$page->id, $payload, $this->headers);
         $response
             ->assertStatus(200)
             ->assertJson([
                 'data' => [
-                    'id' => $page->id,
-                    'title' => $page->title,
+                    'id'           => $page->id,
+                    'title'        => $page->title,
                     'status_label' => $page->status_label,
-                    'status' => ($page->isActive()) ? 'Active' : 'InActive',
-                    'created_by' => $page->created_by,
+                    'status'       => ($page->isActive()) ? 'Active' : 'InActive',
+                    'created_by'   => $page->created_by,
                 ],
             ]);
     }
@@ -91,13 +91,13 @@ class PageTest extends TestCase
     {
         $page = make(Page::class);
         $payload = [
-            'title' => $page->title,
-            'description' => $page->description,
+            'title'           => $page->title,
+            'description'     => $page->description,
             'cannonical_link' => $page->cannonical_link,
-            'seo_title' => 'some tittle',
-            'seo_keyword' => 'some keywords',
+            'seo_title'       => 'some tittle',
+            'seo_keyword'     => 'some keywords',
             'seo_description' => '<p>&nbsp;</p>↵<h1>SEO Description</h1>↵<p>some seco desctription</p>↵<p>askdsaj;ldsjfd</p>',
-            'status' => '1',
+            'status'          => '1',
         ];
         $response = '';
         $response = $this->json('PUT', '/api/v1/pages/1', $payload, $this->headers);
@@ -105,10 +105,10 @@ class PageTest extends TestCase
         $response->assertStatus(200);
         $response->assertJson([
             'data' => [
-                'title' => $page->title,
+                'title'        => $page->title,
                 'status_label' => $page->status_label,
-                'status' => ($page->isActive()) ? 'Active' : 'InActive',
-                'created_by' => '' . $this->user->id,
+                'status'       => ($page->isActive()) ? 'Active' : 'InActive',
+                'created_by'   => ''.$this->user->id,
             ],
         ]);
     }
@@ -124,24 +124,24 @@ class PageTest extends TestCase
     {
         $page = make(Page::class);
         $payload = [
-            'title' => $page->title,
-            'description' => $page->description,
+            'title'           => $page->title,
+            'description'     => $page->description,
             'cannonical_link' => $page->cannonical_link,
-            'seo_title' => 'some tittle',
-            'seo_keyword' => 'some keywords',
+            'seo_title'       => 'some tittle',
+            'seo_keyword'     => 'some keywords',
             'seo_description' => '<p>&nbsp;</p>↵<h1>SEO Description</h1>↵<p>some seco desctription</p>↵<p>askdsaj;ldsjfd</p>',
-            'status' => '1',
+            'status'          => '1',
         ];
         $response = '';
         $response = $this->json('POST', '/api/v1/pages', $payload, $this->headers);
         $response->assertStatus(201);
         $response->assertJson([
             'data' => [
-                'title' => $page->title,
+                'title'        => $page->title,
                 'status_label' => $page->status_label,
-                'status' => ($page->isActive()) ? 'Active' : 'InActive',
-                'created_by' => $this->user->first_name,
-                'created_at' => (\Carbon\Carbon::now())->toDateString(),
+                'status'       => ($page->isActive()) ? 'Active' : 'InActive',
+                'created_by'   => $this->user->first_name,
+                'created_at'   => (\Carbon\Carbon::now())->toDateString(),
             ],
         ]);
     }
@@ -157,7 +157,7 @@ class PageTest extends TestCase
     {
         $page = create(Page::class);
         $payload = [];
-        $response = $this->json('DELETE', '/api/v1/pages/' . $page->id, $payload, $this->headers);
+        $response = $this->json('DELETE', '/api/v1/pages/'.$page->id, $payload, $this->headers);
         $response->assertStatus(200)
             ->assertJson([
                 'message' => 'The Page was successfully deleted.',

tests/Feature/Backend/ManageBlogsTest.php

@@ -47,8 +47,8 @@ class ManageBlogsTest extends TestCase
     {
         $blog = make(Blog::class, [
             'featured_image' => UploadedFile::fake()->image('logo.jpg'),
-            'categories' => $this->categories,
-            'tags' => $this->tags,
+            'categories'     => $this->categories,
+            'tags'           => $this->tags,
         ]);
 
         $this->post(route('admin.blogs.store'), $blog->toArray());
@@ -134,15 +134,15 @@ class ManageBlogsTest extends TestCase
     {
         $blog = make(Blog::class, [
             'featured_image' => UploadedFile::fake()->image('logo.jpg'),
-            'categories' => $this->categories,
-            'tags' => $this->tags,
+            'categories'     => $this->categories,
+            'tags'           => $this->tags,
         ]);
 
         $this->post(route('admin.blogs.store'), $blog->toArray());
 
         $stored_blog = Blog::find(2);
 
-        Storage::disk('public')->assertExists('img/blog/' . $stored_blog->featured_image);
+        Storage::disk('public')->assertExists('img/blog/'.$stored_blog->featured_image);
     }
 
     /** @test */
@@ -201,9 +201,9 @@ class ManageBlogsTest extends TestCase
     {
         $blog = make(Blog::class, [
             'featured_image' => UploadedFile::fake()->image('logo.jpg'),
-            'name' => 'Changed Name',
-            'categories' => $this->categories,
-            'tags' => $this->tags,
+            'name'           => 'Changed Name',
+            'categories'     => $this->categories,
+            'tags'           => $this->tags,
         ]);
 
         $this->patch(route('admin.blogs.update', $this->blog), $blog->toArray());

tests/Feature/Backend/ManageSettingsTest.php

@@ -38,7 +38,7 @@ class ManageSettingsTest extends TestCase
             'logo' => UploadedFile::fake()->image('logo.jpg', 226, 48),
         ]);
 
-        Storage::disk('public')->assertExists('img/logo/' . $this->setting->logo);
+        Storage::disk('public')->assertExists('img/logo/'.$this->setting->logo);
     }
 
     /** @test */
@@ -59,7 +59,7 @@ class ManageSettingsTest extends TestCase
             'favicon' => UploadedFile::fake()->image('favicon.jpg', 16, 16),
         ]);
 
-        Storage::disk('public')->assertExists('img/favicon/' . $this->setting->favicon);
+        Storage::disk('public')->assertExists('img/favicon/'.$this->setting->favicon);
     }
 
     /** @test */