Skip to content

Commit f184238

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: (29 commits) fix: Improve FR validators translation Add swedish translation for issue #43458 [HttpClient] fix collecting debug info on destruction of CurlResponse Fix CS added missing thai translations Add missing translations for Chinese (zh_TW) [DependencyInjection] fix "url" env var processor update translation Remove untranslated translation for Afrikaans [Validator] Add missing validator polish translation [Security,Validator] Added missing Latvian translations #41053 Add the missing translations for Indonesian (id) [Validator] Add missing Lithuanian translation [Validator] Add missing Czech translation replace "ispravna" with "važeća" in translating "valid HTML/CSS" added missing translation for galician Add missing translation in Vietnamese Add missing translation in Bulgarian added missing translations for portuguese [#43450] Add missing validator slovak translation ...
2 parents 357dd3b + dd50a90 commit f184238

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

EnvVarProcessor.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,8 @@ public function getEnv(string $prefix, string $name, \Closure $getEnv)
258258
'fragment' => null,
259259
];
260260

261-
if (null !== $parsedEnv['path']) {
262-
// remove the '/' separator
263-
$parsedEnv['path'] = '/' === $parsedEnv['path'] ? null : substr($parsedEnv['path'], 1);
264-
}
261+
// remove the '/' separator
262+
$parsedEnv['path'] = '/' === ($parsedEnv['path'] ?? '/') ? '' : substr($parsedEnv['path'], 1);
265263

266264
return $parsedEnv;
267265
}

Tests/EnvVarProcessorTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,8 +640,8 @@ public function testGetEnvUrlPath(?string $expected, string $url)
640640
public function provideGetEnvUrlPath()
641641
{
642642
return [
643-
[null, 'https://symfony.com'],
644-
[null, 'https://symfony.com/'],
643+
['', 'https://symfony.com'],
644+
['', 'https://symfony.com/'],
645645
['/', 'https://symfony.com//'],
646646
['blog', 'https://symfony.com/blog'],
647647
['blog/', 'https://symfony.com/blog/'],

0 commit comments

Comments
 (0)