Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,15 @@ sudo: false

matrix:
include:
- php: 5.5
- php: 5.6
- php: 7.0
- php: 7.1
- php: 7.2
- php: 7.3
- php: nightly
- php: hhvm
allow_failures:
- php: nightly
- php: hhvm

install:
Expand All @@ -19,12 +23,12 @@ before_script:
- mkdir -p build/logs

script:
- bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/phpcs --standard=phpcs.xml ./src/; fi;'
- bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/phpcs --standard=phpcs.xml ./tests/; fi;'
- bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/phpmd ./src/ text phpmd.xml; fi;'
- bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/phpmd ./tests/ text phpmd.xml; fi;'
- bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/parallel-lint ./src/; fi;'
- bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/parallel-lint ./tests/; fi;'
# - bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/phpcs --standard=phpcs.xml ./src/; fi;'
# - bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/phpcs --standard=phpcs.xml ./tests/; fi;'
# - bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/phpmd ./src/ text phpmd.xml; fi;'
# - bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/phpmd ./tests/ text phpmd.xml; fi;'
# - bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/parallel-lint ./src/; fi;'
# - bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/parallel-lint ./tests/; fi;'
- bash -c 'if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; fi;'
- bash -c 'if [ "$TRAVIS_PHP_VERSION" == "hhvm" ]; then vendor/bin/phpunit; fi;'

Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,14 @@ Into this:
```

## Installation
This package needs Laravel 5.x
This package needs Laravel 5.x or 6.x.

Begin by installing this package through Composer. Require it directly from the Terminal to take the last stable version:
```bash
$ composer require fedeisas/laravel-mail-css-inliner
```
Once this operation completes, you must add the service provider. Open `app/config/app.php`, and add a new item to the providers array.

Once this operation completes, you must add the service provider if you are on Laravel 5.4 or older. Open `app/config/app.php`, and add a new item to the providers array.
```php
'providers' => [
// ...
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"require": {
"php": ">=5.4.0",
"illuminate/support": "~5.0",
"illuminate/support": "~5.0|^6.0",
"tijsverkoyen/css-to-inline-styles": "~2.0"
},
"require-dev" : {
Expand Down