From 69e5561c2510596a374188b6fb6a1a875afe3835 Mon Sep 17 00:00:00 2001 From: Hassan Amouhzi Date: Sun, 7 Jun 2015 10:21:12 +0200 Subject: [PATCH 1/6] Fix code style in class Constraint --- src/Version/Constraint.php | 56 ++++++++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/src/Version/Constraint.php b/src/Version/Constraint.php index 7dc3a0b..7821b4a 100644 --- a/src/Version/Constraint.php +++ b/src/Version/Constraint.php @@ -14,7 +14,7 @@ abstract class Constraint * @param Constraint $constraint * @return bool */ - public abstract function matches(Constraint $constraint); + abstract public function matches(Constraint $constraint); /** * Parse a string and return a Constraint. @@ -39,7 +39,7 @@ public static function parse($input) } if (count($input) > 1) { - $constraints = array(); + $constraints = []; foreach ($input as $constraint) { $constraints[] = self::parse($constraint); } @@ -68,7 +68,7 @@ public static function parse($input) '(?:' . Stability::REGEX . ')?' . '$/'; - if(!preg_match($regex, $input, $matches)) { + if (!preg_match($regex, $input, $matches)) { throw new \UnexpectedValueException('Invalid type: ' . $input); } @@ -79,12 +79,20 @@ public static function parse($input) } $operator = new Operator($operator); - $parts = array(); + $parts = []; - if (isset($matches[2]) && strlen($matches[2]) > 0) $parts[] = $matches[2]; - if (isset($matches[3]) && strlen($matches[3]) > 0) $parts[] = $matches[3]; - if (isset($matches[4]) && strlen($matches[4]) > 0) $parts[] = $matches[4]; - if (isset($matches[5]) && strlen($matches[5]) > 0) $parts[] = $matches[5]; + if (isset($matches[2]) && strlen($matches[2]) > 0) { + $parts[] = $matches[2]; + } + if (isset($matches[3]) && strlen($matches[3]) > 0) { + $parts[] = $matches[3]; + } + if (isset($matches[4]) && strlen($matches[4]) > 0) { + $parts[] = $matches[4]; + } + if (isset($matches[5]) && strlen($matches[5]) > 0) { + $parts[] = $matches[5]; + } if ((string)$operator == '~') { $end = count($parts); @@ -135,16 +143,22 @@ public static function parse($input) } $version = new Version($parts[0]); - if (isset($parts[1])) $version->setMinor($parts[1]); - if (isset($parts[2])) $version->setRevision($parts[2]); - if (isset($parts[3])) $version->setMicro($parts[3]); + if (isset($parts[1])) { + $version->setMinor($parts[1]); + } + if (isset($parts[2])) { + $version->setRevision($parts[2]); + } + if (isset($parts[3])) { + $version->setMicro($parts[3]); + } if (isset($matches[6]) && strlen($matches[6]) > 0) { if (strtolower($matches[5]) == 'rc') { $stability = 'RC'; - } elseif (in_array(strtolower($matches[6]), array('pl', 'patch', 'p'))) { + } elseif (in_array(strtolower($matches[6]), ['pl', 'patch', 'p'])) { $stability = 'patch'; - } elseif (in_array(strtolower($matches[6]), array('beta', 'b'))) { + } elseif (in_array(strtolower($matches[6]), ['beta', 'b'])) { $stability = 'beta'; } elseif (strtolower($matches[6]) == 'stable') { $stability = 'stable'; @@ -163,9 +177,15 @@ public static function parse($input) die; } $maxVersion = new Version($max[0]); - if (isset($max[1])) $maxVersion->setMinor($max[1]); - if (isset($max[2])) $maxVersion->setRevision($max[2]); - if (isset($max[3])) $maxVersion->setMicro($max[3]); + if (isset($max[1])) { + $maxVersion->setMinor($max[1]); + } + if (isset($max[2])) { + $maxVersion->setRevision($max[2]); + } + if (isset($max[3])) { + $maxVersion->setMicro($max[3]); + } if ((string)$version == '0.0.0.0') { return new SimpleConstraint(new Operator('<'), $maxVersion); @@ -173,10 +193,10 @@ public static function parse($input) if (isset($matches[6]) && strtolower($matches[6]) == 'stable') { $version->setStability(new Stability()); } - return new MultiConstraint(array( + return new MultiConstraint([ new SimpleConstraint(new Operator('>='), $version), new SimpleConstraint(new Operator('<'), $maxVersion) - )); + ]); } } From ed21f243132dc1fda7d4a160ddc563b1701b6656 Mon Sep 17 00:00:00 2001 From: Hassan Amouhzi Date: Sun, 7 Jun 2015 10:21:56 +0200 Subject: [PATCH 2/6] Check Code Style only once is enough --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c9119f0..cb17573 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,6 @@ matrix: - EXECUTE_CS_CHECK=true - php: 5.6 env: - - EXECUTE_CS_CHECK=true - EXECUTE_TEST_COVERALLS=true - php: 7 - php: hhvm From 5fc8fb93a4d4811686f50de7c03fbc2613a7ea08 Mon Sep 17 00:00:00 2001 From: Hassan Amouhzi Date: Sun, 7 Jun 2015 10:24:03 +0200 Subject: [PATCH 3/6] PHP 5.3 is no more supported in version 3.0 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cb17573..944eec2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ cache: matrix: fast_finish: true include: - - php: 5.3 - php: 5.4 - php: 5.5 env: From b251289025237263a5f4b19b2917a8d49035fe83 Mon Sep 17 00:00:00 2001 From: Hassan Amouhzi Date: Sun, 7 Jun 2015 10:24:46 +0200 Subject: [PATCH 4/6] PHP 5.3 is no more supported --- CHANGELOG | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 7e246ac..decf4f8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ -2.2.0 (unreleased) +3.0.0 (unreleased) - New: Added helper class to enable use of inbuilt PHP sort methods (jenolan) + - PHP 5.3 is no more supported 2.1.1 - Fix: Missed that there was a regex as well as inline parsing (jenolan) From a1934b38f75ab63a45d0c3f28ee7510d3029d08f Mon Sep 17 00:00:00 2001 From: Hassan Amouhzi Date: Sun, 7 Jun 2015 18:16:06 +0200 Subject: [PATCH 5/6] Using short_array_syntax for master branch --- .php_cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.php_cs b/.php_cs index 4c78b5e..44df0df 100644 --- a/.php_cs +++ b/.php_cs @@ -30,7 +30,7 @@ $config->fixers( 'object_operator', 'php_closing_tag', 'remove_lines_between_uses', - 'long_array_syntax', + 'short_array_syntax', 'short_tag', 'standardize_not_equal', 'trailing_spaces', From 5a3f17a41b449e25d9f83a4503d02e977ca9ebb1 Mon Sep 17 00:00:00 2001 From: Hassan Amouhzi Date: Sun, 7 Jun 2015 18:18:01 +0200 Subject: [PATCH 6/6] Code style fix --- src/Version/Constraint/MultiConstraint.php | 8 +- src/Version/Constraint/SimpleConstraint.php | 12 +- src/Version/Operator.php | 6 +- src/Version/Version.php | 2 +- tests/Version/ConstraintTest.php | 874 ++++++++++---------- tests/Version/VersionTest.php | 94 +-- 6 files changed, 498 insertions(+), 498 deletions(-) diff --git a/src/Version/Constraint/MultiConstraint.php b/src/Version/Constraint/MultiConstraint.php index 12e43d0..faf5045 100644 --- a/src/Version/Constraint/MultiConstraint.php +++ b/src/Version/Constraint/MultiConstraint.php @@ -65,10 +65,10 @@ public function isSubsetOf(Constraint $constraint) $max2 instanceof SimpleConstraint ) { if ( - in_array((string) $min1->getOperator(), array('>', '>=')) && - in_array((string) $min2->getOperator(), array('>', '>=')) && - in_array((string) $max1->getOperator(), array('<', '<=')) && - in_array((string) $max2->getOperator(), array('<', '<=')) + in_array((string) $min1->getOperator(), ['>', '>=']) && + in_array((string) $min2->getOperator(), ['>', '>=']) && + in_array((string) $max1->getOperator(), ['<', '<=']) && + in_array((string) $max2->getOperator(), ['<', '<=']) ) { return $min1->isSubsetOf($min2) && diff --git a/src/Version/Constraint/SimpleConstraint.php b/src/Version/Constraint/SimpleConstraint.php index c858938..b88cbb9 100644 --- a/src/Version/Constraint/SimpleConstraint.php +++ b/src/Version/Constraint/SimpleConstraint.php @@ -138,7 +138,7 @@ public function isSubsetOf(Constraint $constraint) return false; } // > | >= VS * expect = - if (in_array((string) $this->getOperator(), array('>', '>='))) { + if (in_array((string) $this->getOperator(), ['>', '>='])) { // > VS > OR >= VS >= OR > VS >= if ((string) $constraint->getOperator() == (string) $this->getOperator() || (string) $constraint->getOperator() == '>=' @@ -146,7 +146,7 @@ public function isSubsetOf(Constraint $constraint) return $this->version->compare($constraint->version) >= 0; } // > | >= VS <,<= - if (in_array((string) $constraint->getOperator(), array('<', '<='))) { + if (in_array((string) $constraint->getOperator(), ['<', '<='])) { return false; } // >= VS * expect =,>=,<,<= @@ -157,13 +157,13 @@ public function isSubsetOf(Constraint $constraint) return $this->version->compare($constraint->version) >= 0; } } - if (in_array((string) $this->getOperator(), array('<', '<='))) { + if (in_array((string) $this->getOperator(), ['<', '<='])) { if ((string) $constraint->getOperator() == (string) $this->getOperator() || (string) $constraint->getOperator() == '<=' ) { return $this->version->compare($constraint->version) <= 0; } - if (in_array((string) $constraint->getOperator(), array('>', '>='))) { + if (in_array((string) $constraint->getOperator(), ['>', '>='])) { return false; } if ((string) $this->getOperator() == '<=') { @@ -173,8 +173,8 @@ public function isSubsetOf(Constraint $constraint) return $this->version->compare($constraint->version) <= 0; } } - if (in_array((string) $this->getOperator(), array('<>', '!='))) { - if (in_array((string) $constraint->getOperator(), array('<>', '!='))) { + if (in_array((string) $this->getOperator(), ['<>', '!='])) { + if (in_array((string) $constraint->getOperator(), ['<>', '!='])) { return $this->version->compare($constraint->version) == 0; } return false; diff --git a/src/Version/Operator.php b/src/Version/Operator.php index 83be319..c92f5ef 100644 --- a/src/Version/Operator.php +++ b/src/Version/Operator.php @@ -13,11 +13,11 @@ public function __construct($operator) if ($operator == '==') { $operator = '='; } - if (!in_array($operator, array('=', '<', '>', '<=', '>=', '<>', '!=', '~'))) { - $propositions = array( + if (!in_array($operator, ['=', '<', '>', '<=', '>=', '<>', '!=', '~'])) { + $propositions = [ '~>' => '~', '!' => '!=' - ); + ]; throw new \UnexpectedValueException( 'Invalid operator "' . $operator . '", you probably meant to use the "' . $propositions[$operator] . diff --git a/src/Version/Version.php b/src/Version/Version.php index f9fc8ff..b1660f8 100644 --- a/src/Version/Version.php +++ b/src/Version/Version.php @@ -70,7 +70,7 @@ public static function parse($input) throw new \UnexpectedValueException('Invalid version: ' . $input); } - $numbers = array(); + $numbers = []; if (isset($matches[1]) && strlen($matches[1]) > 0) { $numbers[] = $matches[1]; diff --git a/tests/Version/ConstraintTest.php b/tests/Version/ConstraintTest.php index 4c461b4..4d30f27 100644 --- a/tests/Version/ConstraintTest.php +++ b/tests/Version/ConstraintTest.php @@ -26,68 +26,68 @@ public function testParseConstraintsSimple($input, $expected, $message = '') public function simpleConstraints() { - return array( - array( + return [ + [ '<1.2.3.4-stable', new SimpleConstraint(new Operator('<'), Version::parse('1.2.3.4')), 'lesser than override' - ), + ], 'match any' => - array( + [ '*', new AnythingConstraint() - ), + ], 'match any/2' => - array( + [ '*.*', new AnythingConstraint() - ), + ], 'match any/3' => - array( + [ '*.x.*', new AnythingConstraint() - ), - 'match any/4' => array('x.x.x.*', - new AnythingConstraint()), - 'not equal' => array('<>1.0.0', + ], + 'match any/4' => ['x.x.x.*', + new AnythingConstraint()], + 'not equal' => ['<>1.0.0', new SimpleConstraint(new Operator('<>'), - Version::parse('1.0.0.0'))), - 'not equal/2' => array('!=1.0.0', + Version::parse('1.0.0.0'))], + 'not equal/2' => ['!=1.0.0', new SimpleConstraint(new Operator('!='), - Version::parse('1.0.0.0'))), - 'greater than' => array('>1.0.0', + Version::parse('1.0.0.0'))], + 'greater than' => ['>1.0.0', new SimpleConstraint(new Operator('>'), - Version::parse('1.0.0.0'))), + Version::parse('1.0.0.0'))], 'lesser than' => - array( + [ '<1.2.3.4', new SimpleConstraint(new Operator('<'), Version::parse('1.2.3.4')) - ), - 'less/eq than' => array('<=1.2.3', + ], + 'less/eq than' => ['<=1.2.3', new SimpleConstraint(new Operator('<='), - Version::parse('1.2.3.0'))), - 'great/eq than' => array('>=1.2.3', + Version::parse('1.2.3.0'))], + 'great/eq than' => ['>=1.2.3', new SimpleConstraint(new Operator('>='), - Version::parse('1.2.3.0'))), - 'equals' => array('=1.2.3', + Version::parse('1.2.3.0'))], + 'equals' => ['=1.2.3', new SimpleConstraint(new Operator('='), - Version::parse('1.2.3.0'))), - 'double equals' => array('==1.2.3', + Version::parse('1.2.3.0'))], + 'double equals' => ['==1.2.3', new SimpleConstraint(new Operator('='), - Version::parse('1.2.3.0'))), - 'no op means eq' => array('1.2.3', + Version::parse('1.2.3.0'))], + 'no op means eq' => ['1.2.3', new SimpleConstraint(new Operator('='), - Version::parse('1.2.3.0'))), - 'completes version' => array('=1.0', + Version::parse('1.2.3.0'))], + 'completes version' => ['=1.0', new SimpleConstraint(new Operator('='), - Version::parse('1.0.0.0'))), - 'shorthand beta' => array('1.2.3b5', + Version::parse('1.0.0.0'))], + 'shorthand beta' => ['1.2.3b5', new SimpleConstraint(new Operator('='), - Version::parse('1.2.3.0-beta5'))), - 'accepts spaces' => array('>= 1.2.3', + Version::parse('1.2.3.0-beta5'))], + 'accepts spaces' => ['>= 1.2.3', new SimpleConstraint(new Operator('>='), - Version::parse('1.2.3.0'))), - ); + Version::parse('1.2.3.0'))], + ]; } /** @@ -108,7 +108,7 @@ public function testParseConstraintsNudgesRubyDevsTowardsThePathOfRighteousness( public function testParseConstraintsWildcard($input, $min, $max) { if ($min) { - $expected = new MultiConstraint(array($min, $max)); + $expected = new MultiConstraint([$min, $max]); } else { $expected = $max; } @@ -118,21 +118,21 @@ public function testParseConstraintsWildcard($input, $min, $max) public function wildcardConstraints() { - return array( - array('2.*', new SimpleConstraint(new Operator('>='), Version::parse('2.0.0.0')), - new SimpleConstraint(new Operator('<'), Version::parse('3.0.0.0'))), - array('2.0.*', new SimpleConstraint(new Operator('>='), Version::parse('2.0.0.0')), - new SimpleConstraint(new Operator('<'), Version::parse('2.1.0.0'))), - array('2.2.x', new SimpleConstraint(new Operator('>='), Version::parse('2.2.0.0')), - new SimpleConstraint(new Operator('<'), Version::parse('2.3.0.0'))), - array('2.1.3.*', new SimpleConstraint(new Operator('>='), Version::parse('2.1.3.0')), - new SimpleConstraint(new Operator('<'), Version::parse('2.1.4.0'))), - array('20.*', new SimpleConstraint(new Operator('>='), Version::parse('20.0.0.0')), - new SimpleConstraint(new Operator('<'), Version::parse('21.0.0.0'))), - array('2.10.x', new SimpleConstraint(new Operator('>='), Version::parse('2.10.0.0')), - new SimpleConstraint(new Operator('<'), Version::parse('2.11.0.0'))), - array('0.*', null, new SimpleConstraint(new Operator('<'), Version::parse('1.0.0.0'))), - ); + return [ + ['2.*', new SimpleConstraint(new Operator('>='), Version::parse('2.0.0.0')), + new SimpleConstraint(new Operator('<'), Version::parse('3.0.0.0'))], + ['2.0.*', new SimpleConstraint(new Operator('>='), Version::parse('2.0.0.0')), + new SimpleConstraint(new Operator('<'), Version::parse('2.1.0.0'))], + ['2.2.x', new SimpleConstraint(new Operator('>='), Version::parse('2.2.0.0')), + new SimpleConstraint(new Operator('<'), Version::parse('2.3.0.0'))], + ['2.1.3.*', new SimpleConstraint(new Operator('>='), Version::parse('2.1.3.0')), + new SimpleConstraint(new Operator('<'), Version::parse('2.1.4.0'))], + ['20.*', new SimpleConstraint(new Operator('>='), Version::parse('20.0.0.0')), + new SimpleConstraint(new Operator('<'), Version::parse('21.0.0.0'))], + ['2.10.x', new SimpleConstraint(new Operator('>='), Version::parse('2.10.0.0')), + new SimpleConstraint(new Operator('<'), Version::parse('2.11.0.0'))], + ['0.*', null, new SimpleConstraint(new Operator('<'), Version::parse('1.0.0.0'))], + ]; } /** @@ -144,7 +144,7 @@ public function wildcardConstraints() public function testParseTildeWildcard($input, $min, $max) { if ($min) { - $expected = new MultiConstraint(array($min, $max)); + $expected = new MultiConstraint([$min, $max]); } else { $expected = $max; } @@ -158,37 +158,37 @@ public function testParseTildeWildcard($input, $min, $max) public function tildeConstraints() { - return array( - array('~1', new SimpleConstraint(new Operator('>='), Version::parse('1.0.0.0')), - new SimpleConstraint(new Operator('<'), Version::parse('2.0.0.0'))), - array('~1.0', new SimpleConstraint(new Operator('>='), Version::parse('1.0.0.0')), - new SimpleConstraint(new Operator('<'), Version::parse('2.0.0.0'))), - array('~1.0.0', new SimpleConstraint(new Operator('>='), Version::parse('1.0.0.0')), - new SimpleConstraint(new Operator('<'), Version::parse('1.1.0.0'))), - array('~1.2', new SimpleConstraint(new Operator('>='), Version::parse('1.2.0.0')), - new SimpleConstraint(new Operator('<'), Version::parse('2.0.0.0'))), - array('~1.2.3', new SimpleConstraint(new Operator('>='), Version::parse('1.2.3.0')), - new SimpleConstraint(new Operator('<'), Version::parse('1.3.0.0'))), - array('~1.2.3.4', new SimpleConstraint(new Operator('>='), Version::parse('1.2.3.4')), - new SimpleConstraint(new Operator('<'), Version::parse('1.2.4.0'))), - array('~1.2-beta',new SimpleConstraint(new Operator('>='), Version::parse('1.2.0.0-beta')), - new SimpleConstraint(new Operator('<'), Version::parse('2.0.0.0'))), - array('~1.2-b2', new SimpleConstraint(new Operator('>='), Version::parse('1.2.0.0-beta2')), - new SimpleConstraint(new Operator('<'), Version::parse('2.0.0.0'))), - array('~1.2-BETA2', new SimpleConstraint(new Operator('>='), Version::parse('1.2.0.0-beta2')), - new SimpleConstraint(new Operator('<'), Version::parse('2.0.0.0'))), - array('~1.2.2', new SimpleConstraint(new Operator('>='), Version::parse('1.2.2.0')), - new SimpleConstraint(new Operator('<'), Version::parse('1.3.0.0'))), - array('~1.2.2-stable', new SimpleConstraint(new Operator('>='), Version::parse('1.2.2.0-stable')), - new SimpleConstraint(new Operator('<'), Version::parse('1.3.0.0'))), - ); + return [ + ['~1', new SimpleConstraint(new Operator('>='), Version::parse('1.0.0.0')), + new SimpleConstraint(new Operator('<'), Version::parse('2.0.0.0'))], + ['~1.0', new SimpleConstraint(new Operator('>='), Version::parse('1.0.0.0')), + new SimpleConstraint(new Operator('<'), Version::parse('2.0.0.0'))], + ['~1.0.0', new SimpleConstraint(new Operator('>='), Version::parse('1.0.0.0')), + new SimpleConstraint(new Operator('<'), Version::parse('1.1.0.0'))], + ['~1.2', new SimpleConstraint(new Operator('>='), Version::parse('1.2.0.0')), + new SimpleConstraint(new Operator('<'), Version::parse('2.0.0.0'))], + ['~1.2.3', new SimpleConstraint(new Operator('>='), Version::parse('1.2.3.0')), + new SimpleConstraint(new Operator('<'), Version::parse('1.3.0.0'))], + ['~1.2.3.4', new SimpleConstraint(new Operator('>='), Version::parse('1.2.3.4')), + new SimpleConstraint(new Operator('<'), Version::parse('1.2.4.0'))], + ['~1.2-beta',new SimpleConstraint(new Operator('>='), Version::parse('1.2.0.0-beta')), + new SimpleConstraint(new Operator('<'), Version::parse('2.0.0.0'))], + ['~1.2-b2', new SimpleConstraint(new Operator('>='), Version::parse('1.2.0.0-beta2')), + new SimpleConstraint(new Operator('<'), Version::parse('2.0.0.0'))], + ['~1.2-BETA2', new SimpleConstraint(new Operator('>='), Version::parse('1.2.0.0-beta2')), + new SimpleConstraint(new Operator('<'), Version::parse('2.0.0.0'))], + ['~1.2.2', new SimpleConstraint(new Operator('>='), Version::parse('1.2.2.0')), + new SimpleConstraint(new Operator('<'), Version::parse('1.3.0.0'))], + ['~1.2.2-stable', new SimpleConstraint(new Operator('>='), Version::parse('1.2.2.0-stable')), + new SimpleConstraint(new Operator('<'), Version::parse('1.3.0.0'))], + ]; } public function testParseConstraintsMulti() { $first = new SimpleConstraint(new Operator('>'), Version::parse('2.0.0.0')); $second = new SimpleConstraint(new Operator('<='), Version::parse('3.0.0.0')); - $multi = new MultiConstraint(array($first, $second)); + $multi = new MultiConstraint([$first, $second]); $this->assertSame((string) $multi, (string) Constraint::parse('>2.0,<=3.0')); } @@ -197,8 +197,8 @@ public function testParseConstraintsMultiDisjunctiveHasPrioOverConjuctive() $first = new SimpleConstraint(new Operator('>'), Version::parse('2.0.0.0')); $second = new SimpleConstraint(new Operator('<'), Version::parse('2.0.5.0')); $third = new SimpleConstraint(new Operator('>'), Version::parse('2.0.6.0')); - $multi1 = new MultiConstraint(array($first, $second)); - $multi2 = new MultiConstraint(array($multi1, $third), false); + $multi1 = new MultiConstraint([$first, $second]); + $multi2 = new MultiConstraint([$multi1, $third], false); $this->assertSame((string) $multi2, (string) Constraint::parse('>2.0,<2.0.5 | >2.0.6')); } @@ -206,7 +206,7 @@ public function testParseConstraintsMultiWithStabilities() { $first = new SimpleConstraint(new Operator('>'), Version::parse('2.0.0.0')); $second = new SimpleConstraint(new Operator('<='), Version::parse('3.0.0.0')); - $multi = new MultiConstraint(array($first, $second)); + $multi = new MultiConstraint([$first, $second]); $this->assertSame((string) $multi, (string) Constraint::parse('>2.0,<=3.0')); } @@ -222,10 +222,10 @@ public function testParseConstraintsFails($input) public function failingConstraints() { - return array( - 'empty ' => array(''), - 'invalid version' => array('1.0.0-meh'), - ); + return [ + 'empty ' => [''], + 'invalid version' => ['1.0.0-meh'], + ]; } /** @@ -249,231 +249,231 @@ public function testIsSubsetOf($constraint1, $constraint2, $expected) public function isSubsetOfProvider() { - return array( - array('1.0', '1.0', true), - array('1.5.8', '1.5.8', true), - array('1.0.0', '1.0', true), - array('1.5.0', '2.5', false), - array('2.3.0', '1.5.8', false), + return [ + ['1.0', '1.0', true], + ['1.5.8', '1.5.8', true], + ['1.0.0', '1.0', true], + ['1.5.0', '2.5', false], + ['2.3.0', '1.5.8', false], - array('2.3.0', '>1.0', true), - array('2.3.0', '>2.3', false), - array('2.3.0', '>2.5', false), - array('=1.0.0.0', '>1.0.0.0', false), - - array('1.0.0', '>=1.0', true), - array('2.3.0', '>=1.0', true), - array('2.3.0', '>=5.2.0', false), - - array('2.3.0', '<3.5.8', true), - array('2.3.0', '<2.3', false), - array('2.3.0', '<1.5.8', false), - - array('2.3.0', '<=2.3', true), - array('2.3.0', '<=2.3.0.0', true), - array('2.3.0', '<=0.3.0.0', false), - - array('1.5.0', '!=2.5', true), - array('3.5.0', '!=2.5', true), - array('2.3.0', '!=2.3', false), - - array('1.5.0', '<>2.5', true), - array('3.5.0', '<>2.5', true), - array('2.3.0', '<>2.3', false), - - array('2.5.0', '~2.5', true), - array('2.5.1', '~2.5', true), - array('2.7.0', '~2.5', true), - array('3.0.0', '~2.5', false), + ['2.3.0', '>1.0', true], + ['2.3.0', '>2.3', false], + ['2.3.0', '>2.5', false], + ['=1.0.0.0', '>1.0.0.0', false], + + ['1.0.0', '>=1.0', true], + ['2.3.0', '>=1.0', true], + ['2.3.0', '>=5.2.0', false], + + ['2.3.0', '<3.5.8', true], + ['2.3.0', '<2.3', false], + ['2.3.0', '<1.5.8', false], + + ['2.3.0', '<=2.3', true], + ['2.3.0', '<=2.3.0.0', true], + ['2.3.0', '<=0.3.0.0', false], + + ['1.5.0', '!=2.5', true], + ['3.5.0', '!=2.5', true], + ['2.3.0', '!=2.3', false], + + ['1.5.0', '<>2.5', true], + ['3.5.0', '<>2.5', true], + ['2.3.0', '<>2.3', false], + + ['2.5.0', '~2.5', true], + ['2.5.1', '~2.5', true], + ['2.7.0', '~2.5', true], + ['3.0.0', '~2.5', false], - array('2.5.0', '~2.5.3', false), - array('2.5.1', '~2.5.3', false), - array('2.5.3', '~2.5.3', true), - array('2.5.4', '~2.5.3', true), - array('2.5.4.5', '~2.5.3', true), - array('2.7.0', '~2.5.3', false), - array('3.0.0', '~2.5.3', false), + ['2.5.0', '~2.5.3', false], + ['2.5.1', '~2.5.3', false], + ['2.5.3', '~2.5.3', true], + ['2.5.4', '~2.5.3', true], + ['2.5.4.5', '~2.5.3', true], + ['2.7.0', '~2.5.3', false], + ['3.0.0', '~2.5.3', false], - array('>2.3.0', '1.5.8', false), + ['>2.3.0', '1.5.8', false], - array('>2.3.0', '>1.5.8', true), - array('>2.3.0', '>2.3.0', true), - array('>2.3.0', '>2.3.0.1', false), + ['>2.3.0', '>1.5.8', true], + ['>2.3.0', '>2.3.0', true], + ['>2.3.0', '>2.3.0.1', false], - array('>2.3.0', '>=1.5.8', true), - array('>2.3.0', '>=2.3.0', true), - array('>2.3.0', '>=2.3.0.1', false), + ['>2.3.0', '>=1.5.8', true], + ['>2.3.0', '>=2.3.0', true], + ['>2.3.0', '>=2.3.0.1', false], - array('>2.3.0', '<1.5.8', false), - array('>2.3.0', '<2.3.0', false), - array('>2.3.0', '<2.3.0.1', false), + ['>2.3.0', '<1.5.8', false], + ['>2.3.0', '<2.3.0', false], + ['>2.3.0', '<2.3.0.1', false], - array('>2.3.0', '<=1.5.8', false), - array('>2.3.0', '<=2.3.0', false), - array('>2.3.0', '<=2.3.0.1', false), + ['>2.3.0', '<=1.5.8', false], + ['>2.3.0', '<=2.3.0', false], + ['>2.3.0', '<=2.3.0.1', false], - array('>2.3.0', '!=1.5.8', true), - array('>2.3.0', '!=2.3.0', true), - array('>2.3.0', '!=2.3.0.1', false), + ['>2.3.0', '!=1.5.8', true], + ['>2.3.0', '!=2.3.0', true], + ['>2.3.0', '!=2.3.0.1', false], - array('>2.3.0', '<>1.5.8', true), - array('>2.3.0', '<>2.3.0', true), - array('>2.3.0', '<>2.3.0.1', false), + ['>2.3.0', '<>1.5.8', true], + ['>2.3.0', '<>2.3.0', true], + ['>2.3.0', '<>2.3.0.1', false], - array('>2.3.0', '~1.5.8', false), - array('>2.3.0', '~2.3', false), - array('>2.3.0', '~2.4.', false), + ['>2.3.0', '~1.5.8', false], + ['>2.3.0', '~2.3', false], + ['>2.3.0', '~2.4.', false], - array('>=2.3.0', '1.5.8', false), + ['>=2.3.0', '1.5.8', false], - array('>=2.3.0', '>1.5.8', true), - array('>=2.3.0', '>2.3', false), - array('>=2.3.0', '>2.3.0.1', false), + ['>=2.3.0', '>1.5.8', true], + ['>=2.3.0', '>2.3', false], + ['>=2.3.0', '>2.3.0.1', false], - array('>=2.3.0', '>=1.5.8', true), - array('>=2.3.0', '>=2.3', true), - array('>=2.3.0', '>=2.3.0.1', false), + ['>=2.3.0', '>=1.5.8', true], + ['>=2.3.0', '>=2.3', true], + ['>=2.3.0', '>=2.3.0.1', false], - array('>=2.3.0', '<1.5.8', false), - array('>=2.3.0', '<2.3', false), - array('>=2.3.0', '<2.3.0.1', false), + ['>=2.3.0', '<1.5.8', false], + ['>=2.3.0', '<2.3', false], + ['>=2.3.0', '<2.3.0.1', false], - array('>=2.3.0', '<=1.5.8', false), - array('>=2.3.0', '<=2.3', false), - array('>=2.3.0', '<=2.3.0.1', false), + ['>=2.3.0', '<=1.5.8', false], + ['>=2.3.0', '<=2.3', false], + ['>=2.3.0', '<=2.3.0.1', false], - array('>=2.3.0', '!=1.5.8', true), - array('>=2.3.0', '!=2.3', false), - array('>=2.3.0', '!=2.3.0.1', false), + ['>=2.3.0', '!=1.5.8', true], + ['>=2.3.0', '!=2.3', false], + ['>=2.3.0', '!=2.3.0.1', false], - array('>=2.3.0', '<>1.5.8', true), - array('>=2.3.0', '<>2.3', false), - array('>=2.3.0', '<>2.3.0.1', false), + ['>=2.3.0', '<>1.5.8', true], + ['>=2.3.0', '<>2.3', false], + ['>=2.3.0', '<>2.3.0.1', false], - array('>=2.3.0', '~1.5.8', false), - array('>=2.3.0', '~2.3', false), - array('>=2.3.0', '~2.4.', false), + ['>=2.3.0', '~1.5.8', false], + ['>=2.3.0', '~2.3', false], + ['>=2.3.0', '~2.4.', false], - array('<2.3.0', '1.5.8', false), + ['<2.3.0', '1.5.8', false], - array('<2.3.0', '>1.5.8', false), - array('<2.3.0', '>2.3.0', false), - array('<2.3.0', '>2.3.0.1', false), + ['<2.3.0', '>1.5.8', false], + ['<2.3.0', '>2.3.0', false], + ['<2.3.0', '>2.3.0.1', false], - array('<2.3.0', '>=1.5.8', false), - array('<2.3.0', '>=2.3.0', false), - array('<2.3.0', '>=2.3.0.1', false), + ['<2.3.0', '>=1.5.8', false], + ['<2.3.0', '>=2.3.0', false], + ['<2.3.0', '>=2.3.0.1', false], - array('<2.3.0', '<1.5.8', false), - array('<2.3.0', '<2.3.0', true), - array('<2.3.0', '<2.3.0.1', true), + ['<2.3.0', '<1.5.8', false], + ['<2.3.0', '<2.3.0', true], + ['<2.3.0', '<2.3.0.1', true], - array('<2.3.0', '<=1.5.8', false), - array('<2.3.0', '<=2.3.0', true), - array('<2.3.0', '<=2.3.0.1', true), + ['<2.3.0', '<=1.5.8', false], + ['<2.3.0', '<=2.3.0', true], + ['<2.3.0', '<=2.3.0.1', true], - array('<2.3.0', '!=1.5.8', false), - array('<2.3.0', '!=2.3.0', true), - array('<2.3.0', '!=2.3.0.1', true), + ['<2.3.0', '!=1.5.8', false], + ['<2.3.0', '!=2.3.0', true], + ['<2.3.0', '!=2.3.0.1', true], - array('<2.3.0', '<>1.5.8', false), - array('<2.3.0', '<>2.3.0', true), - array('<2.3.0', '<>2.3.0.1', true), + ['<2.3.0', '<>1.5.8', false], + ['<2.3.0', '<>2.3.0', true], + ['<2.3.0', '<>2.3.0.1', true], - array('<2.3.0', '~1.5.8', false), - array('<2.3.0', '~2.3', false), - array('<2.3.0', '~2.4.', false), + ['<2.3.0', '~1.5.8', false], + ['<2.3.0', '~2.3', false], + ['<2.3.0', '~2.4.', false], - array('<=2.3.0', '1.5.8', false), + ['<=2.3.0', '1.5.8', false], - array('<=2.3.0', '>1.5.8', false), - array('<=2.3.0', '>2.3.0', false), - array('<=2.3.0', '>2.3.0.1', false), + ['<=2.3.0', '>1.5.8', false], + ['<=2.3.0', '>2.3.0', false], + ['<=2.3.0', '>2.3.0.1', false], - array('<=2.3.0', '>=1.5.8', false), - array('<=2.3.0', '>=2.3.0', false), - array('<=2.3.0', '>=2.3.0.1', false), + ['<=2.3.0', '>=1.5.8', false], + ['<=2.3.0', '>=2.3.0', false], + ['<=2.3.0', '>=2.3.0.1', false], - array('<=2.3.0', '<1.5.8', false), - array('<=2.3.0', '<2.3.0', false), - array('<=2.3.0', '<2.3.0.1', true), + ['<=2.3.0', '<1.5.8', false], + ['<=2.3.0', '<2.3.0', false], + ['<=2.3.0', '<2.3.0.1', true], - array('<=2.3.0', '<=1.5.8', false), - array('<=2.3.0', '<=2.3.0', true), - array('<=2.3.0', '<=2.3.0.1', true), + ['<=2.3.0', '<=1.5.8', false], + ['<=2.3.0', '<=2.3.0', true], + ['<=2.3.0', '<=2.3.0.1', true], - array('<=2.3.0', '!=1.5.8', false), - array('<=2.3.0', '!=2.3.0', false), - array('<=2.3.0', '!=2.3.0.1', true), + ['<=2.3.0', '!=1.5.8', false], + ['<=2.3.0', '!=2.3.0', false], + ['<=2.3.0', '!=2.3.0.1', true], - array('<=2.3.0', '<>1.5.8', false), - array('<=2.3.0', '<>2.3.0', false), - array('<=2.3.0', '<>2.3.0.1', true), + ['<=2.3.0', '<>1.5.8', false], + ['<=2.3.0', '<>2.3.0', false], + ['<=2.3.0', '<>2.3.0.1', true], - array('<=2.3.0', '~1.5.8', false), - array('<=2.3.0', '~2.3', false), - array('<=2.3.0', '~2.4.', false), + ['<=2.3.0', '~1.5.8', false], + ['<=2.3.0', '~2.3', false], + ['<=2.3.0', '~2.4.', false], - array('!=2.3.0', '1.5.8', false), + ['!=2.3.0', '1.5.8', false], - array('<>2.3.0', '>1.5.8', false), - array('!=2.3.0', '>2.3.0', false), - array('<>2.3.0', '>2.3.0.1', false), + ['<>2.3.0', '>1.5.8', false], + ['!=2.3.0', '>2.3.0', false], + ['<>2.3.0', '>2.3.0.1', false], - array('!=2.3.0', '>=1.5.8', false), - array('<>2.3.0', '>=2.3.0', false), - array('!=2.3.0', '>=2.3.0.1', false), + ['!=2.3.0', '>=1.5.8', false], + ['<>2.3.0', '>=2.3.0', false], + ['!=2.3.0', '>=2.3.0.1', false], - array('<>2.3.0', '<1.5.8', false), - array('!=2.3.0', '<2.3.0', false), - array('<>2.3.0', '<2.3.0.1', false), + ['<>2.3.0', '<1.5.8', false], + ['!=2.3.0', '<2.3.0', false], + ['<>2.3.0', '<2.3.0.1', false], - array('!=2.3.0', '<=1.5.8', false), - array('<>2.3.0', '<=2.3.0', false), - array('!=2.3.0', '<=2.3.0.1', false), + ['!=2.3.0', '<=1.5.8', false], + ['<>2.3.0', '<=2.3.0', false], + ['!=2.3.0', '<=2.3.0.1', false], - array('<>2.3.0', '!=1.5.8', false), - array('!=2.3.0', '!=2.3.0.0', true), - array('<>2.3.0', '!=2.3.0.1', false), + ['<>2.3.0', '!=1.5.8', false], + ['!=2.3.0', '!=2.3.0.0', true], + ['<>2.3.0', '!=2.3.0.1', false], - array('!=2.3.0', '<>1.5.8', false), - array('<>2.3.0', '<>2.3', true), - array('!=2.3.0', '<>2.3.0.1', false), + ['!=2.3.0', '<>1.5.8', false], + ['<>2.3.0', '<>2.3', true], + ['!=2.3.0', '<>2.3.0.1', false], - array('!=2.3.0', '~1.5.8', false), - array('!=2.3.0', '~2.3', false), - array('!=2.3.0', '~2.4.', false), + ['!=2.3.0', '~1.5.8', false], + ['!=2.3.0', '~2.3', false], + ['!=2.3.0', '~2.4.', false], - array('~2.3.0', '1.5.8', false), + ['~2.3.0', '1.5.8', false], - array('~2.3.5', '>2.3.0', true), - array('~2.3.5', '>2.3.5', false), - array('~2.3.5', '>2.3.6', false), + ['~2.3.5', '>2.3.0', true], + ['~2.3.5', '>2.3.5', false], + ['~2.3.5', '>2.3.6', false], - array('~2.3.5', '>=2.3.0', true), - array('~2.3.5', '>=2.3.5', true), - array('~2.3.5', '>=2.3.6', false), + ['~2.3.5', '>=2.3.0', true], + ['~2.3.5', '>=2.3.5', true], + ['~2.3.5', '>=2.3.6', false], - array('~2.3.5', '<2.3.5', false), - array('~2.3.5', '<2.3.6', false), - array('~2.3.5', '<2.4.0', true), + ['~2.3.5', '<2.3.5', false], + ['~2.3.5', '<2.3.6', false], + ['~2.3.5', '<2.4.0', true], - array('~2.3.5', '<=2.3.5', false), - array('~2.3.5', '<=2.3.6', false), - array('~2.3.5', '<=2.4.0', true), + ['~2.3.5', '<=2.3.5', false], + ['~2.3.5', '<=2.3.6', false], + ['~2.3.5', '<=2.4.0', true], - array('~2.3.5', '!=2.3.0', true), - array('~2.3.5', '!=2.3.6', false), - array('~2.3.5', '<>2.4.0', true), + ['~2.3.5', '!=2.3.0', true], + ['~2.3.5', '!=2.3.6', false], + ['~2.3.5', '<>2.4.0', true], - array('~2.3.5', '~2.3', true), - array('~2.3.5', '~2.4', false), - array('~2.3.5', '~2.3', true), - array('~2.4.5', '~2.3', true), - array('~2.3', '~2.3.2', false), - array('~2.4', '~2.3.4', false), - array('~2.3.5', '~2.3.5', true), - ); + ['~2.3.5', '~2.3', true], + ['~2.3.5', '~2.4', false], + ['~2.3.5', '~2.3', true], + ['~2.4.5', '~2.3', true], + ['~2.3', '~2.3.2', false], + ['~2.4', '~2.3.4', false], + ['~2.3.5', '~2.3.5', true], + ]; } /** @@ -497,230 +497,230 @@ public function testMatches($constraint1, $constraint2, $expected) public function matchesProvider() { - return array( - array('1.0', '1.0', true), - array('1.5.8', '1.5.8', true), - array('1.0.0', '1.0', true), - array('1.5.0', '2.5', false), - array('2.3.0', '1.5.8', false), + return [ + ['1.0', '1.0', true], + ['1.5.8', '1.5.8', true], + ['1.0.0', '1.0', true], + ['1.5.0', '2.5', false], + ['2.3.0', '1.5.8', false], - array('2.3.0', '>1.0', true), - array('2.3.0', '>2.3', false), - array('2.3.0', '>2.5', false), - array('=1.0.0.0', '>1.0.0.0', false), - - array('1.0.0', '>=1.0', true), - array('2.3.0', '>=1.0', true), - array('2.3.0', '>=5.2.0', false), - - array('2.3.0', '<3.5.8', true), - array('2.3.0', '<2.3', false), - array('2.3.0', '<1.5.8', false), - - array('2.3.0', '<=2.3', true), - array('2.3.0', '<=2.3.0.0', true), - array('2.3.0', '<=0.3.0.0', false), - - array('1.5.0', '!=2.5', true), - array('3.5.0', '!=2.5', true), - array('2.3.0', '!=2.3', false), - - array('1.5.0', '<>2.5', true), - array('3.5.0', '<>2.5', true), - array('2.3.0', '<>2.3', false), - - array('2.5.0', '~2.5', true), - array('2.5.1', '~2.5', true), - array('2.7.0', '~2.5', true), - array('3.0.0', '~2.5', false), + ['2.3.0', '>1.0', true], + ['2.3.0', '>2.3', false], + ['2.3.0', '>2.5', false], + ['=1.0.0.0', '>1.0.0.0', false], + + ['1.0.0', '>=1.0', true], + ['2.3.0', '>=1.0', true], + ['2.3.0', '>=5.2.0', false], + + ['2.3.0', '<3.5.8', true], + ['2.3.0', '<2.3', false], + ['2.3.0', '<1.5.8', false], + + ['2.3.0', '<=2.3', true], + ['2.3.0', '<=2.3.0.0', true], + ['2.3.0', '<=0.3.0.0', false], + + ['1.5.0', '!=2.5', true], + ['3.5.0', '!=2.5', true], + ['2.3.0', '!=2.3', false], + + ['1.5.0', '<>2.5', true], + ['3.5.0', '<>2.5', true], + ['2.3.0', '<>2.3', false], + + ['2.5.0', '~2.5', true], + ['2.5.1', '~2.5', true], + ['2.7.0', '~2.5', true], + ['3.0.0', '~2.5', false], - array('2.5.0', '~2.5.3', false), - array('2.5.1', '~2.5.3', false), - array('2.5.3', '~2.5.3', true), - array('2.5.4', '~2.5.3', true), - array('2.5.4.5', '~2.5.3', true), - array('2.7.0', '~2.5.3', false), - array('3.0.0', '~2.5.3', false), + ['2.5.0', '~2.5.3', false], + ['2.5.1', '~2.5.3', false], + ['2.5.3', '~2.5.3', true], + ['2.5.4', '~2.5.3', true], + ['2.5.4.5', '~2.5.3', true], + ['2.7.0', '~2.5.3', false], + ['3.0.0', '~2.5.3', false], - array('>2.3.0', '1.5.8', false), + ['>2.3.0', '1.5.8', false], - array('>2.3.0', '>1.5.8', true), - array('>2.3.0', '>2.3.0', true), - array('>2.3.0', '>2.3.0.1', true), + ['>2.3.0', '>1.5.8', true], + ['>2.3.0', '>2.3.0', true], + ['>2.3.0', '>2.3.0.1', true], - array('>2.3.0', '>=1.5.8', true), - array('>2.3.0', '>=2.3.0', true), - array('>2.3.0', '>=2.3.0.1', true), + ['>2.3.0', '>=1.5.8', true], + ['>2.3.0', '>=2.3.0', true], + ['>2.3.0', '>=2.3.0.1', true], - array('>2.3.0', '<1.5.8', false), - array('>2.3.0', '<2.3.0', false), - array('>2.3.0', '<2.3.2', true), + ['>2.3.0', '<1.5.8', false], + ['>2.3.0', '<2.3.0', false], + ['>2.3.0', '<2.3.2', true], - array('>2.3.0', '<=1.5.8', false), - array('>2.3.0', '<=2.3.0', false), - array('>2.3.0', '<=2.3.0.1', true), + ['>2.3.0', '<=1.5.8', false], + ['>2.3.0', '<=2.3.0', false], + ['>2.3.0', '<=2.3.0.1', true], - array('>2.3.0', '!=1.5.8', true), - array('>2.3.0', '!=2.3.0', true), - array('>2.3.0', '!=2.3.0.1', true), + ['>2.3.0', '!=1.5.8', true], + ['>2.3.0', '!=2.3.0', true], + ['>2.3.0', '!=2.3.0.1', true], - array('>2.3.0', '<>1.5.8', true), - array('>2.3.0', '<>2.3.0', true), - array('>2.3.0', '<>2.3.0.1', true), + ['>2.3.0', '<>1.5.8', true], + ['>2.3.0', '<>2.3.0', true], + ['>2.3.0', '<>2.3.0.1', true], - array('>2.3.0', '~1.5.8', false), - array('>2.3.0', '~2.3', true), - array('>2.3.0', '~2.4', true), + ['>2.3.0', '~1.5.8', false], + ['>2.3.0', '~2.3', true], + ['>2.3.0', '~2.4', true], - array('>=2.3.0', '1.5.8', false), + ['>=2.3.0', '1.5.8', false], - array('>=2.3.0', '>1.5.8', true), - array('>=2.3.0', '>2.3', true), - array('>=2.3.0', '>2.3.0.1', true), + ['>=2.3.0', '>1.5.8', true], + ['>=2.3.0', '>2.3', true], + ['>=2.3.0', '>2.3.0.1', true], - array('>=2.3.0', '>=1.5.8', true), - array('>=2.3.0', '>=2.3', true), - array('>=2.3.0', '>=2.3.0.1', true), + ['>=2.3.0', '>=1.5.8', true], + ['>=2.3.0', '>=2.3', true], + ['>=2.3.0', '>=2.3.0.1', true], - array('>=2.3.0', '<1.5.8', false), - array('>=2.3.0', '<2.3', false), - array('>=2.3.0', '<2.3.0.1', true), + ['>=2.3.0', '<1.5.8', false], + ['>=2.3.0', '<2.3', false], + ['>=2.3.0', '<2.3.0.1', true], - array('>=2.3.0', '<=1.5.8', false), - array('>=2.3.0', '<=2.3', true), - array('>=2.3.0', '<=2.3.0.1', true), + ['>=2.3.0', '<=1.5.8', false], + ['>=2.3.0', '<=2.3', true], + ['>=2.3.0', '<=2.3.0.1', true], - array('>=2.3.0', '!=1.5.8', true), - array('>=2.3.0', '!=2.3', true), - array('>=2.3.0', '!=2.3.0.1', true), + ['>=2.3.0', '!=1.5.8', true], + ['>=2.3.0', '!=2.3', true], + ['>=2.3.0', '!=2.3.0.1', true], - array('>=2.3.0', '<>1.5.8', true), - array('>=2.3.0', '<>2.3', true), - array('>=2.3.0', '<>2.3.0.1', true), + ['>=2.3.0', '<>1.5.8', true], + ['>=2.3.0', '<>2.3', true], + ['>=2.3.0', '<>2.3.0.1', true], - array('>=2.3.0', '~1.5.8', false), - array('>=2.3.0', '~2.3', true), - array('>=2.3.0', '~2.4.', true), + ['>=2.3.0', '~1.5.8', false], + ['>=2.3.0', '~2.3', true], + ['>=2.3.0', '~2.4.', true], - array('<2.3.0', '1.5.8', true), + ['<2.3.0', '1.5.8', true], - array('<2.3.0', '>1.5.8', true), - array('<2.3.0', '>2.3.0', false), - array('<2.3.0', '>2.3.0.1', false), + ['<2.3.0', '>1.5.8', true], + ['<2.3.0', '>2.3.0', false], + ['<2.3.0', '>2.3.0.1', false], - array('<2.3.0', '>=1.5.8', true), - array('<2.3.0', '>=2.3.0', false), - array('<2.3.0', '>=2.3.0.1', false), + ['<2.3.0', '>=1.5.8', true], + ['<2.3.0', '>=2.3.0', false], + ['<2.3.0', '>=2.3.0.1', false], - array('<2.3.0', '<1.5.8', true), - array('<2.3.0', '<2.3.0', true), - array('<2.3.0', '<2.3.0.1', true), + ['<2.3.0', '<1.5.8', true], + ['<2.3.0', '<2.3.0', true], + ['<2.3.0', '<2.3.0.1', true], - array('<2.3.0', '<=1.5.8', true), - array('<2.3.0', '<=2.3.0', true), - array('<2.3.0', '<=2.3.0.1', true), + ['<2.3.0', '<=1.5.8', true], + ['<2.3.0', '<=2.3.0', true], + ['<2.3.0', '<=2.3.0.1', true], - array('<2.3.0', '!=1.5.8', true), - array('<2.3.0', '!=2.3.0', true), - array('<2.3.0', '!=2.3.0.1', true), + ['<2.3.0', '!=1.5.8', true], + ['<2.3.0', '!=2.3.0', true], + ['<2.3.0', '!=2.3.0.1', true], - array('<2.3.0', '<>1.5.8', true), - array('<2.3.0', '<>2.3.0', true), - array('<2.3.0', '<>2.3.0.1', true), + ['<2.3.0', '<>1.5.8', true], + ['<2.3.0', '<>2.3.0', true], + ['<2.3.0', '<>2.3.0.1', true], - array('<2.3.0', '~1.5.8', true), - array('<2.3.0', '~2.3', false), - array('<2.3.0', '~2.4.', false), + ['<2.3.0', '~1.5.8', true], + ['<2.3.0', '~2.3', false], + ['<2.3.0', '~2.4.', false], - array('<=2.3.0', '1.5.8', true), + ['<=2.3.0', '1.5.8', true], - array('<=2.3.0', '>1.5.8', true), - array('<=2.3.0', '>2.3.0', false), - array('<=2.3.0', '>2.3.0.1', false), + ['<=2.3.0', '>1.5.8', true], + ['<=2.3.0', '>2.3.0', false], + ['<=2.3.0', '>2.3.0.1', false], - array('<=2.3.0', '>=1.5.8', true), - array('<=2.3.0', '>=2.3.0', true), - array('<=2.3.0', '>=2.3.0.1', false), + ['<=2.3.0', '>=1.5.8', true], + ['<=2.3.0', '>=2.3.0', true], + ['<=2.3.0', '>=2.3.0.1', false], - array('<=2.3.0', '<1.5.8', true), - array('<=2.3.0', '<2.3.0', true), - array('<=2.3.0', '<2.3.0.1', true), + ['<=2.3.0', '<1.5.8', true], + ['<=2.3.0', '<2.3.0', true], + ['<=2.3.0', '<2.3.0.1', true], - array('<=2.3.0', '<=1.5.8', true), - array('<=2.3.0', '<=2.3.0', true), - array('<=2.3.0', '<=2.3.0.1', true), + ['<=2.3.0', '<=1.5.8', true], + ['<=2.3.0', '<=2.3.0', true], + ['<=2.3.0', '<=2.3.0.1', true], - array('<=2.3.0', '!=1.5.8', true), - array('<=2.3.0', '!=2.3.0', true), - array('<=2.3.0', '!=2.3.0.1', true), + ['<=2.3.0', '!=1.5.8', true], + ['<=2.3.0', '!=2.3.0', true], + ['<=2.3.0', '!=2.3.0.1', true], - array('<=2.3.0', '<>1.5.8', true), - array('<=2.3.0', '<>2.3.0', true), - array('<=2.3.0', '<>2.3.0.1', true), + ['<=2.3.0', '<>1.5.8', true], + ['<=2.3.0', '<>2.3.0', true], + ['<=2.3.0', '<>2.3.0.1', true], - array('<=2.3.0', '~1.5.8', true), - array('<=2.3.0', '~2.3', true), - array('<=2.3.0', '~2.4.', false), + ['<=2.3.0', '~1.5.8', true], + ['<=2.3.0', '~2.3', true], + ['<=2.3.0', '~2.4.', false], - array('!=2.3.0', '1.5.8', true), + ['!=2.3.0', '1.5.8', true], - array('<>2.3.0', '>1.5.8', true), - array('!=2.3.0', '>2.3.0', true), - array('<>2.3.0', '>2.3.0.1', true), + ['<>2.3.0', '>1.5.8', true], + ['!=2.3.0', '>2.3.0', true], + ['<>2.3.0', '>2.3.0.1', true], - array('!=2.3.0', '>=1.5.8', true), - array('<>2.3.0', '>=2.3.0', true), - array('!=2.3.0', '>=2.3.0.1', true), + ['!=2.3.0', '>=1.5.8', true], + ['<>2.3.0', '>=2.3.0', true], + ['!=2.3.0', '>=2.3.0.1', true], - array('<>2.3.0', '<1.5.8', true), - array('!=2.3.0', '<2.3.0', true), - array('<>2.3.0', '<2.3.0.1', true), + ['<>2.3.0', '<1.5.8', true], + ['!=2.3.0', '<2.3.0', true], + ['<>2.3.0', '<2.3.0.1', true], - array('!=2.3.0', '<=1.5.8', true), - array('<>2.3.0', '<=2.3.0', true), - array('!=2.3.0', '<=2.3.0.1', true), + ['!=2.3.0', '<=1.5.8', true], + ['<>2.3.0', '<=2.3.0', true], + ['!=2.3.0', '<=2.3.0.1', true], - array('<>2.3.0', '!=1.5.8', true), - array('!=2.3.0', '!=2.3.0.0', true), - array('<>2.3.0', '!=2.3.0.1', true), + ['<>2.3.0', '!=1.5.8', true], + ['!=2.3.0', '!=2.3.0.0', true], + ['<>2.3.0', '!=2.3.0.1', true], - array('!=2.3.0', '<>1.5.8', true), - array('<>2.3.0', '<>2.3', true), - array('!=2.3.0', '<>2.3.0.1', true), + ['!=2.3.0', '<>1.5.8', true], + ['<>2.3.0', '<>2.3', true], + ['!=2.3.0', '<>2.3.0.1', true], - array('!=2.3.0', '~1.5.8', true), - array('!=2.3.0', '~2.3', true), - array('!=2.3.0', '~2.4.', true), + ['!=2.3.0', '~1.5.8', true], + ['!=2.3.0', '~2.3', true], + ['!=2.3.0', '~2.4.', true], - array('~2.3.0', '1.5.8', false), + ['~2.3.0', '1.5.8', false], - array('~2.3.5', '>2.3.0', true), - array('~2.3.5', '>2.3.5', true), - array('~2.3.5', '>2.3.6', true), + ['~2.3.5', '>2.3.0', true], + ['~2.3.5', '>2.3.5', true], + ['~2.3.5', '>2.3.6', true], - array('~2.3.5', '>=2.3.0', true), - array('~2.3.5', '>=2.3.5', true), - array('~2.3.5', '>=2.3.6', true), + ['~2.3.5', '>=2.3.0', true], + ['~2.3.5', '>=2.3.5', true], + ['~2.3.5', '>=2.3.6', true], - array('~2.3.5', '<2.3.5', false), - array('~2.3.5', '<2.3.6', true), - array('~2.3.5', '<2.4.0', true), + ['~2.3.5', '<2.3.5', false], + ['~2.3.5', '<2.3.6', true], + ['~2.3.5', '<2.4.0', true], - array('~2.3.5', '<=2.3.5', true), - array('~2.3.5', '<=2.3.6', true), - array('~2.3.5', '<=2.4.0', true), + ['~2.3.5', '<=2.3.5', true], + ['~2.3.5', '<=2.3.6', true], + ['~2.3.5', '<=2.4.0', true], - array('~2.3.5', '!=2.3.0', true), - array('~2.3.5', '!=2.3.6', true), - array('~2.3.5', '<>2.4.0', true), + ['~2.3.5', '!=2.3.0', true], + ['~2.3.5', '!=2.3.6', true], + ['~2.3.5', '<>2.4.0', true], - array('~2.3.5', '~2.3', true), - array('~2.3.5', '~2.4', false), - array('~2.3.5', '~2.3', true), - array('~2.4.5', '~2.3', true), - array('~2.3', '~2.3.2', true), - array('~2.4', '~2.3.4', false), - array('~2.3.5', '~2.3.5', true), - ); + ['~2.3.5', '~2.3', true], + ['~2.3.5', '~2.4', false], + ['~2.3.5', '~2.3', true], + ['~2.4.5', '~2.3', true], + ['~2.3', '~2.3.2', true], + ['~2.4', '~2.3.4', false], + ['~2.3.5', '~2.3.5', true], + ]; } } diff --git a/tests/Version/VersionTest.php b/tests/Version/VersionTest.php index f1dae00..62048f8 100644 --- a/tests/Version/VersionTest.php +++ b/tests/Version/VersionTest.php @@ -20,31 +20,31 @@ public function testParseSucceeds($input, $expected) public function successfulParsedVersions() { - return array( - 'none' => array('1.0.0', '1.0.0'), - 'none/2' => array('1.2.3.4', '1.2.3.4'), - 'parses state' => array('1.0.0RC1', '1.0.0-RC1'), - 'CI parsing' => array('1.0.0-rC15', '1.0.0-RC15'), - 'delimiters' => array('1.0.0.RC.15', '1.0.0-RC15'), - 'RC uppercase' => array('1.0.0-rc1', '1.0.0-RC1'), - 'patch replace' => array('1.0.0.pl3', '1.0.0-patch3'), - 'forces w.x.y.z' => array('1.0', '1.0.0'), - 'forces w.x.y.z/2' => array('0', '0.0.0'), - 'parses long' => array('10.4.13-beta', '10.4.13-beta'), - 'parses long/2' => array('10.4.13beta2', '10.4.13-beta2'), - 'expand shorthand' => array('10.4.13-b', '10.4.13-beta'), - 'expand shorthand2' => array('10.4.13-b5', '10.4.13-beta5'), - 'strips leading v' => array('v1.0.0', '1.0.0'), - 'strips v/datetime' => array('v20100102', '20100102'), - 'parses dates y-m' => array('2010.01', '2010-01'), - 'parses dates w/ .' => array('2010.01.02', '2010-01-02'), - 'parses dates w/ -' => array('2010-01-02', '2010-01-02'), - 'parses numbers' => array('2010-01-02.5', '2010-01-02-5'), - 'parses dates y.m.Y' => array('2010.1.555', '2010.1.555'), - 'parses datetime' => array('20100102-203040', '20100102-203040'), - 'parses dt+number' => array('20100102203040-10', '20100102203040-10'), - 'parses dt+patch' => array('20100102-203040-p1', '20100102-203040-patch1'), - ); + return [ + 'none' => ['1.0.0', '1.0.0'], + 'none/2' => ['1.2.3.4', '1.2.3.4'], + 'parses state' => ['1.0.0RC1', '1.0.0-RC1'], + 'CI parsing' => ['1.0.0-rC15', '1.0.0-RC15'], + 'delimiters' => ['1.0.0.RC.15', '1.0.0-RC15'], + 'RC uppercase' => ['1.0.0-rc1', '1.0.0-RC1'], + 'patch replace' => ['1.0.0.pl3', '1.0.0-patch3'], + 'forces w.x.y.z' => ['1.0', '1.0.0'], + 'forces w.x.y.z/2' => ['0', '0.0.0'], + 'parses long' => ['10.4.13-beta', '10.4.13-beta'], + 'parses long/2' => ['10.4.13beta2', '10.4.13-beta2'], + 'expand shorthand' => ['10.4.13-b', '10.4.13-beta'], + 'expand shorthand2' => ['10.4.13-b5', '10.4.13-beta5'], + 'strips leading v' => ['v1.0.0', '1.0.0'], + 'strips v/datetime' => ['v20100102', '20100102'], + 'parses dates y-m' => ['2010.01', '2010-01'], + 'parses dates w/ .' => ['2010.01.02', '2010-01-02'], + 'parses dates w/ -' => ['2010-01-02', '2010-01-02'], + 'parses numbers' => ['2010-01-02.5', '2010-01-02-5'], + 'parses dates y.m.Y' => ['2010.1.555', '2010.1.555'], + 'parses datetime' => ['20100102-203040', '20100102-203040'], + 'parses dt+number' => ['20100102203040-10', '20100102203040-10'], + 'parses dt+patch' => ['20100102-203040-p1', '20100102-203040-patch1'], + ]; } /** @@ -63,13 +63,13 @@ public function testParseFails($input) public function failingParsedVersions() { - return array( - 'empty ' => array(''), - 'invalid chars' => array('a'), - 'invalid type' => array('1.0.0-meh'), - 'too many bits' => array('1.0.0.0.0'), - 'non-dev arbitrary' => array('feature-foo'), - ); + return [ + 'empty ' => [''], + 'invalid chars' => ['a'], + 'invalid type' => ['1.0.0-meh'], + 'too many bits' => ['1.0.0.0.0'], + 'non-dev arbitrary' => ['feature-foo'], + ]; } /** @@ -88,20 +88,20 @@ public function testParseStability($expected, $version) public function stabilityProvider() { - return array( - array('stable', '1'), - array('stable', '1.0'), - array('stable', '3.2.1'), - array('stable', 'v3.2.1'), - array('RC', '3.0-RC2'), - array('stable', '3.1.2-pl2'), - array('stable', '3.1.2-patch'), - array('alpha', '3.1.2-alpha5'), - array('beta', '3.1.2-beta'), - array('beta', '2.0B1'), - array('alpha', '1.2.0a1'), - array('alpha', '1.2_a1'), - array('RC', '2.0.0rc1') - ); + return [ + ['stable', '1'], + ['stable', '1.0'], + ['stable', '3.2.1'], + ['stable', 'v3.2.1'], + ['RC', '3.0-RC2'], + ['stable', '3.1.2-pl2'], + ['stable', '3.1.2-patch'], + ['alpha', '3.1.2-alpha5'], + ['beta', '3.1.2-beta'], + ['beta', '2.0B1'], + ['alpha', '1.2.0a1'], + ['alpha', '1.2_a1'], + ['RC', '2.0.0rc1'] + ]; } }