Merge branch 'develop'

Author: michaeldzjap

src/config/twofactor-auth.php

@@ -64,4 +64,24 @@
         'post' => '/auth/token',
     ],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Database Settings
+    |--------------------------------------------------------------------------
+    |
+    | Starting from Laravel 5.8, the default is to use "bigIncrements" instead
+    | of "increments" for the "id" column on the "users" table. This setting
+    | allows you to control what type to use for the "user_id" column on the
+    | "two_factor_auths" table. The default is to use "unsignedBigInteger" in
+    | order to stay in line with the changes in Laravel 5.8.
+    |
+    | NOTE: Modifying this setting only has an effect before you run any
+    | migrations for this package. If you need to change the signature of
+    | "user_id" afterwards, you will have to write your own migration for this
+    | (see install instructions for more details).
+    |
+    */
+
+    'big_int' => true,
+
 ];

src/database/migrations/2017_05_26_102832_create_two_factor_auths_table.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
@@ -15,7 +16,13 @@ public function up()
     {
         Schema::create('two_factor_auths', function (Blueprint $table) {
             $table->string('id')->nullable();
-            $table->unsignedInteger('user_id');
+
+            if ($this->useBigInt()) {
+                $table->unsignedBigInteger('user_id');
+            } else {
+                $table->unsignedInteger('user_id');
+            }
+
             $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
             $table->timestamps();
         });
@@ -30,4 +37,15 @@ public function down()
     {
         Schema::dropIfExists('two_factor_auths');
     }
+
+    /**
+     * Determine if the type of the "user_id" column should be of type
+     * "unsignedBigInteger".
+     *
+     * @return bool
+     */
+    private function useBigInt()
+    {
+        return config('twofactor-auth.big_int');
+    }
 }