diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-04 09:55:19 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-04 09:55:19 +0100 |
| commit | 3598ef3378bcfb03fba1e368e168f30bb8169eb2 (patch) | |
| tree | 37398a71f681242885ee0ce15985c42506aeb671 /Acl | |
| parent | aba0b41e79aaae3c8eb9c52f9b2da2f01adb80ca (diff) | |
| parent | 4d93fe20999aa43de372f053ff9f8ec5a85b6fa5 (diff) | |
| download | symfony-security-3598ef3378bcfb03fba1e368e168f30bb8169eb2.zip symfony-security-3598ef3378bcfb03fba1e368e168f30bb8169eb2.tar.gz symfony-security-3598ef3378bcfb03fba1e368e168f30bb8169eb2.tar.bz2 | |
Merge branch '2.3' into 2.5
* 2.3:
[2.3] More cs fixes
Removed unused imports
CS fixes
bumped Symfony version to 2.3.24
updated VERSION for 2.3.23
update CONTRIBUTORS for 2.3.23
updated CHANGELOG for 2.3.23
Conflicts:
src/Symfony/Bundle/FrameworkBundle/EventListener/SessionListener.php
src/Symfony/Bundle/SecurityBundle/DependencyInjection/MainConfiguration.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
src/Symfony/Component/Routing/Matcher/Dumper/PhpMatcherDumper.php
Diffstat (limited to 'Acl')
| -rw-r--r-- | Acl/Domain/SecurityIdentityRetrievalStrategy.php | 1 | ||||
| -rw-r--r-- | Acl/Model/MutableAclProviderInterface.php | 2 | ||||
| -rw-r--r-- | Acl/Tests/Domain/AclTest.php | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/Acl/Domain/SecurityIdentityRetrievalStrategy.php b/Acl/Domain/SecurityIdentityRetrievalStrategy.php index b95fddc..43f1d38 100644 --- a/Acl/Domain/SecurityIdentityRetrievalStrategy.php +++ b/Acl/Domain/SecurityIdentityRetrievalStrategy.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Security\Acl\Domain; use Symfony\Component\Security\Core\Authentication\Token\AnonymousToken; - use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; use Symfony\Component\Security\Acl\Model\SecurityIdentityRetrievalStrategyInterface; use Symfony\Component\Security\Core\Authentication\AuthenticationTrustResolver; diff --git a/Acl/Model/MutableAclProviderInterface.php b/Acl/Model/MutableAclProviderInterface.php index f5bb198..f94ddc5 100644 --- a/Acl/Model/MutableAclProviderInterface.php +++ b/Acl/Model/MutableAclProviderInterface.php @@ -24,7 +24,7 @@ interface MutableAclProviderInterface extends AclProviderInterface * @param ObjectIdentityInterface $oid * * @throws AclAlreadyExistsException when there already is an ACL for the given - * object identity + * object identity * * @return MutableAclInterface */ diff --git a/Acl/Tests/Domain/AclTest.php b/Acl/Tests/Domain/AclTest.php index ff29bcf..84b9ba9 100644 --- a/Acl/Tests/Domain/AclTest.php +++ b/Acl/Tests/Domain/AclTest.php @@ -12,7 +12,6 @@ namespace Symfony\Component\Security\Acl\Tests\Domain; use Symfony\Component\Security\Acl\Domain\UserSecurityIdentity; - use Symfony\Component\Security\Acl\Domain\RoleSecurityIdentity; use Symfony\Component\Security\Acl\Domain\PermissionGrantingStrategy; use Symfony\Component\Security\Acl\Domain\ObjectIdentity; |