diff options
36 files changed, 10 insertions, 116 deletions
diff --git a/Acl/Dbal/AclProvider.php b/Acl/Dbal/AclProvider.php index 143dee6..6e05fa9 100644 --- a/Acl/Dbal/AclProvider.php +++ b/Acl/Dbal/AclProvider.php @@ -348,7 +348,6 @@ QUERY; * This method is called when an ACL instance is retrieved from the cache. * * @param AclInterface $acl - * @return void */ private function updateAceIdentityMap(AclInterface $acl) { @@ -396,7 +395,6 @@ QUERY; * map to ensure every ACE only gets instantiated once. * * @param array $aces - * @return void */ private function doUpdateAceIdentityMap(array &$aces) { diff --git a/Acl/Dbal/MutableAclProvider.php b/Acl/Dbal/MutableAclProvider.php index 9050cf8..f1c5e08 100644 --- a/Acl/Dbal/MutableAclProvider.php +++ b/Acl/Dbal/MutableAclProvider.php @@ -148,7 +148,6 @@ class MutableAclProvider extends AclProvider implements MutableAclProviderInterf * @param string $propertyName * @param mixed $oldValue * @param mixed $newValue - * @return void */ public function propertyChanged($sender, $propertyName, $oldValue, $newValue) { @@ -643,7 +642,6 @@ QUERY; * Creates the ACL for the passed object identity * * @param ObjectIdentityInterface $oid - * @return void */ private function createObjectIdentity(ObjectIdentityInterface $oid) { @@ -695,7 +693,6 @@ QUERY; * Deletes all ACEs for the given object identity primary key. * * @param integer $oidPK - * @return void */ private function deleteAccessControlEntries($oidPK) { @@ -706,7 +703,6 @@ QUERY; * Deletes the object identity from the database. * * @param integer $pk - * @return void */ private function deleteObjectIdentity($pk) { @@ -717,7 +713,6 @@ QUERY; * Deletes all entries from the relations table from the database. * * @param integer $pk - * @return void */ private function deleteObjectIdentityRelations($pk) { @@ -728,7 +723,6 @@ QUERY; * This regenerates the ancestor table which is used for fast read access. * * @param AclInterface $acl - * @return void */ private function regenerateAncestorRelations(AclInterface $acl) { @@ -749,7 +743,6 @@ QUERY; * * @param string $name * @param array $changes - * @return void */ private function updateFieldAceProperty($name, array $changes) { @@ -806,7 +799,6 @@ QUERY; * * @param string $name * @param array $changes - * @return void */ private function updateAceProperty($name, array $changes) { @@ -860,7 +852,6 @@ QUERY; * Persists the changes which were made to ACEs to the database. * * @param \SplObjectStorage $aces - * @return void */ private function updateAces(\SplObjectStorage $aces) { diff --git a/Acl/Dbal/Schema.php b/Acl/Dbal/Schema.php index dd8cf08..97372f0 100644 --- a/Acl/Dbal/Schema.php +++ b/Acl/Dbal/Schema.php @@ -26,7 +26,6 @@ final class Schema extends BaseSchema * Constructor * * @param array $options the names for tables - * @return void */ public function __construct(array $options) { @@ -43,8 +42,6 @@ final class Schema extends BaseSchema /** * Adds the class table to the schema - * - * @return void */ protected function addClassTable() { @@ -57,8 +54,6 @@ final class Schema extends BaseSchema /** * Adds the entry table to the schema - * - * @return void */ protected function addEntryTable() { @@ -87,8 +82,6 @@ final class Schema extends BaseSchema /** * Adds the object identity table to the schema - * - * @return void */ protected function addObjectIdentitiesTable() { @@ -109,8 +102,6 @@ final class Schema extends BaseSchema /** * Adds the object identity relation table to the schema - * - * @return void */ protected function addObjectIdentityAncestorsTable() { @@ -128,8 +119,6 @@ final class Schema extends BaseSchema /** * Adds the security identity table to the schema - * - * @return void */ protected function addSecurityIdentitiesTable() { diff --git a/Acl/Domain/Acl.php b/Acl/Domain/Acl.php index ff8db9d..e5cb99d 100644 --- a/Acl/Domain/Acl.php +++ b/Acl/Domain/Acl.php @@ -55,7 +55,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param PermissionGrantingStrategyInterface $permissionGrantingStrategy * @param array $loadedSids * @param Boolean $entriesInheriting - * @return void */ public function __construct($id, ObjectIdentityInterface $objectIdentity, PermissionGrantingStrategyInterface $permissionGrantingStrategy, array $loadedSids = array(), $entriesInheriting) { @@ -76,7 +75,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * Adds a property changed listener * * @param PropertyChangedListener $listener - * @return void */ public function addPropertyChangedListener(PropertyChangedListener $listener) { @@ -282,7 +280,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * Implementation for the \Serializable interface * * @param string $serialized - * @return void */ public function unserialize($serialized) { @@ -404,7 +401,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param string $property * @param integer $index * @throws \OutOfBoundsException - * @return void */ private function deleteAce($property, $index) { @@ -430,7 +426,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param integer $index * @param string $field * @throws \OutOfBoundsException - * @return void */ private function deleteFieldAce($property, $index, $field) { @@ -460,7 +455,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param string $strategy * @throws \OutOfBoundsException * @throws \InvalidArgumentException - * @return void */ private function insertAce($property, $index, $mask, SecurityIdentityInterface $sid, $granting, $strategy = null) { @@ -510,7 +504,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param string $strategy * @throws \InvalidArgumentException * @throws \OutOfBoundsException - * @return void */ private function insertFieldAce($property, $index, $field, $mask, SecurityIdentityInterface $sid, $granting, $strategy = null) { @@ -564,7 +557,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param integer $mask * @param string $strategy * @throws \OutOfBoundsException - * @return void */ private function updateAce($property, $index, $mask, $strategy = null) { @@ -592,7 +584,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param Boolean $auditSuccess * @param Boolean $auditFailure * @throws \OutOfBoundsException - * @return void */ private function updateAuditing(array &$aces, $index, $auditSuccess, $auditFailure) { @@ -621,7 +612,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param string $strategy * @throws \InvalidArgumentException * @throws \OutOfBoundsException - * @return void */ private function updateFieldAce($property, $index, $field, $mask, $strategy = null) { @@ -651,7 +641,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param string $name * @param mixed $oldValue * @param mixed $newValue - * @return void */ private function onPropertyChanged($name, $oldValue, $newValue) { @@ -667,7 +656,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param string $name * @param mixed $oldValue * @param mixed $newValue - * @return void */ private function onEntryPropertyChanged(EntryInterface $entry, $name, $oldValue, $newValue) { diff --git a/Acl/Domain/AclCollectionCache.php b/Acl/Domain/AclCollectionCache.php index c4f5fdd..33825c1 100644 --- a/Acl/Domain/AclCollectionCache.php +++ b/Acl/Domain/AclCollectionCache.php @@ -32,7 +32,6 @@ class AclCollectionCache * @param AclProviderInterface $aclProvider * @param ObjectIdentityRetrievalStrategy $oidRetrievalStrategy * @param SecurityIdentityRetrievalStrategy $sidRetrievalStrategy - * @return void */ public function __construct(AclProviderInterface $aclProvider, ObjectIdentityRetrievalStrategyInterface $oidRetrievalStrategy, SecurityIdentityRetrievalStrategyInterface $sidRetrievalStrategy) { @@ -47,7 +46,6 @@ class AclCollectionCache * * @param mixed $collection anything that can be passed to foreach() * @param array $tokens an array of TokenInterface implementations - * @return void */ public function cache($collection, array $tokens = array()) { diff --git a/Acl/Domain/AuditLogger.php b/Acl/Domain/AuditLogger.php index d6d7d9d..fa91b60 100644 --- a/Acl/Domain/AuditLogger.php +++ b/Acl/Domain/AuditLogger.php @@ -27,7 +27,6 @@ abstract class AuditLogger implements AuditLoggerInterface * * @param Boolean $granted * @param EntryInterface $ace - * @return void */ public function logIfNeeded($granted, EntryInterface $ace) { @@ -47,7 +46,6 @@ abstract class AuditLogger implements AuditLoggerInterface * * @param Boolean $granted * @param EntryInterface $ace - * @return void */ abstract protected function doLog($granted, EntryInterface $ace); } diff --git a/Acl/Domain/DoctrineAclCache.php b/Acl/Domain/DoctrineAclCache.php index 21e5149..731f98c 100644 --- a/Acl/Domain/DoctrineAclCache.php +++ b/Acl/Domain/DoctrineAclCache.php @@ -36,8 +36,6 @@ class DoctrineAclCache implements AclCacheInterface * @param Cache $cache * @param PermissionGrantingStrategyInterface $permissionGrantingStrategy * @param string $prefix - * - * @return void */ public function __construct(Cache $cache, PermissionGrantingStrategyInterface $permissionGrantingStrategy, $prefix = self::PREFIX) { diff --git a/Acl/Domain/Entry.php b/Acl/Domain/Entry.php index c5226a4..9ff567b 100644 --- a/Acl/Domain/Entry.php +++ b/Acl/Domain/Entry.php @@ -127,7 +127,6 @@ class Entry implements AuditableEntryInterface * AclInterface instead. * * @param Boolean $boolean - * @return void */ public function setAuditFailure($boolean) { @@ -141,7 +140,6 @@ class Entry implements AuditableEntryInterface * AclInterface instead. * * @param Boolean $boolean - * @return void */ public function setAuditSuccess($boolean) { @@ -155,7 +153,6 @@ class Entry implements AuditableEntryInterface * AclInterface instead. * * @param integer $mask - * @return void */ public function setMask($mask) { @@ -169,7 +166,6 @@ class Entry implements AuditableEntryInterface * AclInterface instead. * * @param string $strategy - * @return void */ public function setStrategy($strategy) { @@ -198,7 +194,6 @@ class Entry implements AuditableEntryInterface * Implementation of \Serializable * * @param string $serialized - * @return void */ public function unserialize($serialized) { diff --git a/Acl/Domain/FieldEntry.php b/Acl/Domain/FieldEntry.php index 4167ba4..f057367 100644 --- a/Acl/Domain/FieldEntry.php +++ b/Acl/Domain/FieldEntry.php @@ -36,7 +36,6 @@ class FieldEntry extends Entry implements FieldEntryInterface * @param Boolean $granting * @param Boolean $auditFailure * @param Boolean $auditSuccess - * @return void */ public function __construct($id, AclInterface $acl, $field, SecurityIdentityInterface $sid, $strategy, $mask, $granting, $auditFailure, $auditSuccess) { diff --git a/Acl/Domain/ObjectIdentity.php b/Acl/Domain/ObjectIdentity.php index 3bf1fe1..ee2fafc 100644 --- a/Acl/Domain/ObjectIdentity.php +++ b/Acl/Domain/ObjectIdentity.php @@ -30,7 +30,6 @@ final class ObjectIdentity implements ObjectIdentityInterface * * @param string $identifier * @param string $type - * @return void */ public function __construct($identifier, $type) { diff --git a/Acl/Domain/PermissionGrantingStrategy.php b/Acl/Domain/PermissionGrantingStrategy.php index c37ce29..152b704 100644 --- a/Acl/Domain/PermissionGrantingStrategy.php +++ b/Acl/Domain/PermissionGrantingStrategy.php @@ -35,7 +35,6 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface * Sets the audit logger * * @param AuditLoggerInterface $auditLogger - * @return void */ public function setAuditLogger(AuditLoggerInterface $auditLogger) { diff --git a/Acl/Domain/RoleSecurityIdentity.php b/Acl/Domain/RoleSecurityIdentity.php index 51d3d0c..0d3d0d2 100644 --- a/Acl/Domain/RoleSecurityIdentity.php +++ b/Acl/Domain/RoleSecurityIdentity.php @@ -27,7 +27,6 @@ final class RoleSecurityIdentity implements SecurityIdentityInterface * Constructor * * @param mixed $role a Role instance, or its string representation - * @return void */ public function __construct($role) { diff --git a/Acl/Domain/SecurityIdentityRetrievalStrategy.php b/Acl/Domain/SecurityIdentityRetrievalStrategy.php index 4c16a50..70b6d90 100644 --- a/Acl/Domain/SecurityIdentityRetrievalStrategy.php +++ b/Acl/Domain/SecurityIdentityRetrievalStrategy.php @@ -34,8 +34,6 @@ class SecurityIdentityRetrievalStrategy implements SecurityIdentityRetrievalStra * * @param RoleHierarchyInterface $roleHierarchy * @param AuthenticationTrustResolver $authenticationTrustResolver - * - * @return void */ public function __construct(RoleHierarchyInterface $roleHierarchy, AuthenticationTrustResolver $authenticationTrustResolver) { diff --git a/Acl/Exception/NotAllAclsFoundException.php b/Acl/Exception/NotAllAclsFoundException.php index 8e7a08f..3c02495 100644 --- a/Acl/Exception/NotAllAclsFoundException.php +++ b/Acl/Exception/NotAllAclsFoundException.php @@ -28,7 +28,6 @@ class NotAllAclsFoundException extends AclNotFoundException * Sets the partial result * * @param \SplObjectStorage $result - * @return void */ public function setPartialResult(\SplObjectStorage $result) { diff --git a/Acl/Model/AclCacheInterface.php b/Acl/Model/AclCacheInterface.php index bc6c11f..dd515ce 100644 --- a/Acl/Model/AclCacheInterface.php +++ b/Acl/Model/AclCacheInterface.php @@ -22,7 +22,6 @@ interface AclCacheInterface * Removes an ACL from the cache * * @param string $primaryKey a serialized primary key - * @return void */ function evictFromCacheById($primaryKey); @@ -32,7 +31,6 @@ interface AclCacheInterface * The ACL which is returned, must reference the passed object identity. * * @param ObjectIdentityInterface $oid - * @return void */ function evictFromCacheByIdentity(ObjectIdentityInterface $oid); @@ -56,14 +54,11 @@ interface AclCacheInterface * Stores a new ACL in the cache * * @param AclInterface $acl - * @return void */ function putInCache(AclInterface $acl); /** * Removes all ACLs from the cache - * - * @return void */ function clearCache(); } diff --git a/Acl/Model/AuditLoggerInterface.php b/Acl/Model/AuditLoggerInterface.php index dceb76b..56fd12e 100644 --- a/Acl/Model/AuditLoggerInterface.php +++ b/Acl/Model/AuditLoggerInterface.php @@ -24,7 +24,6 @@ interface AuditLoggerInterface * * @param Boolean $granted * @param EntryInterface $ace - * @return void */ function logIfNeeded($granted, EntryInterface $ace); } diff --git a/Acl/Model/AuditableAclInterface.php b/Acl/Model/AuditableAclInterface.php index 2a6d619..9a95106 100644 --- a/Acl/Model/AuditableAclInterface.php +++ b/Acl/Model/AuditableAclInterface.php @@ -24,7 +24,6 @@ interface AuditableAclInterface extends MutableAclInterface * @param integer $index * @param Boolean $auditSuccess * @param Boolean $auditFailure - * @return void */ function updateClassAuditing($index, $auditSuccess, $auditFailure); @@ -35,9 +34,7 @@ interface AuditableAclInterface extends MutableAclInterface * @param string $field * @param Boolean $auditSuccess * @param Boolean $auditFailure - * @return void */ - function updateClassFieldAuditing($index, $field, $auditSuccess, $auditFailure); /** @@ -46,7 +43,6 @@ interface AuditableAclInterface extends MutableAclInterface * @param integer $index * @param Boolean $auditSuccess * @param Boolean $auditFailure - * @return void */ function updateObjectAuditing($index, $auditSuccess, $auditFailure); @@ -57,7 +53,6 @@ interface AuditableAclInterface extends MutableAclInterface * @param string $field * @param Boolean $auditSuccess * @param Boolean $auditFailure - * @return void */ function updateObjectFieldAuditing($index, $field, $auditSuccess, $auditFailure); } diff --git a/Acl/Model/MutableAclInterface.php b/Acl/Model/MutableAclInterface.php index 54a3f8e..521d307 100644 --- a/Acl/Model/MutableAclInterface.php +++ b/Acl/Model/MutableAclInterface.php @@ -25,7 +25,6 @@ interface MutableAclInterface extends AclInterface * Deletes a class-based ACE * * @param integer $index - * @return void */ function deleteClassAce($index); @@ -34,7 +33,6 @@ interface MutableAclInterface extends AclInterface * * @param integer $index * @param string $field - * @return void */ function deleteClassFieldAce($index, $field); @@ -42,7 +40,6 @@ interface MutableAclInterface extends AclInterface * Deletes an object-based ACE * * @param integer $index - * @return void */ function deleteObjectAce($index); @@ -51,7 +48,6 @@ interface MutableAclInterface extends AclInterface * * @param integer $index * @param string $field - * @return void */ function deleteObjectFieldAce($index, $field); @@ -70,7 +66,6 @@ interface MutableAclInterface extends AclInterface * @param integer $index * @param Boolean $granting * @param string $strategy - * @return void */ function insertClassAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); @@ -83,7 +78,6 @@ interface MutableAclInterface extends AclInterface * @param integer $index * @param Boolean $granting * @param string $strategy - * @return void */ function insertClassFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); @@ -95,7 +89,6 @@ interface MutableAclInterface extends AclInterface * @param integer $index * @param Boolean $granting * @param string $strategy - * @return void */ function insertObjectAce(SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); @@ -108,7 +101,6 @@ interface MutableAclInterface extends AclInterface * @param integer $index * @param Boolean $granting * @param string $strategy - * @return void */ function insertObjectFieldAce($field, SecurityIdentityInterface $sid, $mask, $index = 0, $granting = true, $strategy = null); @@ -116,7 +108,6 @@ interface MutableAclInterface extends AclInterface * Sets whether entries are inherited * * @param Boolean $boolean - * @return void */ function setEntriesInheriting($boolean); @@ -124,7 +115,6 @@ interface MutableAclInterface extends AclInterface * Sets the parent ACL * * @param AclInterface $acl - * @return void */ function setParentAcl(AclInterface $acl); @@ -134,7 +124,6 @@ interface MutableAclInterface extends AclInterface * @param integer $index * @param integer $mask * @param string $strategy if null the strategy should not be changed - * @return void */ function updateClassAce($index, $mask, $strategy = null); @@ -145,7 +134,6 @@ interface MutableAclInterface extends AclInterface * @param string $field * @param integer $mask * @param string $strategy if null the strategy should not be changed - * @return void */ function updateClassFieldAce($index, $field, $mask, $strategy = null); @@ -155,7 +143,6 @@ interface MutableAclInterface extends AclInterface * @param integer $index * @param integer $mask * @param string $strategy if null the strategy should not be changed - * @return void */ function updateObjectAce($index, $mask, $strategy = null); @@ -166,7 +153,6 @@ interface MutableAclInterface extends AclInterface * @param string $field * @param integer $mask * @param string $strategy if null the strategy should not be changed - * @return void */ function updateObjectFieldAce($index, $field, $mask, $strategy = null); } diff --git a/Acl/Model/MutableAclProviderInterface.php b/Acl/Model/MutableAclProviderInterface.php index c04eb31..58eeb7d 100644 --- a/Acl/Model/MutableAclProviderInterface.php +++ b/Acl/Model/MutableAclProviderInterface.php @@ -35,7 +35,6 @@ interface MutableAclProviderInterface extends AclProviderInterface * want child ACLs to be deleted, you will have to set their parent ACL to null. * * @param ObjectIdentityInterface $oid - * @return void */ function deleteAcl(ObjectIdentityInterface $oid); @@ -46,7 +45,6 @@ interface MutableAclProviderInterface extends AclProviderInterface * Changes to parent ACLs are not persisted. * * @param MutableAclInterface $acl - * @return void */ function updateAcl(MutableAclInterface $acl); } diff --git a/Acl/Model/SecurityIdentityInterface.php b/Acl/Model/SecurityIdentityInterface.php index 1833630..5bf6189 100644 --- a/Acl/Model/SecurityIdentityInterface.php +++ b/Acl/Model/SecurityIdentityInterface.php @@ -25,7 +25,6 @@ interface SecurityIdentityInterface * not rely on referential equality. * * @param SecurityIdentityInterface $identity - * @return void */ function equals(SecurityIdentityInterface $identity); } diff --git a/Acl/Permission/MaskBuilder.php b/Acl/Permission/MaskBuilder.php index f7a6a3a..e81005b 100644 --- a/Acl/Permission/MaskBuilder.php +++ b/Acl/Permission/MaskBuilder.php @@ -73,7 +73,6 @@ class MaskBuilder * Constructor * * @param integer $mask optional; defaults to 0 - * @return void */ public function __construct($mask = 0) { diff --git a/Core/Authentication/AuthenticationTrustResolver.php b/Core/Authentication/AuthenticationTrustResolver.php index 8ca28fb..9b3ff3d 100644 --- a/Core/Authentication/AuthenticationTrustResolver.php +++ b/Core/Authentication/AuthenticationTrustResolver.php @@ -28,8 +28,6 @@ class AuthenticationTrustResolver implements AuthenticationTrustResolverInterfac * * @param string $anonymousClass * @param string $rememberMeClass - * - * @return void */ public function __construct($anonymousClass, $rememberMeClass) { diff --git a/Core/Authentication/Token/RememberMeToken.php b/Core/Authentication/Token/RememberMeToken.php index 81ab1c2..fe30c21 100644 --- a/Core/Authentication/Token/RememberMeToken.php +++ b/Core/Authentication/Token/RememberMeToken.php @@ -51,7 +51,7 @@ class RememberMeToken extends AbstractToken public function setAuthenticated($authenticated) { if ($authenticated) { - throw new \RuntimeException('You cannot set this token to authenticated after creation.'); + throw new \LogicException('You cannot set this token to authenticated after creation.'); } parent::setAuthenticated(false); diff --git a/Core/Authorization/Voter/AuthenticatedVoter.php b/Core/Authorization/Voter/AuthenticatedVoter.php index d750e33..5847e0d 100644 --- a/Core/Authorization/Voter/AuthenticatedVoter.php +++ b/Core/Authorization/Voter/AuthenticatedVoter.php @@ -35,8 +35,6 @@ class AuthenticatedVoter implements VoterInterface * Constructor. * * @param AuthenticationTrustResolverInterface $authenticationTrustResolver - * - * @return void */ public function __construct(AuthenticationTrustResolverInterface $authenticationTrustResolver) { diff --git a/Core/SecurityContextInterface.php b/Core/SecurityContextInterface.php index d57c409..d0c7214 100644 --- a/Core/SecurityContextInterface.php +++ b/Core/SecurityContextInterface.php @@ -35,7 +35,6 @@ interface SecurityContextInterface * Sets the authentication token. * * @param TokenInterface $token - * @return void */ function setToken(TokenInterface $token = null); diff --git a/Core/User/UserInterface.php b/Core/User/UserInterface.php index 9091bfc..f6356fe 100644 --- a/Core/User/UserInterface.php +++ b/Core/User/UserInterface.php @@ -48,8 +48,6 @@ interface UserInterface /** * Removes sensitive data from the user. - * - * @return void */ function eraseCredentials(); diff --git a/Http/Firewall/LogoutListener.php b/Http/Firewall/LogoutListener.php index 06454a3..63ad673 100644 --- a/Http/Firewall/LogoutListener.php +++ b/Http/Firewall/LogoutListener.php @@ -57,7 +57,6 @@ class LogoutListener implements ListenerInterface * Adds a logout handler * * @param LogoutHandlerInterface $handler - * @return void */ public function addHandler(LogoutHandlerInterface $handler) { diff --git a/Http/HttpUtils.php b/Http/HttpUtils.php index a26b1bd..c11b283 100644 --- a/Http/HttpUtils.php +++ b/Http/HttpUtils.php @@ -127,11 +127,7 @@ class HttpUtils try { $parameters = $this->router->match($request->getPathInfo()); - if (isset($parameters['_locale'])) { - $context->setParameter('_locale', $parameters['_locale']); - } elseif ($session = $request->getSession()) { - $context->setParameter('_locale', $session->getLocale()); - } + $context->setParameter('_locale', isset($parameters['_locale']) ? $parameters['_locale'] : $request->getLocale()); } catch (\Exception $e) { // let's hope user doesn't use the locale in the path } diff --git a/Http/Logout/CookieClearingLogoutHandler.php b/Http/Logout/CookieClearingLogoutHandler.php index 65b45f2..dd3d293 100644 --- a/Http/Logout/CookieClearingLogoutHandler.php +++ b/Http/Logout/CookieClearingLogoutHandler.php @@ -39,7 +39,6 @@ class CookieClearingLogoutHandler implements LogoutHandlerInterface * @param Request $request * @param Response $response * @param TokenInterface $token - * @return void */ public function logout(Request $request, Response $response, TokenInterface $token) { diff --git a/Http/Logout/LogoutHandlerInterface.php b/Http/Logout/LogoutHandlerInterface.php index 6d5c519..71be388 100644 --- a/Http/Logout/LogoutHandlerInterface.php +++ b/Http/Logout/LogoutHandlerInterface.php @@ -30,7 +30,6 @@ interface LogoutHandlerInterface * @param Request $request * @param Response $response * @param TokenInterface $token - * @return void */ function logout(Request $request, Response $response, TokenInterface $token); } diff --git a/Http/Logout/SessionLogoutHandler.php b/Http/Logout/SessionLogoutHandler.php index 9fd49d1..e91cf17 100644 --- a/Http/Logout/SessionLogoutHandler.php +++ b/Http/Logout/SessionLogoutHandler.php @@ -28,7 +28,6 @@ class SessionLogoutHandler implements LogoutHandlerInterface * @param Request $request * @param Response $response * @param TokenInterface $token - * @return void */ public function logout(Request $request, Response $response, TokenInterface $token) { diff --git a/Http/RememberMe/AbstractRememberMeServices.php b/Http/RememberMe/AbstractRememberMeServices.php index 41349ba..e75cf63 100644 --- a/Http/RememberMe/AbstractRememberMeServices.php +++ b/Http/RememberMe/AbstractRememberMeServices.php @@ -143,7 +143,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * @param Request $request * @param Response $response * @param TokenInterface $token - * @return void */ public function logout(Request $request, Response $response, TokenInterface $token) { @@ -155,7 +154,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * an attempted authentication fails. * * @param Request $request - * @return void */ public final function loginFail(Request $request) { @@ -170,7 +168,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * @param Request $request * @param Response $response * @param TokenInterface $token The token that resulted in a successful authentication - * @return void */ public final function loginSuccess(Request $request, Response $response, TokenInterface $token) { @@ -219,7 +216,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * @param Request $request * @param Response $response * @param TokenInterface $token - * @return void */ abstract protected function onLoginSuccess(Request $request, Response $response, TokenInterface $token); @@ -260,7 +256,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * Deletes the remember-me cookie * * @param Request $request - * @return void */ protected function cancelCookie(Request $request) { diff --git a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php index 91105db..b87c9e4 100644 --- a/Http/RememberMe/PersistentTokenBasedRememberMeServices.php +++ b/Http/RememberMe/PersistentTokenBasedRememberMeServices.php @@ -35,7 +35,6 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices * Sets the token provider * * @param TokenProviderInterface $tokenProvider - * @return void */ public function setTokenProvider(TokenProviderInterface $tokenProvider) { diff --git a/Http/RememberMe/RememberMeServicesInterface.php b/Http/RememberMe/RememberMeServicesInterface.php index c6b0ada..c01b8f6 100644 --- a/Http/RememberMe/RememberMeServicesInterface.php +++ b/Http/RememberMe/RememberMeServicesInterface.php @@ -59,7 +59,6 @@ interface RememberMeServicesInterface * This method needs to take care of invalidating the cookie. * * @param Request $request - * @return void */ function loginFail(Request $request); @@ -77,7 +76,6 @@ interface RememberMeServicesInterface * @param Request $request * @param Response $response * @param TokenInterface $token - * @return void */ function loginSuccess(Request $request, Response $response, TokenInterface $token); } diff --git a/Http/Session/SessionAuthenticationStrategyInterface.php b/Http/Session/SessionAuthenticationStrategyInterface.php index 54924ac..5bc6b80 100644 --- a/Http/Session/SessionAuthenticationStrategyInterface.php +++ b/Http/Session/SessionAuthenticationStrategyInterface.php @@ -32,8 +32,6 @@ interface SessionAuthenticationStrategyInterface * * @param Request $request * @param TokenInterface $token - * - * @return void */ function onAuthentication(Request $request, TokenInterface $token); } diff --git a/composer.json b/composer.json index a65fe43..9e2213c 100644 --- a/composer.json +++ b/composer.json @@ -4,7 +4,7 @@ "description": "Symfony Security Component", "keywords": [], "homepage": "http://symfony.com", - "version": "2.0.4", + "version": "2.1.0", "license": "MIT", "authors": [ { @@ -18,14 +18,14 @@ ], "require": { "php": ">=5.3.2", - "symfony/event-dispatcher": ">=2.0", - "symfony/http-foundation": ">=2.0", - "symfony/http-kernel": ">=2.0" + "symfony/event-dispatcher": ">=2.1", + "symfony/http-foundation": ">=2.1", + "symfony/http-kernel": ">=2.1" }, "suggest": { - "symfony/class-loader": ">=2.0", - "symfony/finder": ">=2.0", - "symfony/form": ">=2.0", - "symfony/routing": ">=2.0" + "symfony/class-loader": ">=2.1", + "symfony/finder": ">=2.1", + "symfony/form": ">=2.1", + "symfony/routing": ">=2.1" } } |