Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vlucas/phpdotenv
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.6.8
Choose a base ref
...
head repository: vlucas/phpdotenv
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v3.6.9
Choose a head ref
  • 3 commits
  • 8 files changed
  • 2 contributors

Commits on Oct 2, 2021

  1. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    f1e2a35 View commit details
  2. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    51a8a7b View commit details
  3. Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Copy the full SHA
    a1bf4c9 View commit details
Showing with 24 additions and 21 deletions.
  1. +2 −11 .github/workflows/tests.yml
  2. +1 −0 .gitignore
  3. +3 −5 composer.json
  4. +2 −1 phpunit.xml.dist
  5. +4 −1 tests/Dotenv/DotenvTest.php
  6. +4 −1 tests/Dotenv/EnvironmentVariablesTest.php
  7. +4 −1 tests/Dotenv/LoaderTest.php
  8. +4 −1 tests/Dotenv/ValidatorTest.php
13 changes: 2 additions & 11 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.phpunit.result.cache
composer.lock
phpunit.xml
vendor
8 changes: 3 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
@@ -6,13 +6,11 @@
"authors": [
{
"name": "Graham Campbell",
"email": "graham@alt-three.com",
"homepage": "https://gjcampbell.co.uk/"
"email": "hello@gjcampbell.co.uk"
},
{
"name": "Vance Lucas",
"email": "vance@vancelucas.com",
"homepage": "https://vancelucas.com/"
"email": "vance@vancelucas.com"
}
],
"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": {
3 changes: 2 additions & 1 deletion phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -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"
5 changes: 4 additions & 1 deletion tests/Dotenv/DotenvTest.php
Original file line number Diff line number Diff line change
@@ -10,7 +10,10 @@ class DotenvTest extends TestCase
*/
private $fixturesFolder;

public function setUp()
/**
* @before
*/
public function setUpTest()
{
$this->fixturesFolder = dirname(__DIR__).'/fixtures/env';
}
5 changes: 4 additions & 1 deletion tests/Dotenv/EnvironmentVariablesTest.php
Original file line number Diff line number Diff line change
@@ -11,7 +11,10 @@ class EnvironmentVariablesTest extends TestCase
*/
private $envFactory;

protected function setUp()
/**
* @before
*/
public function setUpTest()
{
$this->envFactory = new DotenvFactory();
(new Loader([dirname(__DIR__).'/fixtures/env/.env'], $this->envFactory))->load();
5 changes: 4 additions & 1 deletion tests/Dotenv/LoaderTest.php
Original file line number Diff line number Diff line change
@@ -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);
5 changes: 4 additions & 1 deletion tests/Dotenv/ValidatorTest.php
Original file line number Diff line number Diff line change
@@ -10,7 +10,10 @@ class ValidatorTest extends TestCase
*/
private $fixturesFolder;

public function setUp()
/**
* @before
*/
public function setUpTest()
{
$this->fixturesFolder = dirname(__DIR__).'/fixtures/env';
}