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

Revert "Store default branch info inside metadata" 

This reverts commit 472a62152d.
pull/8993/head
Jordi Boggiano 2020-06-17 17:32:26 +02:00
parent 0278e7453d
commit cb1f3899bb
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
6 changed files with 1 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Composer/Package/AliasPackage.php
View File

@ -392,11 +392,6 @@ class AliasPackage extends BasePackage implements CompletePackageInterface
return $this->aliasOf->getArchiveExcludes();
}
public function isDefaultBranch()
{
return $this->aliasOf->isDefaultBranch();
}
public function isAbandoned()
{
return $this->aliasOf->isAbandoned();

4
src/Composer/Package/Dumper/ArrayDumper.php
View File

@ -92,10 +92,6 @@ class ArrayDumper
$data['time'] = $package->getReleaseDate()->format(DATE_RFC3339);
}
if ($package->isDefaultBranch()) {
$data['default_branch'] = true;
}
$data = $this->dumpValues($package, $keys, $data);
if ($package instanceof CompletePackageInterface) {

7
src/Composer/Package/Loader/ArrayLoader.php
View File

@ -53,9 +53,6 @@ class ArrayLoader implements LoaderInterface
} else {
$version = $this->versionParser->normalize($config['version']);
}
if (isset($config['default_branch']) && $config['default_branch'] === true) {
$version = '9999999-dev';
}
$package = new $class($config['name'], $version, $config['version']);
$package->setType(isset($config['type']) ? strtolower($config['type']) : 'library');
@ -78,10 +75,6 @@ class ArrayLoader implements LoaderInterface
$package->setInstallationSource($config['installation-source']);
}
if (isset($config['default_branch']) && $config['default_branch'] === true) {
$package->setIsDefaultBranch(true);
}
if (isset($config['source'])) {
if (!isset($config['source']['type']) || !isset($config['source']['url']) || !isset($config['source']['reference'])) {
throw new \UnexpectedValueException(sprintf(

17
src/Composer/Package/Package.php
View File

@ -58,7 +58,6 @@ class Package extends BasePackage
protected $devAutoload = array();
protected $includePaths = array();
protected $archiveExcludes = array();
protected $isDefaultBranch = false;
/**
* Creates a new in memory package.
@ -570,22 +569,6 @@ class Package extends BasePackage
return $this->archiveExcludes;
}
/**
* @param bool $defaultBranch
*/
public function setIsDefaultBranch($defaultBranch)
{
$this->isDefaultBranch = $defaultBranch;
}
/**
* {@inheritDoc}
*/
public function isDefaultBranch()
{
return $this->isDefaultBranch;
}
/**
* Replaces current version and pretty version with passed values.
* It also sets stability.

5
src/Composer/Package/PackageInterface.php
View File

@ -352,11 +352,6 @@ interface PackageInterface
*/
public function getArchiveExcludes();
/**
* @return bool
*/
public function isDefaultBranch();
/**
* Returns a list of options to download package dist files
*

20
src/Composer/Repository/VcsRepository.php
View File

@ -149,10 +149,8 @@ class VcsRepository extends ArrayRepository implements ConfigurableRepositoryInt
$this->loader = new ArrayLoader($this->versionParser);
}
$hasRootIdentifierComposerJson = false;
try {
$hasRootIdentifierComposerJson = $driver->hasComposerFile($driver->getRootIdentifier());
if ($hasRootIdentifierComposerJson) {
if ($driver->hasComposerFile($driver->getRootIdentifier())) {
$data = $driver->getComposerInformation($driver->getRootIdentifier());
$this->packageName = !empty($data['name']) ? $data['name'] : null;
}
@ -213,9 +211,6 @@ class VcsRepository extends ArrayRepository implements ConfigurableRepositoryInt
$data['version'] = preg_replace('{[.-]?dev$}i', '', $data['version']);
$data['version_normalized'] = preg_replace('{(^dev-|[.-]?dev$)}i', '', $data['version_normalized']);
// make sure tag do not contain the default_branch marker
unset($data['default_branch']);
// broken package, version doesn't match tag
if ($data['version_normalized'] !== $parsedTag) {
if ($isVeryVerbose) {
@ -260,11 +255,6 @@ class VcsRepository extends ArrayRepository implements ConfigurableRepositoryInt
}
$branches = $driver->getBranches();
// make sure the root identifier branch gets loaded first
if ($hasRootIdentifierComposerJson && isset($branches[$driver->getRootIdentifier()])) {
$branches = array($driver->getRootIdentifier() => $branches[$driver->getRootIdentifier()]) + $branches;
}
foreach ($branches as $branch => $identifier) {
$msg = 'Reading composer.json of <info>' . ($this->packageName ?: $this->url) . '</info> (<comment>' . $branch . '</comment>)';
if ($isVeryVerbose) {
@ -294,9 +284,6 @@ class VcsRepository extends ArrayRepository implements ConfigurableRepositoryInt
$prefix = substr($branch, 0, 1) === 'v' ? 'v' : '';
$version = $prefix . preg_replace('{(\.9{7})+}', '.x', $parsedBranch);
}
if ($driver->getRootIdentifier() === $branch) {
$parsedBranch = '9999999-dev';
}
$cachedPackage = $this->getCachedPackageVersion($version, $identifier, $isVerbose, $isVeryVerbose);
if ($cachedPackage) {
@ -322,11 +309,6 @@ class VcsRepository extends ArrayRepository implements ConfigurableRepositoryInt
$data['version'] = $version;
$data['version_normalized'] = $parsedBranch;
unset($data['default_branch']);
if ($driver->getRootIdentifier() === $branch) {
$data['default_branch'] = true;
}
if ($isVeryVerbose) {
$this->io->writeError('Importing branch '.$branch.' ('.$data['version'].')');
}