diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-16 10:02:57 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-04-16 10:02:57 +0200 |
| commit | 3b378cf0eb09f4e34cfde24e29cda4f578fe6833 (patch) | |
| tree | 3af3ef29ca707579cc8de674a8da0ff00e151701 /Acl/Domain/DoctrineAclCache.php | |
| parent | ef511d47c94ad92e37112b43efcbf7da8696a803 (diff) | |
| parent | 74eaf535ddcd6cad834c68e7802cfcb08f400c1e (diff) | |
| download | symfony-security-3b378cf0eb09f4e34cfde24e29cda4f578fe6833.zip symfony-security-3b378cf0eb09f4e34cfde24e29cda4f578fe6833.tar.gz symfony-security-3b378cf0eb09f4e34cfde24e29cda4f578fe6833.tar.bz2 | |
Merge branch '2.3' into 2.4
* 2.3:
made {@inheritdoc} annotations consistent across the board
fixed types in phpdocs
made phpdoc types consistent with those defined in Hack
Add support Thai translations
made types consistent with those defined in Hack
removed extra/unsupported arguments
[HttpKernel] fixed an error message
[TwigBundle] removed undefined argument
[Translation] Make IcuDatFileLoader/IcuResFileLoader::load invalid resource compatible with HHVM.
Conflicts:
src/Symfony/Bridge/ProxyManager/Tests/LazyProxy/Fixtures/php/lazy_service.php
src/Symfony/Bundle/FrameworkBundle/Command/ContainerDebugCommand.php
src/Symfony/Bundle/FrameworkBundle/Templating/Loader/FilesystemLoader.php
src/Symfony/Bundle/WebProfilerBundle/EventListener/WebDebugToolbarListener.php
src/Symfony/Component/Config/Definition/ReferenceDumper.php
src/Symfony/Component/Console/Helper/DescriptorHelper.php
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/Finder/Tests/Iterator/RecursiveDirectoryIteratorTest.php
src/Symfony/Component/Form/Extension/Core/DataTransformer/IntegerToLocalizedStringTransformer.php
src/Symfony/Component/Form/Tests/Extension/Core/DataMapper/PropertyPathMapperTest.php
src/Symfony/Component/HttpFoundation/Response.php
src/Symfony/Component/HttpFoundation/StreamedResponse.php
src/Symfony/Component/HttpKernel/Debug/TraceableEventDispatcher.php
src/Symfony/Component/HttpKernel/EventListener/ProfilerListener.php
src/Symfony/Component/HttpKernel/Fragment/FragmentHandler.php
src/Symfony/Component/HttpKernel/Fragment/RoutableFragmentRenderer.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/Tests/Fixtures/KernelForTest.php
src/Symfony/Component/Intl/NumberFormatter/NumberFormatter.php
src/Symfony/Component/Security/Core/Authorization/AccessDecisionManager.php
src/Symfony/Component/Stopwatch/StopwatchPeriod.php
src/Symfony/Component/Translation/TranslatorInterface.php
src/Symfony/Component/Validator/ConstraintValidatorFactory.php
Diffstat (limited to 'Acl/Domain/DoctrineAclCache.php')
| -rw-r--r-- | Acl/Domain/DoctrineAclCache.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Acl/Domain/DoctrineAclCache.php b/Acl/Domain/DoctrineAclCache.php index bfc5452..b680fb1 100644 --- a/Acl/Domain/DoctrineAclCache.php +++ b/Acl/Domain/DoctrineAclCache.php @@ -51,7 +51,7 @@ class DoctrineAclCache implements AclCacheInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function clearCache() { @@ -59,7 +59,7 @@ class DoctrineAclCache implements AclCacheInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function evictFromCacheById($aclId) { @@ -77,7 +77,7 @@ class DoctrineAclCache implements AclCacheInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function evictFromCacheByIdentity(ObjectIdentityInterface $oid) { @@ -90,7 +90,7 @@ class DoctrineAclCache implements AclCacheInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function getFromCacheById($aclId) { @@ -110,7 +110,7 @@ class DoctrineAclCache implements AclCacheInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function getFromCacheByIdentity(ObjectIdentityInterface $oid) { @@ -123,7 +123,7 @@ class DoctrineAclCache implements AclCacheInterface } /** - * {@inheritDoc} + * {@inheritdoc} */ public function putInCache(AclInterface $acl) { |