浏览代码

Merge pull request #4229 from naderman/memory-version-array-merge

VersionParser: remove a few hundred/thousand array_merge calls
Jordi Boggiano 10 年之前
父节点
当前提交
efb9f13248
共有 1 个文件被更改,包括 3 次插入1 次删除
  1. 3 1
      src/Composer/Package/Version/VersionParser.php

+ 3 - 1
src/Composer/Package/Version/VersionParser.php

@@ -259,7 +259,9 @@ class VersionParser
             if (count($andConstraints) > 1) {
                 $constraintObjects = array();
                 foreach ($andConstraints as $constraint) {
-                    $constraintObjects = array_merge($constraintObjects, $this->parseConstraint($constraint));
+                    foreach ($this->parseConstraint($constraint) as $parsedConstraint) {
+                        $constraintObjects[] = $parsedConstraint;
+                    }
                 }
             } else {
                 $constraintObjects = $this->parseConstraint($andConstraints[0]);