8000 Update PHPDocs for IDE support. by PATROMO · Pull Request #72 · laravel/framework · GitHub
[go: up one dir, main page]
Skip to content

Update PHPDocs for IDE support. #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Update PHPDocs for IDE support. #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
22f26ff
Update PHPDocs
PATROMO Jan 16, 2013
17f102d
Update PHPDocs for IDE support.
PATROMO Jan 17, 2013
7a97504
Update PHPDocs for IDE support.
PATROMO Jan 17, 2013
e9c98dc
L4 merge
PATROMO Jan 18, 2013
ee34f0c
Revert "L4 merge"
PATROMO Jan 18, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
178 changes: 89 additions & 89 deletions src/Illuminate/Auth/AuthManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,90 +1,90 @@
<?php namespace Illuminate\Auth;
use Illuminate\Support\Manager;
class AuthManager extends Manager {
/**
* Create a new driver instance.
*
* @param string $driver
* @return mixed
*/
protected function createDriver($driver)
{
$guard = parent::createDriver($driver);
// When using the remember me functionality of the authentication services we
// will need to be set the encryption isntance of the guard, which allows
// secure, encrypted cookie values to get generated for those cookies.
$guard->setCookieJar($this->app['cookie']);
$guard->setDispatcher($this->app['events']);
return $guard;
}
/**
* Create an instance of the database driver.
*
* @return Illuminate\Auth\Guard
*/
protected function createDatabaseDriver()
{
$provider = $this->createDatabaseProvider();
return new Guard($provider, $this->app['session']);
}
/**
* Create an instance of the database user provider.
*
* @return Illuminate\Auth\DatabaseUserProvider
*/
protected function createDatabaseProvider()
{
$connection = $this->app['db']->connection();
// When using the basic database user provider, we need to inject the table we
// want to use, since this is not an Eloquent model we will have no way to
// know without telling the provider, so we'll inject the config value.
$table = $this->app['config']['auth.table'];
return new DatabaseUserProvider($connection, $this->app['hash'], $table);
}
/**
* Create an instance of the Eloquent driver.
*
* @return Illuminate\Auth\Guard
*/
public function createEloquentDriver()
{
$provider = $this->createEloquentProvider();
return new Guard($provider, $this->app['session']);
}
/**
* Create an instance of the Eloquent user provider.
*
* @return Illuminate\Auth\EloquentUserProvider
*/
protected function createEloquentProvider()
{
$model = $this->app['config']['auth.model'];
return new EloquentUserProvider($this->app['hash'], $model);
}
/**
* Get the default authentication driver name.
*
* @return string
*/
protected function getDefaultDriver()
{
return $this->app['config']['auth.driver'];
}
<?php namespace Illuminate\Auth;

use Illuminate\Support\Manager;

class AuthManager extends Manager {

/**
* Create a new driver instance.
*
* @param string $driver
* @return mixed
*/
protected function createDriver($driver)
{
$guard = parent::createDriver($driver);

// When using the remember me functionality of the authentication services we
// will need to be set the encryption isntance of the guard, which allows
// secure, encrypted cookie values to get generated for those cookies.
$guard->setCookieJar($this->app['cookie']);

$guard->setDispatcher($this->app['events']);

return $guard;
}

/**
* Create an instance of the database driver.
*
* @return \Illuminate\Auth\Guard
*/
protected function createDatabaseDriver()
{
$provider = $this->createDatabaseProvider();

return new Guard($provider, $this->app['session']);
}

/**
* Create an instance of the database user provider.
*
* @return \Illuminate\Auth\DatabaseUserProvider
*/
protected function createDatabaseProvider()
{
$connection = $this->app['db']->connection();

// When using the basic database user provider, we need to inject the table we
// want to use, since this is not an Eloquent model we will have no way to
// know without telling the provider, so we'll inject the config value.
$table = $this->app['config']['auth.table'];

return new DatabaseUserProvider($connection, $this->app['hash'], $table);
}

/**
* Create an instance of the Eloquent driver.
*
* @return \Illuminate\Auth\Guard
*/
public function createEloquentDriver()
{
$provider = $this->createEloquentProvider();

return new Guard($provider, $this->app['session']);
}

/**
* Create an instance of the Eloquent user provider.
*
* @return \Illuminate\Auth\EloquentUserProvider
*/
protected function createEloquentProvider()
{
$model = $this->app['config']['auth.model'];

return new EloquentUserProvider($this->app['hash'], $model);
}

/**
* Get the default authentication driver name.
*
* @return string
*/
protected function getDefaultDriver()
{
return $this->app['config']['auth.driver'];
}

}
12 changes: 6 additions & 6 deletions src/Illuminate/Auth/DatabaseUserProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class DatabaseUserProvider implements UserProviderInterface {
/**
* The hasher implementation.
*
* @var Illuminate\Hashing\HasherInterface
* @var \Illuminate\Hashing\HasherInterface
*/
protected $hasher;

Expand All @@ -29,8 +29,8 @@ class DatabaseUserProvider implements UserProviderInterface {
/**
* Create a new database user provider.
*
* @param Illuminate\Database\Connection $conn
* @param Illuminate\Hashing\HasherInterface $hasher
* @param \Illuminate\Database\Connection $conn
* @param \Illuminate\Hashing\HasherInterface $hasher
* @param string $table
* @return void
*/
Expand All @@ -45,7 +45,7 @@ public function __construct(Connection $conn, HasherInterface $hasher, $table)
* Retrieve a user by their unique idenetifier.
*
* @param mixed $identifier
* @return Illuminate\Auth\UserInterface|null
* @return \Illuminate\Auth\UserInterface|null
*/
public function retrieveByID($identifier)
{
Expand All @@ -61,7 +61,7 @@ public function retrieveByID($identifier)
* Retrieve a user by the given credentials.
*
* @param array $credentials
* @return Illuminate\Auth\UserInterface|null
* @return \Illuminate\Auth\UserInterface|null
*/
public function retrieveByCredentials(array $credentials)
{
Expand Down Expand Up @@ -92,7 +92,7 @@ public function retrieveByCredentials(array $credentials)
/**
* Validate a user against the given credentials.
*
* @param Illuminate\Auth\UserInterface $user
* @param \Illuminate\Auth\UserInterface $user
* @param array $credentials
* @return bool
*/
Expand Down
12 changes: 6 additions & 6 deletions src/Illuminate/Auth/EloquentUserProvider.php
View file
Open in desktop
8669
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class EloquentUserProvider implements UserProviderInterface {
/**
* The hasher implementation.
*
* @var Illuminate\Hashing\HasherInterface
* @var \Illuminate\Hashing\HasherInterface
*/
protected $hasher;

Expand All @@ -21,7 +21,7 @@ class EloquentUserProvider implements UserProviderInterface {
/**
* Create a new database user provider.
*
* @param Illuminate\Hashing\HasherInterface $hasher
* @param \Illuminate\Hashing\HasherInterface $hasher
* @param string $model
* @return void
*/
Expand All @@ -35,7 +35,7 @@ public function __construct(HasherInterface $hasher, $model)
* Retrieve a user by their unique identifier.
*
* @param mixed $identifier
* @return Illuminate\Auth\UserInterface|null
* @return \Illuminate\Auth\UserInterface|null
*/
public function retrieveByID($identifier)
{
Expand All @@ -46,7 +46,7 @@ public function retrieveByID($identifier)
* Retrieve a user by the given credentials.
*
* @param array $credentials
* @return Illuminate\Auth\UserInterface|null
* @return \Illuminate\Auth\UserInterface|null
*/
public function retrieveByCredentials(array $credentials)
{
Expand All @@ -66,7 +66,7 @@ public function retrieveByCredentials(array $credentials)
/**
* Validate a user against the given credentials.
*
* @param Illuminate\Auth\UserInterface $user
* @param \Illuminate\Auth\UserInterface $user
* @param array $credentials
* @return bool
*/
Expand All @@ -80,7 +80,7 @@ public function validateCredentials(UserInterface $user, array $credentials)
/**
* Create a new instance of the model.
*
* @return Illuminate\Database\Eloquent\Model
* @return \Illuminate\Database\Eloquent\Model
*/
public function createModel()
{
Expand Down
Loading
0