Skip to content

Commit

Permalink
feature symfony#231 Stick to framework-bundle's version by default (n…
Browse files Browse the repository at this point in the history
…icolas-grekas)

This PR was merged into the 1.0-dev branch.

Discussion
----------

Stick to framework-bundle's version by default

Works around composer/composer#6869

Commits
-------

be325e8 Stick to framework-bundle's version by default
  • Loading branch information
fabpot committed Dec 7, 2017
2 parents d511e9d + be325e8 commit 5c6192e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/Command/RequireCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public function __construct(PackageResolver $resolver)

protected function execute(InputInterface $input, OutputInterface $output)
{
$input->setArgument('packages', $this->resolver->resolve($input->getArgument('packages')));
$input->setArgument('packages', $this->resolver->resolve($input->getArgument('packages'), true));

if ($input->hasOption('no-suggest')) {
$input->setOption('no-suggest', true);
Expand Down
24 changes: 17 additions & 7 deletions src/PackageResolver.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

namespace Symfony\Flex;

use Composer\Factory;
use Composer\Package\Version\VersionParser;
use Composer\Repository\PlatformRepository;

Expand All @@ -29,7 +30,7 @@ public function __construct(Downloader $downloader)
$this->downloader = $downloader;
}

public function resolve(array $arguments = []): array
public function resolve(array $arguments = [], bool $isRequire = false): array
{
$versionParser = new VersionParser();

Expand Down Expand Up @@ -73,27 +74,36 @@ public function resolve(array $arguments = []): array
// third pass to resolve versions
$requires = [];
foreach ($versionParser->parseNameVersionPairs($packages) as $package) {
$requires[] = $package['name'].$this->parseVersion($package['name'], $package['version'] ?? '');
$requires[] = $package['name'].$this->parseVersion($package['name'], $package['version'] ?? '', $isRequire);
}

return array_unique($requires);
}

private function parseVersion(string $package, string $version): string
private function parseVersion(string $package, string $version, bool $isRequire): string
{
if (!$version) {
return '';
if (0 !== strpos($package, 'symfony/')) {
return $version ? ':'.$version : '';
}

if (null === self::$versions) {
self::$versions = $this->downloader->get('/versions.json')->getBody();
}

if (!isset(self::$versions['splits'][$package])) {
return ':'.$version;
return $version ? ':'.$version : '';
}

if ('next' === $version) {
if (!$version) {
try {
$config = @json_decode(file_get_contents(Factory::getComposerFile()), true);
} finally {
if (!$isRequire || !isset($config['require']['symfony/framework-bundle'])) {
return '';
}
}
$version = $config['require']['symfony/framework-bundle'];
} elseif ('next' === $version) {
$version = '^'.self::$versions[$version].'@dev';
} elseif (in_array($version, self::$SYMFONY_VERSIONS, true)) {
$version = '^'.self::$versions[$version];
Expand Down

0 comments on commit 5c6192e

Please sign in to comment.