Skip to content

Commit da4cd4e

Browse files
Merge branch '2.8' into 3.1
* 2.8: [FrameworkBundle] Check for class existence before is_subclass_of Update GroupSequence.php Code enhancement and cleanup [Form] Fix transformer tests after the ICU update [DI] Add anti-regression test Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)" bumped Symfony version to 2.8.11 updated VERSION for 2.8.10 updated CHANGELOG for 2.8.10 [BrowserKit] Fix cookie expiration on 32 bit systems bumped Symfony version to 2.7.18 updated VERSION for 2.7.17 update CONTRIBUTORS for 2.7.17 updated CHANGELOG for 2.7.17 Update misleading comment about RFC4627
2 parents 33a220d + 9b271ee commit da4cd4e

File tree

5 files changed

+5
-4
lines changed

5 files changed

+5
-4
lines changed

DependencyInjection/LazyLoadingFragmentHandler.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ public function __construct(ContainerInterface $container, RequestStack $request
4242
/**
4343
* Adds a service as a fragment renderer.
4444
*
45+
* @param string $name The service name
4546
* @param string $renderer The render service id
4647
*/
4748
public function addRendererService($name, $renderer)

Profiler/Profiler.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function enable()
7878
*
7979
* @param Response $response A Response instance
8080
*
81-
* @return Profile A Profile instance
81+
* @return Profile|false A Profile instance
8282
*/
8383
public function loadProfileFromResponse(Response $response)
8484
{

Tests/EventListener/ValidateRequestListenerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
class ValidateRequestListenerTest extends \PHPUnit_Framework_TestCase
2222
{
2323
/**
24-
* @expectedException Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException
24+
* @expectedException \Symfony\Component\HttpFoundation\Exception\ConflictingHeadersException
2525
*/
2626
public function testListenerThrowsWhenMasterRequestHasInconsistentClientIps()
2727
{

Tests/HttpKernelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public function testVerifyRequestStackPushPopDuringHandle()
303303
}
304304

305305
/**
306-
* @expectedException Symfony\Component\HttpKernel\Exception\BadRequestHttpException
306+
* @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
307307
*/
308308
public function testInconsistentClientIpsOnMasterRequests()
309309
{

UriSigner.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private function buildUrl(array $url, array $params = array())
9898
$host = isset($url['host']) ? $url['host'] : '';
9999
$port = isset($url['port']) ? ':'.$url['port'] : '';
100100
$user = isset($url['user']) ? $url['user'] : '';
101-
$pass = isset($url['pass']) ? ':'.$url['pass'] : '';
101+
$pass = isset($url['pass']) ? ':'.$url['pass'] : '';
102102
$pass = ($user || $pass) ? "$pass@" : '';
103103
$path = isset($url['path']) ? $url['path'] : '';
104104
$query = isset($url['query']) && $url['query'] ? '?'.$url['query'] : '';

0 commit comments

Comments
 (0)