Commit f3dadd96 authored by Viral Solani's avatar Viral Solani

Upgrade to laravel 5.8

parent edef02f2
...@@ -145,3 +145,7 @@ ...@@ -145,3 +145,7 @@
127.0.0.1 - - [07/Mar/2019:18:15:03 +0530] "GET /login HTTP/1.1" 200 12126 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36" 127.0.0.1 - - [07/Mar/2019:18:15:03 +0530] "GET /login HTTP/1.1" 200 12126 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36"
127.0.0.1 - - [07/Mar/2019:18:15:07 +0530] "POST /login HTTP/1.1" 302 1459 "http://laraveladminpanel.local/login" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36" 127.0.0.1 - - [07/Mar/2019:18:15:07 +0530] "POST /login HTTP/1.1" 302 1459 "http://laraveladminpanel.local/login" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36"
127.0.0.1 - - [07/Mar/2019:18:15:07 +0530] "GET /admin/dashboard HTTP/1.1" 200 21420 "http://laraveladminpanel.local/login" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36" 127.0.0.1 - - [07/Mar/2019:18:15:07 +0530] "GET /admin/dashboard HTTP/1.1" 200 21420 "http://laraveladminpanel.local/login" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36"
127.0.0.1 - - [07/Mar/2019:19:47:51 +0530] "GET /admin/dashboard HTTP/1.1" 302 1697 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36"
127.0.0.1 - - [07/Mar/2019:19:47:53 +0530] "GET /login HTTP/1.1" 200 2671 "-" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36"
127.0.0.1 - - [07/Mar/2019:19:48:00 +0530] "POST /login HTTP/1.1" 302 1470 "http://laraveladminpanel.local/login" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36"
127.0.0.1 - - [07/Mar/2019:19:48:00 +0530] "GET /admin/dashboard HTTP/1.1" 200 3839 "http://laraveladminpanel.local/login" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/72.0.3626.109 Safari/537.36"
...@@ -58,20 +58,6 @@ class AppServiceProvider extends ServiceProvider ...@@ -58,20 +58,6 @@ class AppServiceProvider extends ServiceProvider
* Sets third party service providers that are only needed on local/testing environments * Sets third party service providers that are only needed on local/testing environments
*/ */
if ($this->app->environment() != 'production') { if ($this->app->environment() != 'production') {
/**
* Loader for registering facades.
*/
$loader = \Illuminate\Foundation\AliasLoader::getInstance();
/*
* Load third party local providers
*/
$this->app->register(\Barryvdh\Debugbar\ServiceProvider::class);
/*
* Load third party local aliases
*/
$loader->alias('Debugbar', \Barryvdh\Debugbar\Facade::class);
} }
} }
} }
...@@ -19,26 +19,25 @@ ...@@ -19,26 +19,25 @@
"doctrine/dbal": "^2.9", "doctrine/dbal": "^2.9",
"fideloper/proxy": "^4.0", "fideloper/proxy": "^4.0",
"hieu-le/active": "^3.5", "hieu-le/active": "^3.5",
"laravel/framework": "5.7.*", "laravel/framework": "5.8.*",
"laravel/socialite": "^3.0", "laravel/socialite": "^3.0",
"laravel/tinker": "~1.0", "laravel/tinker": "~1.0",
"laravelcollective/html": "^5.4.0", "laravelcollective/html": "^5.4.0",
"spatie/laravel-cors": "^1.2", "spatie/laravel-cors": "^1.2",
"tymon/jwt-auth": "1.0.0-rc.3", "tymon/jwt-auth": "2.0.x-dev",
"unisharp/laravel-filemanager": "~1.8", "unisharp/laravel-filemanager": "~1.8",
"yajra/laravel-datatables-oracle": "~8.0" "yajra/laravel-datatables-oracle": "~9.0"
}, },
"require-dev": { "require-dev": {
"laravel/telescope": "^1.0", "laravel/telescope": "^2.0",
"barryvdh/laravel-debugbar": "^3.0",
"bvipul/generator": "^5.6", "bvipul/generator": "^5.6",
"codedungeon/phpunit-result-printer": "^0.19.10", "codedungeon/phpunit-result-printer": "^0.19.10",
"filp/whoops": "~2.0", "filp/whoops": "~2.0",
"fzaninotto/faker": "~1.4", "fzaninotto/faker": "~1.4",
"laravel/browser-kit-testing": "^4.0.0", "mockery/mockery": "1.2.2",
"mockery/mockery": "0.9.*", "nunomaduro/larastan": "^0.3.15",
"nunomaduro/larastan": "^0.3.8",
"phpunit/phpunit": "~7.0", "phpunit/phpunit": "~7.0",
"laravel/browser-kit-testing": "^4.0.0",
"xethron/migrations-generator": "2.0.2" "xethron/migrations-generator": "2.0.2"
}, },
"autoload": { "autoload": {
......
This diff is collapsed.
<?php <?php
return [ return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Application Name | Application Name
...@@ -147,7 +146,6 @@ return [ ...@@ -147,7 +146,6 @@ return [
*/ */
'providers' => [ 'providers' => [
/* /*
* Laravel Framework Service Providers... * Laravel Framework Service Providers...
*/ */
...@@ -193,7 +191,7 @@ return [ ...@@ -193,7 +191,7 @@ return [
App\Providers\AccessServiceProvider::class, App\Providers\AccessServiceProvider::class,
App\Providers\AppServiceProvider::class, App\Providers\AppServiceProvider::class,
App\Providers\AuthServiceProvider::class, App\Providers\AuthServiceProvider::class,
App\Providers\BladeServiceProvider::class, //App\Providers\BladeServiceProvider::class,
//App\Providers\BroadcastServiceProvider::class, //App\Providers\BroadcastServiceProvider::class,
App\Providers\ComposerServiceProvider::class, App\Providers\ComposerServiceProvider::class,
App\Providers\EventServiceProvider::class, App\Providers\EventServiceProvider::class,
...@@ -216,7 +214,6 @@ return [ ...@@ -216,7 +214,6 @@ return [
*/ */
'aliases' => [ 'aliases' => [
'App' => Illuminate\Support\Facades\App::class, 'App' => Illuminate\Support\Facades\App::class,
'Artisan' => Illuminate\Support\Facades\Artisan::class, 'Artisan' => Illuminate\Support\Facades\Artisan::class,
'Auth' => Illuminate\Support\Facades\Auth::class, 'Auth' => Illuminate\Support\Facades\Auth::class,
...@@ -263,7 +260,5 @@ return [ ...@@ -263,7 +260,5 @@ return [
'Socialite' => Laravel\Socialite\Facades\Socialite::class, 'Socialite' => Laravel\Socialite\Facades\Socialite::class,
'JWTAuth' => Tymon\JWTAuth\Facades\JWTAuth::class, 'JWTAuth' => Tymon\JWTAuth\Facades\JWTAuth::class,
//'Datatables' => Yajra\DataTables\Facades\DataTables::class //'Datatables' => Yajra\DataTables\Facades\DataTables::class
], ],
]; ];
...@@ -50,7 +50,7 @@ abstract class BrowserKitTestCase extends BaseTestCase ...@@ -50,7 +50,7 @@ abstract class BrowserKitTestCase extends BaseTestCase
*/ */
protected $userRole; protected $userRole;
public function setUp() public function setUp(): void
{ {
parent::setUp(); parent::setUp();
...@@ -76,7 +76,7 @@ abstract class BrowserKitTestCase extends BaseTestCase ...@@ -76,7 +76,7 @@ abstract class BrowserKitTestCase extends BaseTestCase
$this->userRole = Role::find(3); $this->userRole = Role::find(3);
} }
public function tearDown() public function tearDown(): void
{ {
$this->beforeApplicationDestroyed(function () { $this->beforeApplicationDestroyed(function () {
DB::disconnect(); DB::disconnect();
......
...@@ -13,19 +13,17 @@ class PageTest extends TestCase ...@@ -13,19 +13,17 @@ class PageTest extends TestCase
public $headers = ''; public $headers = '';
public $user = ''; public $user = '';
public function setUp() public function setUp(): void
{ {
parent::setUp(); parent::setUp();
$this->user = User::find(1); $this->user = User::find(1);
$this->token = JWTAuth::fromUser($this->user); $this->token = JWTAuth::fromUser($this->user);
$this->headers = ['Authorization' => 'Bearer '.$this->token]; $this->headers = ['Authorization' => 'Bearer ' . $this->token];
} }
/** /**
* A basic test example. * A basic test example.
*
* @return void
*/ */
public function testExample() public function testExample()
{ {
...@@ -34,8 +32,6 @@ class PageTest extends TestCase ...@@ -34,8 +32,6 @@ class PageTest extends TestCase
/** /**
* A basic test to get response form pages api. * A basic test to get response form pages api.
*
* @return void
*/ */
/** @test */ /** @test */
...@@ -46,7 +42,7 @@ class PageTest extends TestCase ...@@ -46,7 +42,7 @@ class PageTest extends TestCase
$response $response
->assertStatus(200) ->assertStatus(200)
->assertJsonStructure([ ->assertJsonStructure([
'data'=> [ 'data' => [
[ [
'id', 'id',
'title', 'title',
...@@ -63,8 +59,6 @@ class PageTest extends TestCase ...@@ -63,8 +59,6 @@ class PageTest extends TestCase
/** /**
* A basic test to get response form pages api. * A basic test to get response form pages api.
*
* @return void
*/ */
/** @test */ /** @test */
...@@ -72,11 +66,11 @@ class PageTest extends TestCase ...@@ -72,11 +66,11 @@ class PageTest extends TestCase
{ {
$page = create(Page::class); $page = create(Page::class);
$payload = []; $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 $response
->assertStatus(200) ->assertStatus(200)
->assertJson([ ->assertJson([
'data'=> [ 'data' => [
'id' => $page->id, 'id' => $page->id,
'title' => $page->title, 'title' => $page->title,
'status_label' => $page->status_label, 'status_label' => $page->status_label,
...@@ -90,9 +84,6 @@ class PageTest extends TestCase ...@@ -90,9 +84,6 @@ class PageTest extends TestCase
* Author: Indra Shastri * Author: Indra Shastri
* Date:03-03-2018 * Date:03-03-2018
* A basic test to update a page from api. * A basic test to update a page from api.
*
*
* @return void
*/ */
/** @test */ /** @test */
...@@ -113,11 +104,11 @@ class PageTest extends TestCase ...@@ -113,11 +104,11 @@ class PageTest extends TestCase
$response->assertStatus(200); $response->assertStatus(200);
$response->assertJson([ $response->assertJson([
'data'=> [ 'data' => [
'title' => $page->title, 'title' => $page->title,
'status_label' => $page->status_label, 'status_label' => $page->status_label,
'status' => ($page->isActive()) ? 'Active' : 'InActive', 'status' => ($page->isActive()) ? 'Active' : 'InActive',
'created_by' => ''.$this->user->id, 'created_by' => '' . $this->user->id,
], ],
]); ]);
} }
...@@ -126,8 +117,6 @@ class PageTest extends TestCase ...@@ -126,8 +117,6 @@ class PageTest extends TestCase
* Author: Indra Shastri * Author: Indra Shastri
* Date:03-03-2018 * Date:03-03-2018
* A basic test to create a page from api. * A basic test to create a page from api.
*
* @return void
*/ */
/** @test */ /** @test */
...@@ -161,8 +150,6 @@ class PageTest extends TestCase ...@@ -161,8 +150,6 @@ class PageTest extends TestCase
* Author: Indra Shastri * Author: Indra Shastri
* Date:03-03-2018 * Date:03-03-2018
* A basic test to create a page from api. * A basic test to create a page from api.
*
* @return void
*/ */
/** @test */ /** @test */
...@@ -170,10 +157,10 @@ class PageTest extends TestCase ...@@ -170,10 +157,10 @@ class PageTest extends TestCase
{ {
$page = create(Page::class); $page = create(Page::class);
$payload = []; $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) $response->assertStatus(200)
->assertJson([ ->assertJson([
'message'=> 'The Page was successfully deleted.', 'message' => 'The Page was successfully deleted.',
]); ]);
} }
} }
...@@ -16,7 +16,7 @@ class ManageBlogsTest extends TestCase ...@@ -16,7 +16,7 @@ class ManageBlogsTest extends TestCase
protected $categories; protected $categories;
protected $tags; protected $tags;
public function setUp() public function setUp(): void
{ {
parent::setUp(); parent::setUp();
...@@ -142,7 +142,7 @@ class ManageBlogsTest extends TestCase ...@@ -142,7 +142,7 @@ class ManageBlogsTest extends TestCase
$stored_blog = Blog::find(2); $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 */ /** @test */
...@@ -227,7 +227,8 @@ class ManageBlogsTest extends TestCase ...@@ -227,7 +227,8 @@ class ManageBlogsTest extends TestCase
$catCategory = create(Blog::class, ['name' => 'Cat']); $catCategory = create(Blog::class, ['name' => 'Cat']);
$dogCategory = create(Blog::class, ['name' => 'Dog']); $dogCategory = create(Blog::class, ['name' => 'Dog']);
$this->patch(route('admin.blogs.update', $dogCategory), $this->patch(
route('admin.blogs.update', $dogCategory),
['name' => 'Cat'] ['name' => 'Cat']
)->assertSessionHasErrors('name'); )->assertSessionHasErrors('name');
} }
......
...@@ -11,7 +11,7 @@ class ManageSettingsTest extends TestCase ...@@ -11,7 +11,7 @@ class ManageSettingsTest extends TestCase
{ {
protected $setting; protected $setting;
public function setUp() public function setUp(): void
{ {
parent::setUp(); parent::setUp();
...@@ -38,7 +38,7 @@ class ManageSettingsTest extends TestCase ...@@ -38,7 +38,7 @@ class ManageSettingsTest extends TestCase
'logo' => UploadedFile::fake()->image('logo.jpg', 226, 48), '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 */ /** @test */
...@@ -59,7 +59,7 @@ class ManageSettingsTest extends TestCase ...@@ -59,7 +59,7 @@ class ManageSettingsTest extends TestCase
'favicon' => UploadedFile::fake()->image('favicon.jpg', 16, 16), '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 */ /** @test */
......
...@@ -54,7 +54,7 @@ abstract class TestCase extends BaseTestCase ...@@ -54,7 +54,7 @@ abstract class TestCase extends BaseTestCase
/** /**
* Set up tests. * Set up tests.
*/ */
public function setUp() public function setUp(): void
{ {
parent::setUp(); parent::setUp();
...@@ -80,7 +80,7 @@ abstract class TestCase extends BaseTestCase ...@@ -80,7 +80,7 @@ abstract class TestCase extends BaseTestCase
$this->userRole = Role::find(3); $this->userRole = Role::find(3);
} }
public function tearDown() public function tearDown(): void
{ {
$this->beforeApplicationDestroyed(function () { $this->beforeApplicationDestroyed(function () {
DB::disconnect(); DB::disconnect();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment