8000 Merge branch '4.4' into 5.4 · symfony/symfony@506e4fc · GitHub
[go: up one dir, main page]
Skip to content

Commit 506e4fc

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '4.4' into 5.4
* 4.4: [HttpKernel] Fix test sensitivity on xdebug.file_link_format [HttpKernel] Fix non-scalar check in surrogate fragment renderer [Debug][ErrorHandler] fix operator precedence [Security] Allow redirect after login to absolute URLs
2 parents 8341158 + 45572c9 commit 506e4fc

File tree

14 files changed

+50
-14
lines changed

14 files changed

+50
-14
lines changed

‎src/Symfony/Component/ErrorHandler/ErrorHandler.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ public function screamAt(int $levels, bool $replace = false): int
380380
*/
381381
private function reRegister(int $prev): void
382382
{
383-
if ($prev !== $this->thrownErrors | $this->loggedErrors) {
383+
if ($prev !== ($this->thrownErrors | $this->loggedErrors)) {
384384
$handler = set_error_handler('is_int');
385385
$handler = \is_array($handler) ? $handler[0] : null;
386386
restore_error_handler();

‎src/Symfony/Component/Finder/Tests/Fixtures/gitignore/search_root/a.txt‎

Whitespace-only changes.

‎src/Symfony/Component/Finder/Tests/Fixtures/gitignore/search_root/c.txt‎

Whitespace-only changes.

‎src/Symfony/Component/Finder/Tests/Fixtures/gitignore/search_root/dir/b.txt‎

Whitespace-only changes.

‎src/Symfony/Component/Finder/Tests/Fixtures/gitignore/search_root/dir/c.txt‎

Whitespace-only changes.

‎src/Symfony/Component/HttpKernel/DataCollector/DumpDataCollector.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,9 @@ class DumpDataCollector extends DataCollector implements DataDumperInterface
4949
*/
5050
public function __construct(Stopwatch $stopwatch = null, $fileLinkFormat = null, string $charset = null, RequestStack $requestStack = null, $dumper = null)
5151
{
52+
$fileLinkFormat = $fileLinkFormat ?: \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
5253
$this->stopwatch = $stopwatch;
53-
$this->fileLinkFormat = $fileLinkFormat ?: \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
54+
$this->fileLinkFormat = $fileLinkFormat instanceof FileLinkFormatter && false === $fileLinkFormat->format('', 0) ? false : $fileLinkFormat;
5455
$this->charset = $charset ?: \ini_get('php.output_encoding') ?: \ini_get('default_charset') ?: 'UTF-8';
5556
$this->requestStack = $requestStack;
5657
$this->dumper = $dumper;

‎src/Symfony/Component/HttpKernel/Debug/FileLinkFormatter.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@ class FileLinkFormatter
4040
private $urlFormat;
4141

4242
/**
43-
* @param string|\Closure $urlFormat the URL format, or a closure that returns it on-demand
43+
* @param string|array|null $fileLinkFormat
44+
* @param string|\Closure $urlFormat the URL format, or a closure that returns it on-demand
4445
*/
45-
public function __construct(string $fileLinkFormat = null, RequestStack $requestStack = null, string $baseDir = null, $urlFormat = null)
46+
public function __construct($fileLinkFormat = null, RequestStack $requestStack = null, string $baseDir = null, $urlFormat = null)
4647
{
47-
$fileLinkFormat = (self::FORMATS[$fileLinkFormat] ?? $fileLinkFormat) ?: \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format');
48-
if ($fileLinkFormat && !\is_array($fileLinkFormat)) {
48+
if (!\is_array($fileLinkFormat) && $fileLinkFormat = (self::FORMATS[$fileLinkFormat] ?? $fileLinkFormat) ?: \ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format')) {
4949
$i = strpos($f = $fileLinkFormat, '&', max(strrpos($f, '%f'), strrpos($f, '%l'))) ?: \strlen($f);
5050
$fileLinkFormat = [substr($f, 0, $i)] + preg_split('/&([^>]++)>/', substr($f, $i), -1, \PREG_SPLIT_DELIM_CAPTURE);
5151
}

‎src/Symfony/Component/HttpKernel/Fragment/AbstractSurrogateFragmentRenderer.php‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,11 @@ private function generateSignedFragmentUri(ControllerReference $uri, Request $re
8989
private function containsNonScalars(array $values): bool
9090
{
9191
foreach ($values as $value) {
92-
if (\is_array($value)) {
93-
return $this->containsNonScalars($value);
94-
} elseif (!\is_scalar($value) && null !== $value) {
92+
if (\is_scalar($value) || null === $value) {
93+
continue;
94+
}
95+
96+
if (!\is_array($value) || $this->containsNonScalars($value)) {
9597
return true;
9698
}
9799
}

‎src/Symfony/Component/HttpKernel/Tests/DataCollector/DumpDataCollectorTest.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
use Symfony\Component\HttpFoundation\Request;
1616
use Symfony\Component\HttpFoundation\Response;
1717
use Symfony\Component\HttpKernel\DataCollector\DumpDataCollector;
18+
use Symfony\Component\HttpKernel\Debug\FileLinkFormatter;
1819
use Symfony\Component\VarDumper\Cloner\Data;
1920
use Symfony\Component\VarDumper\Dumper\CliDumper;
2021
use Symfony\Component\VarDumper\Server\Connection;
@@ -28,7 +29,7 @@ public function testDump()
2829
{
2930
$data = new Data([[123]]);
3031

31-
$collector = new DumpDataCollector();
32+
$collector = new DumpDataCollector(null, new FileLinkFormatter([]));
3233

3334
$this->assertSame('dump', $collector->getName());
3435

‎src/Symfony/Component/HttpKernel/Tests/Debug/FileLinkFormatterTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class FileLinkFormatterTest extends TestCase
2020
{
2121
public function testWhenNoFileLinkFormatAndNoRequest()
2222
{
23-
$sut = new FileLinkFormatter();
23+
$sut = new FileLinkFormatter([]);
2424

2525
$this->assertFalse($sut->format('/kernel/root/src/my/very/best/file.php', 3));
2626
}
@@ -47,7 +47,7 @@ public function testWhenNoFileLinkFormatAndRequest()
4747
$request->server->set('SCRIPT_FILENAME', '/public/index.php');
4848
$request->server->set('REQUEST_URI', '/index.php/example');
4949

50-
$sut = new FileLinkFormatter(null, $requestStack, __DIR__, '/_profiler/open?file=%f&line=%l#line%l');
50+
$sut = new FileLinkFormatter([], $requestStack, __DIR__, '/_profiler/open?file=%f&line=%l#line%l');
5151

5252
$this->assertSame('http://www.example.org/_profiler/open?file=file.php&line=3#line3', $sut->format($file, 3));
5353
}

0 commit comments

Comments
 (0)
0