Skip to content

Commit 0969591

Browse files
Merge branch '4.4'
* 4.4: Update GitHub PR template [DI] fix related to preloading [HttpKernel] fix compat with legacy DebugClassLoader [WebProfilerBundle] Assign automatic colors to custom Stopwatch categories [DI] use dirname() when possible Simplify usage of dirname() Remove Google references when not needed Simplify usage of dirname() don't dump a scalar tag value on its own line Remove Google references when not needed [DI] fix Preloader [HttpClient] fix calling the buffer-enabling callback [HttpClient] fix php notice on push do not perform string operations on null Require exact match when reading from stdin with a dash
2 parents 14f6ede + d64e73b commit 0969591

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Tests/Resources/TranslationFilesTest.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ public function provideTranslationFiles()
2929
{
3030
return array_map(
3131
function ($filePath) { return (array) $filePath; },
32-
glob(\dirname(\dirname(__DIR__)).'/Resources/translations/*.xlf')
32+
glob(\dirname(__DIR__, 2).'/Resources/translations/*.xlf')
3333
);
3434
}
3535

3636
public function testNorwegianAlias()
3737
{
3838
$this->assertFileEquals(
39-
\dirname(\dirname(__DIR__)).'/Resources/translations/security.nb.xlf',
40-
\dirname(\dirname(__DIR__)).'/Resources/translations/security.no.xlf',
39+
\dirname(__DIR__, 2).'/Resources/translations/security.nb.xlf',
40+
\dirname(__DIR__, 2).'/Resources/translations/security.no.xlf',
4141
'The NO locale should be an alias for the NB variant of the Norwegian language.'
4242
);
4343
}

0 commit comments

Comments
 (0)