Skip to content

Commit 946c13e

Browse files
committed
Merge branch 'release/3.2.0'
2 parents 9905bde + e7f3dbc commit 946c13e

File tree

4 files changed

+16
-2
lines changed

4 files changed

+16
-2
lines changed

.gitattributes

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/tests export-ignore
2+
.editorconfig export-ignore
3+
.gitattributes export-ignore
4+
.gitignore export-ignore
5+
.travis.yml export-ignore
6+
phpunit.xml export-ignore

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
language: php
2-
dist: trusty
32
sudo: false
43

54
matrix:
@@ -24,6 +23,10 @@ matrix:
2423
env:
2524
- LARAVEL_VERSION=^8.0
2625
- PHPUNIT_VERSION=^9.0
26+
- php: "8.0snapshot"
27+
env:
28+
- LARAVEL_VERSION=^8.0
29+
- PHPUNIT_VERSION=^9.0
2730

2831
install:
2932
- composer require "illuminate/support:${LARAVEL_VERSION}" --no-update -n

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
All notable changes to this project will be documented in this file. This project adheres to
44
[Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
55

6+
## [3.2.0] - 2020-11-25
7+
8+
###
9+
- Package now supports PHP 8.
10+
611
## [3.1.0] - 2020-09-09
712

813
### Added

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
}
2222
],
2323
"require": {
24-
"php": "^7.2",
24+
"php": "^7.2|^8.0",
2525
"ext-json": "*",
2626
"illuminate/support": "^6.0|^7.0|^8.0",
2727
"phpunit/phpunit": "^8.0|^9.0"

0 commit comments

Comments
 (0)