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
12 changes: 2 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"composer/semver": "^3.4",
"illuminate/container": "^12.14",
"nette/utils": "^4.0",
"symfony/console": "^6.4",
"symfony/console": "^6.4.24",
"symfony/finder": "^7.2",
"symfony/process": "^7.2",
"webmozart/assert": "^1.11"
Expand Down Expand Up @@ -39,8 +39,7 @@
},
"replace": {
"symfony/polyfill-ctype": "*",
"symfony/polyfill-intl-normalizer": "*",
"symfony/polyfill-mbstring": "*"
"symfony/polyfill-intl-normalizer": "*"
},
"config": {
"sort-packages": true,
Expand All @@ -55,12 +54,5 @@
"fix-cs": "vendor/bin/ecs check --fix --ansi",
"phpstan": "vendor/bin/phpstan analyse --ansi",
"rector": "vendor/bin/rector process --ansi"
},
"extra": {
"patches": {
"symfony/console": [
"patches/symfony-console-helper-helper-php.patch"
]
}
}
}
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function test(): void
$this->assertSame('^9.0', $changedPackageVersion->getOldVersion());

// note: this might change in near future; improve to dynamic soon
$this->assertStringStartsWith('^12.1', $changedPackageVersion->getNewVersion());
$this->assertStringStartsWith('^12.2', $changedPackageVersion->getNewVersion());
}

public function testSkipDev(): void
Expand All @@ -60,7 +60,7 @@ public static function provideSkipSuggestChangeFiles(): iterable
<<<'JSON'
{
"require-dev": {
"illuminate/container": "^12.19"
"illuminate/container": "^12.24"
},
"suggest": {
"illuminate/container": "to use container"
Expand All @@ -78,7 +78,7 @@ public static function provideSkipSuggestChangeFiles(): iterable
"illuminate/container": "to use container"
},
"require-dev": {
"illuminate/container": "^12.19"
"illuminate/container": "^12.24"
}
}

Expand All @@ -97,7 +97,7 @@ public function testSkipSuggestChange(string $file, string $changedFileContent):

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

$this->assertSame($changedFileContent, $changedPackageVersionsResult->getComposerJsonContents());
}
Expand All @@ -112,13 +112,13 @@ public function testSkipConflictChange(): void

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

$this->assertSame(
<<<'JSON'
{
"require-dev": {
"illuminate/container": "^12.19"
"illuminate/container": "^12.24"
},
"conflict": {
"illuminate/container": "<9.0"
Expand All @@ -141,7 +141,7 @@ public function testSinglePiped(): void

$this->assertSame('illuminate/container', $changedPackageVersion->getPackageName());
$this->assertSame('^12.14 | 13.0', $changedPackageVersion->getOldVersion());
$this->assertSame('^12.19', $changedPackageVersion->getNewVersion());
$this->assertSame('^12.24', $changedPackageVersion->getNewVersion());
}

public function testDoublePiped(): void
Expand All @@ -154,6 +154,6 @@ public function testDoublePiped(): void

$this->assertSame('illuminate/container', $changedPackageVersion->getPackageName());
$this->assertSame('^12.14 | 13.0', $changedPackageVersion->getOldVersion());
$this->assertSame('^12.19', $changedPackageVersion->getNewVersion());
$this->assertSame('^12.24', $changedPackageVersion->getNewVersion());
}
}