ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert back to more sensible architecture.

Browse Source
This commit is contained in:
Taylor Otwell
2011-09-20 23:14:09 -05:00
parent 47db2ff19b
commit 4525eae25a
33 changed files with 1050 additions and 1558 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
laravel/session/drivers/database.php
View File

@@ -1,5 +1,6 @@
<?php namespace Laravel\Session\Drivers;
use Laravel\Config;
use Laravel\Database\Connection;
class Database implements Driver, Sweeper {
@@ -91,7 +92,7 @@ class Database implements Driver, Sweeper {
*/
private function table()
{
return $this->connection->table($this->config->get('session.table'));
return $this->connection->table(Config::get('session.table'));
}
}

23
laravel/session/drivers/file.php
View File

@@ -1,13 +1,8 @@
<?php namespace Laravel\Session\Drivers;
class File implements Driver, Sweeper {
use Laravel\File as F;
/**
* The file engine instance.
*
* @var Laravel\File
*/
private $file;
class File implements Driver, Sweeper {
/**
* The path to which the session files should be written.
@@ -19,13 +14,11 @@ class File implements Driver, Sweeper {
/**
* Create a new File session driver instance.
*
* @param Laravel\File $file
* @param string $path
* @return void
*/
public function __construct(\Laravel\File $file, $path)
public function __construct($path)
{
$this->file = $file;
$this->path = $path;
}
@@ -39,7 +32,7 @@ class File implements Driver, Sweeper {
*/
public function load($id)
{
if ($this->file->exists($path = $this->path.$id)) return unserialize($this->file->get($path));
if (F::exists($path = $this->path.$id)) return unserialize(F::get($path));
}
/**
@@ -51,7 +44,7 @@ class File implements Driver, Sweeper {
*/
public function save($session, $config)
{
$this->file->put($this->path.$session['id'], serialize($session), LOCK_EX);
F::put($this->path.$session['id'], serialize($session), LOCK_EX);
}
/**
@@ -62,7 +55,7 @@ class File implements Driver, Sweeper {
*/
public function delete($id)
{
$this->file->delete($this->path.$id);
F::delete($this->path.$id);
}
/**
@@ -75,9 +68,9 @@ class File implements Driver, Sweeper {
{
foreach (glob($this->path.'*') as $file)
{
if ($this->file->type($file) == 'file' and $this->file->modified($file) < $expiration)
if (F::type($file) == 'file' and F::modified($file) < $expiration)
{
$this->file->delete($file);
F::delete($file);
}
}
}

17
laravel/session/transporters/cookie.php
View File

@@ -1,17 +1,8 @@
<?php namespace Laravel\Session\Transporters;
class Cookie implements Transporter {
use Laravel\Cookie as C;
/**
* Create a new cookie session transporter instance.
*
* @param Cookie $cookie
* @return void
*/
public function __construct(\Laravel\Cookie $cookie)
{
$this->cookie = $cookie;
}
class Cookie implements Transporter {
/**
* Get the session identifier for the request.
@@ -21,7 +12,7 @@ class Cookie implements Transporter {
*/
public function get($config)
{
return $this->cookie->get('laravel_session');
return C::get('laravel_session');
}
/**
@@ -35,7 +26,7 @@ class Cookie implements Transporter {
{
$minutes = ($config['expire_on_close']) ? 0 : $config['lifetime'];
$this->cookie->put('laravel_session', $id, $minutes, $config['path'], $config['domain']);
C::put('laravel_session', $id, $minutes, $config['path'], $config['domain']);
}
}