Skip to content

Commit 15557e7

Browse files
committed
Upgrade dependencies to support Laravel 6
1 parent 434698c commit 15557e7

File tree

5 files changed

+16
-10
lines changed

5 files changed

+16
-10
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@
22
.idea
33
composer.lock
44
phpunit.xml
5+
/.phpunit.result.cache

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
All Notable changes to `UniqueTranslation` will be documented in this file.
44

5+
## 2.0.0 (2019-10-11)
6+
7+
- Upgrade dependencies to support Laravel 6
8+
59
## 1.2.0 (2019-05-01)
610

711
- Enable the use of extra `where` clauses

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ That's where this package comes in to play.
2121

2222
## ✅ Requirements
2323

24-
- PHP >= 7.0
24+
- PHP ^7.2
2525
- MySQL >= 5.7
26-
- [Laravel](https://laravel.com/) >= 5.5
27-
- [spatie/laravel-translatable](https://github.com/spatie/laravel-translatable)
26+
- [Laravel](https://laravel.com/) >= 6 (use v1.* for Laravel 5.*)
27+
- [spatie/laravel-translatable](https://github.com/spatie/laravel-translatable) ^4.2
2828

2929
## 📦 Installation
3030

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
}
1111
],
1212
"require": {
13-
"php": ">=7.0.0"
13+
"php": "^7.2"
1414
},
1515
"require-dev": {
1616
"fzaninotto/faker": "~1.4",
17-
"mockery/mockery": "0.9.*",
18-
"orchestra/testbench": "~3.5.0",
19-
"phpunit/phpunit": "~6.0",
20-
"spatie/laravel-translatable": "^2.1"
17+
"mockery/mockery": "1.2.*",
18+
"orchestra/testbench": "~4.0",
19+
"phpunit/phpunit": "~8.0",
20+
"spatie/laravel-translatable": "^4.2"
2121
},
2222
"autoload": {
2323
"psr-4": {

tests/TestCase.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use CodeZero\UniqueTranslation\UniqueTranslationServiceProvider;
77
use Config;
88
use Illuminate\Database\Schema\Blueprint;
9+
use Illuminate\Support\Str;
910
use Orchestra\Testbench\TestCase as BaseTestCase;
1011

1112
abstract class TestCase extends BaseTestCase
@@ -29,11 +30,11 @@ abstract class TestCase extends BaseTestCase
2930
*
3031
* @return void
3132
*/
32-
public function setUp()
33+
protected function setUp(): void
3334
{
3435
parent::setUp();
3536

36-
Config::set('app.key', str_random(32));
37+
Config::set('app.key', Str::random(32));
3738

3839
App::setLocale('en');
3940

0 commit comments

Comments
 (0)