Merge branch '2.6' into 3.6

Author: GrahamCampbell

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
+        php: ['5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
 
     steps:
       - name: Checkout Code
@@ -27,21 +27,12 @@ jobs:
       - name: Setup Problem Matchers
         run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
 
-      - name: Install PHP 5/7 Dependencies
+      - name: Install Dependencies
         uses: nick-invision/retry@v1
         with:
           timeout_minutes: 5
           max_attempts: 5
           command: composer update --no-interaction --no-progress
-        if: "matrix.php < 8"
-
-      - name: Install PHP 8 Dependencies
-        uses: nick-invision/retry@v1
-        with:
-          timeout_minutes: 5
-          max_attempts: 5
-          command: composer update --no-interaction --no-progress --ignore-platform-req=php
-        if: "matrix.php >= 8"
 
       - name: Execute PHPUnit
         run: vendor/bin/phpunit

.gitignore

@@ -1,3 +1,4 @@
+.phpunit.result.cache
 composer.lock
 phpunit.xml
 vendor

composer.json

@@ -6,13 +6,11 @@
     "authors": [
         {
             "name": "Graham Campbell",
-            "email": "[email protected]",
-            "homepage": "https://gjcampbell.co.uk/"
+            "email": "[email protected]"
         },
         {
             "name": "Vance Lucas",
-            "email": "[email protected]",
-            "homepage": "https://vancelucas.com/"
+            "email": "[email protected]"
         }
     ],
     "require": {
@@ -23,7 +21,7 @@
     "require-dev": {
         "ext-filter": "*",
         "ext-pcre": "*",
-        "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20"
+        "phpunit/phpunit": "^4.8.36 || ^5.7.27 || ^6.5.14 || ^7.5.20 || ^8.5.21"
     },
     "autoload": {
         "psr-4": {

phpunit.xml.dist

@@ -5,11 +5,12 @@
          beStrictAboutOutputDuringTests="true"
          bootstrap="vendor/autoload.php"
          colors="true"
+         convertDeprecationsToExceptions="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          failOnRisky="true"
-         failOnWarning="true"
+         failOnWarning="false"
          processIsolation="false"
          stopOnError="false"
          stopOnFailure="false"

tests/Dotenv/DotenvTest.php

@@ -10,7 +10,10 @@ class DotenvTest extends TestCase
      */
     private $fixturesFolder;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpTest()
     {
         $this->fixturesFolder = dirname(__DIR__).'/fixtures/env';
     }

tests/Dotenv/LoaderTest.php

@@ -17,7 +17,10 @@ class LoaderTest extends TestCase
      */
     protected $keyVal;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpTest()
     {
         $this->folder = dirname(__DIR__).'/fixtures/env';
         $this->keyVal(true);

tests/Dotenv/ValidatorTest.php

@@ -10,7 +10,10 @@ class ValidatorTest extends TestCase
      */
     private $fixturesFolder;
 
-    public function setUp()
+    /**
+     * @before
+     */
+    public function setUpTest()
     {
         $this->fixturesFolder = dirname(__DIR__).'/fixtures/env';
     }