Permalink
Browse files

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
  • Loading branch information...
2 parents 827612b + 676a7bb commit 59447fdde2f198c217659565e687ab702f5817c3 @fabpot fabpot committed Oct 6, 2012
Showing with 9 additions and 7 deletions.
  1. +2 −0 .gitattributes
  2. +3 −3 Event/GetResponseEvent.php
  3. +4 −4 Event/KernelEvent.php
View
@@ -0,0 +1,2 @@
+Tests/ export-ignore
+phpunit.xml.dist export-ignore
@@ -28,14 +28,14 @@ class GetResponseEvent extends KernelEvent
{
/**
* The response object
- * @var Symfony\Component\HttpFoundation\Response
+ * @var Response
*/
private $response;
/**
* Returns the response object
*
- * @return Symfony\Component\HttpFoundation\Response
+ * @return Response
*
* @api
*/
@@ -47,7 +47,7 @@ public function getResponse()
/**
* Sets a response and stops event propagation
*
- * @param Symfony\Component\HttpFoundation\Response $response
+ * @param Response $response
*
* @api
*/
View
@@ -26,13 +26,13 @@ class KernelEvent extends Event
{
/**
* The kernel in which this event was thrown
- * @var Symfony\Component\HttpKernel\HttpKernelInterface
+ * @var HttpKernelInterface
*/
private $kernel;
/**
* The request the kernel is currently processing
- * @var Symfony\Component\HttpFoundation\Request
+ * @var Request
*/
private $request;
@@ -53,7 +53,7 @@ public function __construct(HttpKernelInterface $kernel, Request $request, $requ
/**
* Returns the kernel in which this event was thrown
*
- * @return Symfony\Component\HttpKernel\HttpKernelInterface
+ * @return HttpKernelInterface
*
* @api
*/
@@ -65,7 +65,7 @@ public function getKernel()
/**
* Returns the request the kernel is currently processing
*
- * @return Symfony\Component\HttpFoundation\Request
+ * @return Request
*
* @api
*/

0 comments on commit 59447fd

Please sign in to comment.