From 76debe8c4c4a344543b4c640aaa806dd8106900a Mon Sep 17 00:00:00 2001 From: Louis Charette Date: Sun, 5 Jan 2020 16:24:08 -0500 Subject: [PATCH 1/3] Added PHP 7.4 to Travis --- .travis.yml | 1 + CHANGELOG.md | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5cb4df1..ad41f5b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ php: - 7.1 - 7.2 - 7.3 + - 7.4 before_script: - travis_retry composer self-update diff --git a/CHANGELOG.md b/CHANGELOG.md index c501b33..d469091 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ 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.4] +- Added PHP 7.4 to Travis + ## [4.3.3] - Remove '?string' in `UserFrosting\Support\Repository:mergeItems()` method to restore compatability with RequestSchemaInterface. From 122b830d356fb715c36c3e1111efdf21f4c5ac73 Mon Sep 17 00:00:00 2001 From: Louis Charette Date: Sun, 5 Jan 2020 19:41:48 -0500 Subject: [PATCH 2/3] Fix issue with tests, caused by bad tab --- tests/Repository/data/core/owls/tyto.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Repository/data/core/owls/tyto.json b/tests/Repository/data/core/owls/tyto.json index 7626524..67d5788 100644 --- a/tests/Repository/data/core/owls/tyto.json +++ b/tests/Repository/data/core/owls/tyto.json @@ -1,3 +1,3 @@ { - "plumage": "floofy" + "plumage": "floofy" } From fddbbc1468889dfa38d1cabdee6b7b3e02f81939 Mon Sep 17 00:00:00 2001 From: Louis Charette Date: Sun, 5 Jan 2020 19:44:46 -0500 Subject: [PATCH 3/3] Updated Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d469091..1def1ac 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a ## [4.3.4] - Added PHP 7.4 to Travis +- Fix issue with test data ## [4.3.3] - Remove '?string' in `UserFrosting\Support\Repository:mergeItems()` method to restore compatability with RequestSchemaInterface.