Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 17d6adc

Browse files
GrahamCampbellGrahamCampbell
committed
Merge branch '2.6' into 3.6
2 parents 32a35ac + 2cf2a5a commit 17d6adc

5 files changed

Lines changed: 61 additions & 35 deletions

File tree

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
/.gitattributes export-ignore
66
/.github export-ignore
77
/.gitignore export-ignore
8+
/.github export-ignore
89
/.travis.yml export-ignore
910
/phpunit.xml.dist export-ignore
1011
/README.md export-ignore

‎.github/CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ Then run [PHPUnit](https://phpunit.de/):
2727
$ vendor/bin/phpunit
2828
```
2929

30-
The tests will be automatically run by [Travis CI](https://travis-ci.org/) against pull requests.
30+
The tests will be automatically run by [Travis CI](https://travis-ci.org/) and [GitHub Actions](https://github.com/features/actions) against pull requests.

‎.github/workflows/tests.yml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Tests
2+
3+
on:
4+
push:
5+
pull_request:
6+
7+
jobs:
8+
tests:
9+
name: PHP ${{ matrix.php }}
10+
runs-on: ubuntu-20.04
11+
12+
strategy:
13+
matrix:
14+
php: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
15+
16+
steps:
17+
- name: Checkout Code
18+
uses: actions/checkout@v2
19+
20+
- name: Setup PHP
21+
uses: shivammathur/setup-php@v2
22+
with:
23+
php-version: ${{ matrix.php }}
24+
tools: composer:v2
25+
coverage: none
26+
27+
- name: Setup Problem Matchers
28+
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
29+
30+
- name: Install PHP 5/7 Dependencies
31+
uses: nick-invision/retry@v1
32+
with:
33+
timeout_minutes: 5
34+
max_attempts: 5
35+
command: composer update --no-interaction --no-progress
36+
if: "matrix.php < 8"
37+
38+
- name: Install PHP 8 Dependencies
39+
uses: nick-invision/retry@v1
40+
with:
41+
timeout_minutes: 5
42+
max_attempts: 5
43+
command: composer update --no-interaction --no-progress --ignore-platform-reqs
44+
if: "matrix.php >= 8"
45+
46+
- name: Execute PHPUnit
47+
run: vendor/bin/phpunit

‎.travis.yml‎

Lines changed: 12 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -4,62 +4,41 @@ jobs:
44
dist: trusty
55
language: php
66
php: hhvm-3.18
7-
before_install: composer self-update --preview && travis_retry composer require "phpunit/phpunit:^5.7.27" --dev --no-update -n
7+
before_install: composer self-update --2
8+
install: travis_retry composer update -n -o
9+
script: vendor/bin/phpunit
10+
- name: HHVM 3.24
11+
dist: trusty
12+
language: php
13+
php: hhvm-3.24
14+
before_install: composer self-update --2
815
install: travis_retry composer update -n -o
916
script: vendor/bin/phpunit
1017
- name: HHVM 3.30
1118
dist: trusty
1219
language: php
1320
php: hhvm-3.30
14-
before_install: composer self-update --preview && travis_retry composer require "phpunit/phpunit:^5.7.27" --dev --no-update -n
21+
before_install: composer self-update --2
1522
install: travis_retry composer update -n -o
1623
script: vendor/bin/phpunit
1724
- name: PHP 5.4
1825
dist: trusty
1926
language: php
2027
php: 5.4
21-
before_install: composer self-update --preview
28+
before_install: composer self-update --2
2229
install: travis_retry composer update -n -o
2330
script: vendor/bin/phpunit
2431
- name: PHP 5.5.9
2532
dist: trusty
2633
language: php
2734
php: 5.5.9
28-
before_install: composer self-update --preview
35+
before_install: composer self-update --2
2936
install: travis_retry composer update -n -o
3037
script: vendor/bin/phpunit
3138
- name: PHP 5.5
3239
dist: trusty
3340
language: php
3441
php: 5.5
35-
before_install: composer self-update --preview
42+
before_install: composer self-update --2
3643
install: travis_retry composer update -n -o
3744
script: vendor/bin/phpunit
38-
- name: PHP 5.6
39-
dist: bionic
40-
install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:5.6-base update -n -o
41-
script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:5.6-cli
42-
- name: PHP 7.0
43-
dist: bionic
44-
install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.0-base update -n -o
45-
script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.0-cli
46-
- name: PHP 7.1
47-
dist: bionic
48-
install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.1-base update -n -o
49-
script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.1-cli
50-
- name: PHP 7.2
51-
dist: bionic
52-
install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.2-base update -n -o
53-
script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.2-cli
54-
- name: PHP 7.3
55-
dist: bionic
56-
install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.3-base update -n -o
57-
script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.3-cli
58-
- name: PHP 7.4
59-
dist: bionic
60-
install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:7.4-base update -n -o
61-
script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:7.4-cli
62-
- name: PHP 8.0
63-
dist: bionic
64-
install: travis_retry docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint composer registry.gitlab.com/grahamcampbell/php:8.0-base update -n -o --ignore-platform-req=php
65-
script: docker run -it -w /data -v ${PWD}:/data:delegated --entrypoint vendor/bin/phpunit registry.gitlab.com/grahamcampbell/php:8.0-cli

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Loads environment variables from `.env` to `getenv()`, `$_ENV` and `$_SERVER` au
66
![Banner](https://user-images.githubusercontent.com/2829600/71564012-31105580-2a91-11ea-9ad7-ef1278411b35.png)
77

88
<p align="center">
9-
<a href="https://travis-ci.org/vlucas/phpdotenv"><img src="https://img.shields.io/travis/vlucas/phpdotenv/master.svg?style=flat-square" alt="Build Status"></img></a>
109
<a href="LICENSE"><img src="https://img.shields.io/badge/license-BSD%203--Clause-brightgreen.svg?style=flat-square" alt="Software License"></img></a>
1110
<a href="https://packagist.org/packages/vlucas/phpdotenv"><img src="https://img.shields.io/packagist/dt/vlucas/phpdotenv.svg?style=flat-square" alt="Total Downloads"></img></a>
1211
<a href="https://github.com/vlucas/phpdotenv/releases"><img src="https://img.shields.io/github/release/vlucas/phpdotenv.svg?style=flat-square" alt="Latest Version"></img></a>

0 commit comments

Comments
 (0)