Skip to content

Commit d9526d0

Browse files
Merge branch '2.6' into 2.7
* 2.6: (24 commits) [HttpKernel] Embed the original exception as previous to bounced exceptions [Enhancement] netbeans - force interactive shell when limited detection [FrameworkBundle] fixes displaying of deprecation notices. Revert "Added missing changelog entry" [Debug] Tweak docblocks [Debug] Rework a bit the PHP doc Added missing changelog entry [StringUtil] Fixed singularification of 'movies' [Debug] Renamed "context" key to "scope_vars" to avoid any ambiguity Fix some phpdocs for Twig extensions & templating helpers [Debug] Made code in ErrorHandler easier to read Use specialized config methods instead of the generic ifTrue() method Fix the AJAX profiling bumped Symfony version to 2.6.7 updated VERSION for 2.6.6 updated CHANGELOG for 2.6.6 Safe escaping of fragments for eval() bumped Symfony version to 2.3.28 updated VERSION for 2.3.27 update CONTRIBUTORS for 2.3.27 ... Conflicts: src/Symfony/Component/Debug/ErrorHandler.php src/Symfony/Component/HttpKernel/Kernel.php
2 parents f939208 + 984733e commit d9526d0

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

Templating/Helper/LogoutUrlHelper.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@ public function getLogoutUrl($key)
7676
}
7777

7878
/**
79-
* Returns the canonical name of this helper.
80-
*
81-
* @return string The canonical name
79+
* {@inheritdoc}
8280
*/
8381
public function getName()
8482
{

Templating/Helper/SecurityHelper.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ public function isGranted($role, $object = null, $field = null)
4343
}
4444

4545
/**
46-
* Returns the canonical name of this helper.
47-
*
48-
* @return string The canonical name
46+
* {@inheritdoc}
4947
*/
5048
public function getName()
5149
{

0 commit comments

Comments
 (0)