public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

VersionParser: Append elements directly instead of array_merge

pull/4229/head
Nils Adermann 2015-07-09 12:57:34 +02:00
parent e88df7429f
commit 3fd4672382
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Composer/Package/Version/VersionParser.php
View File

@ -257,11 +257,12 @@ 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(array()); $constraintObjects = array();
foreach ($andConstraints as $constraint) { foreach ($andConstraints as $constraint) {
$constraintObjects[] = $this->parseConstraint($constraint); foreach ($this->parseConstraint($constraint) as $parsedConstraint) {
$constraintObjects[] = $parsedConstraint;
}
} }
$constraintObjects = call_user_func_array('array_merge', $constraintObjects);
} else { } else {
$constraintObjects = $this->parseConstraint($andConstraints[0]); $constraintObjects = $this->parseConstraint($andConstraints[0]);
} }