Skip to content

Commit f94fa31

Browse files
committed
Merge branch '6.0' into 6.1
* 6.0: Use mb_convert_encoding instead of utf8_decode [SecurityBundle] Remove forgotten unused code Minor @requires function tests cleanup [FrameworkBundle] Always add CacheCollectorPass Fix "Notice: Undefined index: headers" in messenger with Oracle [String] Fix ansi escape sequences regex Indicate support for doctrine/persistence 3 [Routing] fix router base url when default uri has trailing slash Replace deprecated String.prototype.substr()
2 parents 0b8eee9 + 011f19d commit f94fa31

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

Dumper/HtmlDumper.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ function xpathHasClass(className) {
369369
if (/\bsf-dump-toggle\b/.test(a.className)) {
370370
e.preventDefault();
371371
if (!toggle(a, isCtrlKey(e))) {
372-
var r = doc.getElementById(a.getAttribute('href').substr(1)),
372+
var r = doc.getElementById(a.getAttribute('href').slice(1)),
373373
s = r.previousSibling,
374374
f = r.parentNode,
375375
t = a.parentNode;
@@ -430,7 +430,7 @@ function xpathHasClass(className) {
430430
x += elt.parentNode.getAttribute('data-depth')/1;
431431
}
432432
} else if (/\bsf-dump-ref\b/.test(elt.className) && (a = elt.getAttribute('href'))) {
433-
a = a.substr(1);
433+
a = a.slice(1);
434434
elt.className += ' '+a;
435435
436436
if (/[\[{]$/.test(elt.previousSibling.nodeValue)) {

Tests/Caster/ExceptionCasterTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,6 @@ public function testHtmlDump()
184184
$this->assertStringMatchesFormat($expectedDump, $dump);
185185
}
186186

187-
/**
188-
* @requires function Twig\Template::getSourceContext
189-
*/
190187
public function testFrameWithTwig()
191188
{
192189
require_once \dirname(__DIR__).'/Fixtures/Twig.php';

Tests/Dumper/CliDumperTest.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,6 @@ public function testFlags()
293293
putenv('DUMP_STRING_LENGTH=');
294294
}
295295

296-
/**
297-
* @requires function Twig\Template::getSourceContext
298-
*/
299296
public function testThrowingCaster()
300297
{
301298
$out = fopen('php://memory', 'r+');

0 commit comments

Comments
 (0)