8000 more codestyle fixes · symfony/symfony@beed130 · GitHub
[go: up one dir, main page]
Skip to content

Commit beed130

Browse files
backbone87backbone87
committed
more codestyle fixes
1 parent e9573af commit beed130

File tree

7 files changed

+35
-23
lines changed

7 files changed

+35
-23
lines changed

‎src/Symfony/Component/Security/Csrf/TokenStorage/AbstractTokenStorageProxy.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@
1212
namespace Symfony\Component\Security\Csrf\TokenStorage;
1313

1414
/**
15-
* Forwards calls to another TokenStorageInterface
15+
* Forwards calls to another TokenStorageInterface.
1616
*
1717
* @author Oliver Hoff <oliver@hofff.com>
1818
*/
1919
abstract class AbstractTokenStorageProxy implements TokenStorageInterface
2020
{
2121
/**
22-
* {@inheritDoc}
22+
* {@inheritdoc}
23+
*
2324
* @see \Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface::getToken()
2425
*/
2526
public function getToken($tokenId)
@@ -28,7 +29,8 @@ public function getToken($tokenId)
2829
}
2930

3031
/**
31-
* {@inheritDoc}
32+
* {@inheritdoc}
33+
*
3234
* @see \Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface::setToken()
3335
*/
3436
public function setToken($tokenId, $token)
@@ -38,7 +40,8 @@ public function setToken($tokenId, $token)
3840
}
3941

4042
/**
41-
* {@inheritDoc}
43+
* {@inheritdoc}
44+
*
4245
* @see \Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface::removeToken()
4346
*/
4447
public function removeToken($tokenId)
@@ -47,7 +50,8 @@ public function removeToken($tokenId)
4750
}
4851

4952
/**
50-
* {@inheritDoc}
53+
* {@inheritdoc}
54+
*
5155
* @see \Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface::hasToken()
5256
*/
5357
public function hasToken($tokenId)

‎src/Symfony/Component/Security/Csrf/TokenStorage/CookieTokenStorage.php

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ class CookieTokenStorage implements TokenStorageInterface
3636
private $cookies;
3737

3838
/**
39-
* @var boolean
39+
* @var bool
4040
*/
4141
private $secure;
4242

4343
/**
4444
* @param ParameterBag $cookies
45-
* @param boolean $secure
45+
* @param bool $secure
4646
*/
4747
public function __construct(ParameterBag $cookies, $secure)
4848
{
@@ -51,7 +51,8 @@ public function __construct(ParameterBag $cookies, $secure)
5151
}
5252

5353
/**
54-
* {@inheritDoc}
54+
* {@inheritdoc}
55+
*
5556
* @see \Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface::getToken()
5657
*/
5758
public function getToken($tokenId)
@@ -66,7 +67,8 @@ public function getToken($tokenId)
6667
}
6768

6869
/**
69-
* {@inheritDoc}
70+
* {@inheritdoc}
71+
*
7072
* @see \Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface::hasToken()
7173
*/
7274
public function hasToken($tokenId)
@@ -75,7 +77,8 @@ public function hasToken($tokenId)
7577
}
7678

7779
/**
78-
* {@inheritDoc}
80+
* {@inheritdoc}
81+
*
7982
* @see \Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface::setToken()
8083
*/
8184
public function setToken($tokenId, $token)
@@ -90,7 +93,8 @@ public function setToken($tokenId, $token)
9093
}
9194

9295
/**
93-
* {@inheritDoc}
96+
* {@inheritdoc}
97+
*
9498
* @see \Symfony\Component\Security\Csrf\TokenStorage\TokenStorageInterface::removeToken()
9599
*/
96100
public function removeToken($tokenId)
@@ -107,7 +111,7 @@ public function removeToken($tokenId)
107111
*/
108112
public function createCookies()
109113
{
110-
$cookies = [];
114+
$cookies = array();
111115

112116
foreach ($this->transientTokens as $tokenId => $token) {
113117
// FIXME empty tokens are handled by the http foundations cookie class
@@ -124,6 +128,7 @@ public function createCookies()
124128

125129
/**
126130
* @param string $tokenId
131+
*
127132
* @return string
128133
*/
129134
protected function resolveToken($tokenId)
@@ -140,7 +145,6 @@ protected function resolveToken($tokenId)
140145
/**
141146
* @param string $tokenId
142147
* @param string $token
143-
* @return void
144148
*/
145149
protected function updateToken($tokenId, $token)
146150
{
@@ -154,8 +158,8 @@ protected function updateToken($tokenId, $token)
154158
}
155159

156160
/**
157-
*
158161
* @param string $tokenId
162+
*
159163
* @return string
160164
*/
161165
protected function generateCookieName($tokenId)

‎src/Symfony/Component/Security/Csrf/TokenStorage/CookieTokenStorageFactory.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@
2121
class CookieTokenStorageFactory implements TokenStorageFactoryInterface
2222
{
2323
/**
24-
* {@inheritDoc}
24+
* {@inheritdoc}
25+
*
2526
* @see \Symfony\Component\Security\Csrf\TokenStorage\TokenStorageFactoryInterface::createTokenStorage()
2627
*/
27-
public function createTokenStorage(Request $request) {
28+
public function createTokenStorage(Request $request)
29+
{
2830
return new CookieTokenStorage($request->cookies, $request->isSecure());
2931
}
3032
}

‎src/Symfony/Component/Security/Csrf/TokenStorage/CookieTokenStorageListener.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public function __construct($tokenStorageKey = null)
4141

4242
/**
4343
* @param FilterResponseEvent $event
44-
* @return void
4544
*/
4645
public function onKernelResponse(FilterResponseEvent $event)
4746
{

‎src/Symfony/Component/Security/Csrf/TokenStorage/RequestStackTokenStorage.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ class RequestStackTokenStorage extends AbstractTokenStorageProxy
4545
private $tokenStorageKey;
4646

4747
/**
48-
* @param RequestStack $requestStack
48+
* @param RequestStack $requestStack
4949
* @param TokenStorageFactoryInterface $factory
50-
* @param string|null $tokenStorageKey
50+
* @param string|null $tokenStorageKey
5151
*/
5252
public function __construct(
5353
RequestStack $requestStack,
@@ -60,7 +60,8 @@ public function __construct(
6060
}
6161

6262
/**
63-
* {@inheritDoc}
63+
* {@inheritdoc}
64+
*
6465
* @see \Symfony\Component\Security\Csrf\TokenStorage\AbstractTokenStorageProxy::getProxiedTokenStorage()
6566
*/
6667
public function getProxiedTokenStorage()
@@ -90,5 +91,4 @@ public function getProxiedTokenStorage()
9091

9192
return $storage;
9293
}
93-
9494
}

‎src/Symfony/Component/Security/Csrf/TokenStorage/SessionTokenStorageFactory.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,12 @@ public function __construct($namespace = null)
3535
}
3636

3737
/**
38-
* {@inheritDoc}
38+
* {@inheritdoc}
39+
*
3940
* @see \Symfony\Component\Security\Csrf\TokenStorage\TokenStorageFactoryInterface::createTokenStorage()
4041
*/
41-
public function createTokenStorage(Request $request) {
42+
public function createTokenStorage(Request $request)
43+
{
4244
$session = $request->getSession();
4345
if (!$session) {
4446
throw new RuntimeException('Request has no session');

‎src/Symfony/Component/Security/Csrf/TokenStorage/TokenStorageFactoryInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ interface TokenStorageFactoryInterface
2424
* Creates a new token storage for the given request.
2525
*
2626
* @param Request $request
27+
*
2728
* @return TokenStorageInterface
2829
*/
2930
public function createTokenStorage(Request $request);

0 commit comments

Comments
 (0)
0