Issue 52

.github/workflows/ci.yml

@@ -6,19 +6,19 @@ on:
       - '*'
   push:
     branches:
-      - master
+      - '*'
 
 permissions:
   contents: read
 
 jobs:
-  test:
+  coding-standard:
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.2', '7.4', '8.0', '8.1', '8.2']
-    name: Test PHP ${{ matrix.php-version }}
+        php-version: ['5.5', '5.6', '7.1', '7.2', '7.4', '8.0', '8.1', '8.2']
+    name: Coding Standard ${{ matrix.php-version }}
 
     steps:
     - uses: actions/checkout@v3
@@ -33,16 +33,16 @@ jobs:
     - name: Composer install
       run: composer install
 
-    - name: Run PHPUnit
-      run: composer run-script test
-  
-  coverage-php:
+    - name: Run PHP CodeSniffer
+      run: composer run-script cs-check
+
+  test:
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.2', '7.4', '8.0', '8.1', '8.2']
-    name: Coverage PHP ${{ matrix.php-version }}
+        php-version: ['5.5', '5.6', '7.1', '7.2', '7.4', '8.0', '8.1', '8.2']
+    name: Test PHP ${{ matrix.php-version }}
 
     steps:
     - uses: actions/checkout@v3
@@ -52,28 +52,21 @@ jobs:
       with:
         php-version: ${{ matrix.php-version }}
         extensions: mbstring, intl
-        coverage: pcov
+        coverage: none
 
     - name: Composer install
       run: composer install
 
     - name: Run PHPUnit
-      run: composer run-script coverage-clover
-
-    - name: Upload to Codecov
-      uses: codecov/codecov-action@v2
-      with:
-        token: ${{ secrets.CODE_COV_TOKEN }}
-        files: ./tmp/coverage.xml
-        verbose: true
+      run: composer run-script test-${{ matrix.php-version }}
 
-  coding-standard:
+  coverage-php:
     runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
-        php-version: ['7.2', '7.4', '8.0', '8.1', '8.2']
-    name: Coding Standard ${{ matrix.php-version }}
+        php-version: ['5.5', '5.6', '7.2', '7.4', '8.0', '8.1', '8.2'] # removed 7.1 as it seems to have an issue with no code coverage driver.
+    name: Coverage PHP ${{ matrix.php-version }}
 
     steps:
     - uses: actions/checkout@v3
@@ -83,34 +76,17 @@ jobs:
       with:
         php-version: ${{ matrix.php-version }}
         extensions: mbstring, intl
-        coverage: none
+        coverage: pcov
 
     - name: Composer install
       run: composer install
 
-    - name: Run PHP CodeSniffer
-      run: composer run-script cs-checkstyle | vendor/bin/cs2pr
-
-  static-analysis:
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: false
-      matrix:
-        php-version: ['7.2', '7.4', '8.0', '8.1', '8.2']
-    name: Static Analysis - PHP ${{ matrix.php-version }}
-
-    steps:
-    - uses: actions/checkout@v3
+    - name: Run PHPUnit
+      run: composer run-script coverage-${{ matrix.php-version }}
 
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
+    - name: Upload to Codecov
+      uses: codecov/codecov-action@v3
       with:
-        php-version: ${{ matrix.php-version }}
-        extensions: mbstring, intl
-        coverage: none
-
-    - name: Composer install
-      run: composer install
-
-    - name: Run PHP Analyzer
-      run: composer run-script phpstan-github
+        token: ${{ secrets.CODECOV_TOKEN }}
+        files: ./tmp/coverage.xml
+        verbose: true

.gitignore

@@ -1,6 +1,11 @@
 .DS_Store
 build
 composer.lock
-tmp
+tmp/*
+!tmp/.gitkeep
 vendor
-.phpunit.result.cache
+.phpunit.result.cache
+/.phpunit.cache
+coverage.xml
+unitreport.xml
+.vscode

README.md → README.markdown

@@ -13,29 +13,20 @@ A `.env` file parsing and loading library for PHP.
 
 ## Requirements
 
-* PHP 5.5+|7.2+
+* PHP 5.5+
 
 ## Installation
 
 _[Using [Composer](http://getcomposer.org/)]_
 
-Run `composer require josegonzalez/dotenv`
+Run `composer require josegonzalez/dotenv:dev-master`
 
 Or add the plugin to your project's `composer.json` - something like this:
 
-For php 5.5 -> 7.4
-```json
+```javascript
   {
     "require": {
-      "josegonzalez/dotenv": ~3.2"
-    }
-  }
-```
-For php 7.4 -> 8.2+
-```json
-  {
-    "require": {
-      "josegonzalez/dotenv": ~4.0"
+      "josegonzalez/dotenv": "dev-master"
     }
   }
 ```

composer.json

@@ -18,12 +18,9 @@
         "m1/env": "2.*"
     },
     "require-dev": {
-        "php": ">=7",
-        "squizlabs/php_codesniffer": "2.*|3.*",
-        "php-coveralls/php-coveralls": "~2.5",
-        "php-mock/php-mock-phpunit": "~2.6",
-        "phpstan/phpstan": "^1.9",
-        "staabm/annotate-pull-request-from-checkstyle": "^1.8"
+        "squizlabs/php_codesniffer": "~2.9||~3.7",
+        "php-coveralls/php-coveralls": "~2.0",
+        "php-mock/php-mock-phpunit": "~1.1||~2.0"
     },
     "autoload": {
         "psr-0": {
@@ -33,16 +30,37 @@
     "scripts": {
         "ci": [
             "@cs-check",
-            "@phpstan",
-            "@test"
+            "@test",
+            "@coverage-clover"
         ],
-        "cs-check": "php -d memory_limit=-1 ./vendor/bin/phpcs --standard=psr2 ./src ./tests",
+        "test-5.5": "@test-5",
+        "test-5.6": "@test-5",
+        "test-7.0": "@test-7",
+        "test-7.1": "@test-7",
+        "test-7.2": "@test-7",
+        "test-7.4": "@test-7",
+        "test-8.0": "@test-8",
+        "test-8.1": "@test-8",
+        "test-8.2": "@test-8",
+        "coverage-5.5": "@coverage-5",
+        "coverage-5.6": "@coverage-5",
+        "coverage-7.0": "@coverage-7",
+        "coverage-7.1": "@coverage-7",
+        "coverage-7.2": "@coverage-7",
+        "coverage-7.4": "@coverage-7",
+        "coverage-8.0": "@coverage-8",
+        "coverage-8.1": "@coverage-8",
+        "coverage-8.2": "@coverage-8",
+        "cs-check": "php -d memory_limit=-1 ./vendor/bin/phpcs --standard=psr2 --exclude=Generic.Files.LineLength ./src ./tests",
         "cs-checkstyle": "php -d memory_limit=-1 ./vendor/bin/phpcs --standard=psr2 --report=checkstyle ./src ./tests",
         "cs-fix": "php -d memory_limit=-1 ./vendor/bin/phpcbf --standard=psr2 ./src ./tests",
-        "phpstan": "php -d memory_limit=-1 ./vendor/bin/phpstan --no-progress -vvv",
-        "phpstan-github": "php -d memory_limit=-1 ./vendor/bin/phpstan --no-progress -vvv --error-format=github",
-        "test": "php -d memory_limit=-1 ./vendor/bin/phpunit --coverage-text --coverage-clover build/logs/clover.xml",
-        "coverage-clover": "php -d memory_limit=-1 -d xdebug.mode=coverage ./vendor/bin/phpunit --coverage-clover=tmp/coverage.xml --testdox",
+        "test": "@test-8",
+        "test-5": "php -d memory_limit=-1 ./vendor/bin/phpunit -c phpunit.5.xml --colors=always --log-junit unitreport.xml --testdox",
+        "test-7": "php -d memory_limit=-1 ./vendor/bin/phpunit -c phpunit.7.xml --colors=always --log-junit unitreport.xml --testdox",
+        "test-8": "php -d memory_limit=-1 ./vendor/bin/phpunit -c phpunit.8.xml --colors=always --log-junit unitreport.xml --testdox",
+        "coverage-5": "php -d memory_limit=-1 -d xdebug.mode=coverage ./vendor/bin/phpunit -c phpunit.5.xml --coverage-text --coverage-clover=./tmp/coverage.xml --testdox",
+        "coverage-7": "php -d memory_limit=-1 -d xdebug.mode=coverage ./vendor/bin/phpunit -c phpunit.7.xml --coverage-text --coverage-clover=./tmp/coverage.xml --testdox",
+        "coverage-8": "php -d memory_limit=-1 -d xdebug.mode=coverage ./vendor/bin/phpunit -c phpunit.8.xml --coverage-text --coverage-clover=./tmp/coverage.xml --testdox",
         "coveralls": "php -d memory_limit=-1 ./vendor/bin/vendor/bin/coveralls -v"
     }
 }

phpunit.5.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         bootstrap="./tests/bootstrap.php"
+>
+  <testsuites>
+    <testsuite name="Dotenv Test Suite">
+      <directory suffix=".php">tests/josegonzalez/Dotenv</directory>
+    </testsuite>
+  </testsuites>
+  <filter>
+    <blacklist>
+      <directory suffix=".php">./docs</directory>
+      <directory suffix=".php">./vendor</directory>
+      <file>./tests/bootstrap.php</file>
+    </blacklist>
+    <!-- this is required, even if empty, until
+    https://github.com/sebastianbergmann/phpunit/issues/1872
+    is resolved -->
+    <whitelist processUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">src</directory>
+    </whitelist>
+  </filter>
+</phpunit>

phpunit.xml → phpunit.7.xml

@@ -14,4 +14,12 @@
       <directory suffix=".php">tests/josegonzalez/Dotenv</directory>
     </testsuite>
   </testsuites>
+  <filter>
+    <!-- this is required, even if empty, until
+    https://github.com/sebastianbergmann/phpunit/issues/1872
+    is resolved -->
+    <whitelist processUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">src</directory>
+    </whitelist>
+  </filter>
 </phpunit>

phpunit.8.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" bootstrap="tests/bootstrap.php" executionOrder="depends,defects" forceCoversAnnotation="true" beStrictAboutCoversAnnotation="true" beStrictAboutOutputDuringTests="true" beStrictAboutTodoAnnotatedTests="true" convertDeprecationsToExceptions="true" failOnRisky="false" failOnWarning="true" backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" verbose="true">
+  <coverage processUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">./src</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="Dotenv Test Suite">
+      <directory suffix=".php">tests/josegonzalez/Dotenv</directory>
+    </testsuite>
+  </testsuites>
+</phpunit>

phpunit.8.xml.bak

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd"
+         bootstrap="tests/bootstrap.php"
+         executionOrder="depends,defects"
+         forceCoversAnnotation="true"
+         beStrictAboutCoversAnnotation="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         convertDeprecationsToExceptions="true"
+         failOnRisky="false"
+         failOnWarning="true"
+         backupGlobals="false"
+         backupStaticAttributes="false"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         verbose="true">
+    <testsuites>
+        <testsuite name="Dotenv Test Suite">
+            <directory suffix=".php">tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src</directory>
+        </whitelist>
+    </filter>
+</phpunit>