Merge pull request #10 from bjuppa/laravel6

Support Laravel 6
bjuppa · Sep 27, 2019 · 8dfaf02 · 8dfaf02
2 parents 96d4408 + 9e05a54
commit 8dfaf02
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,14 +8,12 @@ matrix:
   include:
     - php: 7.1
       env: LARAVEL='5.7.*'
-    - php: 7.2
-      env: LARAVEL='5.7.*'
     - php: 7.2
       env: LARAVEL='5.8.*'
-    - php: 7.3
-      env: LARAVEL='5.7.*'
     - php: 7.3
       env: LARAVEL='5.8.*'
+    - php: 7.3
+      env: LARAVEL='6.*'
   fast_finish: true
 
 before_install:

diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
     "bjuppa/laravel-blog": "^1.3"
   },
   "require-dev": {
-    "orchestra/testbench": "~3.6",
+    "orchestra/testbench": "~3.6 || ^4.0",
     "phpunit/phpunit": ">6.5",
     "mockery/mockery": "^1.0",
     "andrefigueira/blog-article-faker": "^1.0",

diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
@@ -1,6 +1,7 @@
 <?php
 
 use Faker\Generator as Faker;
+use Illuminate\Support\Str;
 
 $factory->define(Bjuppa\LaravelBlogAdmin\Tests\Feature\Fakes\User::class, function (Faker $faker) {
     static $password;
@@ -9,6 +10,6 @@
         'name' => $faker->name,
         'email' => $faker->unique()->safeEmail,
         'password' => $password ?: $password = bcrypt('secret'),
-        'remember_token' => str_random(10),
+        'remember_token' => Str::random(10),
     ];
 });