refactoring session for better architecture.

laravel/session/manager.php

@@ -1,45 +1,129 @@
 <?php namespace Laravel\Session;
 
-use Laravel\Container;
+use Laravel\Str;
+use Laravel\Config;
+use Laravel\Session\Drivers\Driver;
+use Laravel\Session\Transporters\Transporter;
 
 class Manager {
 
 	/**
-	 * The container instance.
+	 * The session driver instance.
 	 *
-	 * @var Container
+	 * @var Driver
 	 */
-	private $container;
+	private $driver;
+
+	/**
+	 * The session identifier transporter instance.
+	 *
+	 * @var Transporter
+	 */
+	private $transporter;
+
+	/**
+	 * The configuration manager instance.
+	 *
+	 * @var Config
+	 */
+	private $config;
+
+	/**
+	 * The session payload instance.
+	 *
+	 * @var Payload
+	 */
+	private $payload;
 
 	/**
 	 * Create a new session manager instance.
 	 *
-	 * @param  Container  $container
+	 * @param  Driver       $driver
+	 * @param  Transporter  $transporter
+	 * @param  Config       $config
 	 * @return void
 	 */
-	public function __construct(Container $container)
+	public function __construct(Driver $driver, Transporter $transporter, Config $config)
 	{
-		$this->container = $container;
+		$this->driver = $driver;
+		$this->config = $config;
+		$this->transporter = $transporter;
 	}
 
 	/**
-	 * Get the session driver.
+	 * Get the session payload for the request.
 	 *
-	 * The session driver returned will be the driver specified in the session configuration
-	 * file. Only one session driver may be active for a given request, so the driver will
-	 * be managed as a singleton.
-	 *
-	 * @param  string          $driver
-	 * @return Session\Driver
+	 * @return Payload
 	 */
-	public function driver($driver)
+	public function payload()
 	{
-		if ($this->container->registered('laravel.session.'.$driver))
+		$session = $this->driver->load($this->transporter->get());
+
+		// If the session is expired, a new session will be generated and all of the data from
+		// the previous session will be lost. The new session will be assigned a random, long
+		// string ID to uniquely identify it among the application's current users.
+		if (is_null($session) or $this->expired($session))
 		{
-			return $this->container->resolve('laravel.session.'.$driver);
+			$session = array('id' => Str::random(40), 'data' => array());
 		}
 
-		throw new \Exception("Session driver [$driver] is not supported.");
+		$payload = new Payload($session);
+
+		// If a CSRF token is not present in the session, we will generate one. These tokens
+		// are generated per session to protect against Cross-Site Request Forgery attacks on
+		// the application. It is up to the developer to take advantage of them using the token
+		// methods on the Form class and the "csrf" route filter.
+		if ( ! $payload->has('csrf_token')) $payload->put('csrf_token', Str::random(16));
+
+		return $payload;
+	}
+
+	/**
+	 * Deteremine if the session is expired based on the last activity timestamp
+	 * and the session lifetime set in the configuration file.
+	 *
+	 * @param  array  $payload
+	 * @return bool
+	 */
+	private function expired($payload)
+	{
+		return (time() - $payload['last_activity']) > ($this->config->get('session.lifetime') * 60);
+	}
+
+	/**
+	 * Close the session handling for the request.
+	 *
+	 * @param  Payload  $payload
+	 * @return void
+	 */
+	public function close(Payload $payload)
+	{
+		$config = $this->config->get('session');
+
+		$this->driver->save($payload->age(), $config);
+
+		$this->transporter->put($payload->session['id'], $config);
+
+		// Some session drivers implement the Sweeper interface, which specified that the driver
+		// must do its garbage collection manually. Alternatively, some drivers such as APC and
+		// Memcached are not required to manually clean up their sessions.
+		if (mt_rand(1, $config['sweepage'][1]) <= $config['sweepage'][0] and $this->driver instanceof Sweeper)
+		{
+			$this->driver->sweep(time() - ($config['lifetime'] * 60));
+		}
+	}
+
+	/**
+	 * Magic Method for calling methods on the session payload instance.
+	 */
+	public function __call($method, $parameters)
+	{
+		if (method_exists($this->payload, $method))
+		{
+			return call_user_func_array(array($this->payload, $method), $parameters);
+		}
+
+		throw new \Exception("Attempting to call undefined method [$method] on session manager.");
 	}
 
 }