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
14 changes: 13 additions & 1 deletion src/FileSystem/ComposerJsonPackageVersionUpdater.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,24 @@ final class ComposerJsonPackageVersionUpdater
public static function update(string $composerJsonContents, string $packageName, string $newVersion): string
{
// replace using regex, to keep original composer.json format
return Strings::replace(
$allChanges = Strings::replace(
$composerJsonContents,
// find
sprintf('#"%s": "(.*?)"#', $packageName),
// replace
sprintf('"%s": "%s"', $packageName, $newVersion)
);

$suggestContent = Strings::match($composerJsonContents, '#"suggest"\s*:\s*{[^}]*}#');

if ($suggestContent !== null) {
$allChanges = Strings::replace(
$allChanges,
'#"suggest"\s*:\s*{[^}]*}#',
$suggestContent[0]
);
}

return $allChanges;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"suggest": {
"illuminate/container": "to use container"
},
"require-dev": {
"illuminate/container": "^9.0"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"require-dev": {
"illuminate/container": "^9.0"
},
"suggest": {
"illuminate/container": "to use container"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
namespace Rector\Jack\Tests\ComposerProcessor\RaiseToInstalledComposerProcessor;

use Nette\Utils\FileSystem;
use PHPUnit\Framework\Attributes\DataProvider;
use Rector\Jack\ComposerProcessor\RaiseToInstalledComposerProcessor;
use Rector\Jack\Tests\AbstractTestCase;
use Rector\Jack\ValueObject\ChangedPackageVersion;
Expand Down Expand Up @@ -49,6 +50,58 @@ public function testSkipDev(): void
$this->assertEmpty($changedPackageVersionsResult->getChangedPackageVersions());
}

/**
* @return iterable<array{string, string}>
*/
public static function provideSkipSuggestChangeFiles(): iterable
{
yield [
__DIR__ . '/Fixture/skip-suggest.json',
<<<'JSON'
{
"require-dev": {
"illuminate/container": "^12.19"
},
"suggest": {
"illuminate/container": "to use container"
}
}

JSON
];

yield [
__DIR__ . '/Fixture/skip-suggest-early-definition.json',
<<<'JSON'
{
"suggest": {
"illuminate/container": "to use container"
},
"require-dev": {
"illuminate/container": "^12.19"
}
}

JSON
];
}

#[DataProvider('provideSkipSuggestChangeFiles')]
public function testSkipSuggestChange(string $file, string $changedFileContent): void
{
$composerJsonContents = FileSystem::read($file);

$changedPackageVersionsResult = $this->raiseToInstalledComposerProcessor->process($composerJsonContents);

$changedPackageVersion = $changedPackageVersionsResult->getChangedPackageVersions()[0];

$this->assertSame('illuminate/container', $changedPackageVersion->getPackageName());
$this->assertSame('^9.0', $changedPackageVersion->getOldVersion());
$this->assertSame('^12.19', $changedPackageVersion->getNewVersion());

$this->assertSame($changedFileContent, $changedPackageVersionsResult->getComposerJsonContents());
}

public function testSinglePiped(): void
{
$composerJsonContents = FileSystem::read(__DIR__ . '/Fixture/single-piped.json');
Expand Down