Merge branch '5.4' into 6.0

* 5.4:
  [FrameworkBundle] Fix tests

Author: nicolas-grekas

Tests/Command/TranslationUpdateCommandTest.php

@@ -149,11 +149,6 @@ public function testFilterDuplicateTransPaths()
             $this->translationDir.'/a/different/test/folder',
         ];
 
-        $expectedPaths = [
-            $this->translationDir.'/a/different/test/folder',
-            $this->translationDir.'/a/test/folder',
-        ];
-
         foreach ($transPaths as $transPath) {
             if (realpath($transPath)) {
                 continue;
@@ -177,6 +172,11 @@ public function testFilterDuplicateTransPaths()
 
         $filteredTransPaths = $method->invoke($command, $transPaths);
 
+        $expectedPaths = [
+            realpath($this->translationDir.'/a/different/test/folder'),
+            realpath($this->translationDir.'/a/test/folder'),
+        ];
+
         $this->assertEquals($expectedPaths, $filteredTransPaths);
     }