Merge pull request #6 from Harmonic/develop

Laravel 6 updates

.gitignore

@@ -1,4 +1,4 @@
-/vendor
+vendor/*
 .env
 .phpunit.result.cache
 /.vscode

.travis.yml

@@ -1,6 +1,5 @@
 language: php
 php:
-  - 7.1
   - 7.2
   - 7.3
 cache:
@@ -15,7 +14,8 @@ env:
   - ILLUMINATE_VERSION=5.5.* PHPUNIT_VERSION=~6.0
   - ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=~7.0
   - ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=~7.0
-  - ILLUMINATE_VERSION=5.8.* PHPUNIT_VERSION=~7.0 COVERAGE=true
+  - ILLUMINATE_VERSION=5.8.* PHPUNIT_VERSION=~7.0
+  - ILLUMINATE_VERSION=6.0.* PHPUNIT_VERSION=~7.2 COVERAGE=true
 matrix:
   # For each PHP version we exclude the coverage env, except for PHP 7.1
   exclude:
@@ -32,6 +32,8 @@ matrix:
       env: ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=~7.0
     - php: 5.5
       env: ILLUMINATE_VERSION=5.8.* PHPUNIT_VERSION=~7.0 COVERAGE=true
+    - php: 5.5
+      env: ILLUMINATE_VERSION=6.0.* PHPUNIT_VERSION=~7.2
     # Don't test Laravel 5.5 and up on PHP 5.6
     - php: 5.6
       env: ILLUMINATE_VERSION=5.5.* PHPUNIT_VERSION=~6.0
@@ -41,20 +43,26 @@ matrix:
       env: ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=~7.0
     - php: 5.6
       env: ILLUMINATE_VERSION=5.8.* PHPUNIT_VERSION=~7.0 COVERAGE=true
+    - php: 5.6
+      env: ILLUMINATE_VERSION=6.0.* PHPUNIT_VERSION=~7.2
     # Test Laravel 5.5 and down on PHP 7.0
     - php: 7.0
       env: ILLUMINATE_VERSION=5.6.* PHPUNIT_VERSION=~7.0
     - php: 7.0
       env: ILLUMINATE_VERSION=5.7.* PHPUNIT_VERSION=~7.0
     - php: 7.0
       env: ILLUMINATE_VERSION=5.8.* PHPUNIT_VERSION=~7.0 COVERAGE=true
+    - php: 7.0
+      env: ILLUMINATE_VERSION=6.0.* PHPUNIT_VERSION=~7.2
     # Test only Laravel 5.4 and up on PHP 7.1
     - php: 7.1
       env: ILLUMINATE_VERSION=5.1.* PHPUNIT_VERSION=~4.0
     - php: 7.1
       env: ILLUMINATE_VERSION=5.2.* PHPUNIT_VERSION=~4.0
     - php: 7.1
       env: ILLUMINATE_VERSION=5.3.* PHPUNIT_VERSION=~5.0
+    - php: 7.1
+      env: ILLUMINATE_VERSION=6.0.* PHPUNIT_VERSION=~7.2
 before_install:
   - echo "memory_limit=2G" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - composer require "illuminate/support:${ILLUMINATE_VERSION}" --no-update --prefer-dist

changelog.md

@@ -2,6 +2,11 @@
 
 All notable changes to `laravel-envcoder` will be documented in this file.
 
+## Version 1.0.5
+
+### Modified
+- Laravel 6 support
+
 ## Version 1.0.4
 
 ### Modified

composer.json

@@ -12,13 +12,13 @@
     "homepage": "https://github.com/harmonic/laravel-envcoder",
     "keywords": ["Laravel", "laravel-envcoder", "environment", ".env"],
     "require": {
-        "illuminate/support": "~5",
+        "illuminate/support": "~6",
         "defuse/php-encryption": "^2.2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5",
+        "phpunit/phpunit": "^8.0",
         "mockery/mockery": "^1.1",
-        "orchestra/testbench": "~3.0",
+        "orchestra/testbench": "~4.0",
         "sempro/phpunit-pretty-print": "^1.0"
     },
     "autoload": {