tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use veradic argument for HTTP::combineVary

This commit is contained in:
Daniel Hensby 2018-06-12 12:52:34 +01:00 committed by Damian Mooyman
parent bf90af4845
commit 37343cf0e2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Control/HTTP.php
View File

@ -603,18 +603,18 @@ class HTTP
/**
* Combine vary strings
*
* @param string $vary,... Each vary as a separate arg
* @param string[] $varies Each vary as a separate arg
* @return string
*/
protected static function combineVary($vary)
protected static function combineVary(...$varies)
{
$varies = [];
foreach (func_get_args() as $arg) {
$argVaries = array_filter(preg_split("/\s*,\s*/", trim($arg)));
$cleanVaries = [];
foreach ($varies as $vary) {
$argVaries = array_filter(preg_split("/\s*,\s*/", trim($vary)));
if ($argVaries) {
$varies = array_merge($varies, $argVaries);
$cleanVaries = array_merge($cleanVaries, $argVaries);
}
}
return implode(', ', array_unique($varies));
return implode(', ', array_unique($cleanVaries));
}
}