Skip to content

Commit 2992b12

Browse files
fabpotfabpot
committed
Merge branch '2.3' into 2.5
* 2.3: [2.3] CS And DocBlock Fixes [2.3] CS Fixes Conflicts: src/Symfony/Bridge/Doctrine/Security/RememberMe/DoctrineTokenProvider.php src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php src/Symfony/Bundle/FrameworkBundle/EventListener/TestSessionListener.php src/Symfony/Component/Config/Definition/ReferenceDumper.php src/Symfony/Component/Console/Application.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/Filesystem/Tests/FilesystemTest.php src/Symfony/Component/Form/Extension/Csrf/EventListener/CsrfValidationListener.php src/Symfony/Component/Form/FormError.php src/Symfony/Component/HttpFoundation/Request.php src/Symfony/Component/HttpFoundation/Response.php src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php src/Symfony/Component/Process/ProcessUtils.php src/Symfony/Component/PropertyAccess/PropertyAccessor.php src/Symfony/Component/PropertyAccess/PropertyAccessorInterface.php src/Symfony/Component/Serializer/Encoder/XmlEncoder.php src/Symfony/Component/Validator/Constraints/CardSchemeValidator.php src/Symfony/Component/Validator/Constraints/GroupSequence.php src/Symfony/Component/Validator/Mapping/ClassMetadata.php src/Symfony/Component/Validator/Mapping/ClassMetadataFactory.php src/Symfony/Component/Validator/Mapping/MemberMetadata.php src/Symfony/Component/Validator/Tests/Fixtures/StubGlobalExecutionContext.php
2 parents 80b6508 + c35fc32 commit 2992b12

31 files changed

+97
-77
lines changed

‎CacheClearer/ChainCacheClearer.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
class ChainCacheClearer implements CacheClearerInterface
2020
{
2121
/**
22-
* @var array $clearers
22+
* @var array
2323
*/
2424
protected $clearers;
2525

‎DataCollector/ConfigDataCollector.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public function hasApc()
181181
}
182182

183183
/**
184-
* Returns true if Zend OPcache is enabled
184+
* Returns true if Zend OPcache is enabled.
185185
*
186186
* @return bool true if Zend OPcache is enabled, false otherwise
187187
*/

‎Event/FilterControllerEvent.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\HttpFoundation\Request;
1616

1717
/**
18-
* Allows filtering of a controller callable
18+
* Allows filtering of a controller callable.
1919
*
2020
* You can call getController() to retrieve the current controller. With
2121
* setController() you can set a new controller that is used in the processing
@@ -30,7 +30,8 @@
3030
class FilterControllerEvent extends KernelEvent
3131
{
3232
/**
33-
* The current controller
33+
* The current controller.
34+
*
3435
* @var callable
3536
*/
3637
private $controller;
@@ -43,7 +44,7 @@ public function __construct(HttpKernelInterface $kernel, $controller, Request $r
4344
}
4445

4546
/**
46-
* Returns the current controller
47+
* Returns the current controller.
4748
*
4849
* @return callable
4950
*
@@ -55,7 +56,7 @@ public function getController()
5556
}
5657

5758
/**
58-
* Sets a new controller
59+
* Sets a new controller.
5960
*
6061
* @param callable $controller
6162
*

‎Event/FilterResponseEvent.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\HttpFoundation\Response;
1717

1818
/**
19-
* Allows to filter a Response object
19+
* Allows to filter a Response object.
2020
*
2121
* You can call getResponse() to retrieve the current response. With
2222
* setResponse() you can set a new response that will be returned to the
@@ -29,7 +29,8 @@
2929
class FilterResponseEvent extends KernelEvent
3030
{
3131
/**
32-
* The current response object
32+
* The current response object.
33+
*
3334
* @var Response
3435
*/
3536
private $response;
@@ -42,7 +43,7 @@ public function __construct(HttpKernelInterface $kernel, Request $request, $requ
4243
}
4344

4445
/**
45-
* Returns the current response object
46+
* Returns the current response object.
4647
*
4748
* @return Response
4849
*
@@ -54,7 +55,7 @@ public function getResponse()
5455
}
5556

5657
/**
57-
* Sets a new response object
58+
* Sets a new response object.
5859
*
5960
* @param Response $response
6061
*

‎Event/GetResponseEvent.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Symfony\Component\HttpFoundation\Response;
1515

1616
/**
17-
* Allows to create a response for a request
17+
* Allows to create a response for a request.
1818
*
1919
* Call setResponse() to set the response that will be returned for the
2020
* current request. The propagation of this event is stopped as soon as a
@@ -27,13 +27,14 @@
2727
class GetResponseEvent extends KernelEvent
2828
{
2929
/**
30-
* The response object
30+
* The response object.
31+
*
3132
* @var Response
3233
*/
3334
private $response;
3435

3536
/**
36-
* Returns the response object
37+
* Returns the response object.
3738
*
3839
* @return Response
3940
*
@@ -45,7 +46,7 @@ public function getResponse()
4546
}
4647

4748
/**
48-
* Sets a response and stops event propagation
49+
* Sets a response and stops event propagation.
4950
*
5051
* @param Response $response
5152
*
@@ -59,7 +60,7 @@ public function setResponse(Response $response)
5960
}
6061

6162
/**
62-
* Returns whether a response was set
63+
* Returns whether a response was set.
6364
*
6465
* @return bool Whether a response was set
6566
*

‎Event/GetResponseForControllerResultEvent.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\HttpFoundation\Request;
1616

1717
/**
18-
* Allows to create a response for the return value of a controller
18+
* Allows to create a response for the return value of a controller.
1919
*
2020
* Call setResponse() to set the response that will be returned for the
2121
* current request. The propagation of this event is stopped as soon as a
@@ -28,7 +28,7 @@
2828
class GetResponseForControllerResultEvent extends GetResponseEvent
2929
{
3030
/**
31-
* The return value of the controller
31+
* The return value of the controller.
3232
*
3333
* @var mixed
3434
*/

‎Event/GetResponseForExceptionEvent.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use Symfony\Component\HttpFoundation\Request;
1616

1717
/**
18-
* Allows to create a response for a thrown exception
18+
* Allows to create a response for a thrown exception.
1919
*
2020
* Call setResponse() to set the response that will be returned for the
2121
* current request. The propagation of this event is stopped as soon as a
@@ -32,7 +32,8 @@
3232
class GetResponseForExceptionEvent extends GetResponseEvent
3333
{
3434
/**
35-
* The exception object
35+
* The exception object.
36+
*
3637
* @var \Exception
3738
*/
3839
private $exception;
@@ -45,7 +46,7 @@ public function __construct(HttpKernelInterface $kernel, Request $request, $requ
4546
}
4647

4748
/**
48-
* Returns the thrown exception
49+
* Returns the thrown exception.
4950
*
5051
* @return \Exception The thrown exception
5152
*
@@ -57,7 +58,7 @@ public function getException()
5758
}
5859

5960
/**
60-
* Replaces the thrown exception
61+
* Replaces the thrown exception.
6162
*
6263
* This exception will be thrown if no response is set in the event.
6364
*

‎Event/KernelEvent.php‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
use Symfony\Component\EventDispatcher\Event;
1717

1818
/**
19-
* Base class for events thrown in the HttpKernel component
19+
* Base class for events thrown in the HttpKernel component.
2020
*
2121
* @author Bernhard Schussek <bschussek@gmail.com>
2222
*
@@ -25,20 +25,23 @@
2525
class KernelEvent extends Event
2626
{
2727
/**
28-
* The kernel in which this event was thrown
28+
* The kernel in which this event was thrown.
29+
*
2930
* @var HttpKernelInterface
3031
*/
3132
private $kernel;
3233

3334
/**
34-
* The request the kernel is currently processing
35+
* The request the kernel is currently processing.
36+
*
3537
* @var Request
3638
*/
3739
private $request;
3840

3941
/**
4042
* The request type the kernel is currently processing. One of
41-
* HttpKernelInterface::MASTER_REQUEST and HttpKernelInterface::SUB_REQUEST
43+
* HttpKernelInterface::MASTER_REQUEST and HttpKernelInterface::SUB_REQUEST.
44+
*
4245
* @var int
4346
*/
4447
private $requestType;
@@ -51,7 +54,7 @@ public function __construct(HttpKernelInterface $kernel, Request $request, $requ
5154
}
5255

5356
/**
54-
* Returns the kernel in which this event was thrown
57+
* Returns the kernel in which this event was thrown.
5558
*
5659
* @return HttpKernelInterface
5760
*
@@ -63,7 +66,7 @@ public function getKernel()
6366
}
6467

6568
/**
66-
* Returns the request the kernel is currently processing
69+
* Returns the request the kernel is currently processing.
6770
*
6871
* @return Request
6972
*
@@ -75,7 +78,7 @@ public function getRequest()
7578
}
7679

7780
/**
78-
* Returns the request type the kernel is currently processing
81+
* Returns the request type the kernel is currently processing.
7982
*
8083
* @return int One of HttpKernelInterface::MASTER_REQUEST and
8184
* HttpKernelInterface::SUB_REQUEST

‎Event/PostResponseEvent.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,15 @@
1717
use Symfony\Component\HttpFoundation\Response;
1818

1919
/**
20-
* Allows to execute logic after a response was sent
20+
* Allows to execute logic after a response was sent.
2121
*
2222
* @author Jordi Boggiano <j.boggiano@seld.be>
2323
*/
2424
class PostResponseEvent extends Event
2525
{
2626
/**
27-
* The kernel in which this event was thrown
27+
* The kernel in which this event was thrown.
28+
*
2829
* @var HttpKernelInterface
2930
*/
3031
private $kernel;

‎Exception/PreconditionRequiredHttpException.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
* PreconditionRequiredHttpException.
1616
*
1717
* @author Ben Ramsey <ben@benramsey.com>
18+
*
1819
* @see http://tools.ietf.org/html/rfc6585
1920
*/
2021
class PreconditionRequiredHttpException extends HttpException

0 commit comments

Comments
 (0)