Merge remote branch 'donpinkster/typo-fix'

* donpinkster/typo-fix:
  [TwigBundle] Fixed PHPDoc
  [TwigBundle] Fixed typo
This commit is contained in:
Fabien Potencier 2011-03-12 14:27:30 +01:00
commit f6c119c619

View File

@ -14,7 +14,7 @@ namespace Symfony\Bundle\TwigBundle;
use Symfony\Component\DependencyInjection\ContainerInterface;
/**
* AppVariables is the entry point for Symfony global variables in Twig templates.
* GlobalVariables is the entry point for Symfony global variables in Twig templates.
*
* @author Fabien Potencier <fabien@symfony.com>
*/
@ -65,7 +65,7 @@ class GlobalVariables
}
/**
* Returns the security context service.
* Returns the current request.
*
* @return Symfony\Component\HttpFoundation\Request|void The http request object
*/
@ -77,7 +77,7 @@ class GlobalVariables
}
/**
* Returns the security context service.
* Returns the current session.
*
* @return Symfony\Component\HttpFoundation\Session|void The session
*/