Merge pull request #9 from richan-fongdasen/laravel-5.8

Add support for Laravel 5.8

Author: richan-fongdasen

.gitignore

@@ -19,6 +19,14 @@ Vagrantfile
 *.log
 
 
+# Code Editor / IDE generated files
+# ----------------------------------------------------------------------- #
+
+.idea
+*.sublime-project
+*.sublime-workspace
+
+
 # Composer & Vendor Files
 # ----------------------------------------------------------------------- #
 

.travis.yml

@@ -5,26 +5,22 @@ dist: trusty
 matrix:
   fast_finish: true
   include:
-    - php: 5.5.9
-      env: LARAVEL=5.1.* ORCHESTRA=3.1.*
-    - php: 5.5.9
-      env: LARAVEL=5.2.* ORCHESTRA=3.2.*
-    - php: 5.6
-      env: LARAVEL=5.3.* ORCHESTRA=3.3.*
-    - php: 5.6
-      env: LARAVEL=5.4.* ORCHESTRA=3.4.*
-    - php: 7.0
-      env: LARAVEL=5.5.* ORCHESTRA=3.5.* COVERAGE=1
+    - php: 7.1
+      env: LARAVEL=5.5.* ORCHESTRA=3.5.*
     - php: 7.1
       env: LARAVEL=5.6.* ORCHESTRA=3.6.*
     - php: 7.2
       env: LARAVEL=5.7.* ORCHESTRA=3.7.*
+    - php: 7.2
+      env: LARAVEL=5.8.* ORCHESTRA=3.8.* COVERAGE=1
+    - php: 7.3
+      env: LARAVEL=5.8.* ORCHESTRA=3.8.*
 
   allow_failures:
     - env: COVERAGE=1
 
 before_install:
-  - if [[ $TRAVIS_PHP_VERSION != 7.0 ]] ; then phpenv config-rm xdebug.ini; fi
+  - phpenv config-rm xdebug.ini
   - travis_retry composer self-update
 
 before_script:

composer.json

@@ -21,16 +21,16 @@
         "source": "https://github.com/richan-fongdasen/laravel-varnishable"
     },
     "require": {
-        "php": "^5.5.9 || ^7.0 || ^7.1.3",
+        "php": "^7.1.3",
         "guzzlehttp/guzzle": "~6.0",
-        "illuminate/database": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*",
-        "illuminate/support": "5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*|5.7.*"
+        "illuminate/database": "5.5.*|5.6.*|5.7.*|5.8.*",
+        "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*"
     },
     "require-dev": {
-        "mockery/mockery": "~0.9.8",
-        "orchestra/database": "~3.1",
-        "orchestra/testbench": "~3.1",
-        "phpunit/phpunit": "~7.0 || ~6.0 || ~5.2 || ~4.8"
+        "mockery/mockery": "~1.0",
+        "orchestra/database": "~3.5",
+        "orchestra/testbench": "~3.5",
+        "phpunit/phpunit": "^8.0 || ~7.0 || ~6.0"
     },
     "config": {
         "sort-packages": true

phpunit.xml

@@ -8,8 +8,7 @@
     convertNoticesToExceptions="true"
     convertWarningsToExceptions="true"
     processIsolation="false"
-    stopOnFailure="true"
-    syntaxCheck="false">
+    stopOnFailure="true">
     <testsuites>
         <testsuite name="Laravel Varnishable Test Suite">
             <directory suffix="Tests.php">./tests/</directory>

tests/Concerns/InvalidateVarnishCacheTests.php

@@ -24,8 +24,10 @@ class InvalidateVarnishCacheTests extends TestCase
 
     /**
      * Setup the test environment
+     *
+     * @return void
      */
-    public function setUp()
+    public function setUp() :void
     {
         parent::setUp();
 

tests/Concerns/ManageEtagHeaderTests.php

@@ -24,8 +24,10 @@ class ManageEtagHeaderTests extends TestCase
 
     /**
      * Setup the test environment
+     *
+     * @return void
      */
-    public function setUp()
+    public function setUp() :void
     {
         parent::setUp();
 

tests/Concerns/ManageLastModifiedHeaderTests.php

@@ -25,8 +25,10 @@ class ManageLastModifiedHeaderTests extends TestCase
 
     /**
      * Setup the test environment
+     *
+     * @return void
      */
-    public function setUp()
+    public function setUp() :void
     {
         parent::setUp();
 

tests/Concerns/ManipulateHttpResponseTests.php

@@ -32,8 +32,10 @@ class ManipulateHttpResponseTests extends TestCase
 
     /**
      * Setup the test environment
+     *
+     * @return void
      */
-    public function setUp()
+    public function setUp() :void
     {
         parent::setUp();
 

tests/Middleware/CacheableByVarnishTests.php

@@ -18,8 +18,10 @@ class CacheableByVarnishTests extends TestCase
 
     /**
      * Setup the test environment
+     *
+     * @return void
      */
-    public function setUp()
+    public function setUp() :void
     {
         parent::setUp();
 

tests/Middleware/UncacheableByVarnishTests.php

@@ -18,8 +18,10 @@ class UncacheableByVarnishTests extends TestCase
 
     /**
      * Setup the test environment
+     *
+     * @return void
      */
-    public function setUp()
+    public function setUp() :void
     {
         parent::setUp();
 

tests/TestCase.php

@@ -140,8 +140,10 @@ protected function prepareException($exception)
 
     /**
      * Setup the test environment
+     *
+     * @return void
      */
-    public function setUp()
+    public function setUp() :void
     {
         parent::setUp();
 

tests/VarnishableObserverTests.php

@@ -10,8 +10,10 @@ class VarnishableObserverTests extends TestCase
 {
     /**
      * Setup the test environment
+     *
+     * @return void
      */
-    public function setUp()
+    public function setUp() :void
     {
         parent::setUp();
 

tests/VarnishableServiceTests.php

@@ -16,8 +16,10 @@ class VarnishableServiceTests extends TestCase
 
     /**
      * Setup the test environment
+     *
+     * @return void
      */
-    public function setUp()
+    public function setUp() :void
     {
         parent::setUp();