Merge branch '1.10'

4 years ago · 74a63b4d6b
parent 81bf47ffa2 3c2889672b
commit 74a63b4d6b
2 changed files with 2 additions and 0 deletions
--- a/src/Composer/Repository/PlatformRepository.php
+++ b/src/Composer/Repository/PlatformRepository.php
@ -12,6 +12,7 @@

 namespace Composer\Repository;

+use Composer\Composer;
 use Composer\Package\CompletePackage;
 use Composer\Package\PackageInterface;
 use Composer\Package\Version\VersionParser;
--- a/tests/Composer/Test/Package/Loader/ValidatingArrayLoaderTest.php
+++ b/tests/Composer/Test/Package/Loader/ValidatingArrayLoaderTest.php
@ -86,6 +86,7 @@ class ValidatingArrayLoaderTest extends TestCase
                        'a/b' => '1.*',
                        'b/c' => '~2',
                        'example' => '>2.0-dev,<2.4-dev',
+                        'composer-runtime-api' => '*',
                    ),
                    'require-dev' => array(
                        'a/b' => '1.*',