IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed references to the field "migrated".

Browse Source
This commit is contained in:
James Cole 2014-12-09 06:37:36 +01:00
parent cb312ca025
commit 999a7481e4
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/database/seeds/DefaultUserSeeder.php
View File

@ -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]);
}
}

1
app/lib/FireflyIII/Database/User.php
View File

@ -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));

1
app/models/User.php
View File

@ -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',
];

1
app/tests/factories/User.php
View File

@ -2,7 +2,6 @@
League\FactoryMuffin\Facade::define(
'User', [
'email' => 'email',
'migrated' => 1,
'password' => 'empty'
]
);