WIP: Laravel upgrade 5.8

.gitignore

@@ -1,6 +1,7 @@
 /node_modules
 /public/hot
 /public/storage
+/public/modules/*
 /storage/*.key
 /vendor
 Homestead.json

Modules/.gitignore

@@ -0,0 +1,9 @@
+Activity/
+Contact/
+CourierTracking/
+Faq/
+Location/
+Rarv/
+StationaryPrint/
+Task/
+Transaction/

Modules/Core/Tests/Asset/AsgardAssetManagerTest.php

@@ -12,9 +12,9 @@ class AsgardAssetManagerTest extends BaseTestCase
      */
     private $assetManager;
 
-    public function setUp()
+    protected function setUp():void
     {
-        parent::__construct();
+        parent::setUp();
         $this->assetManager = new AsgardAssetManager();
     }
 

Modules/Core/Tests/Asset/AsgardAssetPipelineTest.php

@@ -19,10 +19,10 @@ class AsgardAssetPipelineTest extends BaseTestCase
     /**
      *
      */
-    public function setUp()
+    protected function setUp():void
     {
-        parent::__construct();
-        $this->refreshApplication();
+        parent::setUp();
+
         $this->assetPipeline = new AsgardAssetPipeline($this->app['Modules\Core\Foundation\Asset\Manager\AssetManager']);
         $this->assetManager = $this->app['Modules\Core\Foundation\Asset\Manager\AssetManager'];
     }

Modules/Core/Tests/Asset/AssetFactoryTest.php

@@ -13,10 +13,10 @@ class AssetFactoryTest extends BaseTestCase
      */
     private $assetFactory;
 
-    public function setUp()
+    protected function setUp():void
     {
-        parent::__construct();
-        $this->refreshApplication();
+        parent::setUp();
+
         $this->assetFactory = app(AssetTypeFactory::class);
     }
 

Modules/Core/Tests/BaseTestCase.php

@@ -8,7 +8,7 @@ abstract class BaseTestCase extends TestCase
 {
     protected $app;
 
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
         $this->refreshApplication();

Modules/Core/Tests/TestBrowserTest.php

@@ -9,7 +9,7 @@
 
 abstract class TestBrowserTest extends BaseTestCase
 {
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
 

Modules/Core/Tests/Theme/ThemeManagerTest.php

@@ -15,7 +15,7 @@ class ThemeManagerTest extends BaseTestCase
     /**
      *
      */
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
 

Modules/Core/Tests/Theme/ThemeTest.php

@@ -12,7 +12,7 @@ class ThemeTest extends BaseTestCase
      */
     protected $theme;
 
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
 

Modules/Core/composer.json

@@ -22,14 +22,14 @@
   "require": {
     "php": "^7.1.3",
     "composer/installers": "~1.0",
-    "nwidart/laravel-modules": "^4.0",
-    "laravelcollective/html": "5.7.*",
+    "nwidart/laravel-modules": "^5.0",
+    "laravelcollective/html": "5.8.*",
     "laracasts/presenter": "~0.2",
-    "dimsav/laravel-translatable": "~9.0",
-    "mcamara/laravel-localization": "~1.3",
+    "dimsav/laravel-translatable": "~10.0",
+    "mcamara/laravel-localization": "~1.5",
     "floatingpoint/stylist": "~0.5",
     "maatwebsite/laravel-sidebar": "~2.1",
-    "yajra/laravel-datatables-oracle": "~8.0",
+    "yajra/laravel-datatables-oracle": "~9.0",
     "tightenco/ziggy": "~0.4"
   },
   "require-dev": {

Modules/Media/Tests/EloquentFileRepositoryTest.php

@@ -22,7 +22,7 @@ class EloquentFileRepositoryTest extends MediaTestCase
      */
     private $file;
 
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
 
@@ -32,7 +32,7 @@ public function setUp()
         $this->app['config']->set('asgard.media.config.files-path', '/assets/media/');
     }
 
-    public function tearDown()
+    protected function tearDown():void
     {
         if ($this->app['files']->isDirectory(public_path('assets')) === true) {
             $this->app['files']->deleteDirectory(public_path('assets'));

Modules/Media/Tests/EloquentFolderRepositoryTest.php

@@ -20,7 +20,7 @@ final class EloquentFolderRepositoryTest extends MediaTestCase
      */
     private $folder;
 
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
 
@@ -30,7 +30,7 @@ public function setUp()
         $this->app['config']->set('asgard.media.config.files-path', '/assets/media/');
     }
 
-    public function tearDown()
+    protected function tearDown():void
     {
         if ($this->app['files']->isDirectory(public_path('assets')) === true) {
             $this->app['files']->deleteDirectory(public_path('assets'));

Modules/Media/Tests/FileMoverTest.php

@@ -19,7 +19,7 @@ final class FileMoverTest extends MediaTestCase
      */
     private $file;
 
-    protected function setUp()
+    protected function setUp():void
     {
         parent::setUp();
 
@@ -30,7 +30,7 @@ protected function setUp()
         $this->app['config']->set('asgard.media.config.files-path', '/assets/media/');
     }
 
-    public function tearDown()
+    protected function tearDown():void
     {
         if ($this->app['files']->isDirectory(public_path('assets')) === true) {
             $this->app['files']->deleteDirectory(public_path('assets'));

Modules/Media/Tests/FileServiceTest.php

@@ -12,15 +12,15 @@ final class FileServiceTest extends MediaTestCase
      */
     private $fileService;
 
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
         $this->resetDatabase();
         $this->fileService = app(FileService::class);
         $this->app['config']->set('asgard.media.config.files-path', '/assets/media/');
     }
 
-    public function tearDown()
+    protected function tearDown():void
     {
         if ($this->app['files']->isDirectory(public_path('assets')) === true) {
             $this->app['files']->deleteDirectory(public_path('assets'));

Modules/Media/Tests/FileTest.php

@@ -13,7 +13,7 @@ class FileTest extends MediaTestCase
      */
     private $file;
 
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
 

Modules/Media/Tests/FolderMoverTest.php

@@ -18,7 +18,7 @@ final class FolderMoverTest extends MediaTestCase
      */
     private $folder;
 
-    protected function setUp()
+    protected function setUp():void
     {
         parent::setUp();
 
@@ -29,7 +29,7 @@ protected function setUp()
         $this->app['config']->set('asgard.media.config.files-path', '/assets/media/');
     }
 
-    public function tearDown()
+    protected function tearDown():void
     {
         if ($this->app['files']->isDirectory(public_path('assets')) === true) {
             $this->app['files']->deleteDirectory(public_path('assets'));

Modules/Media/Tests/ImagyTest.php

@@ -34,7 +34,7 @@ class ImagyTest extends MediaTestCase
     /**
      *
      */
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
         $this->app['config']->set('asgard.media.config.files-path', '/assets/media/');
@@ -47,7 +47,7 @@ public function setUp()
         $this->finder->copy("{$this->mediaPath}google-map.png", "{$this->testbenchPublicPath}google-map.png");
     }
 
-    public function tearDown()
+    protected function tearDown():void
     {
         $this->finder->delete("{$this->testbenchPublicPath}google-map.png");
         $this->finder->delete("{$this->testbenchPublicPath}google-map_smallThumb.png");

Modules/Media/Tests/MoverTest.php

@@ -13,7 +13,7 @@ final class MoverTest extends MediaTestCase
      */
     private $mover;
 
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
 
@@ -24,7 +24,7 @@ public function setUp()
         $this->app['config']->set('asgard.media.config.files-path', '/assets/media/');
     }
 
-    public function tearDown()
+    protected function tearDown():void
     {
         if ($this->app['files']->isDirectory(public_path('assets')) === true) {
             $this->app['files']->deleteDirectory(public_path('assets'));

Modules/Media/Tests/ThumbnailsManagerTest.php

@@ -12,7 +12,7 @@ class ThumbnailsManagerTest extends MediaTestCase
      */
     private $thumbnailManager;
 
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
         $this->thumbnailManager = app(ThumbnailManager::class);

Modules/Menu/Services/MenuItemUriGenerator.php

@@ -70,7 +70,7 @@ private function getPageSlug($id, $lang)
         $translation = $page->translate($lang);
 
         if ($translation === null) {
-            return $page->translate(config('app.fallback_locale'))->slug;
+            $translation = $page->translate(config('app.fallback_locale'));
         }
 
         return $translation->slug;

Modules/Menu/Tests/BaseMenuTest.php

@@ -34,7 +34,7 @@ abstract class BaseMenuTest extends TestCase
     /**
      *
      */
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
 

Modules/Menu/Tests/EloquentMenuItemRepositoryTest.php

@@ -10,7 +10,7 @@
 
 class EloquentMenuItemRepositoryTest extends BaseMenuTest
 {
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
     }

Modules/Menu/Tests/MenuItemUriGeneratorTest.php

@@ -17,7 +17,7 @@ class MenuItemUriGeneratorTest extends BaseMenuTest
      */
     private $menuItemUriGenerator;
 
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
         $this->page = app(PageRepository::class);
@@ -45,6 +45,7 @@ public function it_generates_uri_with_the_parents_slug()
     {
         Event::fake();
         $this->page->create([
+            'id' => 1,
             'is_home' => 1,
             'template' => 'default',
             'en' => [
@@ -54,12 +55,13 @@ public function it_generates_uri_with_the_parents_slug()
             ],
         ]);
         $this->page->create([
+            'id' => 2,
             'is_home' => 0,
             'template' => 'default',
             'en' => [
                 'title' => 'About',
-                'slug' => 'about',
                 'body' => 'My Page Body',
+                'slug' => 'about',
             ],
         ]);
         $menu = $this->createMenu('main', 'Main');
@@ -76,7 +78,7 @@ public function it_generates_uri_with_the_parents_slug()
         ];
         $this->menuItem->create($data);
 
-        self::assertEquals('awesome-page/about', $this->menuItemUriGenerator->generateUri(2, '1', 'en'));
+        self::assertEquals('awesome-page/about', $this->menuItemUriGenerator->generateUri(2, 1, 'en'));
     }
 
     /** @test */

Modules/Menu/Tests/MenuOrdenerTest.php

@@ -9,7 +9,7 @@ class MenuOrdenerTest extends BaseMenuTest
      */
     protected $menuOrdener;
 
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
         $this->createMenu('main', 'Main Menu');

Modules/Menu/composer.json

@@ -24,12 +24,12 @@
   "require": {
     "php": "^7.1.3",
     "composer/installers": "~1.0",
-    "nwidart/laravel-menus": "^3.0",
+    "nwidart/laravel-menus": "^4.0",
     "typicms/nestablecollection": "1.1.12"
   },
   "require-dev": {
-    "phpunit/phpunit": "~7.0",
-    "orchestra/testbench": "3.6.*",
+    "phpunit/phpunit": "~7.5",
+    "orchestra/testbench": "3.8.*",
     "fzaninotto/faker": "1.4.0",
     "doctrine/dbal": "~2.5",
     "idavoll/page-module": "4.0.x-dev"

Modules/Page/Tests/BasePageTest.php

@@ -21,7 +21,7 @@ abstract class BasePageTest extends TestCase
      */
     protected $page;
 
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
 

Modules/Setting/Tests/BaseSettingTest.php

@@ -15,7 +15,7 @@ abstract class BaseSettingTest extends TestCase
      */
     protected $settingRepository;
 
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
 

Modules/Setting/Tests/EloquentSettingRepositoryTest.php

@@ -10,7 +10,7 @@
 
 class EloquentSettingRepositoryTest extends BaseSettingTest
 {
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
     }

Modules/Setting/Tests/SettingsTest.php

@@ -9,7 +9,7 @@ class SettingsTest extends BaseSettingTest
      */
     protected $setting;
 
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();
         $this->setting = app('Modules\Setting\Support\Settings');

Modules/Tag/Tests/BaseTestCase.php

@@ -12,7 +12,7 @@
 
 abstract class BaseTestCase extends TestCase
 {
-    public function setUp()
+    protected function setUp():void
     {
         parent::setUp();