From e09ed20c17c1f308f84cf0b3c71e6b795f60e11a Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 18 Dec 2011 14:33:54 +0100 Subject: [PATCH] fixed CS --- ParameterBag.php | 2 +- Request.php | 48 +++++++++--------- RequestMatcher.php | 28 +++++------ Response.php | 54 ++++++++++----------- ResponseHeaderBag.php | 2 +- ServerBag.php | 4 +- SessionStorage/ArraySessionStorage.php | 2 +- SessionStorage/FilesystemSessionStorage.php | 10 ++-- SessionStorage/PdoSessionStorage.php | 10 ++-- 9 files changed, 80 insertions(+), 80 deletions(-) diff --git a/ParameterBag.php b/ParameterBag.php index 2b256abf3..5dbd940b3 100644 --- a/ParameterBag.php +++ b/ParameterBag.php @@ -22,7 +22,7 @@ class ParameterBag { /** * Parameter storage. - * + * * @var array */ protected $parameters; diff --git a/Request.php b/Request.php index 53bcc729c..8c9a9939e 100644 --- a/Request.php +++ b/Request.php @@ -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 */ @@ -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) @@ -976,9 +976,9 @@ public function setDefaultLocale($locale) /** * Sets the locale. - * - * @param string $locale - * + * + * @param string $locale + * * @api */ public function setLocale($locale) @@ -988,7 +988,7 @@ public function setLocale($locale) /** * Get the locale. - * + * * @return string */ public function getLocale() @@ -1234,8 +1234,8 @@ protected function prepareRequestUri() /** * Prepares the base URL. - * - * @return string + * + * @return string */ protected function prepareBaseUrl() { @@ -1374,8 +1374,8 @@ static protected function initializeFormats() /** * Sets the default PHP locale. - * - * @param string $locale + * + * @param string $locale */ private function setPhpDefaultLocale($locale) { diff --git a/RequestMatcher.php b/RequestMatcher.php index 23950c1dd..0ca082d70 100644 --- a/RequestMatcher.php +++ b/RequestMatcher.php @@ -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; @@ -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) @@ -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) @@ -187,13 +187,13 @@ protected function checkIp4($requestIp, $ip) /** * Validates an IPv6 address. - * + * * @author David Soria Parra * @see https://github.com/dsp/v6tools - * + * * @param string $requestIp * @param string $ip - * + * * @return boolean True valid, false if not. */ protected function checkIp6($requestIp, $ip) diff --git a/Response.php b/Response.php index 99d9c3265..48cede9ad 100644 --- a/Response.php +++ b/Response.php @@ -29,22 +29,22 @@ class Response * @var string */ protected $content; - + /** * @var string */ protected $version; - + /** * @var integer */ protected $statusCode; - + /** * @var string */ protected $statusText; - + /** * @var string */ @@ -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() @@ -863,9 +863,9 @@ public function isInvalid() /** * Is response informative? - * + * * @return boolean - * + * * @api */ public function isInformational() @@ -875,9 +875,9 @@ public function isInformational() /** * Is response successful? - * + * * @return boolean - * + * * @api */ public function isSuccessful() @@ -887,9 +887,9 @@ public function isSuccessful() /** * Is the response a redirect? - * + * * @return boolean - * + * * @api */ public function isRedirection() @@ -899,9 +899,9 @@ public function isRedirection() /** * Is there a client error? - * + * * @return boolean - * + * * @api */ public function isClientError() @@ -911,9 +911,9 @@ public function isClientError() /** * Was there a server side error? - * + * * @return boolean - * + * * @api */ public function isServerError() @@ -923,9 +923,9 @@ public function isServerError() /** * Is the response OK? - * + * * @return boolean - * + * * @api */ public function isOk() @@ -935,9 +935,9 @@ public function isOk() /** * Is the reponse forbidden? - * + * * @return boolean - * + * * @api */ public function isForbidden() @@ -947,9 +947,9 @@ public function isForbidden() /** * Is the response a not found error? - * + * * @return boolean - * + * * @api */ public function isNotFound() @@ -959,9 +959,9 @@ public function isNotFound() /** * Is the response a redirect of some form? - * + * * @return boolean - * + * * @api */ public function isRedirect($location = null) @@ -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)); } -} \ No newline at end of file +} diff --git a/ResponseHeaderBag.php b/ResponseHeaderBag.php index d27cd39af..11615b96c 100644 --- a/ResponseHeaderBag.php +++ b/ResponseHeaderBag.php @@ -30,7 +30,7 @@ class ResponseHeaderBag extends HeaderBag * @var array */ protected $computedCacheControl = array(); - + /** * @var array */ diff --git a/ServerBag.php b/ServerBag.php index e39091960..92b29a070 100644 --- a/ServerBag.php +++ b/ServerBag.php @@ -21,8 +21,8 @@ class ServerBag extends ParameterBag { /** * Gets the HTTP headers. - * - * @return string + * + * @return string */ public function getHeaders() { diff --git a/SessionStorage/ArraySessionStorage.php b/SessionStorage/ArraySessionStorage.php index aeda2d3c7..5a6558a2b 100644 --- a/SessionStorage/ArraySessionStorage.php +++ b/SessionStorage/ArraySessionStorage.php @@ -24,7 +24,7 @@ class ArraySessionStorage implements SessionStorageInterface { /** * Storage data. - * + * * @var array */ private $data = array(); diff --git a/SessionStorage/FilesystemSessionStorage.php b/SessionStorage/FilesystemSessionStorage.php index 55f626e72..f1d571a17 100644 --- a/SessionStorage/FilesystemSessionStorage.php +++ b/SessionStorage/FilesystemSessionStorage.php @@ -25,21 +25,21 @@ class FilesystemSessionStorage extends NativeSessionStorage { /** * File path. - * + * * @var string */ private $path; - + /** * Data. - * + * * @var array */ private $data; - + /** * Session started flag. - * + * * @var boolean */ private $started; diff --git a/SessionStorage/PdoSessionStorage.php b/SessionStorage/PdoSessionStorage.php index ee2641a98..1debd633c 100644 --- a/SessionStorage/PdoSessionStorage.php +++ b/SessionStorage/PdoSessionStorage.php @@ -21,14 +21,14 @@ class PdoSessionStorage extends NativeSessionStorage { /** * PDO instance. - * + * * @var \PDO */ private $db; - + /** * Database options. - * + * * @var array */ private $dbOptions; @@ -253,7 +253,7 @@ public function sessionWrite($id, $data) * * @param string $id * @param string $data - * + * * @return boolean True. */ private function createNewSession($id, $data = '') @@ -276,4 +276,4 @@ private function createNewSession($id, $data = '') return true; } -} \ No newline at end of file +}