Skip to content

Commit cbf46e9

Browse files
committed
Merge branch '2.5' into 2.6
* 2.5: CS fixes [2.3] More cs fixes Removed unused imports CS fixes bumped Symfony version to 2.5.9 updated VERSION for 2.5.8 update CONTRIBUTORS for 2.5.8 updated CHANGELOG for 2.5.8 bumped Symfony version to 2.3.24 updated VERSION for 2.3.23 update CONTRIBUTORS for 2.3.23 updated CHANGELOG for 2.3.23 Conflicts: src/Symfony/Component/Console/Helper/ProgressBar.php src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/Kernel.php src/Symfony/Component/Security/Http/HttpUtils.php src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
2 parents 15f1f69 + 1e92f58 commit cbf46e9

File tree

7 files changed

+8
-12
lines changed

7 files changed

+8
-12
lines changed

DataCollector/Util/ValueExporter.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ class ValueExporter
1919
/**
2020
* Converts a PHP value to a string.
2121
*
22-
* @param mixed $value The PHP value
23-
* @param int $depth only for internal usage
24-
* @param bool $deep only for internal usage
22+
* @param mixed $value The PHP value
23+
* @param int $depth only for internal usage
24+
* @param bool $deep only for internal usage
2525
*
2626
* @return string The string representation of the given value
2727
*/

Event/KernelEvent.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public function getRequestType()
9090
/**
9191
* Checks if this is a master request.
9292
*
93-
* @return bool True if the request is a master request
93+
* @return bool True if the request is a master request
9494
*
9595
* @api
9696
*/

EventListener/ExceptionListener.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ protected function logException(\Exception $exception, $message, $original = tru
104104
* Clones the request for the exception.
105105
*
106106
* @param \Exception $exception The thrown exception.
107-
* @param Request $request The original request.
107+
* @param Request $request The original request.
108108
*
109109
* @return Request $request The cloned request.
110110
*/

EventListener/SaveSessionListener.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
1515
use Symfony\Component\HttpKernel\Event\FilterResponseEvent;
16-
use Symfony\Component\HttpKernel\HttpKernelInterface;
1716
use Symfony\Component\HttpKernel\KernelEvents;
1817

1918
/**

Exception/UnprocessableEntityHttpException.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ class UnprocessableEntityHttpException extends HttpException
2121
/**
2222
* Constructor.
2323
*
24-
* @param string $message The internal exception message
25-
* @param \Exception $previous The previous exception
26-
* @param int $code The internal exception code
24+
* @param string $message The internal exception message
25+
* @param \Exception $previous The previous exception
26+
* @param int $code The internal exception code
2727
*/
2828
public function __construct($message = null, \Exception $previous = null, $code = 0)
2929
{

Tests/Bundle/BundleTest.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
namespace Symfony\Component\HttpKernel\Tests\Bundle;
1313

14-
use Symfony\Component\DependencyInjection\ContainerBuilder;
15-
use Symfony\Component\DependencyInjection\Definition;
1614
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionAbsentBundle\ExtensionAbsentBundle;
1715
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\Command\FooCommand;
1816
use Symfony\Component\HttpKernel\Tests\Fixtures\ExtensionPresentBundle\ExtensionPresentBundle;

Tests/ClientTest.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
namespace Symfony\Component\HttpKernel\Tests;
1313

1414
use Symfony\Component\HttpKernel\Client;
15-
use Symfony\Component\HttpKernel\HttpKernel;
1615
use Symfony\Component\HttpFoundation\Request;
1716
use Symfony\Component\HttpFoundation\Response;
1817
use Symfony\Component\HttpFoundation\StreamedResponse;

0 commit comments

Comments
 (0)