diff --git a/Tests/Asset/AsgardAssetManagerTest.php b/Tests/Asset/AsgardAssetManagerTest.php index 3bbe1989..110ce97d 100644 --- a/Tests/Asset/AsgardAssetManagerTest.php +++ b/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(); } diff --git a/Tests/Asset/AsgardAssetPipelineTest.php b/Tests/Asset/AsgardAssetPipelineTest.php index d378a9b6..9aea79b4 100644 --- a/Tests/Asset/AsgardAssetPipelineTest.php +++ b/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']; } diff --git a/Tests/Asset/AssetFactoryTest.php b/Tests/Asset/AssetFactoryTest.php index 34ea9929..6fbaa013 100644 --- a/Tests/Asset/AssetFactoryTest.php +++ b/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); } diff --git a/Tests/BaseTestCase.php b/Tests/BaseTestCase.php index e471c54a..d1b18312 100644 --- a/Tests/BaseTestCase.php +++ b/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(); diff --git a/Tests/TestBrowserTest.php b/Tests/TestBrowserTest.php index 89c1a04f..c63615f9 100644 --- a/Tests/TestBrowserTest.php +++ b/Tests/TestBrowserTest.php @@ -9,7 +9,7 @@ abstract class TestBrowserTest extends BaseTestCase { - public function setUp() + protected function setUp():void { parent::setUp(); diff --git a/Tests/Theme/ThemeManagerTest.php b/Tests/Theme/ThemeManagerTest.php index b1caacf7..62bbab42 100644 --- a/Tests/Theme/ThemeManagerTest.php +++ b/Tests/Theme/ThemeManagerTest.php @@ -15,7 +15,7 @@ class ThemeManagerTest extends BaseTestCase /** * */ - public function setUp() + protected function setUp():void { parent::setUp(); diff --git a/Tests/Theme/ThemeTest.php b/Tests/Theme/ThemeTest.php index 426f3e12..53f70810 100644 --- a/Tests/Theme/ThemeTest.php +++ b/Tests/Theme/ThemeTest.php @@ -12,7 +12,7 @@ class ThemeTest extends BaseTestCase */ protected $theme; - public function setUp() + protected function setUp():void { parent::setUp(); diff --git a/composer.json b/composer.json index 2a14725e..98740aea 100644 --- a/composer.json +++ b/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": {