Remove a few hundred/thousand array_merge calls

main
Nils Adermann 9 years ago
parent dbdd4978a7
commit e88df7429f

@ -257,10 +257,11 @@ class VersionParser
foreach ($orConstraints as $constraints) { foreach ($orConstraints as $constraints) {
$andConstraints = preg_split('{(?<!^|as|[=>< ,]) *(?<!-)[, ](?!-) *(?!,|as|$)}', $constraints); $andConstraints = preg_split('{(?<!^|as|[=>< ,]) *(?<!-)[, ](?!-) *(?!,|as|$)}', $constraints);
if (count($andConstraints) > 1) { if (count($andConstraints) > 1) {
$constraintObjects = array(); $constraintObjects = array(array());
foreach ($andConstraints as $constraint) { foreach ($andConstraints as $constraint) {
$constraintObjects = array_merge($constraintObjects, $this->parseConstraint($constraint)); $constraintObjects[] = $this->parseConstraint($constraint);
} }
$constraintObjects = call_user_func_array('array_merge', $constraintObjects);
} else { } else {
$constraintObjects = $this->parseConstraint($andConstraints[0]); $constraintObjects = $this->parseConstraint($andConstraints[0]);
} }

Loading…
Cancel
Save