Skip to content

Commit dd0cade

Browse files
authored
[Console] Fix symfony/console diff broken on windows on symfony/console 6.4.24 (#29)
* [Console] Fix symfony/console diff broken on windows on symfony/console 6.4.24 * fix unit test
1 parent 47bd48d commit dd0cade

File tree

3 files changed

+10
-18
lines changed

3 files changed

+10
-18
lines changed

composer.json

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"composer/semver": "^3.4",
1111
"illuminate/container": "^12.14",
1212
"nette/utils": "^4.0",
13-
"symfony/console": "^6.4",
13+
"symfony/console": "^6.4.24",
1414
"symfony/finder": "^7.2",
1515
"symfony/process": "^7.2",
1616
"webmozart/assert": "^1.11"
@@ -39,8 +39,7 @@
3939
},
4040
"replace": {
4141
"symfony/polyfill-ctype": "*",
42-
"symfony/polyfill-intl-normalizer": "*",
43-
"symfony/polyfill-mbstring": "*"
42+
"symfony/polyfill-intl-normalizer": "*"
4443
},
4544
"config": {
4645
"sort-packages": true,
@@ -55,12 +54,5 @@
5554
"fix-cs": "vendor/bin/ecs check --fix --ansi",
5655
"phpstan": "vendor/bin/phpstan analyse --ansi",
5756
"rector": "vendor/bin/rector process --ansi"
58-
},
59-
"extra": {
60-
"patches": {
61-
"symfony/console": [
62-
"patches/symfony-console-helper-helper-php.patch"
63-
]
64-
}
6557
}
6658
}

patches/symfony-console-helper-helper-php.patch

Whitespace-only changes.

tests/ComposerProcessor/RaiseToInstalledComposerProcessor/RaiseToInstalledComposerProcessorTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public function test(): void
3939
$this->assertSame('^9.0', $changedPackageVersion->getOldVersion());
4040

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

4545
public function testSkipDev(): void
@@ -60,7 +60,7 @@ public static function provideSkipSuggestChangeFiles(): iterable
6060
<<<'JSON'
6161
{
6262
"require-dev": {
63-
"illuminate/container": "^12.19"
63+
"illuminate/container": "^12.24"
6464
},
6565
"suggest": {
6666
"illuminate/container": "to use container"
@@ -78,7 +78,7 @@ public static function provideSkipSuggestChangeFiles(): iterable
7878
"illuminate/container": "to use container"
7979
},
8080
"require-dev": {
81-
"illuminate/container": "^12.19"
81+
"illuminate/container": "^12.24"
8282
}
8383
}
8484

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

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

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

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

117117
$this->assertSame(
118118
<<<'JSON'
119119
{
120120
"require-dev": {
121-
"illuminate/container": "^12.19"
121+
"illuminate/container": "^12.24"
122122
},
123123
"conflict": {
124124
"illuminate/container": "<9.0"
@@ -141,7 +141,7 @@ public function testSinglePiped(): void
141141

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

147147
public function testDoublePiped(): void
@@ -154,6 +154,6 @@ public function testDoublePiped(): void
154154

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

0 commit comments

Comments
 (0)