Skip to content

Commit

Permalink
Tabs to spaces
Browse files Browse the repository at this point in the history 
Signed-off-by: Graham Campbell <graham@cachethq.io>
  • Loading branch information
Graham Campbell committed Jun 1, 2015
1 parent 599e785 commit 2e4b417
Show file tree
Hide file tree
Showing 592 changed files with 89,127 additions and 89,127 deletions.
14 changes: 7 additions & 7 deletions .php_cs
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?php

$finder = Symfony\Component\Finder\Finder::create()
->files()
->in(__DIR__)
->name('*.stub')
->ignoreDotFiles(true)
->ignoreVCS(true);
->files()
->in(__DIR__)
->name('*.stub')
->ignoreDotFiles(true)
->ignoreVCS(true);

return Symfony\CS\Config\Config::create()
->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
->finder($finder);
->level(Symfony\CS\FixerInterface::PSR2_LEVEL)
->finder($finder);
222 changes: 111 additions & 111 deletions src/Illuminate/Auth/AuthManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,116 +4,116 @@

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 instance 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->setRequest($this->app->refresh('request', $guard, 'setRequest'));
}

/**
* Call a custom driver creator.
*
* @param string $driver
* @return \Illuminate\Auth\Guard
*/
protected function callCustomCreator($driver)
{
$custom = parent::callCustomCreator($driver);

if ($custom instanceof Guard)
{
return $custom;
}

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

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

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

/**
* 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.store']);
}

/**
* 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
*/
public function getDefaultDriver()
{
return $this->app['config']['auth.driver'];
}

/**
* Set the default authentication driver name.
*
* @param string $name
* @return void
*/
public function setDefaultDriver($name)
{
$this->app['config']['auth.driver'] = $name;
}
/**
* 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 instance 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->setRequest($this->app->refresh('request', $guard, 'setRequest'));
}

/**
* Call a custom driver creator.
*
* @param string $driver
* @return \Illuminate\Auth\Guard
*/
protected function callCustomCreator($driver)
{
$custom = parent::callCustomCreator($driver);

if ($custom instanceof Guard)
{
return $custom;
}

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

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

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

/**
* 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.store']);
}

/**
* 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
*/
public function getDefaultDriver()
{
return $this->app['config']['auth.driver'];
}

/**
* Set the default authentication driver name.
*
* @param string $name
* @return void
*/
public function setDefaultDriver($name)
{
$this->app['config']['auth.driver'] = $name;
}

}
116 changes: 58 additions & 58 deletions src/Illuminate/Auth/AuthServiceProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,70 +4,70 @@

class AuthServiceProvider extends ServiceProvider {

/**
* Register the service provider.
*
* @return void
*/
public function register()
{
$this->registerAuthenticator();
/**
* Register the service provider.
*
* @return void
*/
public function register()
{
$this->registerAuthenticator();

$this->registerUserResolver();
$this->registerUserResolver();

$this->registerRequestRebindHandler();
}
$this->registerRequestRebindHandler();
}

/**
* Register the authenticator services.
*
* @return void
*/
protected function registerAuthenticator()
{
$this->app->singleton('auth', function($app)
{
// Once the authentication service has actually been requested by the developer
// we will set a variable in the application indicating such. This helps us
// know that we need to set any queued cookies in the after event later.
$app['auth.loaded'] = true;
/**
* Register the authenticator services.
*
* @return void
*/
protected function registerAuthenticator()
{
$this->app->singleton('auth', function($app)
{
// Once the authentication service has actually been requested by the developer
// we will set a variable in the application indicating such. This helps us
// know that we need to set any queued cookies in the after event later.
$app['auth.loaded'] = true;

return new AuthManager($app);
});
return new AuthManager($app);
});

$this->app->singleton('auth.driver', function($app)
{
return $app['auth']->driver();
});
}
$this->app->singleton('auth.driver', function($app)
{
return $app['auth']->driver();
});
}

/**
* Register a resolver for the authenticated user.
*
* @return void
*/
protected function registerUserResolver()
{
$this->app->bind('Illuminate\Contracts\Auth\Authenticatable', function($app)
{
return $app['auth']->user();
});
}
/**
* Register a resolver for the authenticated user.
*
* @return void
*/
protected function registerUserResolver()
{
$this->app->bind('Illuminate\Contracts\Auth\Authenticatable', function($app)
{
return $app['auth']->user();
});
}

/**
* Register a resolver for the authenticated user.
*
* @return void
*/
protected function registerRequestRebindHandler()
{
$this->app->rebinding('request', function($app, $request)
{
$request->setUserResolver(function() use ($app)
{
return $app['auth']->user();
});
});
}
/**
* Register a resolver for the authenticated user.
*
* @return void
*/
protected function registerRequestRebindHandler()
{
$this->app->rebinding('request', function($app, $request)
{
$request->setUserResolver(function() use ($app)
{
return $app['auth']->user();
});
});
}

}
Loading

0 comments on commit 2e4b417

Please sign in to comment.