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

Reorg ComposerRepository to fix tests

pull/8780/head
Jordi Boggiano 2020-04-13 12:10:31 +02:00
parent 048781c268
commit 62fda2ed85
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/Repository/ComposerRepository.php
View File

@ -498,7 +498,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
* @param string $name package name * @param string $name package name
* @return array|mixed * @return array|mixed
*/ */
private function whatProvides($name, array $acceptableStabilities = array(), array $stabilityFlags = array()) private function whatProvides($name, array $acceptableStabilities = null, array $stabilityFlags = null)
{ {
if (!$this->hasPartialPackages() || !isset($this->partialPackagesByName[$name])) { if (!$this->hasPartialPackages() || !isset($this->partialPackagesByName[$name])) {
// skip platform packages, root package and composer-plugin-api // skip platform packages, root package and composer-plugin-api
@ -590,7 +590,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
$version['version_normalized'] = $this->versionParser->normalize($version['version']); $version['version_normalized'] = $this->versionParser->normalize($version['version']);
} }
if ($this->isVersionAcceptable($acceptableStabilities, $stabilityFlags, null, $normalizedName, $version)) { if ($this->isVersionAcceptable(null, $normalizedName, $version, $acceptableStabilities, $stabilityFlags)) {
$versionsToLoad[$version['uid']] = $version; $versionsToLoad[$version['uid']] = $version;
} }
} }
@ -711,7 +711,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
$version['version_normalized'] = $repo->versionParser->normalize($version['version']); $version['version_normalized'] = $repo->versionParser->normalize($version['version']);
} }
if ($repo->isVersionAcceptable($acceptableStabilities, $stabilityFlags, $constraint, $realName, $version)) { if ($repo->isVersionAcceptable($constraint, $realName, $version, $acceptableStabilities, $stabilityFlags)) {
$versionsToLoad[] = $version; $versionsToLoad[] = $version;
} }
} }
@ -741,7 +741,7 @@ class ComposerRepository extends ArrayRepository implements ConfigurableReposito
* @param string $name package name (must be lowercased already) * @param string $name package name (must be lowercased already)
* @private * @private
*/ */
public function isVersionAcceptable(array $acceptableStabilities, array $stabilityFlags, $constraint, $name, $versionData) public function isVersionAcceptable($constraint, $name, $versionData, array $acceptableStabilities = null, array $stabilityFlags = null)
{ {
$versions = array($versionData['version_normalized']); $versions = array($versionData['version_normalized']);

2
tests/Composer/Test/Repository/ComposerRepositoryTest.php
View File

@ -154,7 +154,7 @@ class ComposerRepositoryTest extends TestCase
$versionParser = new VersionParser(); $versionParser = new VersionParser();
$reflMethod = new \ReflectionMethod($repo, 'whatProvides'); $reflMethod = new \ReflectionMethod($repo, 'whatProvides');
$reflMethod->setAccessible(true); $reflMethod->setAccessible(true);
$packages = $reflMethod->invoke($repo, 'a', array($this, 'isPackageAcceptableReturnTrue')); $packages = $reflMethod->invoke($repo, 'a');
$this->assertCount(5, $packages); $this->assertCount(5, $packages);
$this->assertEquals(array('1', '1-alias', '2', '2-alias', '3'), array_keys($packages)); $this->assertEquals(array('1', '1-alias', '2', '2-alias', '3'), array_keys($packages));