From a0699224af0b40e06e041c394c66a9f515c66970 Mon Sep 17 00:00:00 2001 From: ArjanSchouten Date: Tue, 2 Feb 2016 22:02:23 +0100 Subject: [PATCH] Add support for Laravel 5.2 projects Update the minimum required php version to 5.6 --- .travis.yml | 6 ------ README.md | 8 ++++---- composer.json | 10 +++++----- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index bf7b951..d83f18e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ language: php php: - - 5.5 - 5.6 - 7.0 - hhvm @@ -11,11 +10,6 @@ cache: - $HOME/.composer/cache - vendor -matrix: - allow_failures: - - php: 7.0 - fast_finish: true - sudo: false before_install: diff --git a/README.md b/README.md index 5a01b67..38ebb6d 100644 --- a/README.md +++ b/README.md @@ -16,15 +16,15 @@ Html Minification can be extremely powerfull and can reduce the size of you're w ## Installation (Couldn't be easier!) Let composer do the hard work for us! ```php -composer require arjanschouten/htmlminifier dev-master +composer require arjanschouten/htmlminifier ``` -#### Laravel 5.1 -With Laravel 5.1 you've to register the service provider in the ```config/app.php``` file and add it to the providers array: +#### Laravel 5.1 and Laravel 5.2 +With Laravel 5 you've to register the service provider in the ```config/app.php``` file and add it to the providers array: ```php ArjanSchouten\HtmlMinifier\Laravel\HtmlMinifierServiceProvider::class ``` -#### Lumen +#### Lumen 5 With Lumen you've to register the service provider in the ```bootstrap/app.php``` file and add the following line: ```php $app->register(ArjanSchouten\HtmlMinifier\Laravel\HtmlMinifierServiceProvider::class); diff --git a/composer.json b/composer.json index b2546c6..1e09030 100644 --- a/composer.json +++ b/composer.json @@ -10,11 +10,11 @@ } ], "require": { - "php": ">=5.5", - "illuminate/contracts": "5.1.*", - "illuminate/filesystem": "5.1.*", - "illuminate/support": "5.1.*", - "illuminate/console": "5.1.*" + "php": ">=5.6", + "illuminate/contracts": "5.1.*|5.2.*", + "illuminate/filesystem": "5.1.*|5.2.*", + "illuminate/support": "5.1.*|5.2.*", + "illuminate/console": "5.1.*|5.2.*" }, "require-dev": { "mockery/mockery": "~0.9",