Skip to content

Commit 0ff5a0d

Browse files
author
Babichev Maxim
committed
Merge remote-tracking branch 'remotes/origin/themosis' into status-fix
# Conflicts: # changelog.md Add support framework's: lumen, themosis
2 parents f6cfb50 + f6e8299 commit 0ff5a0d

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### Added
9+
- Add support Themosis Framework
10+
811
### Changed
912
- In all the methods of translations have added the status of the transfer.
1013

@@ -222,3 +225,4 @@ The operation is now executed in the transaction and updates the new `refund` fi
222225
[1.1.1]: https://github.com/bavix/laravel-wallet/compare/1.1.0...1.1.1
223226
[1.1.0]: https://github.com/bavix/laravel-wallet/compare/1.0.0...1.1.0
224227
[1.0.0]: https://github.com/bavix/laravel-wallet/compare/0.0.1...1.0.0
228+
[0.0.1]: https://github.com/bavix/laravel-wallet/compare/d181a99e751c5138694580ca4361d5129baa26b3...0.0.1

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@
2424
],
2525
"require": {
2626
"php": "^7.1",
27-
"laravel/framework": "~5.5.0|~5.6.0|~5.7.0|~5.8.0",
27+
"illuminate/database": "~5.5.0|~5.6.0|~5.7.0|~5.8.0",
2828
"ramsey/uuid": "^3.0"
2929
},
3030
"require-dev": {
3131
"doctrine/dbal": "^2.8",
3232
"mockery/mockery": "^1.2",
3333
"orchestra/testbench": "^3.7",
34-
"phpunit/phpunit": "^7.4"
34+
"phpunit/phpunit": "^7.5"
3535
},
3636
"autoload": {
3737
"psr-4": {

0 commit comments

Comments
 (0)