Merge pull request #382 from thephpleague/feature/improve-travis

Improve travis settings for CI/CD
thephpleague · Mar 6, 2020 · 8b781ba · 8b781ba
2 parents c8069f9 + f3527f3
commit 8b781ba
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,33 +3,48 @@ sudo: false
 cache:
     directories:
         - "$HOME/.composer/cache"
-env:
-    global:
-        - COMPOSER_ARGS="--no-interaction --prefer-source --no-suggest"
 matrix:
     include:
+        - php: 7.2
+          env:
+              - COLLECT_COVERAGE=false
+              - COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --prefer-lowest --prefer-stable"
+              - RUN_PHPSTAN=false
+              - VALIDATE_CODING_STYLE=false
         - php: 7.2
           env:
               - COLLECT_COVERAGE=true
-              - IGNORE_PLATFORMS=false
+              - COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source"
               - RUN_PHPSTAN=true
               - VALIDATE_CODING_STYLE=true
+        - php: 7.3
+          env:
+              - COLLECT_COVERAGE=false
+              - COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --prefer-lowest --prefer-stable"
+              - RUN_PHPSTAN=false
+              - VALIDATE_CODING_STYLE=false
         - php: 7.3
           env:
               - COLLECT_COVERAGE=true
-              - IGNORE_PLATFORMS=false
+              - COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source"
               - RUN_PHPSTAN=true
+              - VALIDATE_CODING_STYLE=true
+        - php: 7.4
+          env:
+              - COLLECT_COVERAGE=false
+              - COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --prefer-lowest --prefer-stable"
+              - RUN_PHPSTAN=false
               - VALIDATE_CODING_STYLE=false
         - php: 7.4
           env:
               - COLLECT_COVERAGE=true
-              - IGNORE_PLATFORMS=false
+              - COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source"
               - RUN_PHPSTAN=true
-              - VALIDATE_CODING_STYLE=false
+              - VALIDATE_CODING_STYLE=true
         - php: nightly
           env:
               - COLLECT_COVERAGE=false
-              - IGNORE_PLATFORMS=true
+              - COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --ignore-platform-reqs"
               - RUN_PHPSTAN=false
               - VALIDATE_CODING_STYLE=false
     allow_failures:
@@ -38,8 +53,7 @@ matrix:
 before_install:
     - travis_retry composer self-update
 install:
-    - if [ "$IGNORE_PLATFORMS" == "true" ]; then travis_retry composer update $COMPOSER_ARGS --ignore-platform-reqs; fi
-    - if [ "$IGNORE_PLATFORMS" == "false" ]; then travis_retry composer update $COMPOSER_ARGS; fi
+    - travis_retry composer update $COMPOSER_ARGS
 script:
     - if [ "$VALIDATE_CODING_STYLE" == "true" ]; then composer phpcs; fi
     - if [ "$RUN_PHPSTAN" == "true" ]; then composer phpstan; fi

diff --git a/README.md b/README.md
@@ -17,12 +17,11 @@ Highlights
 
 * Simple API
 * Read and Write to CSV documents in a memory efficient and scalable way
-* Support PHP Stream filtering capabilities
+* Support PHP stream filtering capabilities
 * Transform CSV documents into popular format (JSON, XML or HTML)
 * Fully documented
 * Fully unit tested
 * Framework-agnostic
-* Composer ready, [PSR-2] and [PSR-4] compliant
 
 Documentation
 -------
@@ -32,7 +31,7 @@ Full documentation can be found at [csv.thephpleague.com](https://csv.thephpleag
 System Requirements
 -------
 
-You need **PHP >= 7.2.0** and the `mbstring` extension to use `Csv` but the latest stable version of PHP is recommended.
+You need **PHP >= 7.2.5** and the `mbstring` extension to use `Csv` but the latest stable version of PHP is recommended.
 
 Install
 -------
@@ -94,6 +93,3 @@ License
 -------
 
 The MIT License (MIT). Please see [LICENSE](LICENSE) for more information.
-
-[PSR-2]: http://www.php-fig.org/psr/psr-2/
-[PSR-4]: http://www.php-fig.org/psr/psr-4/
diff --git a/composer.json b/composer.json
@@ -1,8 +1,8 @@
 {
     "name": "league/csv",
     "type": "library",
-    "description" : "Csv data manipulation made easy in PHP",
-    "keywords": ["csv", "import", "export", "read", "write", "filter"],
+    "description" : "CSV data manipulation made easy in PHP",
+    "keywords": ["csv", "import", "export", "read", "write", "filter", "convert", "transform"],
     "license": "MIT",
     "homepage" : "http://csv.thephpleague.com",
     "authors": [
@@ -15,13 +15,12 @@
     ],
     "support": {
         "docs": "https://csv.thephpleague.com",
-        "forum": "https://groups.google.com/forum/#!forum/thephpleague",
         "issues": "https://github.com/thephpleague/csv/issues",
         "rss": "https://github.com/thephpleague/csv/releases.atom",
         "source": "https://github.com/thephpleague/csv"
     },
     "require": {
-        "php" : "^7.2",
+        "php" : "^7.2.5",
         "ext-json" : "*",
         "ext-mbstring" : "*"
     },
@@ -69,7 +68,7 @@
     },
     "suggest": {
         "ext-iconv" : "Needed to ease transcoding CSV using iconv stream filters",
-        "ext-dom" : "Need to use the XMLConverter class"
+        "ext-dom" : "Required to use the XMLConverter and or the HTMLConverter classes"
     },
     "extra": {
         "branch-alias": {