From 0acd30227fd5047f13a7a942893529689e917b6e Mon Sep 17 00:00:00 2001 From: Alex Bouma Date: Wed, 4 Sep 2019 21:01:03 +0200 Subject: [PATCH 1/4] Allow installation with Laravel 6 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a757fc9..b9687fa 100644 --- a/composer.json +++ b/composer.json @@ -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" : { From 43d169ebcd5ea4feed0e684738098bae9490813e Mon Sep 17 00:00:00 2001 From: Alex Bouma Date: Wed, 4 Sep 2019 21:02:56 +0200 Subject: [PATCH 2/4] Test on newer php versions and drop unsupported versions by test suite --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cca7cee..64240a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: From 8ecc0d9afbdcd21c9cae204c24f49cb42e024406 Mon Sep 17 00:00:00 2001 From: Alex Bouma Date: Wed, 4 Sep 2019 21:28:42 +0200 Subject: [PATCH 3/4] Disable unconfigured code tools in test suite --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64240a8..ea09d40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,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;' From 0e438c4fb7ee8f56e0b4682d0b392f6a92c2b4f2 Mon Sep 17 00:00:00 2001 From: Alex Bouma Date: Thu, 5 Sep 2019 09:38:31 +0200 Subject: [PATCH 4/4] Added remarks about 6.x support and service provider needed on Laravel <= 5.4 --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0fc6685..4b42ccd 100644 --- a/README.md +++ b/README.md @@ -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' => [ // ...