Skip to content

Commit 0c515f8

Browse files
authored
Merge pull request #664 from asgrim/1-4-8-merge-up
1.4.8 merge up to 1.5.x - output newline, and Windows exe build fixes
2 parents ad38710 + 924517e commit 0c515f8

4 files changed

Lines changed: 21 additions & 22 deletions

File tree

.github/workflows/build-assets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
- ubuntu-24.04-arm
8181
- macos-15-intel
8282
- macos-26
83-
# - windows-2025 - disabled for now, seems broken
83+
- windows-2022
8484
permissions:
8585
contents: read
8686
# id-token:write is required for build provenance attestation.

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@
4646
"behat/behat": "^3.29.0",
4747
"bnf/phpstan-psr-container": "^1.1",
4848
"doctrine/coding-standard": "^14.0.0",
49-
"phpstan/phpstan": "^2.2.3",
50-
"phpstan/phpstan-phpunit": "^2.0.17",
49+
"phpstan/phpstan": "^2.2.5",
50+
"phpstan/phpstan-phpunit": "^2.0.18",
5151
"phpstan/phpstan-webmozart-assert": "^2.0",
5252
"phpunit/phpunit": "^10.5.63",
5353
"thecodingmachine/phpstan-safe-rule": "^1.4.7"

composer.lock

Lines changed: 17 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Util/Process.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public static function outputCallbackForVerbosity(IOInterface $io, int $minVerbo
7171
$type === SymfonyProcess::ERR ? '<comment>' : '',
7272
$outputMessage,
7373
$type === SymfonyProcess::ERR ? '</comment>' : '',
74-
));
74+
), false);
7575
};
7676
}
7777

0 commit comments

Comments
 (0)