Make casing consistent (UserProviderInterface) · JavaDevl/framework@a8d1305 · GitHub

JavaDevl / framework Public

forked from laravel/framework

• Notifications You must be signed in to change notification settings
• Fork 0
• Star 0

• Code
• Pull requests
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit a8d1305

Browse filesBrowse the repository at this point in the historyBrowse files

julien-c

committed

Make casing consistent (UserProviderInterface)

1 parent 4a1a963 commit a8d1305
Copy full SHA for a8d1305

3 files changed

+4-4Lines changed: 4 additions & 4 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src/Illuminate/Auth
  • Guard.php
• tests/Auth
  • AuthDatabaseUserProviderTest.php
  • AuthEloquentUserProviderTest.php

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/Illuminate/Auth/Guard.php‎

Copy file name to clipboardExpand all lines: src/Illuminate/Auth/Guard.php

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -143,7 +143,7 @@ public function user()
143	143
144	144	if ( ! is_null($id))
145	145	{
146		- $user = $this->provider->retrieveByID($id);
	146	+ $user = $this->provider->retrieveById($id);
147	147	}
148	148
149	149	// If the user is null, but we decrypt a "recaller" cookie we can attempt to

Collapse file

‎tests/Auth/AuthDatabaseUserProviderTest.php‎

Copy file name to clipboardExpand all lines: tests/Auth/AuthDatabaseUserProviderTest.php

+2-2Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -17,7 +17,7 @@ public function testRetrieveByIDReturnsUserWhenUserIsFound()
17	17	$conn->shouldReceive('find')->once()->with(1)->andReturn(array('id' => 1, 'name' => 'Dayle'));
18	18	$hasher = m::mock('Illuminate\Contracts\Hashing\Hasher');
19	19	$provider = new Illuminate\Auth\DatabaseUserProvider($conn, $hasher, 'foo');
20		- $user = $provider->retrieveByID(1);
	20	+ $user = $provider->retrieveById(1);
21	21
22	22	$this->assertInstanceOf('Illuminate\Auth\GenericUser', $user);
23	23	$this->assertEquals(1, $user->getAuthIdentifier());
@@ -32,7 +32,7 @@ public function testRetrieveByIDReturnsNullWhenUserIsNotFound()
32	32	$conn->shouldReceive('find')->once()->with(1)->andReturn(null);
33	33	$hasher = m::mock('Illuminate\Contracts\Hashing\Hasher');
34	34	$provider = new Illuminate\Auth\DatabaseUserProvider($conn, $hasher, 'foo');
35		- $user = $provider->retrieveByID(1);
	35	+ $user = $provider->retrieveById(1);
36	36
37	37	$this->assertNull($user);
38	38	}

Collapse file

‎tests/Auth/AuthEloquentUserProviderTest.php‎

Copy file name to clipboardExpand all lines: tests/Auth/AuthEloquentUserProviderTest.php

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -17,7 +17,7 @@ public function testRetrieveByIDReturnsUser()
17	17	$mock->shouldReceive('newQuery')->once()->andReturn($mock);
18	18	$mock->shouldReceive('find')->once()->with(1)->andReturn('bar');
19	19	$provider->expects($this->once())->method('createModel')->will($this->returnValue($mock));
20		- $user = $provider->retrieveByID(1);
	20	+ $user = $provider->retrieveById(1);
21	21
22	22	$this->assertEquals('bar', $user);
23	23	}

0 commit comments

Comments

0 (0)