Skip to content

Commit e5d4d84

Browse files
Merge branch '6.0' into 6.1
* 6.0: CS fixes Bump Symfony version to 6.0.11 Update VERSION for 6.0.10 Update CHANGELOG for 6.0.10 Bump Symfony version to 5.4.11 Update VERSION for 5.4.10 Update CHANGELOG for 5.4.10 Bump Symfony version to 4.4.44 Update VERSION for 4.4.43 Update CONTRIBUTORS for 4.4.43 Update CHANGELOG for 4.4.43
2 parents 7be7f6e + 88813c1 commit e5d4d84

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Internal/BasicErrorHandler.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ public static function register(bool $debug): void
2424

2525
if (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
2626
ini_set('display_errors', $debug);
27-
} elseif (!filter_var(ini_get('log_errors'), \FILTER_VALIDATE_BOOLEAN) || ini_get('error_log')) {
27+
} elseif (!filter_var(\ini_get('log_errors'), \FILTER_VALIDATE_BOOLEAN) || \ini_get('error_log')) {
2828
// CLI - display errors only if they're not already logged to STDERR
2929
ini_set('display_errors', 1);
3030
}
3131

32-
if (0 <= ini_get('zend.assertions')) {
32+
if (0 <= \ini_get('zend.assertions')) {
3333
ini_set('zend.assertions', 1);
3434
ini_set('assert.active', $debug);
3535
ini_set('assert.warning', 0);

SymfonyRuntime.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,6 @@ protected function getArgument(\ReflectionParameter $parameter, ?string $type):
182182
Command::class => $this->command ??= new Command(),
183183
default => parent::getArgument($parameter, $type),
184184
};
185-
186185
}
187186

188187
protected static function register(GenericRuntime $runtime): GenericRuntime

0 commit comments

Comments
 (0)