final code cleanup
This commit is contained in:
parent
f41717dcb1
commit
49d9666958
|
@ -81,9 +81,9 @@ public static function start($bundle)
|
||||||
throw new \Exception("Bundle [$bundle] has not been installed.");
|
throw new \Exception("Bundle [$bundle] has not been installed.");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Each bundle may have a "start" script which is responsible for preparing
|
// Each bundle may have a start script which is responsible for preparing
|
||||||
// the bundle for use by the application. The start script may register any
|
// the bundle for use by the application. The start script may register
|
||||||
// classes the bundle uses with the auto-loader, etc.
|
// any classes the bundle uses with the auto-loader, etc.
|
||||||
if (file_exists($path = static::path($bundle).'start'.EXT))
|
if (file_exists($path = static::path($bundle).'start'.EXT))
|
||||||
{
|
{
|
||||||
require $path;
|
require $path;
|
||||||
|
|
|
@ -141,7 +141,7 @@ protected static function parse($key)
|
||||||
|
|
||||||
// If there are not at least two segments in the array, it means that the
|
// If there are not at least two segments in the array, it means that the
|
||||||
// developer is requesting the entire configuration array to be returned.
|
// developer is requesting the entire configuration array to be returned.
|
||||||
// If that is the case, we'll make the item field of the array "null".
|
// If that is the case, we'll make the item field "null".
|
||||||
if (count($segments) >= 2)
|
if (count($segments) >= 2)
|
||||||
{
|
{
|
||||||
$parsed = array($bundle, $segments[0], implode('.', array_slice($segments, 1)));
|
$parsed = array($bundle, $segments[0], implode('.', array_slice($segments, 1)));
|
||||||
|
|
|
@ -31,29 +31,40 @@ public static function send()
|
||||||
{
|
{
|
||||||
if (headers_sent()) return false;
|
if (headers_sent()) return false;
|
||||||
|
|
||||||
// All cookies are stored in the "jar" when set and not sent directly to
|
// All cookies are stored in the "jar" when set and not sent directly to the
|
||||||
// the browser. This simply makes testing all of the cookie stuff very
|
// browser. This simply makes testing all of the cookie stuff very easy
|
||||||
// easy since the jar can be inspected by the tests.
|
// since the jar can be inspected by the tests.
|
||||||
foreach (static::$jar as $cookie)
|
foreach (static::$jar as $cookie)
|
||||||
{
|
{
|
||||||
extract($cookie);
|
static::set($cookie);
|
||||||
|
|
||||||
$time = ($minutes !== 0) ? time() + ($minutes * 60) : 0;
|
|
||||||
|
|
||||||
// A cookie payload can't exceed 4096 bytes, so if the payload is greater
|
|
||||||
// than that, we'll raise an error to warn the developer since it could
|
|
||||||
// cause serious session problems.
|
|
||||||
$value = static::sign($name, $value);
|
|
||||||
|
|
||||||
if (strlen($value) > 4000)
|
|
||||||
{
|
|
||||||
throw new \Exception("Payload too large for cookie.");
|
|
||||||
}
|
|
||||||
|
|
||||||
setcookie($name, $value, $time, $path, $domain, $secure);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Send a cookie from the cookie jar back to the browser.
|
||||||
|
*
|
||||||
|
* @param array $cookie
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
protected static function set($cookie)
|
||||||
|
{
|
||||||
|
extract($cookie);
|
||||||
|
|
||||||
|
$time = ($minutes !== 0) ? time() + ($minutes * 60) : 0;
|
||||||
|
|
||||||
|
// A cookie payload can't exceed 4096 bytes, so if the payload is greater
|
||||||
|
// than that, we'll raise an error to warn the developer since it could
|
||||||
|
// cause serious cookie-based session problems.
|
||||||
|
$value = static::sign($name, $value);
|
||||||
|
|
||||||
|
if (strlen($value) > 4000)
|
||||||
|
{
|
||||||
|
throw new \Exception("Payload too large for cookie.");
|
||||||
|
}
|
||||||
|
|
||||||
|
setcookie($name, $value, $time, $path, $domain, $secure);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the value of a cookie.
|
* Get the value of a cookie.
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue