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

overtrue · web-flow · commit 34de2965f154 · 2020-04-13T12:41:27.000+08:00
Support laravel 7.0
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'));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@ public function up()`
`33`	`33`	`*/`
`34`	`34`	`public function down()`
`35`	`35`	`{`
`36`		`- Schema::dropIfExists(config('follow.followings_table'));`
	`36`	`+ Schema::dropIfExists(config('follow.followings_table', 'user_follower'));`
`37`	`37`	`}`
`38`	`38`	`}`