php/archived-pie
1
0
Fork 0
mirror of https://github.com/php/pie.git synced 2026-03-23 23:12:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ensure test uses --allow-non-interactive-project-install

Browse Source
This commit is contained in:
James Titcumb
2025-09-15 20:47:30 +01:00
parent 4add071f86
commit a82b4a5490
4 changed files with 64 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpunit.xml.dist
View File

@@ -11,6 +11,9 @@
displayDetailsOnTestsThatTriggerWarnings="true"
failOnRisky="true"
failOnWarning="true">
<php>
<env name="COMPOSER_NO_INTERACTION" value="1" />
</php>
<testsuites>
<testsuite name="unit">
<directory>test/unit</directory>

16
src/Command/CommandHelper.php
View File

@@ -51,15 +51,15 @@ use const PHP_VERSION;
/** @internal This is not public API for PIE, so should not be depended upon unless you accept the risk of BC breaks */
final class CommandHelper
{
public const ARG_REQUESTED_PACKAGE_AND_VERSION = 'requested-package-and-version';
public const OPTION_WITH_PHP_CONFIG = 'with-php-config';
public const OPTION_WITH_PHP_PATH = 'with-php-path';
public const OPTION_WITH_PHPIZE_PATH = 'with-phpize-path';
public const OPTION_WORKING_DIRECTORY = 'working-dir';
public const ARG_REQUESTED_PACKAGE_AND_VERSION = 'requested-package-and-version';
public const OPTION_WITH_PHP_CONFIG = 'with-php-config';
public const OPTION_WITH_PHP_PATH = 'with-php-path';
public const OPTION_WITH_PHPIZE_PATH = 'with-phpize-path';
public const OPTION_WORKING_DIRECTORY = 'working-dir';
public const OPTION_ALLOW_NON_INTERACTIVE_PROJECT_INSTALL = 'allow-non-interactive-project-install';
private const OPTION_MAKE_PARALLEL_JOBS = 'make-parallel-jobs';
private const OPTION_SKIP_ENABLE_EXTENSION = 'skip-enable-extension';
private const OPTION_FORCE = 'force';
private const OPTION_MAKE_PARALLEL_JOBS = 'make-parallel-jobs';
private const OPTION_SKIP_ENABLE_EXTENSION = 'skip-enable-extension';
private const OPTION_FORCE = 'force';
/** @psalm-suppress UnusedConstructor */
private function __construct()

6
src/Command/InstallExtensionsForProjectCommand.php
View File

@@ -25,20 +25,22 @@ use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\QuestionHelper;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\ConsoleOutputInterface;
use Symfony\Component\Console\Output\NullOutput;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\ChoiceQuestion;
use Throwable;
use function array_column;
use function array_keys;
use function array_map;
use function array_merge;
use function array_walk;
use function assert;
use function chdir;
use function count;
use function getcwd;
use function implode;
use function in_array;
use function is_dir;
use function is_string;
@@ -131,7 +133,6 @@ final class InstallExtensionsForProjectCommand extends Command
'<warning>Aborting! You are not running in interactive mode, and --%s was not specified.</warning>',
CommandHelper::OPTION_ALLOW_NON_INTERACTIVE_PROJECT_INSTALL,
));
// @todo more details
return Command::FAILURE;
}
@@ -270,6 +271,7 @@ final class InstallExtensionsForProjectCommand extends Command
return;
}
$selectedPackageName = substr($selectedPackageAnswer, 0, (int) strpos($selectedPackageAnswer, ':'));
} else {
$selectedPackageName = $matches[0]['name'];

67
test/integration/Command/InstallExtensionsForProjectCommandTest.php
View File

@@ -101,10 +101,6 @@ final class InstallExtensionsForProjectCommandTest extends TestCase
new Constraint('>=', '1.2.0.0-dev'),
new Constraint('<', '2.0.0.0-dev'),
]), Link::TYPE_REQUIRE, '^1.2'),
// 'ext-mismatching' => new Link('my/project', 'ext-mismatching', new MultiConstraint([
// new Constraint('>=', '2.0.0.0-dev'),
// new Constraint('<', '3.0.0.0-dev'),
// ]), Link::TYPE_REQUIRE, '^2.0'),
]);
$this->composerFactoryForProject->method('rootPackage')->willReturn($rootPackage);
@@ -119,20 +115,8 @@ final class InstallExtensionsForProjectCommandTest extends TestCase
$this->composerFactoryForProject->method('composer')->willReturn($composer);
// $this->installedPiePackages->method('allPiePackages')->willReturn([
// 'mismatching' => new Package(
// $this->createMock(CompletePackageInterface::class),
// ExtensionType::PhpModule,
// ExtensionName::normaliseFromString('mismatching'),
// 'vendor/mismatching',
// '1.9.3',
// null,
// ),
// ]);
$this->findMatchingPackages->method('for')->willReturn([
['name' => 'vendor1/foobar', 'description' => 'The official foobar implementation'],
['name' => 'vendor2/afoobar', 'description' => 'An improved async foobar extension'],
]);
$this->questionHelper->method('ask')->willReturn('vendor1/foobar: The official foobar implementation');
@@ -142,18 +126,65 @@ final class InstallExtensionsForProjectCommandTest extends TestCase
->with('vendor1/foobar:^1.2');
$this->commandTester->execute(
[],
['--allow-non-interactive-project-install' => true],
['verbosity' => BufferedOutput::VERBOSITY_VERY_VERBOSE],
);
$outputString = $this->commandTester->getDisplay();
$this->commandTester->assertCommandIsSuccessful();
$this->commandTester->assertCommandIsSuccessful($outputString);
self::assertStringContainsString('Checking extensions for your project my/project', $outputString);
self::assertStringContainsString('requires: ext-standard:* ✅ Already installed', $outputString);
self::assertStringContainsString('requires: ext-foobar:^1.2 🚫 Missing', $outputString);
}
public function testInstallingExtensionsForPhpProjectWithMultipleMatches(): void
{
$rootPackage = new RootPackage('my/project', '1.2.3.0', '1.2.3');
$rootPackage->setRequires([
'ext-standard' => new Link('my/project', 'ext-standard', new Constraint('=', '*'), Link::TYPE_REQUIRE, '*'),
'ext-foobar' => new Link('my/project', 'ext-foobar', new MultiConstraint([
new Constraint('>=', '1.2.0.0-dev'),
new Constraint('<', '2.0.0.0-dev'),
]), Link::TYPE_REQUIRE, '^1.2'),
]);
$this->composerFactoryForProject->method('rootPackage')->willReturn($rootPackage);
$installedRepository = new InstalledArrayRepository([$rootPackage]);
$repositoryManager = $this->createMock(RepositoryManager::class);
$repositoryManager->method('getLocalRepository')->willReturn($installedRepository);
$composer = $this->createMock(Composer::class);
$composer->method('getPackage')->willReturn($rootPackage);
$composer->method('getRepositoryManager')->willReturn($repositoryManager);
$this->composerFactoryForProject->method('composer')->willReturn($composer);
$this->findMatchingPackages->method('for')->willReturn([
['name' => 'vendor1/foobar', 'description' => 'The official foobar implementation'],
['name' => 'vendor2/afoobar', 'description' => 'An improved async foobar extension'],
]);
$this->questionHelper->method('ask')->willReturn('vendor1/foobar: The official foobar implementation');
$this->installSelectedPackage->expects(self::never())
->method('withPieCli');
$this->commandTester->execute(
['--allow-non-interactive-project-install' => true],
['verbosity' => BufferedOutput::VERBOSITY_VERY_VERBOSE],
);
$outputString = $this->commandTester->getDisplay();
self::assertSame(Command::FAILURE, $this->commandTester->getStatusCode());
self::assertStringContainsString('Checking extensions for your project my/project', $outputString);
self::assertStringContainsString('requires: ext-standard:* ✅ Already installed', $outputString);
self::assertStringContainsString('requires: ext-foobar:^1.2 🚫 Missing', $outputString);
self::assertStringContainsString('Multiple packages were found for ext-foobar', $outputString);
}
public function testInstallingExtensionsForPieProject(): void
{
$rootPackage = new RootPackage('my/project', '1.2.3.0', '1.2.3');