Skip to content

[BUGFIX] Return processed paths from plugin config #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbuerk merged 3 commits into from
Sep 27, 2026
Merged

[BUGFIX] Return processed paths from plugin config #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af75dac
[TASK] Guard package name type for version option
sbuerk Sep 27, 2026
a1e1314
[BUGFIX] Return processed paths from plugin config
sbuerk Sep 27, 2026
d1388de
[TASK] Raise phpunit to a version without advisory
sbuerk Sep 27, 2026
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 composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"phpstan/phpstan": "^2.1.2",
"phpstan/phpdoc-parser": "^1.30.1",
"bnf/phpstan-psr-container": "^1.1.0",
"phpunit/phpunit": "9.6.22",
"phpunit/phpunit": "^9.6.33",
"phpstan/phpstan-phpunit": "^2.0.4",
"phpstan/phpstan-symfony": "^2.0.2",
"phpstan/phpstan-deprecation-rules": "^2.0.1"
Expand Down
2 changes: 1 addition & 1 deletion src/Composer/Repository/FixturePathRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ protected function initialize(): void
// copy symlink/relative options to transport options
$package['transport-options'] = array_intersect_key($this->options, ['symlink' => true, 'relative' => true]);
// use the version provided as option if available
if (isset($package['name'], $this->options['versions'][$package['name']])) {
if (isset($package['name']) && is_string($package['name']) && isset($this->options['versions'][$package['name']])) {
$package['version'] = $this->options['versions'][$package['name']];
}

Expand Down
23 changes: 16 additions & 7 deletions src/Plugin/Config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,21 @@ protected function processFixtureExtensionPaths(array $paths, int $flags = 0): a
$relativePaths = $this->isRelativePathsFlag($flags);
$returnPaths = [];
foreach ($paths as $path => $selection) {
$path = rtrim(($relativePaths ? $path : $this->realpath($path)), '/\\');
$returnPaths[$path] = $selection;
if ($relativePaths) {
$path = $this->normalizePath((string)$path);
if ($path === '') {
// Keep the current directory, an empty url is not a valid fixture-path repository url.
$path = '.';
}
} else {
$path = $this->realpath((string)$path);
}
// Different notations of the same path must not drop the selection of the former ones.
$returnPaths[$path] = isset($returnPaths[$path])
? array_values(array_unique(array_merge($returnPaths[$path], $selection)))
: $selection;
}
return $paths;
return $returnPaths;
}

/**
Expand All @@ -155,7 +166,7 @@ protected function processFixtureExtensionPaths(array $paths, int $flags = 0): a
*/
private function isRelativePathsFlag(int $flags): bool
{
return ($flags & self::FLAG_PATHS_RELATIVE) === 1;
return ($flags & self::FLAG_PATHS_RELATIVE) !== 0;
}

/**
Expand All @@ -165,10 +176,10 @@ private function isRelativePathsFlag(int $flags): bool
*/
private function realpath(string $path): string
{
$path = $this->normalizePath($path);
if ($path === '') {
return $this->baseDir;
}
$path = $this->normalizePath($path);
if ($path[0] === '/' || (!empty($path[1]) && $path[1] === ':')) {
return $path;
}
Expand Down Expand Up @@ -224,8 +235,6 @@ private static function handleRootPackageExtraConfig(IOInterface $io, RootPackag
if (empty($fixtureExtensionPaths)) {
return $rootPackageExtraConfig;
}
$basePath = '/fake/root';
$config = new self($basePath);
$validPaths = [];
foreach ($fixtureExtensionPaths as $path => $selection) {
if (!is_array($selection)) {
Expand Down
163 changes: 157 additions & 6 deletions tests/Unit/Plugin/ConfigTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,16 @@ public static function realpathDataSets(): \Generator
'path' => '/',
'expectedPath' => '/',
];
yield 'Current directory path returns baseDir' => [
'baseDir' => '/fake/root',
'path' => './',
'expectedPath' => '/fake/root',
];
yield 'Relative path is prefixed with baseDir and trimmed' => [
'baseDir' => '/fake/root',
'path' => 'some/relative/path/',
'expectedPath' => '/fake/root/some/relative/path',
];
}

/**
Expand Down Expand Up @@ -193,7 +203,8 @@ public static function loadCreatesConfigWithExpectedPathsDataSets(): \Generator
{
yield 'Empty extra config returns empty array' => [
'extraConfig' => [],
'expectedPaths' => [],
'expectedRelativePaths' => [],
'expectedAbsolutePaths' => [],
'expectedOutput' => '',
];
yield 'Other extra configuration are kept' => [
Expand All @@ -202,7 +213,8 @@ public static function loadCreatesConfigWithExpectedPathsDataSets(): \Generator
'extension-key' => 'some_extension_key',
],
],
'expectedPaths' => [],
'expectedRelativePaths' => [],
'expectedAbsolutePaths' => [],
'expectedOutput' => '',
];
yield 'Non-array extra->sbuerk/fixture-packages/paths value is removed' => [
Expand All @@ -211,7 +223,8 @@ public static function loadCreatesConfigWithExpectedPathsDataSets(): \Generator
'paths' => false,
],
],
'expectedPaths' => [],
'expectedRelativePaths' => [],
'expectedAbsolutePaths' => [],
'expectedOutput' => '<warning>extra->sbuerk/fixture-packages/paths must be an array, "boolean" given.</warning>' . PHP_EOL,
];
yield 'Non-array extra->sbuerk/fixture-packages/paths value is removed keeping other settings' => [
Expand All @@ -221,16 +234,148 @@ public static function loadCreatesConfigWithExpectedPathsDataSets(): \Generator
'paths' => false,
],
],
'expectedPaths' => [],
'expectedRelativePaths' => [],
'expectedAbsolutePaths' => [],
'expectedOutput' => '<warning>extra->sbuerk/fixture-packages/paths must be an array, "boolean" given.</warning>' . PHP_EOL,
];
yield 'Path without trailing slash' => [
'extraConfig' => [
'sbuerk/fixture-packages' => [
'paths' => [
'Tests/Functional/Fixtures/Extensions/*' => ['autoload'],
],
],
],
'expectedRelativePaths' => [
'Tests/Functional/Fixtures/Extensions/*' => ['autoload'],
],
'expectedAbsolutePaths' => [
'/fake/root/Tests/Functional/Fixtures/Extensions/*' => ['autoload'],
],
'expectedOutput' => '',
];
yield 'Path with trailing slash is trimmed' => [
'extraConfig' => [
'sbuerk/fixture-packages' => [
'paths' => [
'Tests/Functional/Fixtures/Extensions/' => ['autoload'],
],
],
],
'expectedRelativePaths' => [
'Tests/Functional/Fixtures/Extensions' => ['autoload'],
],
'expectedAbsolutePaths' => [
'/fake/root/Tests/Functional/Fixtures/Extensions' => ['autoload'],
],
'expectedOutput' => '',
];
yield 'Path with trailing backslash is trimmed' => [
'extraConfig' => [
'sbuerk/fixture-packages' => [
'paths' => [
'Tests\\Functional\\Fixtures\\Extensions\\' => ['autoload-dev'],
],
],
],
'expectedRelativePaths' => [
'Tests/Functional/Fixtures/Extensions' => ['autoload-dev'],
],
'expectedAbsolutePaths' => [
'/fake/root/Tests/Functional/Fixtures/Extensions' => ['autoload-dev'],
],
'expectedOutput' => '',
];
yield 'Path list syntax with trailing slash is trimmed' => [
'extraConfig' => [
'sbuerk/fixture-packages' => [
'paths' => [
'Tests/Functional/Fixtures/Extensions/*/',
],
],
],
'expectedRelativePaths' => [
'Tests/Functional/Fixtures/Extensions/*' => ['autoload'],
],
'expectedAbsolutePaths' => [
'/fake/root/Tests/Functional/Fixtures/Extensions/*' => ['autoload'],
],
'expectedOutput' => '',
];
yield 'Path outside project is kept relative or resolved against base dir' => [
'extraConfig' => [
'sbuerk/fixture-packages' => [
'paths' => [
'../other-project/Fixtures/*/' => ['autoload', 'autoload-dev'],
],
],
],
'expectedRelativePaths' => [
'../other-project/Fixtures/*' => ['autoload', 'autoload-dev'],
],
'expectedAbsolutePaths' => [
'/fake/root/../other-project/Fixtures/*' => ['autoload', 'autoload-dev'],
],
'expectedOutput' => '',
];
yield 'Current directory path is kept as current directory or resolved to base dir' => [
'extraConfig' => [
'sbuerk/fixture-packages' => [
'paths' => [
'./' => ['autoload'],
],
],
],
'expectedRelativePaths' => [
'.' => ['autoload'],
],
'expectedAbsolutePaths' => [
'/fake/root' => ['autoload'],
],
'expectedOutput' => '',
];
yield 'Selections of paths normalized to the same path are merged' => [
'extraConfig' => [
'sbuerk/fixture-packages' => [
'paths' => [
'Tests/Fixtures/' => ['autoload'],
'Tests/Fixtures' => ['autoload-dev', 'autoload'],
'/fake/root/Tests/Fixtures' => ['autoload-dev'],
],
],
],
'expectedRelativePaths' => [
'Tests/Fixtures' => ['autoload', 'autoload-dev'],
'/fake/root/Tests/Fixtures' => ['autoload-dev'],
],
'expectedAbsolutePaths' => [
'/fake/root/Tests/Fixtures' => ['autoload', 'autoload-dev'],
],
'expectedOutput' => '',
];
yield 'Absolute path is kept absolute and trimmed' => [
'extraConfig' => [
'sbuerk/fixture-packages' => [
'paths' => [
'/some/absolute/Fixtures/' => ['autoload'],
],
],
],
'expectedRelativePaths' => [
'/some/absolute/Fixtures' => ['autoload'],
],
'expectedAbsolutePaths' => [
'/some/absolute/Fixtures' => ['autoload'],
],
'expectedOutput' => '',
];
}

/**
* @dataProvider loadCreatesConfigWithExpectedPathsDataSets
* @test
*/
public function loadCreatesConfigWithExpectedPaths(array $extraConfig, array $expectedPaths, string $expectedOutput): void
public function loadCreatesConfigWithExpectedPaths(array $extraConfig, array $expectedRelativePaths, array $expectedAbsolutePaths, string $expectedOutput): void
{
$rootPackage = new RootPackage('fake/package', '1.0.0', '1.0.0.0');
$rootPackage->setExtra($extraConfig);
Expand All @@ -241,7 +386,13 @@ public function loadCreatesConfigWithExpectedPaths(array $extraConfig, array $ex
$bufferedIO = new BufferIO();
$config = Config::load($composer, $bufferedIO);
self::assertInstanceOf(Config::class, $config);
self::assertSame($expectedPaths, $config->paths(Config::FLAG_PATHS_RELATIVE));
self::assertSame($expectedRelativePaths, $config->paths(Config::FLAG_PATHS_RELATIVE));
self::assertSame($expectedRelativePaths, $config->get('paths', Config::FLAG_PATHS_RELATIVE));
self::assertSame(['config' => ['paths' => $expectedRelativePaths]], $config->all(Config::FLAG_PATHS_RELATIVE));
self::assertSame($expectedAbsolutePaths, $config->paths());
self::assertSame($expectedAbsolutePaths, $config->paths(Config::FLAG_PATHS_DEFAULT));
self::assertSame($expectedAbsolutePaths, $config->get('paths'));
self::assertSame(['config' => ['paths' => $expectedAbsolutePaths]], $config->all());
self::assertSame($expectedOutput, $bufferedIO->getOutput());
}
}
Loading