Skip to content

Commit

Permalink
fixed CS
Browse files Browse the repository at this point in the history
  • Loading branch information
fabpot committed Dec 18, 2011
1 parent bbf2709 commit e09ed20
Show file tree
Hide file tree
Showing 9 changed files with 80 additions and 80 deletions.
2 changes: 1 addition & 1 deletion ParameterBag.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ParameterBag
{
/**
* Parameter storage.
*
*
* @var array
*/
protected $parameters;
Expand Down
48 changes: 24 additions & 24 deletions Request.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,62 +75,62 @@ class Request
* @var string
*/
protected $content;

/**
* @var string
*/
protected $languages;

/**
* @var string
*/
protected $charsets;

/**
* @var string
*/
protected $acceptableContentTypes;

/**
* @var string
*/
protected $pathInfo;

/**
* @var string
*/
protected $requestUri;

/**
* @var string
*/
protected $baseUrl;

/**
* @var string
*/
protected $basePath;

/**
* @var string
*/
protected $method;

/**
* @var string
*/
protected $format;

/**
* @var \Symfony\Component\HttpFoundation\Session
*/
protected $session;

/**
* @var string
*/
protected $locale;

/**
* @var string
*/
Expand Down Expand Up @@ -957,16 +957,16 @@ public function setRequestFormat($format)
*
* @api
*/
public function getContentType()
public function getContentType()
{
return $this->getFormat($this->server->get('CONTENT_TYPE'));
}

/**
* Sets the default locale.
*
* @param string $locale
*
*
* @param string $locale
*
* @api
*/
public function setDefaultLocale($locale)
Expand All @@ -976,9 +976,9 @@ public function setDefaultLocale($locale)

/**
* Sets the locale.
*
* @param string $locale
*
*
* @param string $locale
*
* @api
*/
public function setLocale($locale)
Expand All @@ -988,7 +988,7 @@ public function setLocale($locale)

/**
* Get the locale.
*
*
* @return string
*/
public function getLocale()
Expand Down Expand Up @@ -1234,8 +1234,8 @@ protected function prepareRequestUri()

/**
* Prepares the base URL.
*
* @return string
*
* @return string
*/
protected function prepareBaseUrl()
{
Expand Down Expand Up @@ -1374,8 +1374,8 @@ static protected function initializeFormats()

/**
* Sets the default PHP locale.
*
* @param string $locale
*
* @param string $locale
*/
private function setPhpDefaultLocale($locale)
{
Expand Down
28 changes: 14 additions & 14 deletions RequestMatcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,26 @@ class RequestMatcher implements RequestMatcherInterface
* @var string
*/
private $path;

/**
* @var string
*/
private $host;

/**
* @var string
*/
private $methods;

/**
* @var string
* @var string
*/
private $ip;

/**
* Attributes.
*
* @var array
*
* @var array
*/
private $attributes;

Expand Down Expand Up @@ -145,10 +145,10 @@ public function matches(Request $request)

/**
* Validates an IP address.
*
*
* @param string $requestIp
* @param string $ip
*
*
* @return boolean True valid, false if not.
*/
protected function checkIp($requestIp, $ip)
Expand All @@ -163,10 +163,10 @@ protected function checkIp($requestIp, $ip)

/**
* Validates an IPv4 address.
*
*
* @param string $requestIp
* @param string $ip
*
*
* @return boolean True valid, false if not.
*/
protected function checkIp4($requestIp, $ip)
Expand All @@ -187,13 +187,13 @@ protected function checkIp4($requestIp, $ip)

/**
* Validates an IPv6 address.
*
*
* @author David Soria Parra <dsp at php dot net>
* @see https://github.com/dsp/v6tools
*
*
* @param string $requestIp
* @param string $ip
*
*
* @return boolean True valid, false if not.
*/
protected function checkIp6($requestIp, $ip)
Expand Down
54 changes: 27 additions & 27 deletions Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@ class Response
* @var string
*/
protected $content;

/**
* @var string
*/
protected $version;

/**
* @var integer
*/
protected $statusCode;

/**
* @var string
*/
protected $statusText;

/**
* @var string
*/
Expand Down Expand Up @@ -851,9 +851,9 @@ public function isNotModified(Request $request)
// http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
/**
* Is response invalid?
*
*
* @return boolean
*
*
* @api
*/
public function isInvalid()
Expand All @@ -863,9 +863,9 @@ public function isInvalid()

/**
* Is response informative?
*
*
* @return boolean
*
*
* @api
*/
public function isInformational()
Expand All @@ -875,9 +875,9 @@ public function isInformational()

/**
* Is response successful?
*
*
* @return boolean
*
*
* @api
*/
public function isSuccessful()
Expand All @@ -887,9 +887,9 @@ public function isSuccessful()

/**
* Is the response a redirect?
*
*
* @return boolean
*
*
* @api
*/
public function isRedirection()
Expand All @@ -899,9 +899,9 @@ public function isRedirection()

/**
* Is there a client error?
*
*
* @return boolean
*
*
* @api
*/
public function isClientError()
Expand All @@ -911,9 +911,9 @@ public function isClientError()

/**
* Was there a server side error?
*
*
* @return boolean
*
*
* @api
*/
public function isServerError()
Expand All @@ -923,9 +923,9 @@ public function isServerError()

/**
* Is the response OK?
*
*
* @return boolean
*
*
* @api
*/
public function isOk()
Expand All @@ -935,9 +935,9 @@ public function isOk()

/**
* Is the reponse forbidden?
*
*
* @return boolean
*
*
* @api
*/
public function isForbidden()
Expand All @@ -947,9 +947,9 @@ public function isForbidden()

/**
* Is the response a not found error?
*
*
* @return boolean
*
*
* @api
*/
public function isNotFound()
Expand All @@ -959,9 +959,9 @@ public function isNotFound()

/**
* Is the response a redirect of some form?
*
*
* @return boolean
*
*
* @api
*/
public function isRedirect($location = null)
Expand All @@ -971,13 +971,13 @@ public function isRedirect($location = null)

/**
* Is the response empty?
*
*
* @return boolean
*
*
* @api
*/
public function isEmpty()
{
return in_array($this->statusCode, array(201, 204, 304));
}
}
}
2 changes: 1 addition & 1 deletion ResponseHeaderBag.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class ResponseHeaderBag extends HeaderBag
* @var array
*/
protected $computedCacheControl = array();

/**
* @var array
*/
Expand Down
Loading

0 comments on commit e09ed20

Please sign in to comment.