merged branch drak/docb (PR #5672)

This PR was merged into the 2.0 branch.

Commits
-------

22c7a91 [HttpKernel][Translator] Fixed type-hints

Discussion
----------

[HttpKernel][Translator] Fixed type-hints

Bug fix: yes
Feature addition: no
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: -
Todo: -
License of the code: MIT
Documentation PR: -

---------------------------------------------------------------------------

by drak at 2012-10-04T15:18:55Z

This PR is ready - the travis build fail is not related to this PR which is just docblock changes.

---------------------------------------------------------------------------

by pborreli at 2012-10-04T15:37:57Z

the travis build fail is indeed not related to your PR but your branch. see https://github.com/drak/symfony/blob/docb/.travis.yml

You should fetch upstream remote, merge, rebase and push again.

---------------------------------------------------------------------------

by drak at 2012-10-04T16:50:28Z

Thanks for the info, but the branch is 100% up to date with `2.0`, the file you quoted is as it is in the main repo: https://github.com/symfony/symfony/blob/2.0/.travis.yml - in any case, it doesnt affect merging this changeset.

src/Symfony/Component/HttpKernel/Event/GetResponseEvent.php

@@ -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 @@ class GetResponseEvent extends KernelEvent
     /**
      * Sets a response and stops event propagation
      *
-     * @param Symfony\Component\HttpFoundation\Response $response
+     * @param Response $response
      *
      * @api
      */

src/Symfony/Component/HttpKernel/Event/KernelEvent.php

@@ -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 @@ class KernelEvent extends Event
     /**
      * Returns the kernel in which this event was thrown
      *
-     * @return Symfony\Component\HttpKernel\HttpKernelInterface
+     * @return HttpKernelInterface
      *
      * @api
      */
@@ -65,7 +65,7 @@ class KernelEvent extends Event
     /**
      * Returns the request the kernel is currently processing
      *
-     * @return Symfony\Component\HttpFoundation\Request
+     * @return Request
      *
      * @api
      */

src/Symfony/Component/Translation/Loader/XliffFileLoader.php

@@ -51,7 +51,7 @@ class XliffFileLoader implements LoaderInterface
      *
      * @param string $file
      *
-     * @return SimpleXMLElement
+     * @return \SimpleXMLElement
      */
     private function parseFile($file)
     {
@@ -106,7 +106,7 @@ class XliffFileLoader implements LoaderInterface
     /**
      * Returns the XML errors of the internal XML parser
      *
-     * @return array  An array of errors
+     * @return array An array of errors
      */
     private function getXmlErrors($internalErrors)
     {

src/Symfony/Component/Translation/MessageSelector.php

@@ -44,7 +44,7 @@ class MessageSelector
      *
      * @return string
      *
-     * @throws InvalidArgumentException
+     * @throws \InvalidArgumentException
      *
      * @api
      */