diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-16 12:34:31 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-16 12:34:31 +0200 |
| commit | 9efff1d83d7b20d340c0abfcfe738640867882f6 (patch) | |
| tree | 49d48f2f6a2a2e137805e0517ddee78893ff6edf /Core/SecurityContextInterface.php | |
| parent | be954bbe63838d3d08885b96547e6081a0773757 (diff) | |
| parent | a6be31fc09c34a308c7a756b39e8a504a822694f (diff) | |
| download | symfony-security-9efff1d83d7b20d340c0abfcfe738640867882f6.zip symfony-security-9efff1d83d7b20d340c0abfcfe738640867882f6.tar.gz symfony-security-9efff1d83d7b20d340c0abfcfe738640867882f6.tar.bz2 | |
Merge branch '2.3' into 2.4
* 2.3:
fixed types in phpdocs
Conflicts:
src/Symfony/Bridge/Twig/TwigEngine.php
src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
src/Symfony/Component/Filesystem/Tests/FilesystemTest.php
src/Symfony/Component/Form/Extension/Core/ChoiceList/SimpleChoiceList.php
src/Symfony/Component/HttpKernel/Controller/ControllerResolver.php
src/Symfony/Component/HttpKernel/Controller/ControllerResolverInterface.php
src/Symfony/Component/PropertyAccess/PropertyAccessorBuilder.php
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
src/Symfony/Component/Stopwatch/StopwatchEvent.php
src/Symfony/Component/Templating/PhpEngine.php
Diffstat (limited to 'Core/SecurityContextInterface.php')
| -rw-r--r-- | Core/SecurityContextInterface.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Core/SecurityContextInterface.php b/Core/SecurityContextInterface.php index 434f9a5..ca816a8 100644 --- a/Core/SecurityContextInterface.php +++ b/Core/SecurityContextInterface.php @@ -44,7 +44,7 @@ interface SecurityContextInterface * @param mixed $attributes * @param mixed $object * - * @return Boolean + * @return bool */ public function isGranted($attributes, $object = null); } |