Skip to content

Commit 9d6957e

Browse files
dbuStyleCIBot
authored andcommitted
Applied fixes from StyleCI
1 parent 7976eac commit 9d6957e

18 files changed

+31
-31
lines changed

Command/BaseInvalidateCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ abstract class BaseInvalidateCommand extends ContainerAwareCommand
3030
* If no cache manager is specified explicitly, fos_http_cache.cache_manager
3131
* is automatically loaded.
3232
*
33-
* @param CacheManager|null $cacheManager The cache manager to talk to.
33+
* @param CacheManager|null $cacheManager The cache manager to talk to
3434
*/
3535
public function __construct(CacheManager $cacheManager = null)
3636
{

Command/InvalidatePathCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class InvalidatePathCommand extends BaseInvalidateCommand
3232
* If no cache manager is specified explicitly, fos_http_cache.cache_manager
3333
* is automatically loaded.
3434
*
35-
* @param CacheManager|null $cacheManager The cache manager to talk to.
36-
* @param string $commandName Name of this command, in case you want to reuse it.
35+
* @param CacheManager|null $cacheManager The cache manager to talk to
36+
* @param string $commandName Name of this command, in case you want to reuse it
3737
*/
3838
public function __construct(CacheManager $cacheManager = null, $commandName = 'fos:httpcache:invalidate:path')
3939
{

Command/InvalidateRegexCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ class InvalidateRegexCommand extends BaseInvalidateCommand
3333
* If no cache manager is specified explicitly, fos_http_cache.cache_manager
3434
* is automatically loaded.
3535
*
36-
* @param CacheManager|null $cacheManager The cache manager to talk to.
37-
* @param string $commandName Name of this command, in case you want to reuse it.
36+
* @param CacheManager|null $cacheManager The cache manager to talk to
37+
* @param string $commandName Name of this command, in case you want to reuse it
3838
*/
3939
public function __construct(CacheManager $cacheManager = null, $commandName = 'fos:httpcache:invalidate:regex')
4040
{

Command/InvalidateTagCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ class InvalidateTagCommand extends ContainerAwareCommand
4141
*
4242
* Passing CacheManager as argument is deprecated and will be restricted to TagHandler in 2.0.
4343
*
44-
* @param TagHandler|CacheManager|null $tagHandler The tag handler to talk to.
45-
* @param string $commandName Name of this command, in case you want to reuse it.
44+
* @param TagHandler|CacheManager|null $tagHandler The tag handler to talk to
45+
* @param string $commandName Name of this command, in case you want to reuse it
4646
*/
4747
public function __construct($tagHandler = null, $commandName = 'fos:httpcache:invalidate:tag')
4848
{

Command/RefreshPathCommand.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class RefreshPathCommand extends BaseInvalidateCommand
3232
* If no cache manager is specified explicitly, fos_http_cache.cache_manager
3333
* is automatically loaded.
3434
*
35-
* @param CacheManager|null $cacheManager The cache manager to talk to.
36-
* @param string $commandName Name of this command, in case you want to reuse it.
35+
* @param CacheManager|null $cacheManager The cache manager to talk to
36+
* @param string $commandName Name of this command, in case you want to reuse it
3737
*/
3838
public function __construct(CacheManager $cacheManager = null, $commandName = 'fos:httpcache:refresh:path')
3939
{

Configuration/InvalidateRoute.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class InvalidateRoute extends ConfigurationAnnotation
3232
/**
3333
* Handle route name given without explicit key.
3434
*
35-
* @param string $value The route name.
35+
* @param string $value The route name
3636
*/
3737
public function setValue($value)
3838
{

EventListener/AbstractRuleSubscriber.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
class AbstractRuleSubscriber
1919
{
2020
/**
21-
* @var array List of arrays with RuleMatcher, settings array.
21+
* @var array List of arrays with RuleMatcher, settings array
2222
*/
2323
private $rulesMap = array();
2424

2525
/**
2626
* Add a rule matcher with a list of header directives to apply if the
2727
* request and response are matched.
2828
*
29-
* @param RuleMatcherInterface $ruleMatcher The headers apply to responses matched by this matcher.
30-
* @param array $settings An array of header configuration.
29+
* @param RuleMatcherInterface $ruleMatcher The headers apply to responses matched by this matcher
30+
* @param array $settings An array of header configuration
3131
*/
3232
public function addRule(
3333
RuleMatcherInterface $ruleMatcher,
@@ -42,7 +42,7 @@ public function addRule(
4242
* @param Request $request
4343
* @param Response $response
4444
*
45-
* @return array|false Settings to apply or false if no rule matched.
45+
* @return array|false Settings to apply or false if no rule matched
4646
*/
4747
protected function matchRule(Request $request, Response $response)
4848
{

EventListener/CacheControlSubscriber.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ class CacheControlSubscriber extends AbstractRuleSubscriber implements EventSubs
5050
* If not empty, add a debug header with that name to all responses,
5151
* telling the cache proxy to add debug output.
5252
*
53-
* @var string|bool Name of the header or false to add no header.
53+
* @var string|bool Name of the header or false to add no header
5454
*/
5555
private $debugHeader;
5656

5757
/**
58-
* @param string|bool $debugHeader Header to set to trigger debugging, or false to send no header.
58+
* @param string|bool $debugHeader Header to set to trigger debugging, or false to send no header
5959
*/
6060
public function __construct($debugHeader = false)
6161
{
@@ -148,7 +148,7 @@ public function onKernelResponse(FilterResponseEvent $event)
148148
*
149149
* @param Response $response
150150
* @param array $directives
151-
* @param bool $overwrite Whether to keep existing cache headers or to overwrite them.
151+
* @param bool $overwrite Whether to keep existing cache headers or to overwrite them
152152
*/
153153
private function setCache(Response $response, array $directives, $overwrite)
154154
{
@@ -185,7 +185,7 @@ private function setCache(Response $response, array $directives, $overwrite)
185185
*
186186
* @param Response $response
187187
* @param array $controls
188-
* @param bool $overwrite Whether to keep existing cache headers or to overwrite them.
188+
* @param bool $overwrite Whether to keep existing cache headers or to overwrite them
189189
*/
190190
private function setExtraCacheDirectives(Response $response, array $controls, $overwrite)
191191
{
@@ -216,7 +216,7 @@ private function setExtraCacheDirectives(Response $response, array $controls, $o
216216
*
217217
* @param Request $request
218218
*
219-
* @return bool True if the request is safe and headers can be set.
219+
* @return bool True if the request is safe and headers can be set
220220
*/
221221
protected function isRequestSafe(Request $request)
222222
{

EventListener/InvalidationSubscriber.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public function onKernelException()
119119
/**
120120
* Flush cache manager when console terminates or errors.
121121
*
122-
* @throws ExceptionCollection If an exception occurs during flush.
122+
* @throws ExceptionCollection If an exception occurs during flush
123123
*/
124124
public function onConsoleTerminate(ConsoleEvent $event)
125125
{

EventListener/TagSubscriber.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ public static function getSubscribedEvents()
107107
*
108108
* @param Request $request
109109
*
110-
* @return array List of tags affected by the request.
110+
* @return array List of tags affected by the request
111111
*/
112112
private function getAnnotationTags(Request $request)
113113
{

EventListener/UserContextSubscriber.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class UserContextSubscriber implements EventSubscriberInterface
6262
private $ttl;
6363

6464
/**
65-
* @var bool Whether to automatically add the Vary header for the hash / user identifier if there was no hash.
65+
* @var bool Whether to automatically add the Vary header for the hash / user identifier if there was no hash
6666
*/
6767
private $addVaryOnHash;
6868

Handler/TagHandler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class TagHandler extends BaseTagHandler
2222
* @param Response $response
2323
* @param bool $replace Whether to replace the current tags on the
2424
* response. If false, parses the header to merge
25-
* tags.
25+
* tags
2626
*
2727
* @return $this
2828
*/

Http/RuleMatcher.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class RuleMatcher implements RuleMatcherInterface
4040
private $expressionLanguage;
4141

4242
/**
43-
* @param RequestMatcherInterface $requestMatcher Strategy to match the request.
44-
* @param array $criteria Additional criteria not covered by request matcher.
43+
* @param RequestMatcherInterface $requestMatcher Strategy to match the request
44+
* @param array $criteria Additional criteria not covered by request matcher
4545
*/
4646
public function __construct(RequestMatcherInterface $requestMatcher, array $criteria)
4747
{

Http/RuleMatcherInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ interface RuleMatcherInterface
2828
* @param Request $request
2929
* @param Response $response
3030
*
31-
* @return bool True if request and response match, false otherwise.
31+
* @return bool True if request and response match, false otherwise
3232
*/
3333
public function matches(Request $request, Response $response);
3434
}

HttpCache.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
/**
2323
* Base class for enhanced Symfony reverse proxy based on the symfony FrameworkBundle HttpCache.
2424
*
25-
* @deprecated Use FOS\HttpCacheBundle\SymfonyCache\EventDispatchingHttpCache instead.
25+
* @deprecated Use FOS\HttpCacheBundle\SymfonyCache\EventDispatchingHttpCache instead
2626
*
2727
* @author Jérôme Vieilledent <[email protected]> (courtesy of eZ Systems AS)
2828
*

Tests/Functional/Command/CommandTestCase.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ abstract class CommandTestCase extends WebTestCase
2525
*
2626
* @param Client $client
2727
* @param string $command
28-
* @param int $verbosity Verbosity level to use.
29-
* @param int $exitCode Expected command exit code.
28+
* @param int $verbosity Verbosity level to use
29+
* @param int $exitCode Expected command exit code
3030
*
3131
* @return string
3232
*/

Tests/Unit/DependencyInjection/ConfigurationTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ public function testRulesBothStatusAndExpression()
433433
}
434434

435435
/**
436-
* @return array The configuration when nothing is specified.
436+
* @return array The configuration when nothing is specified
437437
*/
438438
private function getEmptyConfig()
439439
{

UserContext/RoleProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function __construct($context = null)
5454
/**
5555
* {@inheritdoc}
5656
*
57-
* @throws InvalidConfigurationException when called without a security context being set.
57+
* @throws InvalidConfigurationException when called without a security context being set
5858
*/
5959
public function updateUserContext(UserContext $context)
6060
{

0 commit comments

Comments
 (0)