Merge pull request #33 from intraordinaire/feature/laravel-5.8

⬆️ Upgrading to Laravel 5.8

.travis.yml

@@ -1,18 +1,15 @@
 language: php
 
 php:
-  - 7.1
+  - 7.1.3
   - 7.2
 env:
   global:
     - setup=basic
 
 matrix:
-  include:
-    - php: 7.1
-      env: setup=lowest
-    - php: 7.1
-      env: setup=stable
+  fast_finish: true
+
 sudo: false
 
 services:
@@ -25,8 +22,6 @@ before_install:
 
 install:
   - if [[ $setup = 'basic' ]]; then travis_retry composer install --no-interaction --prefer-dist --no-suggest; fi
-  - if [[ $setup = 'stable' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-stable --no-suggest; fi
-  - if [[ $setup = 'lowest' ]]; then travis_retry composer update --prefer-dist --no-interaction --prefer-lowest --prefer-stable --no-suggest; fi
 
 script:
   - >
@@ -36,9 +31,6 @@ script:
      vendor/phpunit/phpunit/phpunit --configuration phpunit.xml --coverage-clover=coverage.clover
     fi
 
-matrix:
-  fast_finish: true
-
 after_script:
   - wget https://scrutinizer-ci.com/ocular.phar
   - php ocular.phar code-coverage:upload --access-token="9857f9bb4b1c260b94eb773a541d6e42e05db0db45d5a25757590276d5e50445" --format=php-clover coverage.clover

composer.json

@@ -21,20 +21,20 @@
 
     "require": {
         "php": ">=7.1.3",
-        "illuminate/support": "5.7.*",
-        "illuminate/database": "5.7.*",
-        "illuminate/translation": "5.7.*",
-        "distilleries/datatable-builder": "2.13.*",
-        "distilleries/form-builder": "2.12.*",
-        "distilleries/permission-util": "1.9.*",
-        "distilleries/security": "1.0.*",
+        "illuminate/support": "5.8.*",
+        "illuminate/database": "5.8.*",
+        "illuminate/translation": "5.8.*",
+        "distilleries/datatable-builder": "2.14.*",
+        "distilleries/form-builder": "2.13.*",
+        "distilleries/permission-util": "1.10.*",
+        "distilleries/security": "1.1.*",
         "forxer/Gravatar": "~1.2",
         "maatwebsite/excel": "3.1.*"
     },
     "require-dev": {
-        "orchestra/database": "3.7.*",
-        "orchestra/testbench": "3.7.*",
-        "orchestra/testbench-browser-kit": "3.7.*",
+        "orchestra/database": "3.8.*",
+        "orchestra/testbench": "3.8.*",
+        "orchestra/testbench-browser-kit": "3.8.*",
         "phpunit/phpunit": "~7.0",
         "mockery/mockery": "~1.0",
         "fzaninotto/faker": "~1.4"

src/Distilleries/Expendable/Contracts/EventContract.php

@@ -2,5 +2,9 @@
 
 interface EventContract {
 
-    public function fire($params = array());
+    /**
+     * @param  array  $params
+     * @return mixed
+     */
+    public function dispatch($params = array());
 }

src/Distilleries/Expendable/Events/EventDispatcher.php

@@ -14,21 +14,33 @@ class EventDispatcher implements EventContract {
     // ------------------------------------------------------------------------------------------------
 
 
-    public function __construct($eventName, $params = array(), $auto_fire = true)
+    public function __construct($eventName, $params = array(), $auto_dispatch = true)
     {
         $this->event_name = $eventName;
         $this->params     = $params;
 
-        if ($auto_fire === true)
+        if ($auto_dispatch === true)
         {
-            $this->fire($this->params);
+            $this->dispatch($this->params);
         }
     }
 
     // ------------------------------------------------------------------------------------------------
 
+    /**
+     * @inheritDoc
+     */
+    public function dispatch($params = array())
+    {
+        Event::dispatch($this->event_name, array($params));
+    }
+
+    /**
+     * @param  array  $params
+     * @deprecated Use dispatch instead
+     */
     public function fire($params = array())
     {
-        Event::fire($this->event_name, array($params));
+        $this->dispatch($params);
     }
 }

tests/Exceptions/HandlerTest.php

@@ -40,7 +40,8 @@ public function testExceptionAdmin()
         $response = $this->call('GET', '/test');
         $this->assertEquals(404,$response->getStatusCode());
         $this->assertNotContains('page-404',$response->getContent());
-        $this->assertContains('Sorry, the page you are looking for could not be found.',$response->getContent());
+        $this->assertContains('404',$response->getContent());
+        $this->assertContains('Not Found',$response->getContent());
     }
 
 
@@ -114,7 +115,8 @@ public function testExceptionNoCatche()
         $response = $this->call('GET', '/test');
         $this->assertEquals(404,$response->getStatusCode());
         $this->assertNotContains('page-404',$response->getContent());
-        $this->assertContains('Sorry, the page you are looking for could not be found.',$response->getContent());
+        $this->assertContains('404',$response->getContent());
+        $this->assertContains('Not Found',$response->getContent());
     }
 
 

tests/ExpendableTestCase.php

@@ -31,7 +31,7 @@ protected function resolveApplication()
     }
 
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
         $this->app['Illuminate\Contracts\Console\Kernel']->call('vendor:publish', ['--all' => true]);

tests/Http/Controllers/Backend/ComponentControllerTest.php

@@ -4,7 +4,7 @@ class ComponentControllerTest extends ExpendableTestCase {
 
     protected $controller = 'Backend\ComponentController';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Http/Controllers/Backend/LanguageControllerTest.php

@@ -2,7 +2,7 @@
 
 class LanguageControllerTest extends ExpendableTestCase {
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Http/Controllers/Backend/LoginControllerTest.php

@@ -3,7 +3,7 @@
 class LoginControllerTest extends ExpendableTestCase
 {
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Http/Controllers/Backend/OrderedControllerTest.php

@@ -2,7 +2,7 @@
 
 class OrderedControllerTest extends ExpendableTestCase
 {
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Http/Controllers/Backend/PermissionControllerTest.php

@@ -4,7 +4,7 @@ class PermissionControllerTest extends ExpendableTestCase {
 
     protected $controller = 'Backend\PermissionController';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Http/Controllers/Backend/RoleControllerTest.php

@@ -4,7 +4,7 @@ class RoleControllerTest extends ExpendableTestCase {
 
     protected $controller = 'Backend\RoleController';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Http/Controllers/Backend/ServiceControllerTest.php

@@ -4,7 +4,7 @@ class ServiceControllerTest extends ExpendableTestCase {
 
     protected $controller = 'Backend\ServiceController';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();
 

tests/Http/Controllers/Backend/UserControllerTest.php

@@ -4,7 +4,7 @@ class UserControllerTest extends ExpendableTestCase {
 
     protected $controller = 'Backend\UserController';
 
-    public function setUp()
+    public function setUp(): void
     {
         parent::setUp();