From 5eb67f2d6e8937e119191b87eb7271dfde6294a0 Mon Sep 17 00:00:00 2001 From: Tom Witkowski Date: Thu, 12 Mar 2020 13:57:40 +0100 Subject: [PATCH 1/2] add laravel 7 support --- .github/workflows/run-tests.yml | 4 +++- CHANGELOG.md | 4 ++++ README.md | 2 +- composer.json | 6 +++--- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index d49986f..80b59bc 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -13,9 +13,11 @@ jobs: fail-fast: true matrix: php: [7.4] - laravel: [6.*] + laravel: [7.*, 6.*] dependency-version: [prefer-lowest, prefer-stable] include: + - laravel: 7.* + testbench: 5.* - laravel: 6.* testbench: 4.* diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ab1975..6480cc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to `laravel-unavatar` will be documented in this file +## 0.1.1 - 2020-03-12 + +- add Laravel 7 support + ## 0.1.0 - 2020-02-22 - initial release diff --git a/README.md b/README.md index 29027bb..1bb6e0b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# PHP Unavatar +# Laravel Unavatar [![Latest Version](http://img.shields.io/packagist/v/astrotomic/laravel-unavatar.svg?label=Release&style=for-the-badge)](https://packagist.org/packages/astrotomic/laravel-unavatar) [![MIT License](https://img.shields.io/github/license/Astrotomic/laravel-unavatar.svg?label=License&color=blue&style=for-the-badge)](https://github.com/Astrotomic/laravel-unavatar/blob/master/LICENSE) diff --git a/composer.json b/composer.json index 971a0c2..f776ff1 100644 --- a/composer.json +++ b/composer.json @@ -22,11 +22,11 @@ "require": { "php": "^7.1", "astrotomic/php-unavatar": "^0.1.0", - "illuminate/support": "^6.0" + "illuminate/support": "^6.0 | ^7.0" }, "require-dev": { - "orchestra/testbench": "^4.0", - "phpunit/phpunit": "^8.0" + "orchestra/testbench": "^4.0 | ^5.0", + "phpunit/phpunit": "^8.0 | ^9.0" }, "config": { "sort-packages": true From ab39bd475ff10fa7cd27e36a93b7e9c63dd05067 Mon Sep 17 00:00:00 2001 From: Gummibeer Date: Thu, 12 Mar 2020 12:58:16 +0000 Subject: [PATCH 2/2] normalize composer.json --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index f776ff1..6207c1f 100644 --- a/composer.json +++ b/composer.json @@ -22,11 +22,11 @@ "require": { "php": "^7.1", "astrotomic/php-unavatar": "^0.1.0", - "illuminate/support": "^6.0 | ^7.0" + "illuminate/support": "^6.0 || ^7.0" }, "require-dev": { - "orchestra/testbench": "^4.0 | ^5.0", - "phpunit/phpunit": "^8.0 | ^9.0" + "orchestra/testbench": "^4.0 || ^5.0", + "phpunit/phpunit": "^8.0 || ^9.0" }, "config": { "sort-packages": true