From 999a7481e446576e8fb8508e36b2e4b57e4d595e Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 9 Dec 2014 06:37:36 +0100 Subject: [PATCH] Removed references to the field "migrated". --- app/database/seeds/DefaultUserSeeder.php | 12 +++--------- app/lib/FireflyIII/Database/User.php | 1 - app/models/User.php | 1 - app/tests/factories/User.php | 1 - 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/app/database/seeds/DefaultUserSeeder.php b/app/database/seeds/DefaultUserSeeder.php index 0e4c292529..f61caf90fa 100644 --- a/app/database/seeds/DefaultUserSeeder.php +++ b/app/database/seeds/DefaultUserSeeder.php @@ -10,15 +10,9 @@ class DefaultUserSeeder extends Seeder DB::table('users')->delete(); if (App::environment() == 'testing') { - User::create( - ['email' => 'thegrumpydictator@gmail.com', 'password' => 'james', 'reset' => null, 'remember_token' => null, 'migrated' => 0] - ); - User::create( - ['email' => 'acceptance@example.com', 'password' => 'acceptance', 'reset' => null, 'remember_token' => null, 'migrated' => 0] - ); - User::create( - ['email' => 'functional@example.com', 'password' => 'functional', 'reset' => null, 'remember_token' => null, 'migrated' => 0] - ); + User::create(['email' => 'thegrumpydictator@gmail.com', 'password' => 'james', 'reset' => null, 'remember_token' => null]); + User::create(['email' => 'acceptance@example.com', 'password' => 'acceptance', 'reset' => null, 'remember_token' => null]); + User::create(['email' => 'functional@example.com', 'password' => 'functional', 'reset' => null, 'remember_token' => null]); } } diff --git a/app/lib/FireflyIII/Database/User.php b/app/lib/FireflyIII/Database/User.php index e33ef42f4c..a3992d2f90 100644 --- a/app/lib/FireflyIII/Database/User.php +++ b/app/lib/FireflyIII/Database/User.php @@ -40,7 +40,6 @@ class User { $user = new \User; $user->email = isset($data['email']) ? $data['email'] : null; - $user->migrated = 0; $user->reset = \Str::random(32); $user->password = \Hash::make(\Str::random(12)); diff --git a/app/models/User.php b/app/models/User.php index 761d5e5de4..1d5ac84bde 100644 --- a/app/models/User.php +++ b/app/models/User.php @@ -15,7 +15,6 @@ class User extends Eloquent implements UserInterface, RemindableInterface public static $rules = [ 'email' => 'required|email|unique:users,email', - 'migrated' => 'required|boolean', 'password' => 'required|between:60,60', 'reset' => 'between:32,32', ]; diff --git a/app/tests/factories/User.php b/app/tests/factories/User.php index c7a74e8e82..92efe04843 100644 --- a/app/tests/factories/User.php +++ b/app/tests/factories/User.php @@ -2,7 +2,6 @@ League\FactoryMuffin\Facade::define( 'User', [ 'email' => 'email', - 'migrated' => 1, 'password' => 'empty' ] );