Merge branch '2.6' into 3.6

.travis.yml

@@ -1,58 +1,62 @@
-matrix:
+jobs:
   include:
     - name: HHVM 3.18
       dist: trusty
       language: php
       php: hhvm-3.18
       before_install: travis_retry composer require "phpunit/phpunit:^5.7.27" --dev --no-update -n
-      install: travis_retry composer install --prefer-dist -n -o
+      install: travis_retry composer update -n -o
       script: vendor/bin/phpunit
     - name: HHVM 3.30
       dist: trusty
       language: php
       php: hhvm-3.30
       before_install: travis_retry composer require "phpunit/phpunit:^5.7.27" --dev --no-update -n
-      install: travis_retry composer install --prefer-dist -n -o
+      install: travis_retry composer update -n -o
       script: vendor/bin/phpunit
     - name: PHP 5.4
       dist: trusty
       language: php
       php: 5.4
-      install: travis_retry composer install --prefer-dist -n -o
+      install: travis_retry composer update -n -o
       script: vendor/bin/phpunit
     - name: PHP 5.5.9
       dist: trusty
       language: php
       php: 5.5.9
-      install: travis_retry composer install --prefer-dist -n -o
+      install: travis_retry composer update -n -o
       script: vendor/bin/phpunit
     - name: PHP 5.5
       dist: trusty
       language: php
       php: 5.5
-      install: travis_retry composer install --prefer-dist -n -o
+      install: travis_retry composer update -n -o
       script: vendor/bin/phpunit
     - name: PHP 5.6
       dist: xenial
-      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:5.6 install --prefer-dist -n -o
+      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:5.6 update -n -o
       script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:5.6
     - name: PHP 7.0
       dist: xenial
-      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.0 install --prefer-dist -n -o
+      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.0 update -n -o
       script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.0
     - name: PHP 7.1
       dist: xenial
-      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.1 install --prefer-dist -n -o
+      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.1 update -n -o
       script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.1
     - name: PHP 7.2
       dist: xenial
-      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.2 install --prefer-dist -n -o
+      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.2 update -n -o
       script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.2
     - name: PHP 7.3
       dist: xenial
-      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.3 install --prefer-dist -n -o
+      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.3 update -n -o
       script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.3
     - name: PHP 7.4
       dist: xenial
-      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.4 install --prefer-dist -n -o
+      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.4 update -n -o
       script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.4
+    - name: PHP 8.0
+      dist: xenial
+      install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:8.0 update -n -o --ignore-platform-reqs
+      script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:8.0

composer.json

@@ -2,8 +2,8 @@
     "name": "vlucas/phpdotenv",
     "description": "Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` automagically.",
     "keywords": ["env", "dotenv", "environment"],
-    "license" : "BSD-3-Clause",
-    "authors" : [
+    "license": "BSD-3-Clause",
+    "authors": [
         {
             "name": "Graham Campbell",
             "email": "[email protected]",
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": "^5.4 || ^7.0",
+        "php": "^5.4 || ^7.0 || ^8.0",
         "phpoption/phpoption": "^1.5",
         "symfony/polyfill-ctype": "^1.9"
     },
@@ -34,6 +34,10 @@
         "ext-filter": "Required to use the boolean validator.",
         "ext-pcre": "Required to use most of the library."
     },
+    "config": {
+        "preferred-install": "dist",
+        "platform-check": false
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "3.6-dev"