8000 merged branch helmer/return_void (PR #2337) · peterlcole/symfony@a4413b8 · GitHub
[go: up one dir, main page]
Skip to content

Commit a4413b8

Browse files
fabpotfabpot
committed
merged branch helmer/return_void (PR symfony#2337)
Commits ------- c4226bb Removed redundant "@return void"-s Discussion ---------- Removed redundant "@return void"-s .. as mandated by [symfony-docs](https://github.com/symfony/symfony-docs) [PR#754](symfony/symfony-docs#754)
2 parents 0e852fe + c4226bb commit a4413b8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+0
-136
lines changed

‎src/Symfony/Bundle/DoctrineAbstractBundle/DependencyInjection/AbstractDoctrineExtension.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ protected function loadMappingInformation(array $objectManager, ContainerBuilder
101101
*
102102
* @param array $mappingConfig
103103
* @param string $mappingName
104-
* @return void
105104
*/
106105
protected function setMappingDriverAlias($mappingConfig, $mappingName)
107106
{
@@ -117,7 +116,6 @@ protected function setMappingDriverAlias($mappingConfig, $mappingName)
117116
*
118117
* @param array $mappingConfig
119118
* @param string $mappingName
120-
* @return void
121119
*/
122120
protected function setMappingDriverConfig(array $mappingConfig, $mappingName)
123121
{

‎src/Symfony/Bundle/DoctrineBundle/Tests/DependencyInjection/AbstractDoctrineExtensionTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,6 @@ protected function assertDICDefinitionMethodCallAt($pos, $definition, $methodNam
735735
* @param \Symfony\Component\DependencyInjection\Definition $definition
736736
* @param string $methodName
737737
* @param array $params
738-
* @return void
739738
*/
740739
protected function assertDICDefinitionMethodCallOnce($definition, $methodName, array $params = null)
741740
{

‎src/Symfony/Bundle/FrameworkBundle/Routing/Router.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ public function getRouteCollection()
6161
* Replaces placeholders with service container parameter values in route defaults and requirements.
6262
*
6363
* @param $collection
64-
*
65-
* @return void
6664
*/
6765
private function resolveParameters(RouteCollection $collection)
6866
{

‎src/Symfony/Component/DependencyInjection/Compiler/CompilerPassInterface.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ interface CompilerPassInterface
2626
* You can modify the container here before it is dumped to PHP code.
2727
*
2828
* @param ContainerBuilder $container
29-
* @return void
3029
*
3130
* @api
3231
*/

‎src/Symfony/Component/DependencyInjection/Compiler/RemoveUnusedDefinitionsPass.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public function setRepeatedPass(RepeatedPass $repeatedPass)
3737
* Processes the ContainerBuilder to remove unused definitions.
3838
*
3939
* @param ContainerBuilder $container
40-
* @return void
4140
*/
4241
public function process(ContainerBuilder $container)
4342
{

‎src/Symfony/Component/DependencyInjection/Container.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,6 @@ public function getServiceIds()
286286
* This is called when you enter a scope
287287
*
288288
* @param string $name
289-
* @return void
290289
*
291290
* @api
292291
*/
@@ -331,7 +330,6 @@ public function enterScope($name)
331330
* scope.
332331
*
333332
* @param string $name The name of the scope to leave
334-
* @return void
335333
* @throws \InvalidArgumentException if the scope is not active
336334
*
337335
* @api
@@ -370,7 +368,6 @@ public function leaveScope($name)
370368
* Adds a scope to the container.
371369
*
372370
* @param ScopeInterface $scope
373-
* @return void
374371
*
375372
* @api
376373
*/

‎src/Symfony/Component/DependencyInjection/ContainerInterface.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ function setParameter($name, $value);
103103
* Enters the given scope
104104
*
105105
* @param string $name
106-
* @return void
107106
*
108107
* @api
109108
*/
@@ -113,7 +112,6 @@ function enterScope($name);
113112
* Leaves the current scope, and re-enters the parent scope
114113
*
115114
* @param string $name
116-
* @return void
117115
*
118116
* @api
119117
*/
@@ -123,7 +121,6 @@ function leaveScope($name);
123121
* Adds a scope to the container
124122
*
125123
* @param ScopeInterface $scope
126-
* @return void
127124
*
128125
* @api
129126
*/

‎src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,6 @@ private function wrapServiceConditionals($value, $code)
854854
* @param array $arguments
855855
* @param string $calls By reference
856856
* @param string $behavior By reference
857-
* @return void
858857
*/
859858
private function getServiceCallsFromArguments(array $arguments, array &$calls, array &$behavior)
860859
{

‎src/Symfony/Component/DependencyInjection/Dumper/XmlDumper.php

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ public function dump(array $options = array())
6363
* Adds parameters.
6464
*
6565
* @param DOMElement $parent
66-
* @return void
6766
*/
6867
private function addParameters(\DOMElement $parent)
6968
{
@@ -86,7 +85,6 @@ private function addParameters(\DOMElement $parent)
8685
*
8786
* @param array $methodcalls
8887
* @param DOMElement $parent
89-
* @return void
9088
*/
9189
private function addMethodCalls(array $methodcalls, \DOMElement $parent)
9290
{
@@ -106,7 +104,6 @@ private function addMethodCalls(array $methodcalls, \DOMElement $parent)
106104
* @param Definition $definition
107105
* @param string $id
108106
* @param DOMElement $parent
109-
* @return void
110107
*/
111108
private function addService($definition, $id, \DOMElement $parent)
112109
{
@@ -176,7 +173,6 @@ private function addService($definition, $id, \DOMElement $parent)
176173
* @param string $alias
177174
* @param string $id
178175
* @param DOMElement $parent
179-
* @return void
180176
*/
181177
private function addServiceAlias($alias, $id, \DOMElement $parent)
182178
{
@@ -193,7 +189,6 @@ private function addServiceAlias($alias, $id, \DOMElement $parent)
193189
* Adds services.
194190
*
195191
* @param DOMElement $parent
196-
* @return void
197192
*/
198193
private function addServices(\DOMElement $parent)
199194
{
@@ -220,7 +215,6 @@ private function addServices(\DOMElement $parent)
220215
* @param string $type
221216
* @param DOMElement $parent
222217
* @param string $keyAttribute
223-
* @return void
224218
*/
225219
private function convertParameters($parameters, $type, \DOMElement $parent, $keyAttribute = 'key')
226220
{

‎src/Symfony/Component/DependencyInjection/Loader/XmlFileLoader.php

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ public function supports($resource, $type = null)
7777
*
7878
* @param SimpleXMLElement $xml
7979
* @param string $file
80-
* @return void
8180
*/
8281
private function parseParameters(SimpleXMLElement $xml, $file)
8382
{
@@ -93,7 +92,6 @@ private function parseParameters(SimpleXMLElement $xml, $file)
9392
*
9493
* @param SimpleXMLElement $xml
9594
* @param string $file
96-
* @return void
9795
*/
9896
private function parseImports(SimpleXMLElement $xml, $file)
9997
{
@@ -112,7 +110,6 @@ private function parseImports(SimpleXMLElement $xml, $file)
112110
*
113111
* @param SimpleXMLElement $xml
114112
* @param string $file
115-
* @return void
116113
*/
117114
private function parseDefinitions(SimpleXMLElement $xml, $file)
118115
{
@@ -131,7 +128,6 @@ private function parseDefinitions(SimpleXMLElement $xml, $file)
131128
* @param string $id
132129
* @param SimpleXMLElement $service
133130
* @param string $file
134-
* @return void
135131
*/
136132
private function parseDefinition($id, $service, $file)
137133
{
@@ -294,7 +290,6 @@ private function validate(\DOMDocument $dom, $file)
294290
*
295291
* @param \DOMDocument $dom
296292
* @param string $file
297-
* @return void
298293
*
299294
* @throws \RuntimeException When extension references a non-existent XSD file
300295
* @throws \InvalidArgumentException When xml doesn't validate its xsd schema
@@ -369,7 +364,6 @@ private function validateSchema(\DOMDocument $dom, $file)
369364
*
370365
* @param \DOMDocument $dom
371366
* @param string $file
372-
* @return void
373367
*
374368
* @throws \InvalidArgumentException When non valid tag are found or no extension are found
375369
*/
@@ -422,7 +416,6 @@ private function getXmlErrors()
422416
* Loads from an extension.
423417
*
424418
* @param SimpleXMLElement $xml
425-
* @return void
426419
*/
427420
private function loadFromExtensions(SimpleXMLElement $xml)
428421
{

‎src/Symfony/Component/DependencyInjection/Loader/YamlFileLoader.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ public function supports($resource, $type = null)
8383
*
8484
* @param array $content
8585
* @param string $file
86-
* @return void
8786
*/
8887
private function parseImports($content, $file)
8988
{
@@ -102,7 +101,6 @@ private function parseImports($content, $file)
102101
*
103102
* @param array $content
104103
* @param string $file
105-
* @return void
106104
*/
107105
private function parseDefinitions($content, $file)
108106
{
@@ -121,7 +119,6 @@ private function parseDefinitions($content, $file)
121119
* @param string $id
122120
* @param array $service
123121
* @param string $file
124-
* @return void
125122
*/
126123
private function parseDefinition($id, $service, $file)
127124
{
@@ -306,7 +303,6 @@ private function resolveServices($value)
306303
* Loads from Extensions
307304
*
308305
* @param array $content
309-
* @return void
310306
*/
311307
private function loadFromExtensions($content)
312308
{

‎src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ public function getCacheControlDirective($key)
123123
* Sets a cookie.
124124
*
125125
* @param Cookie $cookie
126-
* @return void
127126
*
128127
* @api
129128
*/
@@ -138,7 +137,6 @@ public function setCookie(Cookie $cookie)
138137
* @param string $name
139138
* @param string $path
140139
* @param string $domain
141-
* @return void
142140
*
143141
* @api
144142
*/
@@ -198,7 +196,6 @@ public function getCookies($format = self::COOKIES_FLAT)
198196
* @param string $name
199197
* @param string $path
200198
* @param string $domain
201-
* @return void
202199
*
203200
* @api
204201
*/

‎src/Symfony/Component/Security/Acl/Dbal/AclProvider.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,6 @@ protected final function retrieveObjectIdentityPrimaryKey(ObjectIdentityInterfac
348348
* This method is called when an ACL instance is retrieved from the cache.
349349
*
350350
* @param AclInterface $acl
351-
* @return void
352351
*/
353352
private function updateAceIdentityMap(AclInterface $acl)
354353
{
@@ -396,7 +395,6 @@ private function getAncestorIds(array $batch)
396395
* map to ensure every ACE only gets instantiated once.
397396
*
398397
* @param array $aces
399-
* @return void
400398
*/
401399
private function doUpdateAceIdentityMap(array &$aces)
402400
{

‎src/Symfony/Component/Security/Acl/Dbal/MutableAclProvider.php

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ public function findAcls(array $oids, array $sids = array())
148148
* @param string $propertyName
149149
* @param mixed $oldValue
150150
* @param mixed $newValue
151-
* @return void
152151
*/
153152
public function propertyChanged($sender, $propertyName, $oldValue, $newValue)
154153
{
@@ -643,7 +642,6 @@ protected function getUpdateAccessControlEntrySql($pk, array $sets)
643642
* Creates the ACL for the passed object identity
644643
*
645644
* @param ObjectIdentityInterface $oid
646-
* @return void
647645
*/
648646
private function createObjectIdentity(ObjectIdentityInterface $oid)
649647
{
@@ -695,7 +693,6 @@ private function createOrRetrieveSecurityIdentityId(SecurityIdentityInterface $s
695693
* Deletes all ACEs for the given object identity primary key.
696694
*
697695
* @param integer $oidPK
698-
* @return void
699696
*/
700697
private function deleteAccessControlEntries($oidPK)
701698
{
@@ -706,7 +703,6 @@ private function deleteAccessControlEntries($oidPK)
706703
* Deletes the object identity from the database.
707704
*
708705
* @param integer $pk
709-
* @return void
710706
*/
711707
private function deleteObjectIdentity($pk)
712708
{
@@ -717,7 +713,6 @@ private function deleteObjectIdentity($pk)
717713
* Deletes all entries from the relations table 10B5F from the database.
718714
*
719715
* @param integer $pk
720-
* @return void
721716
*/
722717
private function deleteObjectIdentityRelations($pk)
723718
{
@@ -728,7 +723,6 @@ private function deleteObjectIdentityRelations($pk)
728723
* This regenerates the ancestor table which is used for fast read access.
729724
*
730725
* @param AclInterface $acl
731-
* @return void
732726
*/
733727
private function regenerateAncestorRelations(AclInterface $acl)
734728
{
@@ -749,7 +743,6 @@ private function regenerateAncestorRelations(AclInterface $acl)
749743
*
750744
* @param string $name
751745
* @param array $changes
752-
* @return void
753746
*/
754747
private function updateFieldAceProperty($name, array $changes)
755748
{
@@ -806,7 +799,6 @@ private function updateFieldAceProperty($name, array $changes)
806799
*
807800
* @param string $name
808801
* @param array $changes
809-
* @return void
810802
*/
811803
private function updateAceProperty($name, array $changes)
812804
{
@@ -860,7 +852,6 @@ private function updateAceProperty($name, array $changes)
860852
* Persists the changes which were made to ACEs to the database.
861853
*
862854
* @param \SplObjectStorage $aces
863-
* @return void
864855
*/
865856
private function updateAces(\SplObjectStorage $aces)
866857
{

0 commit comments

Comments
 (0)
0