Skip to content

Commit 8b781ba

Browse files
authored
Merge pull request thephpleague#382 from thephpleague/feature/improve-travis
Improve travis settings for CI/CD
2 parents c8069f9 + f3527f3 commit 8b781ba

File tree

3 files changed

+30
-21
lines changed

3 files changed

+30
-21
lines changed

.travis.yml

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,33 +3,48 @@ sudo: false
33
cache:
44
directories:
55
- "$HOME/.composer/cache"
6-
env:
7-
global:
8-
- COMPOSER_ARGS="--no-interaction --prefer-source --no-suggest"
96
matrix:
107
include:
8+
- php: 7.2
9+
env:
10+
- COLLECT_COVERAGE=false
11+
- COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --prefer-lowest --prefer-stable"
12+
- RUN_PHPSTAN=false
13+
- VALIDATE_CODING_STYLE=false
1114
- php: 7.2
1215
env:
1316
- COLLECT_COVERAGE=true
14-
- IGNORE_PLATFORMS=false
17+
- COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source"
1518
- RUN_PHPSTAN=true
1619
- VALIDATE_CODING_STYLE=true
20+
- php: 7.3
21+
env:
22+
- COLLECT_COVERAGE=false
23+
- COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --prefer-lowest --prefer-stable"
24+
- RUN_PHPSTAN=false
25+
- VALIDATE_CODING_STYLE=false
1726
- php: 7.3
1827
env:
1928
- COLLECT_COVERAGE=true
20-
- IGNORE_PLATFORMS=false
29+
- COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source"
2130
- RUN_PHPSTAN=true
31+
- VALIDATE_CODING_STYLE=true
32+
- php: 7.4
33+
env:
34+
- COLLECT_COVERAGE=false
35+
- COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --prefer-lowest --prefer-stable"
36+
- RUN_PHPSTAN=false
2237
- VALIDATE_CODING_STYLE=false
2338
- php: 7.4
2439
env:
2540
- COLLECT_COVERAGE=true
26-
- IGNORE_PLATFORMS=false
41+
- COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source"
2742
- RUN_PHPSTAN=true
28-
- VALIDATE_CODING_STYLE=false
43+
- VALIDATE_CODING_STYLE=true
2944
- php: nightly
3045
env:
3146
- COLLECT_COVERAGE=false
32-
- IGNORE_PLATFORMS=true
47+
- COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --ignore-platform-reqs"
3348
- RUN_PHPSTAN=false
3449
- VALIDATE_CODING_STYLE=false
3550
allow_failures:
@@ -38,8 +53,7 @@ matrix:
3853
before_install:
3954
- travis_retry composer self-update
4055
install:
41-
- if [ "$IGNORE_PLATFORMS" == "true" ]; then travis_retry composer update $COMPOSER_ARGS --ignore-platform-reqs; fi
42-
- if [ "$IGNORE_PLATFORMS" == "false" ]; then travis_retry composer update $COMPOSER_ARGS; fi
56+
- travis_retry composer update $COMPOSER_ARGS
4357
script:
4458
- if [ "$VALIDATE_CODING_STYLE" == "true" ]; then composer phpcs; fi
4559
- if [ "$RUN_PHPSTAN" == "true" ]; then composer phpstan; fi

README.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,11 @@ Highlights
1717

1818
* Simple API
1919
* Read and Write to CSV documents in a memory efficient and scalable way
20-
* Support PHP Stream filtering capabilities
20+
* Support PHP stream filtering capabilities
2121
* Transform CSV documents into popular format (JSON, XML or HTML)
2222
* Fully documented
2323
* Fully unit tested
2424
* Framework-agnostic
25-
* Composer ready, [PSR-2] and [PSR-4] compliant
2625

2726
Documentation
2827
-------
@@ -32,7 +31,7 @@ Full documentation can be found at [csv.thephpleague.com](https://csv.thephpleag
3231
System Requirements
3332
-------
3433

35-
You need **PHP >= 7.2.0** and the `mbstring` extension to use `Csv` but the latest stable version of PHP is recommended.
34+
You need **PHP >= 7.2.5** and the `mbstring` extension to use `Csv` but the latest stable version of PHP is recommended.
3635

3736
Install
3837
-------
@@ -94,6 +93,3 @@ License
9493
-------
9594

9695
The MIT License (MIT). Please see [LICENSE](LICENSE) for more information.
97-
98-
[PSR-2]: http://www.php-fig.org/psr/psr-2/
99-
[PSR-4]: http://www.php-fig.org/psr/psr-4/

composer.json

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "league/csv",
33
"type": "library",
4-
"description" : "Csv data manipulation made easy in PHP",
5-
"keywords": ["csv", "import", "export", "read", "write", "filter"],
4+
"description" : "CSV data manipulation made easy in PHP",
5+
"keywords": ["csv", "import", "export", "read", "write", "filter", "convert", "transform"],
66
"license": "MIT",
77
"homepage" : "http://csv.thephpleague.com",
88
"authors": [
@@ -15,13 +15,12 @@
1515
],
1616
"support": {
1717
"docs": "https://csv.thephpleague.com",
18-
"forum": "https://groups.google.com/forum/#!forum/thephpleague",
1918
"issues": "https://github.com/thephpleague/csv/issues",
2019
"rss": "https://github.com/thephpleague/csv/releases.atom",
2120
"source": "https://github.com/thephpleague/csv"
2221
},
2322
"require": {
24-
"php" : "^7.2",
23+
"php" : "^7.2.5",
2524
"ext-json" : "*",
2625
"ext-mbstring" : "*"
2726
},
@@ -69,7 +68,7 @@
6968
},
7069
"suggest": {
7170
"ext-iconv" : "Needed to ease transcoding CSV using iconv stream filters",
72-
"ext-dom" : "Need to use the XMLConverter class"
71+
"ext-dom" : "Required to use the XMLConverter and or the HTMLConverter classes"
7372
},
7473
"extra": {
7574
"branch-alias": {

0 commit comments

Comments
 (0)