fixed previous merge

This commit is contained in:
Fabien Potencier 2014-06-03 22:40:26 +02:00
parent 636f0d5d99
commit ceb4e0e369

View File

@ -247,8 +247,6 @@ class HeaderBag implements \IteratorAggregate, \Countable
* *
* @param string $key The Cache-Control directive name * @param string $key The Cache-Control directive name
* @param mixed $value The Cache-Control directive value * @param mixed $value The Cache-Control directive value
*
* @api
*/ */
public function addCacheControlDirective($key, $value = true) public function addCacheControlDirective($key, $value = true)
{ {
@ -263,8 +261,6 @@ class HeaderBag implements \IteratorAggregate, \Countable
* @param string $key The Cache-Control directive * @param string $key The Cache-Control directive
* *
* @return bool true if the directive exists, false otherwise * @return bool true if the directive exists, false otherwise
*
* @api
*/ */
public function hasCacheControlDirective($key) public function hasCacheControlDirective($key)
{ {
@ -277,8 +273,6 @@ class HeaderBag implements \IteratorAggregate, \Countable
* @param string $key The directive name * @param string $key The directive name
* *
* @return mixed|null The directive value if defined, null otherwise * @return mixed|null The directive value if defined, null otherwise
*
* @api
*/ */
public function getCacheControlDirective($key) public function getCacheControlDirective($key)
{ {
@ -289,8 +283,6 @@ class HeaderBag implements \IteratorAggregate, \Countable
* Removes a Cache-Control directive. * Removes a Cache-Control directive.
* *
* @param string $key The Cache-Control directive * @param string $key The Cache-Control directive
*
* @api
*/ */
public function removeCacheControlDirective($key) public function removeCacheControlDirective($key)
{ {