Skip to content

Commit 186f05e

Browse files
jderussenicolas-grekas
authored andcommitted
Add compatibility with composer2
1 parent f850efc commit 186f05e

18 files changed

+258
-1037
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ env:
2424

2525
before_install:
2626
- ([[ $TRAVIS_PHP_VERSION = nightly ]] && composer config platform.php 7.4.99 || true)
27+
- composer self-update --snapshot
2728
- composer validate
2829

2930
install:

composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"minimum-stability": "dev",
1313
"require": {
1414
"php": ">=7.1",
15-
"composer-plugin-api": "^1.0"
15+
"composer-plugin-api": "^2.0"
1616
},
1717
"require-dev": {
18-
"composer/composer": "^1.0.2",
18+
"composer/composer": "^2.0@dev",
1919
"symfony/dotenv": "^4.4|^5.0",
2020
"symfony/phpunit-bridge": "^4.4|^5.0",
2121
"symfony/process": "^4.4|^5.0"
@@ -27,7 +27,7 @@
2727
},
2828
"extra": {
2929
"branch-alias": {
30-
"dev-master": "1.7-dev"
30+
"dev-master": "2.0-dev"
3131
},
3232
"class": "Symfony\\Flex\\Flex"
3333
}

src/Cache.php

Lines changed: 0 additions & 147 deletions
This file was deleted.

src/Command/RecipesCommand.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
use Composer\Command\BaseCommand;
1515
use Composer\Downloader\TransportException;
16+
use Composer\Util\HttpDownloader;
1617
use Symfony\Component\Console\Input\InputArgument;
1718
use Symfony\Component\Console\Input\InputInterface;
1819
use Symfony\Component\Console\Output\OutputInterface;
1920
use Symfony\Flex\InformationOperation;
2021
use Symfony\Flex\Lock;
21-
use Symfony\Flex\ParallelDownloader;
2222
use Symfony\Flex\Recipe;
2323

2424
/**
@@ -32,7 +32,7 @@ class RecipesCommand extends BaseCommand
3232
private $symfonyLock;
3333
private $downloader;
3434

35-
public function __construct(/* cannot be type-hinted */ $flex, Lock $symfonyLock, ParallelDownloader $downloader)
35+
public function __construct(/* cannot be type-hinted */ $flex, Lock $symfonyLock, HttpDownloader $downloader)
3636
{
3737
$this->flex = $flex;
3838
$this->symfonyLock = $symfonyLock;
@@ -354,8 +354,8 @@ private function findRecipeCommitDataFromTreeRef(string $package, string $repo,
354354

355355
private function requestGitHubApi(string $path)
356356
{
357-
$contents = $this->downloader->getContents('api.github.com', $path, false);
357+
$response = $this->downloader->get($path);
358358

359-
return json_decode($contents, true);
359+
return json_decode($response->getBody(), true);
360360
}
361361
}

src/Command/UnpackCommand.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
114114
$lockFile->write($lockData);
115115

116116
// force removal of files under vendor/
117-
$locker = new Locker($io, $lockFile, $composer->getRepositoryManager(), $composer->getInstallationManager(), file_get_contents($json->getPath()));
117+
$locker = new Locker($io, $lockFile, $composer->getInstallationManager(), file_get_contents($json->getPath()));
118118
$composer->setLocker($locker);
119119
$install = Installer::create($io, $composer);
120120
$install
121121
->setDevMode(true)
122122
->setDumpAutoloader(false)
123123
->setRunScripts(false)
124-
->setSkipSuggest(true)
125124
->setIgnorePlatformRequirements(true)
126125
;
127126

src/ComposerRepository.php

Lines changed: 0 additions & 58 deletions
This file was deleted.

0 commit comments

Comments
 (0)