Skip to content

Commit ca5577c

Browse files
committed
Merge branch '3.1'
* 3.1: fixed CS fixed CS fixed CS fixed form tests [Console] Fix formatting of SymfonyStyle::comment() [Form] fix post max size translation type extension for >= 2.8 [Security] Allow LDAP loadUser override removed dots at the end of @param and @return fixed typo
2 parents 2d59b33 + d7612e8 commit ca5577c

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

CacheClearer/CacheClearerInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ interface CacheClearerInterface
2121
/**
2222
* Clears any caches necessary.
2323
*
24-
* @param string $cacheDir The cache directory.
24+
* @param string $cacheDir The cache directory
2525
*/
2626
public function clear($cacheDir);
2727
}

CacheClearer/ChainCacheClearer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ChainCacheClearer implements CacheClearerInterface
2626
/**
2727
* Constructs a new instance of ChainCacheClearer.
2828
*
29-
* @param array $clearers The initial clearers.
29+
* @param array $clearers The initial clearers
3030
*/
3131
public function __construct(array $clearers = array())
3232
{

ControllerMetadata/ArgumentMetadataFactoryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
interface ArgumentMetadataFactoryInterface
2020
{
2121
/**
22-
* @param mixed $controller The controller to resolve the arguments for.
22+
* @param mixed $controller The controller to resolve the arguments for
2323
*
2424
* @return ArgumentMetadata[]
2525
*/

EventListener/DumpListener.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ class DumpListener implements EventSubscriberInterface
2828
private $dumper;
2929

3030
/**
31-
* @param ClonerInterface $cloner Cloner service.
32-
* @param DataDumperInterface $dumper Dumper service.
31+
* @param ClonerInterface $cloner Cloner service
32+
* @param DataDumperInterface $dumper Dumper service
3333
*/
3434
public function __construct(ClonerInterface $cloner, DataDumperInterface $dumper)
3535
{

EventListener/ExceptionListener.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ protected function logException(\Exception $exception, $message)
9696
/**
9797
* Clones the request for the exception.
9898
*
99-
* @param \Exception $exception The thrown exception.
100-
* @param Request $request The original request.
99+
* @param \Exception $exception The thrown exception
100+
* @param Request $request The original request
101101
*
102-
* @return Request $request The cloned request.
102+
* @return Request $request The cloned request
103103
*/
104104
protected function duplicateRequest(\Exception $exception, Request $request)
105105
{

Exception/HttpException.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public function getHeaders()
4242
/**
4343
* Set response headers.
4444
*
45-
* @param array $headers Response headers.
45+
* @param array $headers Response headers
4646
*/
4747
public function setHeaders(array $headers)
4848
{

KernelInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ interface KernelInterface extends HttpKernelInterface, \Serializable
2727
/**
2828
* Returns an array of bundles to register.
2929
*
30-
* @return BundleInterface[] An array of bundle instances.
30+
* @return BundleInterface[] An array of bundle instances
3131
*/
3232
public function registerBundles();
3333

Tests/Exception/UnprocessableEntityHttpExceptionTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class UnprocessableEntityHttpExceptionTest extends HttpExceptionTest
1010
* Test that setting the headers using the setter function
1111
* is working as expected.
1212
*
13-
* @param array $headers The headers to set.
13+
* @param array $headers The headers to set
1414
*
1515
* @dataProvider headerDataProvider
1616
*/

0 commit comments

Comments
 (0)