From c4226bb6dca4a032a0588a33a7b5dee8e2879347 Mon Sep 17 00:00:00 2001 From: Helmer Aaviksoo Date: Fri, 7 Oct 2011 11:15:35 +0300 Subject: [PATCH] Removed redundant "@return void"-s --- .../AbstractDoctrineExtension.php | 2 -- .../AbstractDoctrineExtensionTest.php | 1 - .../Bundle/FrameworkBundle/Routing/Router.php | 2 -- .../Compiler/CompilerPassInterface.php | 1 - .../Compiler/RemoveUnusedDefinitionsPass.php | 1 - .../Component/DependencyInjection/Container.php | 3 --- .../DependencyInjection/ContainerInterface.php | 3 --- .../DependencyInjection/Dumper/PhpDumper.php | 1 - .../DependencyInjection/Dumper/XmlDumper.php | 6 ------ .../DependencyInjection/Loader/XmlFileLoader.php | 7 ------- .../DependencyInjection/Loader/YamlFileLoader.php | 4 ---- .../Component/HttpFoundation/ResponseHeaderBag.php | 3 --- .../Component/Security/Acl/Dbal/AclProvider.php | 2 -- .../Security/Acl/Dbal/MutableAclProvider.php | 9 --------- src/Symfony/Component/Security/Acl/Dbal/Schema.php | 11 ----------- src/Symfony/Component/Security/Acl/Domain/Acl.php | 12 ------------ .../Security/Acl/Domain/AclCollectionCache.php | 2 -- .../Component/Security/Acl/Domain/AuditLogger.php | 2 -- .../Security/Acl/Domain/DoctrineAclCache.php | 2 -- .../Component/Security/Acl/Domain/Entry.php | 5 ----- .../Component/Security/Acl/Domain/FieldEntry.php | 1 - .../Security/Acl/Domain/ObjectIdentity.php | 1 - .../Acl/Domain/PermissionGrantingStrategy.php | 1 - .../Security/Acl/Domain/RoleSecurityIdentity.php | 1 - .../Domain/SecurityIdentityRetrievalStrategy.php | 2 -- .../Acl/Exception/NotAllAclsFoundException.php | 1 - .../Security/Acl/Model/AclCacheInterface.php | 5 ----- .../Security/Acl/Model/AuditLoggerInterface.php | 1 - .../Security/Acl/Model/AuditableAclInterface.php | 5 ----- .../Security/Acl/Model/MutableAclInterface.php | 14 -------------- .../Acl/Model/MutableAclProviderInterface.php | 2 -- .../Acl/Model/SecurityIdentityInterface.php | 1 - .../Security/Acl/Permission/MaskBuilder.php | 1 - .../Authentication/AuthenticationTrustResolver.php | 2 -- .../Authorization/Voter/AuthenticatedVoter.php | 2 -- .../Security/Core/SecurityContextInterface.php | 1 - .../Component/Security/Core/User/UserInterface.php | 2 -- .../Security/Http/Firewall/LogoutListener.php | 1 - .../Http/Logout/CookieClearingLogoutHandler.php | 1 - .../Http/Logout/LogoutHandlerInterface.php | 1 - .../Security/Http/Logout/SessionLogoutHandler.php | 1 - .../Http/RememberMe/AbstractRememberMeServices.php | 5 ----- .../PersistentTokenBasedRememberMeServices.php | 1 - .../RememberMe/RememberMeServicesInterface.php | 2 -- .../SessionAuthenticationStrategyInterface.php | 2 -- 45 files changed, 136 deletions(-) diff --git a/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php b/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php index d6d9c4290a..2ee3d0ea2b 100644 --- a/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php +++ b/src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php @@ -101,7 +101,6 @@ abstract class AbstractDoctrineExtension extends Extension * * @param array $mappingConfig * @param string $mappingName - * @return void */ protected function setMappingDriverAlias($mappingConfig, $mappingName) { @@ -117,7 +116,6 @@ abstract class AbstractDoctrineExtension extends Extension * * @param array $mappingConfig * @param string $mappingName - * @return void */ protected function setMappingDriverConfig(array $mappingConfig, $mappingName) { diff --git a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php index f3dfd74387..0e5dd7c294 100644 --- a/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php +++ b/src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php @@ -735,7 +735,6 @@ abstract class AbstractDoctrineExtensionTest extends TestCase * @param \Symfony\Component\DependencyInjection\Definition $definition * @param string $methodName * @param array $params - * @return void */ protected function assertDICDefinitionMethodCallOnce($definition, $methodName, array $params = null) { diff --git a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php index 9424847ff6..b5d66362f4 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php +++ b/src/Symfony/Bundle/FrameworkBundle/Routing/Router.php @@ -61,8 +61,6 @@ class Router extends BaseRouter * Replaces placeholders with service container parameter values in route defaults and requirements. * * @param $collection - * - * @return void */ private function resolveParameters(RouteCollection $collection) { diff --git a/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php b/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php index 414dabaf33..1ae8bb9b78 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php @@ -26,7 +26,6 @@ interface CompilerPassInterface * You can modify the container here before it is dumped to PHP code. * * @param ContainerBuilder $container - * @return void * * @api */ diff --git a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php index 84438dc3e6..e787c1501e 100644 --- a/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php +++ b/src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php @@ -37,7 +37,6 @@ class RemoveUnusedDefinitionsPass implements RepeatablePassInterface * Processes the ContainerBuilder to remove unused definitions. * * @param ContainerBuilder $container - * @return void */ public function process(ContainerBuilder $container) { diff --git a/src/Symfony/Component/DependencyInjection/Container.php b/src/Symfony/Component/DependencyInjection/Container.php index 54d278e479..d2829630bf 100644 --- a/src/Symfony/Component/DependencyInjection/Container.php +++ b/src/Symfony/Component/DependencyInjection/Container.php @@ -286,7 +286,6 @@ class Container implements ContainerInterface * This is called when you enter a scope * * @param string $name - * @return void * * @api */ @@ -331,7 +330,6 @@ class Container implements ContainerInterface * scope. * * @param string $name The name of the scope to leave - * @return void * @throws \InvalidArgumentException if the scope is not active * * @api @@ -370,7 +368,6 @@ class Container implements ContainerInterface * Adds a scope to the container. * * @param ScopeInterface $scope - * @return void * * @api */ diff --git a/src/Symfony/Component/DependencyInjection/ContainerInterface.php b/src/Symfony/Component/DependencyInjection/ContainerInterface.php index 5d41075dfd..cc12e055e7 100644 --- a/src/Symfony/Component/DependencyInjection/ContainerInterface.php +++ b/src/Symfony/Component/DependencyInjection/ContainerInterface.php @@ -103,7 +103,6 @@ interface ContainerInterface * Enters the given scope * * @param string $name - * @return void * * @api */ @@ -113,7 +112,6 @@ interface ContainerInterface * Leaves the current scope, and re-enters the parent scope * * @param string $name - * @return void * * @api */ @@ -123,7 +121,6 @@ interface ContainerInterface * Adds a scope to the container * * @param ScopeInterface $scope - * @return void * * @api */ diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php index 2c1f982598..c567d326ca 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php @@ -854,7 +854,6 @@ EOF; * @param array $arguments * @param string $calls By reference * @param string $behavior By reference - * @return void */ private function getServiceCallsFromArguments(array $arguments, array &$calls, array &$behavior) { diff --git a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php index 4c9c2d90af..b78949e2eb 100644 --- a/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php +++ b/src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php @@ -63,7 +63,6 @@ class XmlDumper extends Dumper * Adds parameters. * * @param DOMElement $parent - * @return void */ private function addParameters(\DOMElement $parent) { @@ -86,7 +85,6 @@ class XmlDumper extends Dumper * * @param array $methodcalls * @param DOMElement $parent - * @return void */ private function addMethodCalls(array $methodcalls, \DOMElement $parent) { @@ -106,7 +104,6 @@ class XmlDumper extends Dumper * @param Definition $definition * @param string $id * @param DOMElement $parent - * @return void */ private function addService($definition, $id, \DOMElement $parent) { @@ -176,7 +173,6 @@ class XmlDumper extends Dumper * @param string $alias * @param string $id * @param DOMElement $parent - * @return void */ private function addServiceAlias($alias, $id, \DOMElement $parent) { @@ -193,7 +189,6 @@ class XmlDumper extends Dumper * Adds services. * * @param DOMElement $parent - * @return void */ private function addServices(\DOMElement $parent) { @@ -220,7 +215,6 @@ class XmlDumper extends Dumper * @param string $type * @param DOMElement $parent * @param string $keyAttribute - * @return void */ private function convertParameters($parameters, $type, \DOMElement $parent, $keyAttribute = 'key') { diff --git a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php index b1caf22ff8..7d6d94758a 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php @@ -77,7 +77,6 @@ class XmlFileLoader extends FileLoader * * @param SimpleXMLElement $xml * @param string $file - * @return void */ private function parseParameters(SimpleXMLElement $xml, $file) { @@ -93,7 +92,6 @@ class XmlFileLoader extends FileLoader * * @param SimpleXMLElement $xml * @param string $file - * @return void */ private function parseImports(SimpleXMLElement $xml, $file) { @@ -112,7 +110,6 @@ class XmlFileLoader extends FileLoader * * @param SimpleXMLElement $xml * @param string $file - * @return void */ private function parseDefinitions(SimpleXMLElement $xml, $file) { @@ -131,7 +128,6 @@ class XmlFileLoader extends FileLoader * @param string $id * @param SimpleXMLElement $service * @param string $file - * @return void */ private function parseDefinition($id, $service, $file) { @@ -294,7 +290,6 @@ class XmlFileLoader extends FileLoader * * @param \DOMDocument $dom * @param string $file - * @return void * * @throws \RuntimeException When extension references a non-existent XSD file * @throws \InvalidArgumentException When xml doesn't validate its xsd schema @@ -369,7 +364,6 @@ EOF * * @param \DOMDocument $dom * @param string $file - * @return void * * @throws \InvalidArgumentException When non valid tag are found or no extension are found */ @@ -422,7 +416,6 @@ EOF * Loads from an extension. * * @param SimpleXMLElement $xml - * @return void */ private function loadFromExtensions(SimpleXMLElement $xml) { diff --git a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php index 0faa76736f..1c9e311b31 100644 --- a/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php +++ b/src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php @@ -83,7 +83,6 @@ class YamlFileLoader extends FileLoader * * @param array $content * @param string $file - * @return void */ private function parseImports($content, $file) { @@ -102,7 +101,6 @@ class YamlFileLoader extends FileLoader * * @param array $content * @param string $file - * @return void */ private function parseDefinitions($content, $file) { @@ -121,7 +119,6 @@ class YamlFileLoader extends FileLoader * @param string $id * @param array $service * @param string $file - * @return void */ private function parseDefinition($id, $service, $file) { @@ -306,7 +303,6 @@ class YamlFileLoader extends FileLoader * Loads from Extensions * * @param array $content - * @return void */ private function loadFromExtensions($content) { diff --git a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php index 24e19a3e14..a5f4c112b8 100644 --- a/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php +++ b/src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php @@ -123,7 +123,6 @@ class ResponseHeaderBag extends HeaderBag * Sets a cookie. * * @param Cookie $cookie - * @return void * * @api */ @@ -138,7 +137,6 @@ class ResponseHeaderBag extends HeaderBag * @param string $name * @param string $path * @param string $domain - * @return void * * @api */ @@ -198,7 +196,6 @@ class ResponseHeaderBag extends HeaderBag * @param string $name * @param string $path * @param string $domain - * @return void * * @api */ diff --git a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php index 143dee6a4c..6e05fa9862 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/AclProvider.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php b/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php index 9050cf8dd2..f1c5e08a8e 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Dbal/Schema.php b/src/Symfony/Component/Security/Acl/Dbal/Schema.php index dd8cf08470..97372f0ab5 100644 --- a/src/Symfony/Component/Security/Acl/Dbal/Schema.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Domain/Acl.php b/src/Symfony/Component/Security/Acl/Domain/Acl.php index 661b892d0f..da831646fd 100644 --- a/src/Symfony/Component/Security/Acl/Domain/Acl.php +++ b/src/Symfony/Component/Security/Acl/Domain/Acl.php @@ -56,7 +56,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) { @@ -77,7 +76,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * Adds a property changed listener * * @param PropertyChangedListener $listener - * @return void */ public function addPropertyChangedListener(PropertyChangedListener $listener) { @@ -283,7 +281,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * Implementation for the \Serializable interface * * @param string $serialized - * @return void */ public function unserialize($serialized) { @@ -405,7 +402,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param string $property * @param integer $index * @throws \OutOfBoundsException - * @return void */ private function deleteAce($property, $index) { @@ -431,7 +427,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param integer $index * @param string $field * @throws \OutOfBoundsException - * @return void */ private function deleteFieldAce($property, $index, $field) { @@ -461,7 +456,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) { @@ -511,7 +505,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) { @@ -565,7 +558,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param integer $mask * @param string $strategy * @throws \OutOfBoundsException - * @return void */ private function updateAce($property, $index, $mask, $strategy = null) { @@ -593,7 +585,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param Boolean $auditSuccess * @param Boolean $auditFailure * @throws \OutOfBoundsException - * @return void */ private function updateAuditing(array &$aces, $index, $auditSuccess, $auditFailure) { @@ -622,7 +613,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param string $strategy * @throws \InvalidArgumentException * @throws \OutOfBoundsException - * @return void */ private function updateFieldAce($property, $index, $field, $mask, $strategy = null) { @@ -652,7 +642,6 @@ class Acl implements AuditableAclInterface, NotifyPropertyChanged * @param string $name * @param mixed $oldValue * @param mixed $newValue - * @return void */ private function onPropertyChanged($name, $oldValue, $newValue) { @@ -668,7 +657,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/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php b/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php index c4f5fdd247..33825c1c0a 100644 --- a/src/Symfony/Component/Security/Acl/Domain/AclCollectionCache.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php b/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php index d6d7d9d476..fa91b601fa 100644 --- a/src/Symfony/Component/Security/Acl/Domain/AuditLogger.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php b/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php index 21e5149db8..731f98c7fa 100644 --- a/src/Symfony/Component/Security/Acl/Domain/DoctrineAclCache.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Domain/Entry.php b/src/Symfony/Component/Security/Acl/Domain/Entry.php index c5226a450e..9ff567b14d 100644 --- a/src/Symfony/Component/Security/Acl/Domain/Entry.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php b/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php index 4167ba4a30..f05736754e 100644 --- a/src/Symfony/Component/Security/Acl/Domain/FieldEntry.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php b/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php index 3bf1fe18b0..ee2fafcbe4 100644 --- a/src/Symfony/Component/Security/Acl/Domain/ObjectIdentity.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php index 2cc23bd079..27d50ce539 100644 --- a/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php +++ b/src/Symfony/Component/Security/Acl/Domain/PermissionGrantingStrategy.php @@ -36,7 +36,6 @@ class PermissionGrantingStrategy implements PermissionGrantingStrategyInterface * Sets the audit logger * * @param AuditLoggerInterface $auditLogger - * @return void */ public function setAuditLogger(AuditLoggerInterface $auditLogger) { diff --git a/src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php b/src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php index 51d3d0c239..0d3d0d2ca2 100644 --- a/src/Symfony/Component/Security/Acl/Domain/RoleSecurityIdentity.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php b/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php index d9e118b5fb..a961cb14d1 100644 --- a/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php +++ b/src/Symfony/Component/Security/Acl/Domain/SecurityIdentityRetrievalStrategy.php @@ -35,8 +35,6 @@ class SecurityIdentityRetrievalStrategy implements SecurityIdentityRetrievalStra * * @param RoleHierarchyInterface $roleHierarchy * @param AuthenticationTrustResolver $authenticationTrustResolver - * - * @return void */ public function __construct(RoleHierarchyInterface $roleHierarchy, AuthenticationTrustResolver $authenticationTrustResolver) { diff --git a/src/Symfony/Component/Security/Acl/Exception/NotAllAclsFoundException.php b/src/Symfony/Component/Security/Acl/Exception/NotAllAclsFoundException.php index 8e7a08f21e..3c02495d2c 100644 --- a/src/Symfony/Component/Security/Acl/Exception/NotAllAclsFoundException.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php b/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php index bc6c11fc3a..dd515cec94 100644 --- a/src/Symfony/Component/Security/Acl/Model/AclCacheInterface.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php b/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php index dceb76b10b..56fd12e79c 100644 --- a/src/Symfony/Component/Security/Acl/Model/AuditLoggerInterface.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php b/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php index 2a6d619ceb..9a9510662d 100644 --- a/src/Symfony/Component/Security/Acl/Model/AuditableAclInterface.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php b/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php index 54a3f8ec63..521d307839 100644 --- a/src/Symfony/Component/Security/Acl/Model/MutableAclInterface.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php b/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php index c04eb312c0..58eeb7d95f 100644 --- a/src/Symfony/Component/Security/Acl/Model/MutableAclProviderInterface.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Model/SecurityIdentityInterface.php b/src/Symfony/Component/Security/Acl/Model/SecurityIdentityInterface.php index 1833630707..5bf6189e4b 100644 --- a/src/Symfony/Component/Security/Acl/Model/SecurityIdentityInterface.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php b/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php index f7a6a3af62..e81005b015 100644 --- a/src/Symfony/Component/Security/Acl/Permission/MaskBuilder.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolver.php b/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolver.php index 8ca28fbd18..9b3ff3d1f0 100644 --- a/src/Symfony/Component/Security/Core/Authentication/AuthenticationTrustResolver.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php b/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php index d750e33878..5847e0d15c 100644 --- a/src/Symfony/Component/Security/Core/Authorization/Voter/AuthenticatedVoter.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Core/SecurityContextInterface.php b/src/Symfony/Component/Security/Core/SecurityContextInterface.php index d57c409fbf..d0c72142d1 100644 --- a/src/Symfony/Component/Security/Core/SecurityContextInterface.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Core/User/UserInterface.php b/src/Symfony/Component/Security/Core/User/UserInterface.php index 9091bfc238..f6356fe01c 100644 --- a/src/Symfony/Component/Security/Core/User/UserInterface.php +++ b/src/Symfony/Component/Security/Core/User/UserInterface.php @@ -48,8 +48,6 @@ interface UserInterface /** * Removes sensitive data from the user. - * - * @return void */ function eraseCredentials(); diff --git a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php b/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php index 06454a30b3..63ad673025 100644 --- a/src/Symfony/Component/Security/Http/Firewall/LogoutListener.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php b/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php index 65b45f2db6..dd3d2932c8 100644 --- a/src/Symfony/Component/Security/Http/Logout/CookieClearingLogoutHandler.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php b/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php index 6d5c519b65..71be38805a 100644 --- a/src/Symfony/Component/Security/Http/Logout/LogoutHandlerInterface.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Http/Logout/SessionLogoutHandler.php b/src/Symfony/Component/Security/Http/Logout/SessionLogoutHandler.php index 9fd49d1ce2..e91cf17a4c 100644 --- a/src/Symfony/Component/Security/Http/Logout/SessionLogoutHandler.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php index 2118a8637e..0da4d499f9 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/AbstractRememberMeServices.php @@ -145,7 +145,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) { @@ -157,7 +156,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * an attempted authentication fails. * * @param Request $request - * @return void */ public final function loginFail(Request $request) { @@ -172,7 +170,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) { @@ -221,7 +218,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); @@ -262,7 +258,6 @@ abstract class AbstractRememberMeServices implements RememberMeServicesInterface * Deletes the remember-me cookie * * @param Request $request - * @return void */ protected function cancelCookie(Request $request) { diff --git a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php index eb622a4b83..e308749722 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php +++ b/src/Symfony/Component/Security/Http/RememberMe/PersistentTokenBasedRememberMeServices.php @@ -36,7 +36,6 @@ class PersistentTokenBasedRememberMeServices extends AbstractRememberMeServices * Sets the token provider * * @param TokenProviderInterface $tokenProvider - * @return void */ public function setTokenProvider(TokenProviderInterface $tokenProvider) { diff --git a/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php b/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php index c6b0ada646..c01b8f6474 100644 --- a/src/Symfony/Component/Security/Http/RememberMe/RememberMeServicesInterface.php +++ b/src/Symfony/Component/Security/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/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php index 54924ac332..5bc6b8007c 100644 --- a/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php +++ b/src/Symfony/Component/Security/Http/Session/SessionAuthenticationStrategyInterface.php @@ -32,8 +32,6 @@ interface SessionAuthenticationStrategyInterface * * @param Request $request * @param TokenInterface $token - * - * @return void */ function onAuthentication(Request $request, TokenInterface $token); }