Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 67f70af

Browse files
taylorotwelltaylorotwell
committed
update reasons and readme.
1 parent 304df9d commit 67f70af

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

‎readme.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Laravel 4 Beta Change Log
22

3+
## Beta 3
4+
5+
- Fixed a few things in the ArrayStore session driver.
6+
- Improve reasons in Password Broker.
7+
38
## Beta 2
49

510
- Migrated to ircmaxell's [password-compat](http://github.com/ircmaxell/password_compat) library for PHP 5.5 forward compatibility on hashes. No backward compatibility breaks.

‎src/Illuminate/Auth/Reminders/PasswordBroker.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,8 @@ protected function validNewPasswords()
197197
*/
198198
protected function makeErrorRedirect($reason = '')
199199
{
200+
if ($reason != '') $reason = 'reminders.'.$reason;
201+
200202
return $this->redirect->refresh()->with('error', true)->with('reason', $reason);
201203
}
202204

‎tests/Auth/AuthPasswordBrokerTest.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function testRedirectIsReturnedByResetWhenUserCredentialsInvalid()
8484
$mocks['users']->shouldReceive('retrieveByCredentials')->once()->with(array('creds'))->andReturn(null);
8585
$mocks['redirect']->shouldReceive('refresh')->andReturn($redirect = m::mock('Illuminate\Http\RedirectResponse'));
8686
$redirect->shouldReceive('with')->once()->with('error', true)->andReturn($redirect);
87-
$redirect->shouldReceive('with')->once()->with('reason', 'user')->andReturn($redirect);
87+
$redirect->shouldReceive('with')->once()->with('reason', 'reminders.user')->andReturn($redirect);
8888

8989
$this->assertInstanceof('Illuminate\Http\RedirectResponse', $broker->reset(array('creds'), function() {}));
9090
}
@@ -100,7 +100,7 @@ public function testRedirectReturnedByRemindWhenPasswordsDontMatch()
100100
$request->shouldReceive('input')->once()->with('password_confirmation')->andReturn('bar');
101101
$mocks['redirect']->shouldReceive('refresh')->andReturn($redirect = m::mock('Illuminate\Http\RedirectResponse'));
102102
$redirect->shouldReceive('with')->once()->with('error', true)->andReturn($redirect);
103-
$redirect->shouldReceive('with')->once()->with('reason', 'password')->andReturn($redirect);
103+
$redirect->shouldReceive('with')->once()->with('reason', 'reminders.password')->andReturn($redirect);
104104

105105
$this->assertInstanceof('Illuminate\Http\RedirectResponse', $broker->reset(array('creds'), function() {}));
106106
}
@@ -116,7 +116,7 @@ public function testRedirectReturnedByRemindWhenPasswordNotSet()
116116
$request->shouldReceive('input')->once()->with('password_confirmation')->andReturn(null);
117117
$mocks['redirect']->shouldReceive('refresh')->andReturn($redirect = m::mock('Illuminate\Http\RedirectResponse'));
118118
$redirect->shouldReceive('with')->once()->with('error', true)->andReturn($redirect);
119-
$redirect->shouldReceive('with')->once()->with('reason', 'password')->andReturn($redirect);
119+
$redirect->shouldReceive('with')->once()->with('reason', 'reminders.password')->andReturn($redirect);
120120

121121
$this->assertInstanceof('Illuminate\Http\RedirectResponse', $broker->reset(array('creds'), function() {}));
122122
}
@@ -132,7 +132,7 @@ public function testRedirectReturnedByRemindWhenPasswordsLessThanSixCharacters()
132132
$request->shouldReceive('input')->once()->with('password_confirmation')->andReturn('abc');
133133
$mocks['redirect']->shouldReceive('refresh')->andReturn($redirect = m::mock('Illuminate\Http\RedirectResponse'));
134134
$redirect->shouldReceive('with')->once()->with('error', true)->andReturn($redirect);
135-
$redirect->shouldReceive('with')->once()->with('reason', 'password')->andReturn($redirect);
135+
$redirect->shouldReceive('with')->once()->with('reason', 'reminders.password')->andReturn($redirect);
136136

137137
$this->assertInstanceof('Illuminate\Http\RedirectResponse', $broker->reset(array('creds'), function() {}));
138138
}
@@ -149,7 +149,7 @@ public function testRedirectReturnedByRemindWhenRecordDoesntExistInTable()
149149
$mocks['reminders']->shouldReceive('exists')->with($user, 'token')->andReturn(false);
150150
$mocks['redirect']->shouldReceive('refresh')->andReturn($redirect = m::mock('Illuminate\Http\RedirectResponse'));
151151
$redirect->shouldReceive('with')->once()->with('error', true)->andReturn($redirect);
152-
$redirect->shouldReceive('with')->once()->with('reason', 'token')->andReturn($redirect);
152+
$redirect->shouldReceive('with')->once()->with('reason', 'reminders.token')->andReturn($redirect);
153153

154154
$this->assertInstanceof('Illuminate\Http\RedirectResponse', $broker->reset(array('creds'), function() {}));
155155
}

0 commit comments

Comments
 (0)