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
2 changes: 1 addition & 1 deletion .php-cs-fixer.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
->setCacheFile(__DIR__ . '/runtime/cache/.php-cs-fixer.cache')
->setParallelConfig(ParallelConfigFactory::detect())
->setRules([
'@PER-CS2.0' => true,
'@PER-CS' => true,
'no_unused_imports' => true,
])
->setFinder($finder);
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## 1.2.1 under development

- Chg #430: Replace deprecated PHP CS Fixer rule set `@PER-CS2.0` with `@PER-CS` (@dbuhonov)
- Chg #447, #450: Allow symfony/console 8 (@samdark)
- Enh #448: Add grouping to `make` help output (@Xakki, @samdark)
- Enh #449: Update composer dependencies and refactor to replace use of deprecated classes (@vjik)
Expand Down
2 changes: 1 addition & 1 deletion config/common/di/error-handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
return [
HtmlRenderer::class => [
'__construct()' => [
'traceLink' => static function (string $file, int|null $line) use ($params): string|null {
'traceLink' => static function (string $file, ?int $line) use ($params): string|null {
if (!isset($params['traceLink'])) {
return null;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Environment.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public static function isProd(): bool
/**
* @return non-empty-string|null
*/
public static function appHostPath(): string|null
public static function appHostPath(): ?string
{
/** @var non-empty-string|null */
return self::$values['APP_HOST_PATH'];
Expand Down Expand Up @@ -114,7 +114,7 @@ private static function setString(string $key, string $default): void
self::$values[$key] = $value ?? $default;
}

private static function setNonEmptyStringOrNull(string $key, string|null $default): void
private static function setNonEmptyStringOrNull(string $key, ?string $default): void
{
$value = self::getRawValue($key);
self::$values[$key] = $value === null || $value === '' ? $default : $value;
Expand Down
Loading