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

Merge branch '1.10'

pull/8860/head
Jordi Boggiano 2020-04-30 21:30:27 +02:00
parent 81bf47ffa2 3c2889672b
commit 74a63b4d6b
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Composer/Repository/PlatformRepository.php
View File

@ -12,6 +12,7 @@
namespace Composer\Repository; namespace Composer\Repository;
use Composer\Composer;
use Composer\Package\CompletePackage; use Composer\Package\CompletePackage;
use Composer\Package\PackageInterface; use Composer\Package\PackageInterface;
use Composer\Package\Version\VersionParser; use Composer\Package\Version\VersionParser;

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

@ -86,6 +86,7 @@ class ValidatingArrayLoaderTest extends TestCase
'a/b' => '1.*', 'a/b' => '1.*',
'b/c' => '~2', 'b/c' => '~2',
'example' => '>2.0-dev,<2.4-dev', 'example' => '>2.0-dev,<2.4-dev',
'composer-runtime-api' => '*',
), ),
'require-dev' => array( 'require-dev' => array(
'a/b' => '1.*', 'a/b' => '1.*',