Skip to content

Commit 59447fd

Browse files
committed
Merge branch '2.1'
* 2.1: fixed CS added doc comments added doc comments [Validator] Updated swedish translation Update src/Symfony/Component/Validator/Resources/translations/validators.de.xlf [2.1] Exclude tests from zips via gitattributes [HttpKernel][Translator] Fixed type-hints Updated lithuanian validation translation [DomCrawler] Allows using multiselect through Form::setValues(). [Translation] forced the catalogue to be regenerated when a resource is added (closes symfony/translation#1) Unit test for patched method OptionsResolver::validateOptionValues(). validateOptionValues throw a notice if an allowed value is set and the corresponding option isn't. [Form] Hardened code of ViolationMapper against errors [HttpFoundation] Fixed #5611 - Request::splitHttpAcceptHeader incorrect result order. [Form] Fixed negative index access in PropertyPathBuilder Update src/Symfony/Component/Validator/Resources/translations/validators.ro.xlf Conflicts: src/Symfony/Component/DomCrawler/Form.php src/Symfony/Component/Process/Process.php
2 parents 827612b + 676a7bb commit 59447fd

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

.gitattributes

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Tests/ export-ignore
2+
phpunit.xml.dist export-ignore

Event/GetResponseEvent.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ class GetResponseEvent extends KernelEvent
2828
{
2929
/**
3030
* The response object
31-
* @var Symfony\Component\HttpFoundation\Response
31+
* @var Response
3232
*/
3333
private $response;
3434

3535
/**
3636
* Returns the response object
3737
*
38-
* @return Symfony\Component\HttpFoundation\Response
38+
* @return Response
3939
*
4040
* @api
4141
*/
@@ -47,7 +47,7 @@ public function getResponse()
4747
/**
4848
* Sets a response and stops event propagation
4949
*
50-
* @param Symfony\Component\HttpFoundation\Response $response
50+
* @param Response $response
5151
*
5252
* @api
5353
*/

Event/KernelEvent.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ class KernelEvent extends Event
2626
{
2727
/**
2828
* The kernel in which this event was thrown
29-
* @var Symfony\Component\HttpKernel\HttpKernelInterface
29+
* @var HttpKernelInterface
3030
*/
3131
private $kernel;
3232

3333
/**
3434
* The request the kernel is currently processing
35-
* @var Symfony\Component\HttpFoundation\Request
35+
* @var Request
3636
*/
3737
private $request;
3838

@@ -53,7 +53,7 @@ public function __construct(HttpKernelInterface $kernel, Request $request, $requ
5353
/**
5454
* Returns the kernel in which this event was thrown
5555
*
56-
* @return Symfony\Component\HttpKernel\HttpKernelInterface
56+
* @return HttpKernelInterface
5757
*
5858
* @api
5959
*/
@@ -65,7 +65,7 @@ public function getKernel()
6565
/**
6666
* Returns the request the kernel is currently processing
6767
*
68-
* @return Symfony\Component\HttpFoundation\Request
68+
* @return Request
6969
*
7070
* @api
7171
*/

0 commit comments

Comments
 (0)