cleaning up code and comments.

taylorotwell · taylorotwell · commit 825e8b2d4922 · 2012-04-05T21:40:56.000-05:00
diff --git a/laravel/session/drivers/cookie.php b/laravel/session/drivers/cookie.php
@@ -1,6 +1,4 @@
-<?php namespace Laravel\Session\Drivers;
-
-use Laravel\Crypter;
+<?php namespace Laravel\Session\Drivers; use Laravel\Crypter, Laravel\Cookie as C;
 
 class Cookie extends Driver {
 
@@ -21,9 +19,9 @@ class Cookie extends Driver {
 	 */
 	public function load($id)
 	{
-		if (\Laravel\Cookie::has(Cookie::payload))
+		if (C::has(Cookie::payload))
 		{
-			return unserialize(Crypter::decrypt(\Laravel\Cookie::get(Cookie::payload)));
+			return unserialize(Crypter::decrypt(C::get(Cookie::payload)));
 		}
 	}
 
@@ -41,7 +39,7 @@ public function save($session, $config, $exists)
 
 		$payload = Crypter::encrypt(serialize($session));
 
-		\Laravel\Cookie::put(Cookie::payload, $payload, $lifetime, $path, $domain);
+		C::put(Cookie::payload, $payload, $lifetime, $path, $domain);
 	}
 
 	/**
@@ -52,7 +50,7 @@ public function save($session, $config, $exists)
 	 */
 	public function delete($id)
 	{
-		\Laravel\Cookie::forget(Cookie::payload);
+		C::forget(Cookie::payload);
 	}
 
 }
diff --git a/laravel/session/drivers/driver.php b/laravel/session/drivers/driver.php
@@ -31,7 +31,7 @@ abstract public function save($session, $config, $exists);
 	abstract public function delete($id);
 
 	/**
-	 * Insert a fresh session and return the payload array.
+	 * Create a fresh session array with a unique ID.
 	 *
 	 * @return array
 	 */
diff --git a/laravel/session/payload.php b/laravel/session/payload.php
@@ -298,10 +298,9 @@ public function save()
 		// session on the user's subsequent requests to the application.
 		$this->cookie($config);
 
-		// Some session drivers implement the Sweeper interface, meaning that
+		// Some session drivers implement the Sweeper interface meaning that
 		// they must clean up expired sessions manually. If the driver is a
-		// sweeper, we need to determine if garbage collection should be
-		// run for the request.
+		// sweeper, we'll calculate if we need to run garbage collection.
 		$sweepage = $config['sweepage'];
 
 		if ($this->driver instanceof Sweeper and (mt_rand(1, $sweepage[1]) <= $sweepage[0]))

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-<?php namespace Laravel\Session\Drivers;`
`2`		`-`
`3`		`-use Laravel\Crypter;`
	`1`	`+<?php namespace Laravel\Session\Drivers; use Laravel\Crypter, Laravel\Cookie as C;`
`4`	`2`
`5`	`3`	`class Cookie extends Driver {`
`6`	`4`
`@@ -21,9 +19,9 @@ class Cookie extends Driver {`
`21`	`19`	`*/`
`22`	`20`	`public function load($id)`
`23`	`21`	`{`
`24`		`- if (\Laravel\Cookie::has(Cookie::payload))`
	`22`	`+ if (C::has(Cookie::payload))`
`25`	`23`	`{`
`26`		`- return unserialize(Crypter::decrypt(\Laravel\Cookie::get(Cookie::payload)));`
	`24`	`+ return unserialize(Crypter::decrypt(C::get(Cookie::payload)));`
`27`	`25`	`}`
`28`	`26`	`}`
`29`	`27`
`@@ -41,7 +39,7 @@ public function save($session, $config, $exists)`
`41`	`39`
`42`	`40`	`$payload = Crypter::encrypt(serialize($session));`
`43`	`41`
`44`		`- \Laravel\Cookie::put(Cookie::payload, $payload, $lifetime, $path, $domain);`
	`42`	`+ C::put(Cookie::payload, $payload, $lifetime, $path, $domain);`
`45`	`43`	`}`
`46`	`44`
`47`	`45`	`/**`
`@@ -52,7 +50,7 @@ public function save($session, $config, $exists)`
`52`	`50`	`*/`
`53`	`51`	`public function delete($id)`
`54`	`52`	`{`
`55`		`- \Laravel\Cookie::forget(Cookie::payload);`
	`53`	`+ C::forget(Cookie::payload);`
`56`	`54`	`}`
`57`	`55`
`58`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ abstract public function save($session, $config, $exists);`
`31`	`31`	`abstract public function delete($id);`
`32`	`32`
`33`	`33`	`/**`
`34`		`- * Insert a fresh session and return the payload array.`
	`34`	`+ * Create a fresh session array with a unique ID.`
`35`	`35`	`*`
`36`	`36`	`* @return array`
`37`	`37`	`*/`