Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
dependency-versions: [ "highest" ]
include:
- php: "7.2"
tools: "composer:v2.0"
tools: "composer:v2.6"
dependency-versions: "lowest"

steps:
Expand Down
Binary file removed composer-normalize.phar
Binary file not shown.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"require-dev": {
"ext-json": "*",
"composer/composer": "^2.0",
"composer/composer": "^2.6",
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan": "^1.8",
"phpstan/phpstan-phpunit": "^1.1",
Expand Down
6 changes: 1 addition & 5 deletions src/Command/BinCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
use function file_put_contents;
use function getcwd;
use function glob;
use function method_exists;
use function min;
use function mkdir;
use function putenv;
Expand Down Expand Up @@ -97,10 +96,7 @@ public function isProxyCommand(): bool

public function execute(InputInterface $input, OutputInterface $output): int
{
// Switch to requireComposer() once Composer 2.3 is set as the minimum
$composer = method_exists($this, 'requireComposer')
? $this->requireComposer()
: $this->getComposer();
$composer = $this->requireComposer();

$config = Config::fromComposer($composer);
$currentWorkingDir = getcwd();
Expand Down
7 changes: 1 addition & 6 deletions tests/Fixtures/MyTestCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@
use Composer\Factory;
use Composer\IO\NullIO;

use function method_exists;

class MyTestCommand extends BaseCommand
{
/**
Expand Down Expand Up @@ -41,10 +39,7 @@ public function __construct()

public function execute(InputInterface $input, OutputInterface $output): int
{
// Switch to tryComposer() once Composer 2.3 is set as the minimum
$this->composer = method_exists($this, 'tryComposer')
? $this->tryComposer()
: $this->getComposer(false);
$this->composer = $this->tryComposer();

$factory = Factory::create(new NullIO());
$config = $factory->getConfig();
Expand Down
Loading