diff --git a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml index 3739bfd352..f5ac8c15c2 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml +++ b/src/Symfony/Bundle/FrameworkBundle/Resources/config/translation.xml @@ -67,7 +67,7 @@ - + diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php index 236dacd5dc..8127ab8a7f 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php +++ b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/Bundle/TestBundle/Controller/SessionController.php @@ -45,6 +45,7 @@ class SessionController extends ContainerAware public function logoutAction() { $request = $this->container->get('request')->getSession('session')->clear(); + return new Response('Session cleared.'); } diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php index 8b82218ff4..32dd42e12e 100644 --- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php +++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php @@ -48,9 +48,9 @@ class SecurityExtension extends Extension if (!array_filter($configs)) { return; } - + $mainConfig = $this->getConfiguration($configs, $container); - + $config = $this->processConfiguration($mainConfig, $configs); // load services diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php index f82bc09bdb..8faf21777e 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/DependencyInjection/FormLoginExtension.php @@ -16,4 +16,4 @@ class FormLoginExtension extends Extension ->addArgument(new Reference('router')) ; } -} \ No newline at end of file +} diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Security/LocalizedFormFailureHandler.php b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Security/LocalizedFormFailureHandler.php index 7becb027d7..ebdc8d4d7f 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Security/LocalizedFormFailureHandler.php +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/Bundle/FormLoginBundle/Security/LocalizedFormFailureHandler.php @@ -21,4 +21,4 @@ class LocalizedFormFailureHandler implements AuthenticationFailureHandlerInterfa { return new RedirectResponse($this->router->generate('localized_login_path', array(), true)); } -} \ No newline at end of file +} diff --git a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/localized_form_failure_handler.yml b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/localized_form_failure_handler.yml index 45954538b5..e01ed369b1 100644 --- a/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/localized_form_failure_handler.yml +++ b/src/Symfony/Bundle/SecurityBundle/Tests/Functional/app/StandardFormLogin/localized_form_failure_handler.yml @@ -15,6 +15,6 @@ security: default: form_login: login_path: localized_login_path - check_path: localized_check_path + check_path: localized_check_path failure_handler: localized_form_failure_handler - anonymous: ~ \ No newline at end of file + anonymous: ~ diff --git a/src/Symfony/Component/Config/Definition/ArrayNode.php b/src/Symfony/Component/Config/Definition/ArrayNode.php index f322f26bf7..10b5c5d9f9 100644 --- a/src/Symfony/Component/Config/Definition/ArrayNode.php +++ b/src/Symfony/Component/Config/Definition/ArrayNode.php @@ -49,10 +49,10 @@ class ArrayNode extends BaseNode implements PrototypeNodeInterface $this->allowNewKeys = true; $this->performDeepMerging = true; } - + /** * Retrieves the children of this node. - * + * * @return array The children */ public function getChildren() diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php index 2d511203a2..b76e9fc3ee 100644 --- a/src/Symfony/Component/Config/Definition/BaseNode.php +++ b/src/Symfony/Component/Config/Definition/BaseNode.php @@ -54,17 +54,17 @@ abstract class BaseNode implements NodeInterface $this->required = false; $this->equivalentValues = array(); } - + /** * Sets info message - * + * * @param string $info The info text */ public function setInfo($info) { $this->info = $info; } - + /** * Returns info message * @@ -77,8 +77,8 @@ abstract class BaseNode implements NodeInterface /** * Sets the example configuration for this node. - * - * @param array $example + * + * @param array $example */ public function setExample($example) { @@ -87,7 +87,7 @@ abstract class BaseNode implements NodeInterface /** * Retrieves the example configuration for this node. - * + * * @return mixed The example */ public function getExample() diff --git a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php index a6421f539b..ede11d6121 100644 --- a/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php +++ b/src/Symfony/Component/Config/Definition/Builder/NodeDefinition.php @@ -62,32 +62,32 @@ abstract class NodeDefinition implements NodeParentInterface return $this; } - + /** * Sets info message - * + * * @param string $info The info text - * + * * @return NodeDefinition */ public function setInfo($info) { $this->info = $info; - + return $this; } /** * Sets example configuration - * + * * @param example $example - * + * * @return NodeDefinition */ public function setExample($example) { $this->example = $example; - + return $this; } @@ -121,9 +121,9 @@ abstract class NodeDefinition implements NodeParentInterface if (null !== $this->validation) { $this->validation->rules = ExprBuilder::buildExpressions($this->validation->rules); } - + $node = $this->createNode(); - + $node->setInfo($this->info); $node->setExample($this->example); diff --git a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php index e051596cd8..ca5a27a034 100644 --- a/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php +++ b/src/Symfony/Component/Config/Definition/PrototypedArrayNode.php @@ -80,7 +80,7 @@ class PrototypedArrayNode extends ArrayNode /** * Retrieves the name of the attribute which value should be used as key. - * + * * @return string The name of the attribute */ public function getKeyAttribute() @@ -133,10 +133,10 @@ class PrototypedArrayNode extends ArrayNode { $this->prototype = $node; } - + /** * Retrieves the prototype - * + * * @return PrototypeNodeInterface The prototype */ public function getPrototype() diff --git a/src/Symfony/Component/DependencyInjection/Extension/ConfigurationExtensionInterface.php b/src/Symfony/Component/DependencyInjection/Extension/ConfigurationExtensionInterface.php index 478acb9e8b..b633f9006c 100644 --- a/src/Symfony/Component/DependencyInjection/Extension/ConfigurationExtensionInterface.php +++ b/src/Symfony/Component/DependencyInjection/Extension/ConfigurationExtensionInterface.php @@ -12,7 +12,7 @@ namespace Symfony\Component\DependencyInjection\Extension; use Symfony\Component\DependencyInjection\ContainerBuilder; - + /** * ConfigurationExtensionInterface is the interface implemented by container extension classes. * @@ -22,10 +22,10 @@ interface ConfigurationExtensionInterface { /** * Returns extension configuration - * + * * @param array $config $config An array of configuration values * @param ContainerBuilder $container A ContainerBuilder instance - * + * * @return ConfigurationInterface|null The configuration or null */ function getConfiguration(array $config, ContainerBuilder $container); diff --git a/src/Symfony/Component/EventDispatcher/Event.php b/src/Symfony/Component/EventDispatcher/Event.php index d029e28f89..fc2c0d4eac 100644 --- a/src/Symfony/Component/EventDispatcher/Event.php +++ b/src/Symfony/Component/EventDispatcher/Event.php @@ -38,7 +38,7 @@ class Event * @var EventDispatcher Dispatcher that dispatched this event */ private $dispatcher; - + /** * @var string This event's name */ @@ -94,24 +94,24 @@ class Event { return $this->dispatcher; } - + /** * Gets the event's name. - * + * * @return string - * + * * @api */ public function getName() { return $this->name; } - + /** * Sets the event's name property. - * + * * @param string $name The event name. - * + * * @api */ public function setName($name) diff --git a/src/Symfony/Component/HttpFoundation/ParameterBag.php b/src/Symfony/Component/HttpFoundation/ParameterBag.php index 2b256abf3c..5dbd940b39 100644 --- a/src/Symfony/Component/HttpFoundation/ParameterBag.php +++ b/src/Symfony/Component/HttpFoundation/ParameterBag.php @@ -22,7 +22,7 @@ class ParameterBag { /** * Parameter storage. - * + * * @var array */ protected $parameters; diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php index 53bcc729c7..8c9a9939ec 100644 --- a/src/Symfony/Component/HttpFoundation/Request.php +++ b/src/Symfony/Component/HttpFoundation/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 @@ class Request * * @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 @@ class Request /** * Sets the locale. - * - * @param string $locale - * + * + * @param string $locale + * * @api */ public function setLocale($locale) @@ -988,7 +988,7 @@ class Request /** * Get the locale. - * + * * @return string */ public function getLocale() @@ -1234,8 +1234,8 @@ class Request /** * Prepares the base URL. - * - * @return string + * + * @return string */ protected function prepareBaseUrl() { @@ -1374,8 +1374,8 @@ class Request /** * Sets the default PHP locale. - * - * @param string $locale + * + * @param string $locale */ private function setPhpDefaultLocale($locale) { diff --git a/src/Symfony/Component/HttpFoundation/RequestMatcher.php b/src/Symfony/Component/HttpFoundation/RequestMatcher.php index 23950c1dd8..0ca082d709 100644 --- a/src/Symfony/Component/HttpFoundation/RequestMatcher.php +++ b/src/Symfony/Component/HttpFoundation/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 @@ class RequestMatcher implements RequestMatcherInterface /** * 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 @@ class RequestMatcher implements RequestMatcherInterface /** * 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 @@ class RequestMatcher implements RequestMatcherInterface /** * 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/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php index 99d9c3265f..48cede9add 100644 --- a/src/Symfony/Component/HttpFoundation/Response.php +++ b/src/Symfony/Component/HttpFoundation/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 @@ class Response // http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html /** * Is response invalid? - * + * * @return boolean - * + * * @api */ public function isInvalid() @@ -863,9 +863,9 @@ class Response /** * Is response informative? - * + * * @return boolean - * + * * @api */ public function isInformational() @@ -875,9 +875,9 @@ class Response /** * Is response successful? - * + * * @return boolean - * + * * @api */ public function isSuccessful() @@ -887,9 +887,9 @@ class Response /** * Is the response a redirect? - * + * * @return boolean - * + * * @api */ public function isRedirection() @@ -899,9 +899,9 @@ class Response /** * Is there a client error? - * + * * @return boolean - * + * * @api */ public function isClientError() @@ -911,9 +911,9 @@ class Response /** * Was there a server side error? - * + * * @return boolean - * + * * @api */ public function isServerError() @@ -923,9 +923,9 @@ class Response /** * Is the response OK? - * + * * @return boolean - * + * * @api */ public function isOk() @@ -935,9 +935,9 @@ class Response /** * Is the reponse forbidden? - * + * * @return boolean - * + * * @api */ public function isForbidden() @@ -947,9 +947,9 @@ class Response /** * Is the response a not found error? - * + * * @return boolean - * + * * @api */ public function isNotFound() @@ -959,9 +959,9 @@ class Response /** * Is the response a redirect of some form? - * + * * @return boolean - * + * * @api */ public function isRedirect($location = null) @@ -971,13 +971,13 @@ class Response /** * 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/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php index d27cd39af3..11615b96cd 100644 --- a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php +++ b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php @@ -30,7 +30,7 @@ class ResponseHeaderBag extends HeaderBag * @var array */ protected $computedCacheControl = array(); - + /** * @var array */ diff --git a/src/Symfony/Component/HttpFoundation/ServerBag.php b/src/Symfony/Component/HttpFoundation/ServerBag.php index e39091960f..92b29a070b 100644 --- a/src/Symfony/Component/HttpFoundation/ServerBag.php +++ b/src/Symfony/Component/HttpFoundation/ServerBag.php @@ -21,8 +21,8 @@ class ServerBag extends ParameterBag { /** * Gets the HTTP headers. - * - * @return string + * + * @return string */ public function getHeaders() { diff --git a/src/Symfony/Component/HttpFoundation/SessionStorage/ArraySessionStorage.php b/src/Symfony/Component/HttpFoundation/SessionStorage/ArraySessionStorage.php index aeda2d3c7e..5a6558a2b3 100644 --- a/src/Symfony/Component/HttpFoundation/SessionStorage/ArraySessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/SessionStorage/ArraySessionStorage.php @@ -24,7 +24,7 @@ class ArraySessionStorage implements SessionStorageInterface { /** * Storage data. - * + * * @var array */ private $data = array(); diff --git a/src/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php b/src/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php index 55f626e72e..f1d571a176 100644 --- a/src/Symfony/Component/HttpFoundation/SessionStorage/FilesystemSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/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/src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php b/src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php index ee2641a98a..1debd633c2 100644 --- a/src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php +++ b/src/Symfony/Component/HttpFoundation/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 @@ class PdoSessionStorage extends NativeSessionStorage * * @param string $id * @param string $data - * + * * @return boolean True. */ private function createNewSession($id, $data = '') @@ -276,4 +276,4 @@ class PdoSessionStorage extends NativeSessionStorage return true; } -} \ No newline at end of file +} diff --git a/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php b/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php index 4c32b21a04..132cea99c3 100644 --- a/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php +++ b/src/Symfony/Component/Security/Core/Event/AuthenticationEvent.php @@ -32,4 +32,4 @@ class AuthenticationEvent extends Event { return $this->authenticationToken; } -} \ No newline at end of file +} diff --git a/src/Symfony/Component/Security/Core/Event/AuthenticationFailureEvent.php b/src/Symfony/Component/Security/Core/Event/AuthenticationFailureEvent.php index 6518b698e0..6705fc9d64 100644 --- a/src/Symfony/Component/Security/Core/Event/AuthenticationFailureEvent.php +++ b/src/Symfony/Component/Security/Core/Event/AuthenticationFailureEvent.php @@ -34,4 +34,4 @@ class AuthenticationFailureEvent extends AuthenticationEvent { return $this->authenticationException; } -} \ No newline at end of file +} diff --git a/src/Symfony/Component/Serializer/Serializer.php b/src/Symfony/Component/Serializer/Serializer.php index 3bcb907464..9c8fe05871 100644 --- a/src/Symfony/Component/Serializer/Serializer.php +++ b/src/Symfony/Component/Serializer/Serializer.php @@ -310,6 +310,7 @@ class Serializer implements SerializerInterface, NormalizerInterface, Denormaliz && $encoder->supportsEncoding($format) ) { $this->encoderByFormat[$format] = $i; + return $encoder; } } @@ -333,6 +334,7 @@ class Serializer implements SerializerInterface, NormalizerInterface, Denormaliz && $encoder->supportsDecoding($format) ) { $this->decoderByFormat[$format] = $i; + return $encoder; } } diff --git a/src/Symfony/Component/Translation/Loader/MoFileLoader.php b/src/Symfony/Component/Translation/Loader/MoFileLoader.php index 5fc7712f18..b11cd194a4 100644 --- a/src/Symfony/Component/Translation/Loader/MoFileLoader.php +++ b/src/Symfony/Component/Translation/Loader/MoFileLoader.php @@ -166,4 +166,4 @@ class MoFileLoader extends ArrayLoader implements LoaderInterface return (integer) substr($result, -8); } -} \ No newline at end of file +} diff --git a/tests/Symfony/Tests/Component/Console/Command/ListCommandTest.php b/tests/Symfony/Tests/Component/Console/Command/ListCommandTest.php index b08d25a072..a21b78f65d 100644 --- a/tests/Symfony/Tests/Component/Console/Command/ListCommandTest.php +++ b/tests/Symfony/Tests/Component/Console/Command/ListCommandTest.php @@ -26,7 +26,7 @@ class ListCommandTest extends \PHPUnit_Framework_TestCase $commandTester->execute(array('command' => $command->getName(), '--xml' => true)); $this->assertRegExp('//', $commandTester->getDisplay(), '->execute() returns a list of available commands in XML if --xml is passed'); - + $commandTester->execute(array('command' => $command->getName(), '--raw' => true)); $output = <<