Skip to content

Commit eca7bc7

Browse files
committed
Merge branch 'release/2.0.0'
2 parents a23a918 + d42e6eb commit eca7bc7

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
66

77
## [Unreleased]
88

9+
## [2.0.0] - 2021-01-07
10+
### Changed
11+
- Update to version ^2.0 JsonMapper
12+
913
## [1.1.3] - 2020-09-14
1014
### Added
1115
- Add support for Laravel 8

Version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.3
1+
2.0.0

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"license": "MIT",
1313
"minimum-stability": "stable",
1414
"require": {
15-
"json-mapper/json-mapper": "^1.0",
15+
"json-mapper/json-mapper": "^2.0",
1616
"php": "^7.2 || ^8.0",
1717
"illuminate/support": "^5.5|^6|^7|^8"
1818
},
@@ -43,7 +43,7 @@
4343
"squizlabs/php_codesniffer": "^3.5",
4444
"phpstan/phpstan": "^0.12.19",
4545
"php-coveralls/php-coveralls": "^2.2",
46-
"phpunit/phpunit": "^8.0",
46+
"phpunit/phpunit": "^8.0 || ^9.0",
4747
"orchestra/testbench": "^5.3|^6.0"
4848
}
4949
}

tests/Implementation/EloquentModel.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44

55
namespace JsonMapper\LaravelPackage\Tests\Implementation;
66

7-
87
class EloquentModel
98
{
109

11-
}
10+
}

0 commit comments

Comments
 (0)