Skip to content

Commit

Permalink
Merge branch '5.1' into 5.x
Browse files Browse the repository at this point in the history
* 5.1:
  [DI] Fix Preloader exception when preloading a class with an unknown parent/interface
  [Translation] added missing Albanian translations
  [Form, Security, Validator] Add missing Turkish translations (tr)
  Display php info for extra versions in travis
  [ProxyManager] use "composer/package-versions-deprecated" instead of "ocramius/package-versions"
  38737 add missing dutch translation
  Fix transient tests
  [Validator] Add missing Slovak translations.
  [Form, Security, Validator] Add missing Persian translations (fa_IR)
  [Form] Fix wrong translations for Ukrainian (uk)
  [Validator] Add missing translations for Ukrainian (uk)
  [Security] Add missing translations for Ukrainian (uk)
  [Form] Add missing translations for Ukrainian (uk)
  [Security] Add missing Slovak translations.
  [Form] Added missing Spanish translations.
  Fix transient tests
  • Loading branch information
nicolas-grekas committed Oct 27, 2020
2 parents 25ec7e9 + 4e13f3f commit c78bd92
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Tests/Dumper/ServerDumperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ private function getServerProcess(): Process
'VAR_DUMPER_SERVER' => self::VAR_DUMPER_SERVER,
]);

return $process->setTimeout(9);
return $process->setTimeout('\\' === \DIRECTORY_SEPARATOR ? 19 : 9);
}
}

0 comments on commit c78bd92

Please sign in to comment.