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

Updated Symfony HttpFoundation to 2.1.6.

Browse Source
This commit is contained in:
Taylor Otwell
2013-01-06 13:58:32 -06:00
parent f754e1fa55
commit cb567c5e4d
55 changed files with 1758 additions and 805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
laravel/vendor/Symfony/Component/HttpFoundation/HeaderBag.php vendored
View File

@@ -18,7 +18,7 @@ namespace Symfony\Component\HttpFoundation;
*
* @api
*/
class HeaderBag
class HeaderBag implements \IteratorAggregate, \Countable
{
protected $headers;
protected $cacheControl;
@@ -50,16 +50,13 @@ class HeaderBag
return '';
}
$beautifier = function ($name) {
return preg_replace_callback('/\-(.)/', function ($match) { return '-'.strtoupper($match[1]); }, ucfirst($name));
};
$max = max(array_map('strlen', array_keys($this->headers))) + 1;
$content = '';
ksort($this->headers);
foreach ($this->headers as $name => $values) {
$name = implode('-', array_map('ucfirst', explode('-', $name)));
foreach ($values as $value) {
$content .= sprintf("%-{$max}s %s\r\n", $beautifier($name).':', $value);
$content .= sprintf("%-{$max}s %s\r\n", $name.':', $value);
}
}
@@ -93,7 +90,7 @@ class HeaderBag
/**
* Replaces the current HTTP headers by a new set.
*
* @param array $headers An array of HTTP headers
* @param array $headers An array of HTTP headers
*
* @api
*/
@@ -106,7 +103,7 @@ class HeaderBag
/**
* Adds new headers the current HTTP headers set.
*
* @param array $headers An array of HTTP headers
* @param array $headers An array of HTTP headers
*
* @api
*/
@@ -160,7 +157,7 @@ class HeaderBag
{
$key = strtr(strtolower($key), '_', '-');
$values = (array) $values;
$values = array_values((array) $values);
if (true === $replace || !isset($this->headers[$key])) {
$this->headers[$key] = $values;
@@ -226,7 +223,9 @@ class HeaderBag
* @param string $key The parameter key
* @param \DateTime $default The default value
*
* @return \DateTime The filtered value
* @return null|\DateTime The filtered value
*
* @throws \RuntimeException When the HTTP header is not parseable
*
* @api
*/
@@ -267,6 +266,26 @@ class HeaderBag
$this->set('Cache-Control', $this->getCacheControlHeader());
}
/**
* Returns an iterator for headers.
*
* @return \ArrayIterator An \ArrayIterator instance
*/
public function getIterator()
{
return new \ArrayIterator($this->headers);
}
/**
* Returns the number of headers.
*
* @return int The number of headers
*/
public function count()
{
return count($this->headers);
}
protected function getCacheControlHeader()
{
$parts = array();
@@ -298,7 +317,7 @@ class HeaderBag
$cacheControl = array();
preg_match_all('#([a-zA-Z][a-zA-Z_-]*)\s*(?:=(?:"([^"]*)"|([^ \t",;]*)))?#', $header, $matches, PREG_SET_ORDER);
foreach ($matches as $match) {
$cacheControl[strtolower($match[1])] = isset($match[2]) && $match[2] ? $match[2] : (isset($match[3]) ? $match[3] : true);
$cacheControl[strtolower($match[1])] = isset($match[3]) ? $match[3] : (isset($match[2]) ? $match[2] : true);
}
return $cacheControl;