From 3fd46723829c9fd9ade5db3a2f6fdb8765542738 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Thu, 9 Jul 2015 12:57:34 +0200 Subject: [PATCH] VersionParser: Append elements directly instead of array_merge --- src/Composer/Package/Version/VersionParser.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Composer/Package/Version/VersionParser.php b/src/Composer/Package/Version/VersionParser.php index f7650f367..0f9faa8a7 100644 --- a/src/Composer/Package/Version/VersionParser.php +++ b/src/Composer/Package/Version/VersionParser.php @@ -257,11 +257,12 @@ class VersionParser foreach ($orConstraints as $constraints) { $andConstraints = preg_split('{(?< ,]) *(? 1) { - $constraintObjects = array(array()); + $constraintObjects = array(); 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 { $constraintObjects = $this->parseConstraint($andConstraints[0]); }