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

Merge remote-tracking branch 'upstream/master' into override_init_array

pull/4088/head
nevvermind 2015-06-03 00:04:19 +01:00
parent 8c0d4857ef 65dd1f7137
commit a747b293b3
5 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/00-intro.md
View File

@ -142,6 +142,8 @@ Create a new `composer.bat` file alongside `composer.phar`:
C:\bin>echo @php "%~dp0composer.phar" %*>composer.bat C:\bin>echo @php "%~dp0composer.phar" %*>composer.bat
``` ```
Add the directory to your PATH environment variable if it isn't already.
Close your current terminal. Test usage with a new terminal: Close your current terminal. Test usage with a new terminal:
```sh ```sh

2
src/Composer/Package/Loader/ValidatingArrayLoader.php
View File

@ -70,7 +70,7 @@ class ValidatingArrayLoader implements LoaderInterface
$this->validateArray('scripts'); // TODO validate event names & listener syntax $this->validateArray('scripts'); // TODO validate event names & listener syntax
$this->validateString('description'); $this->validateString('description');
$this->validateUrl('homepage'); $this->validateUrl('homepage');
$this->validateFlatArray('keywords', '[A-Za-z0-9 ._-]+'); $this->validateFlatArray('keywords', '[\p{N}\p{L} ._-]+');
if (isset($this->config['license'])) { if (isset($this->config['license'])) {
if (is_string($this->config['license'])) { if (is_string($this->config['license'])) {

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

@ -416,12 +416,16 @@ class VersionParser
$lowVersion = $this->normalize($matches['from']); $lowVersion = $this->normalize($matches['from']);
$lowerBound = new VersionConstraint('>=', $lowVersion . $lowStabilitySuffix); $lowerBound = new VersionConstraint('>=', $lowVersion . $lowStabilitySuffix);
if ((!empty($matches[11]) && !empty($matches[12])) || !empty($matches[14]) || !empty($matches[16])) { $empty = function ($x) {
return ($x === 0 || $x === "0") ? false : empty($x);
};
if ((!$empty($matches[11]) && !$empty($matches[12])) || !empty($matches[14]) || !empty($matches[16])) {
$highVersion = $this->normalize($matches['to']); $highVersion = $this->normalize($matches['to']);
$upperBound = new VersionConstraint('<=', $highVersion); $upperBound = new VersionConstraint('<=', $highVersion);
} else { } else {
$highMatch = array('', $matches[10], $matches[11], $matches[12], $matches[13]); $highMatch = array('', $matches[10], $matches[11], $matches[12], $matches[13]);
$highVersion = $this->manipulateVersionString($highMatch, empty($matches[11]) ? 1 : 2, 1) . '-dev'; $highVersion = $this->manipulateVersionString($highMatch, $empty($matches[11]) ? 1 : 2, 1) . '-dev';
$upperBound = new VersionConstraint('<', $highVersion); $upperBound = new VersionConstraint('<', $highVersion);
} }

2
tests/Composer/Test/Package/Loader/ValidatingArrayLoaderTest.php
View File

@ -47,7 +47,7 @@ class ValidatingArrayLoaderTest extends \PHPUnit_Framework_TestCase
'description' => 'Foo bar', 'description' => 'Foo bar',
'version' => '1.0.0', 'version' => '1.0.0',
'type' => 'library', 'type' => 'library',
'keywords' => array('a', 'b_c', 'D E'), 'keywords' => array('a', 'b_c', 'D E', 'éîüø', '微信'),
'homepage' => 'https://foo.com', 'homepage' => 'https://foo.com',
'time' => '2010-10-10T10:10:10+00:00', 'time' => '2010-10-10T10:10:10+00:00',
'license' => 'MIT', 'license' => 'MIT',

16
tests/Composer/Test/Package/Version/VersionParserTest.php
View File

@ -374,12 +374,16 @@ class VersionParserTest extends \PHPUnit_Framework_TestCase
public function hyphenConstraints() public function hyphenConstraints()
{ {
return array( return array(
array('1 - 2', new VersionConstraint('>=', '1.0.0.0-dev'), new VersionConstraint('<', '3.0.0.0-dev')), array('1 - 2', new VersionConstraint('>=', '1.0.0.0-dev'), new VersionConstraint('<', '3.0.0.0-dev')),
array('1.2.3 - 2.3.4.5', new VersionConstraint('>=', '1.2.3.0-dev'), new VersionConstraint('<=', '2.3.4.5')), array('1.2.3 - 2.3.4.5', new VersionConstraint('>=', '1.2.3.0-dev'), new VersionConstraint('<=', '2.3.4.5')),
array('1.2-beta - 2.3', new VersionConstraint('>=', '1.2.0.0-beta'), new VersionConstraint('<', '2.4.0.0-dev')), array('1.2-beta - 2.3', new VersionConstraint('>=', '1.2.0.0-beta'), new VersionConstraint('<', '2.4.0.0-dev')),
array('1.2-beta - 2.3-dev', new VersionConstraint('>=', '1.2.0.0-beta'), new VersionConstraint('<=', '2.3.0.0-dev')), array('1.2-beta - 2.3-dev', new VersionConstraint('>=', '1.2.0.0-beta'), new VersionConstraint('<=', '2.3.0.0-dev')),
array('1.2-RC - 2.3.1', new VersionConstraint('>=', '1.2.0.0-RC'), new VersionConstraint('<=', '2.3.1.0')), array('1.2-RC - 2.3.1', new VersionConstraint('>=', '1.2.0.0-RC'), new VersionConstraint('<=', '2.3.1.0')),
array('1.2.3-alpha - 2.3-RC', new VersionConstraint('>=', '1.2.3.0-alpha'), new VersionConstraint('<=', '2.3.0.0-RC')), array('1.2.3-alpha - 2.3-RC', new VersionConstraint('>=', '1.2.3.0-alpha'), new VersionConstraint('<=', '2.3.0.0-RC')),
array('1 - 2.0', new VersionConstraint('>=', '1.0.0.0-dev'), new VersionConstraint('<', '2.1.0.0-dev')),
array('1 - 2.1', new VersionConstraint('>=', '1.0.0.0-dev'), new VersionConstraint('<', '2.2.0.0-dev')),
array('1.2 - 2.1.0', new VersionConstraint('>=', '1.2.0.0-dev'), new VersionConstraint('<=', '2.1.0.0')),
array('1.3 - 2.1.3', new VersionConstraint('>=', '1.3.0.0-dev'), new VersionConstraint('<=', '2.1.3.0')),
); );
} }