From e88df7429fc707caa9fb3e9361cb7e7526617221 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Wed, 8 Jul 2015 13:36:19 +0200 Subject: [PATCH] Remove a few hundred/thousand array_merge calls --- src/Composer/Package/Version/VersionParser.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Composer/Package/Version/VersionParser.php b/src/Composer/Package/Version/VersionParser.php index 89bf4819f..f7650f367 100644 --- a/src/Composer/Package/Version/VersionParser.php +++ b/src/Composer/Package/Version/VersionParser.php @@ -257,10 +257,11 @@ class VersionParser foreach ($orConstraints as $constraints) { $andConstraints = preg_split('{(?< ,]) *(? 1) { - $constraintObjects = array(); + $constraintObjects = array(array()); foreach ($andConstraints as $constraint) { - $constraintObjects = array_merge($constraintObjects, $this->parseConstraint($constraint)); + $constraintObjects[] = $this->parseConstraint($constraint); } + $constraintObjects = call_user_func_array('array_merge', $constraintObjects); } else { $constraintObjects = $this->parseConstraint($andConstraints[0]); }