From 2c2149a2e5fb91b727657e8d9f76857efd100810 Mon Sep 17 00:00:00 2001 From: Louis Charette Date: Sat, 22 Jun 2019 10:11:46 -0400 Subject: [PATCH] Updated dependencies --- .travis.yml | 27 --------------------------- CHANGELOG.md | 6 ++++++ README.md | 1 + composer.json | 8 ++++---- 4 files changed, 11 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbd6b12..5cb4df1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,39 +3,12 @@ dist: trusty language: php php: - - 5.6 - - 7 - 7.1 - 7.2 - 7.3 -env: - - LARAVEL_VERSION=5.4.* - - LARAVEL_VERSION=5.5.* - - LARAVEL_VERSION=5.6.* - - LARAVEL_VERSION=5.7.* - - LARAVEL_VERSION=5.8.* - -matrix: - exclude: - - php: 5.6 - env: LARAVEL_VERSION=5.5.* - - php: 5.6 - env: LARAVEL_VERSION=5.6.* - - php: 5.6 - env: LARAVEL_VERSION=5.7.* - - php: 5.6 - env: LARAVEL_VERSION=5.8.* - - php: 7.0 - env: LARAVEL_VERSION=5.6.* - - php: 7.0 - env: LARAVEL_VERSION=5.7.* - - php: 7.0 - env: LARAVEL_VERSION=5.8.* - before_script: - travis_retry composer self-update - - if [ "$LARAVEL_VERSION" != "" ]; then composer require "illuminate/redis:${LARAVEL_VERSION}" --no-update; fi; - travis_retry composer install --prefer-source --no-interaction script: diff --git a/CHANGELOG.md b/CHANGELOG.md index 1306ec6..434f037 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## [4.3.0] +- Dropping support for PHP 5.6 & 7.0 +- Updated Illuminate/Config to 5.8 +- Updated PHPUnit to 7.5 + ## [4.2.1] - Fix issue with FileRepositoryLoader's `prependPath` method. - Fix issue with `Util::stripPrefix` if prefix is same as string to process on PHP 5.6. @@ -29,6 +34,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ## 4.0.0 - Initial Release +[4.3.0]: https://github.com/userfrosting/support/compare/4.2.1...4.3.0 [4.2.1]: https://github.com/userfrosting/support/compare/4.2.0...4.2.1 [4.2.0]: https://github.com/userfrosting/support/compare/4.1.3...4.2.0 [4.1.3]: https://github.com/userfrosting/support/compare/4.1.2...4.1.3 diff --git a/README.md b/README.md index 876d14b..a649cd5 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Support module for UserFrosting 4 [![Latest Version](https://img.shields.io/github/release/userfrosting/support.svg)](https://github.com/userfrosting/support/releases) +![PHP Version](https://img.shields.io/packagist/php-v/userfrosting/userfrosting.svg?color=brightgreen) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE.md) [![Join the chat at https://chat.userfrosting.com/channel/support](https://demo.rocket.chat/images/join-chat.svg)](https://chat.userfrosting.com/channel/support) [![Donate](https://img.shields.io/badge/Open%20Collective-Donate-blue.svg)](https://opencollective.com/userfrosting#backer) diff --git a/composer.json b/composer.json index 382c90c..99377eb 100644 --- a/composer.json +++ b/composer.json @@ -12,15 +12,15 @@ } ], "require": { - "illuminate/config": "^5.4", + "illuminate/config": "^5.8", "jackiedo/dotenv-editor": "~1.0.7", - "php": ">=5.6.0", - "userfrosting/uniformresourcelocator": "~4.2.1", + "php": ">=7.1", + "userfrosting/uniformresourcelocator": "~4.2.1 | ~4.3.0", "symfony/yaml": ">=2.1" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.13", - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^7.5" }, "autoload": { "psr-4": {