Skip to content

Commit 86af461

Browse files
Merge branch '7.0' into 7.1
* 7.0: [Console][PhpUnitBridge][VarDumper] Fix `NO_COLOR` empty value handling [Translation] Fix CSV escape char in `CsvFileLoader` on PHP >= 7.4 [DoctrineBridge] fix messenger bus dispatch inside an active transaction [HttpFoundation] Add tests for uncovered sections treat uninitialized properties referenced by property paths as null properly set up constraint options [ErrorHandler][VarDumper] Remove PHP 8.4 deprecations move adding detailed JSON error messages to the validate phase [Profiler] Add word wrap in tables in dialog to see all the text [Core] Fix & Enhance security arabic translation. [HttpFoundation] Add tests for `MethodRequestMatcher` and `SchemeRequestMatcher`
2 parents 5857c57 + 3b5bed5 commit 86af461

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

Caster/DOMCaster.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
class DOMCaster
2424
{
2525
private const ERROR_CODES = [
26-
\DOM_PHP_ERR => 'DOM_PHP_ERR',
26+
0 => 'DOM_PHP_ERR',
2727
\DOM_INDEX_SIZE_ERR => 'DOM_INDEX_SIZE_ERR',
2828
\DOMSTRING_SIZE_ERR => 'DOMSTRING_SIZE_ERR',
2929
\DOM_HIERARCHY_REQUEST_ERR => 'DOM_HIERARCHY_REQUEST_ERR',
@@ -143,16 +143,12 @@ public static function castDocument(\DOMDocument $dom, array $a, Stub $stub, boo
143143
'doctype' => $dom->doctype,
144144
'implementation' => $dom->implementation,
145145
'documentElement' => new CutStub($dom->documentElement),
146-
'actualEncoding' => $dom->actualEncoding,
147146
'encoding' => $dom->encoding,
148147
'xmlEncoding' => $dom->xmlEncoding,
149-
'standalone' => $dom->standalone,
150148
'xmlStandalone' => $dom->xmlStandalone,
151-
'version' => $dom->version,
152149
'xmlVersion' => $dom->xmlVersion,
153150
'strictErrorChecking' => $dom->strictErrorChecking,
154151
'documentURI' => $dom->documentURI ? new LinkStub($dom->documentURI) : $dom->documentURI,
155-
'config' => $dom->config,
156152
'formatOutput' => $dom->formatOutput,
157153
'validateOnParse' => $dom->validateOnParse,
158154
'resolveExternals' => $dom->resolveExternals,
@@ -294,9 +290,6 @@ public static function castEntity(\DOMEntity|\Dom\Entity $dom, array $a, Stub $s
294290
'publicId' => $dom->publicId,
295291
'systemId' => $dom->systemId,
296292
'notationName' => $dom->notationName,
297-
'actualEncoding' => $dom->actualEncoding,
298-
'encoding' => $dom->encoding,
299-
'version' => $dom->version,
300293
];
301294

302295
return $a;

Caster/ExceptionCaster.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class ExceptionCaster
4242
\E_USER_ERROR => 'E_USER_ERROR',
4343
\E_USER_WARNING => 'E_USER_WARNING',
4444
\E_USER_NOTICE => 'E_USER_NOTICE',
45-
\E_STRICT => 'E_STRICT',
45+
2048 => 'E_STRICT',
4646
];
4747

4848
private static array $framesCache = [];

Dumper/CliDumper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,7 @@ private function hasColorSupport(mixed $stream): bool
587587
}
588588

589589
// Follow https://no-color.org/
590-
if (isset($_SERVER['NO_COLOR']) || false !== getenv('NO_COLOR')) {
590+
if ('' !== ($_SERVER['NO_COLOR'] ?? getenv('NO_COLOR') ?: '')) {
591591
return false;
592592
}
593593

0 commit comments

Comments
 (0)