Merge pull request #136 from CasperLaiTW/laravel-6.0-7.0

Support laravel 7.0
overtrue · Apr 13, 2020 · 34de296 · 34de296
2 parents b8450c3 + a1bcac7
commit 34de296
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
         }
     ],
     "require": {
-        "laravel/framework": "^5.5"
+        "laravel/framework": "^5.5|~6.0|~7.0"
     },
     "autoload": {
         "psr-4": {
@@ -22,7 +22,6 @@
         }
     },
     "require-dev": {
-        "laravel/framework": "^5.5",
         "mockery/mockery": "^1.2",
         "phpunit/phpunit": "~8.0",
         "orchestra/testbench": "^3.7",

diff --git a/migrations/2020_04_04_000000_create_user_follower_table.php b/migrations/2020_04_04_000000_create_user_follower_table.php
@@ -33,6 +33,6 @@ public function up()
      */
     public function down()
     {
-        Schema::dropIfExists(config('follow.followings_table'));
+        Schema::dropIfExists(config('follow.followings_table', 'user_follower'));
     }
 }