Skip to content

Commit 9b271ee

Browse files
Merge branch '2.7' into 2.8
* 2.7: [FrameworkBundle] Check for class existence before is_subclass_of Update GroupSequence.php Code enhancement and cleanup [DI] Add anti-regression test Revert "minor #19689 [DI] Cleanup array_key_exists (ro0NL)" [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 d2364b5 + 201676b commit 9b271ee

File tree

5 files changed

+6
-5
lines changed

5 files changed

+6
-5
lines changed

DependencyInjection/LazyLoadingFragmentHandler.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ public function __construct(ContainerInterface $container, $requestStack = null,
5454
/**
5555
* Adds a service as a fragment renderer.
5656
*
57+
* @param string $name The service name
5758
* @param string $renderer The render service id
5859
*/
5960
public function addRendererService($name, $renderer)

Profiler/Profiler.php

Lines changed: 2 additions & 2 deletions
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
{
@@ -153,7 +153,7 @@ public function export(Profile $profile)
153153
*
154154
* @param string $data A data string as exported by the export() method
155155
*
156-
* @return Profile A Profile instance
156+
* @return Profile|false A Profile instance
157157
*
158158
* @deprecated since Symfony 2.8, to be removed in 3.0.
159159
*/

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
@@ -272,7 +272,7 @@ public function testVerifyRequestStackPushPopDuringHandle()
272272
}
273273

274274
/**
275-
* @expectedException Symfony\Component\HttpKernel\Exception\BadRequestHttpException
275+
* @expectedException \Symfony\Component\HttpKernel\Exception\BadRequestHttpException
276276
*/
277277
public function testInconsistentClientIpsOnMasterRequests()
278278
{

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)