Skip to content

Commit f1d4dd4

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.4
* 3.4: Enable "native_constant_invocation" CS rule Make AbstractPhpFileCacheWarmer public
2 parents 1bef323 + 31562c7 commit f1d4dd4

18 files changed

+140
-140
lines changed

‎Caster/AmqpCaster.php‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,27 +23,27 @@
2323
class AmqpCaster
2424
{
2525
private static $flags = [
26-
AMQP_DURABLE => 'AMQP_DURABLE',
27-
AMQP_PASSIVE => 'AMQP_PASSIVE',
28-
AMQP_EXCLUSIVE => 'AMQP_EXCLUSIVE',
29-
AMQP_AUTODELETE => 'AMQP_AUTODELETE',
30-
AMQP_INTERNAL => 'AMQP_INTERNAL',
31-
AMQP_NOLOCAL => 'AMQP_NOLOCAL',
32-
AMQP_AUTOACK => 'AMQP_AUTOACK',
33-
AMQP_IFEMPTY => 'AMQP_IFEMPTY',
34-
AMQP_IFUNUSED => 'AMQP_IFUNUSED',
35-
AMQP_MANDATORY => 'AMQP_MANDATORY',
36-
AMQP_IMMEDIATE => 'AMQP_IMMEDIATE',
37-
AMQP_MULTIPLE => 'AMQP_MULTIPLE',
38-
AMQP_NOWAIT => 'AMQP_NOWAIT',
39-
AMQP_REQUEUE => 'AMQP_REQUEUE',
26+
\AMQP_DURABLE => 'AMQP_DURABLE',
27+
\AMQP_PASSIVE => 'AMQP_PASSIVE',
28+
\AMQP_EXCLUSIVE => 'AMQP_EXCLUSIVE',
29+
\AMQP_AUTODELETE => 'AMQP_AUTODELETE',
30+
\AMQP_INTERNAL => 'AMQP_INTERNAL',
31+
\AMQP_NOLOCAL => 'AMQP_NOLOCAL',
32+
\AMQP_AUTOACK => 'AMQP_AUTOACK',
33+
\AMQP_IFEMPTY => 'AMQP_IFEMPTY',
34+
\AMQP_IFUNUSED => 'AMQP_IFUNUSED',
35+
\AMQP_MANDATORY => 'AMQP_MANDATORY',
36+
\AMQP_IMMEDIATE => 'AMQP_IMMEDIATE',
37+
\AMQP_MULTIPLE => 'AMQP_MULTIPLE',
38+
\AMQP_NOWAIT => 'AMQP_NOWAIT',
39+
\AMQP_REQUEUE => 'AMQP_REQUEUE',
4040
];
4141

4242
private static $exchangeTypes = [
43-
AMQP_EX_TYPE_DIRECT => 'AMQP_EX_TYPE_DIRECT',
44-
AMQP_EX_TYPE_FANOUT => 'AMQP_EX_TYPE_FANOUT',
45-
AMQP_EX_TYPE_TOPIC => 'AMQP_EX_TYPE_TOPIC',
46-
AMQP_EX_TYPE_HEADERS => 'AMQP_EX_TYPE_HEADERS',
43+
\AMQP_EX_TYPE_DIRECT => 'AMQP_EX_TYPE_DIRECT',
44+
\AMQP_EX_TYPE_FANOUT => 'AMQP_EX_TYPE_FANOUT',
45+
\AMQP_EX_TYPE_TOPIC => 'AMQP_EX_TYPE_TOPIC',
46+
\AMQP_EX_TYPE_HEADERS => 'AMQP_EX_TYPE_HEADERS',
4747
];
4848

4949
public static function castConnection(\AMQPConnection $c, array $a, Stub $stub, $isNested)

‎Caster/DOMCaster.php‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -23,44 +23,44 @@
2323
class DOMCaster
2424
{
2525
private static $errorCodes = [
26-
DOM_PHP_ERR => 'DOM_PHP_ERR',
27-
DOM_INDEX_SIZE_ERR => 'DOM_INDEX_SIZE_ERR',
28-
DOMSTRING_SIZE_ERR => 'DOMSTRING_SIZE_ERR',
29-
DOM_HIERARCHY_REQUEST_ERR => 'DOM_HIERARCHY_REQUEST_ERR',
30-
DOM_WRONG_DOCUMENT_ERR => 'DOM_WRONG_DOCUMENT_ERR',
31-
DOM_INVALID_CHARACTER_ERR => 'DOM_INVALID_CHARACTER_ERR',
32-
DOM_NO_DATA_ALLOWED_ERR => 'DOM_NO_DATA_ALLOWED_ERR',
33-
DOM_NO_MODIFICATION_ALLOWED_ERR => 'DOM_NO_MODIFICATION_ALLOWED_ERR',
34-
DOM_NOT_FOUND_ERR => 'DOM_NOT_FOUND_ERR',
35-
DOM_NOT_SUPPORTED_ERR => 'DOM_NOT_SUPPORTED_ERR',
36-
DOM_INUSE_ATTRIBUTE_ERR => 'DOM_INUSE_ATTRIBUTE_ERR',
37-
DOM_INVALID_STATE_ERR => 'DOM_INVALID_STATE_ERR',
38-
DOM_SYNTAX_ERR => 'DOM_SYNTAX_ERR',
39-
DOM_INVALID_MODIFICATION_ERR => 'DOM_INVALID_MODIFICATION_ERR',
40-
DOM_NAMESPACE_ERR => 'DOM_NAMESPACE_ERR',
41-
DOM_INVALID_ACCESS_ERR => 'DOM_INVALID_ACCESS_ERR',
42-
DOM_VALIDATION_ERR => 'DOM_VALIDATION_ERR',
26+
\DOM_PHP_ERR => 'DOM_PHP_ERR',
27+
\DOM_INDEX_SIZE_ERR => 'DOM_INDEX_SIZE_ERR',
28+
\DOMSTRING_SIZE_ERR => 'DOMSTRING_SIZE_ERR',
29+
\DOM_HIERARCHY_REQUEST_ERR => 'DOM_HIERARCHY_REQUEST_ERR',
30+
\DOM_WRONG_DOCUMENT_ERR => 'DOM_WRONG_DOCUMENT_ERR',
31+
\DOM_INVALID_CHARACTER_ERR => 'DOM_INVALID_CHARACTER_ERR',
32+
\DOM_NO_DATA_ALLOWED_ERR => 'DOM_NO_DATA_ALLOWED_ERR',
33+
\DOM_NO_MODIFICATION_ALLOWED_ERR => 'DOM_NO_MODIFICATION_ALLOWED_ERR',
34+
\DOM_NOT_FOUND_ERR => 'DOM_NOT_FOUND_ERR',
35+
\DOM_NOT_SUPPORTED_ERR => 'DOM_NOT_SUPPORTED_ERR',
36+
\DOM_INUSE_ATTRIBUTE_ERR => 'DOM_INUSE_ATTRIBUTE_ERR',
37+
\DOM_INVALID_STATE_ERR => 'DOM_INVALID_STATE_ERR',
38+
\DOM_SYNTAX_ERR => 'DOM_SYNTAX_ERR',
39+
\DOM_INVALID_MODIFICATION_ERR => 'DOM_INVALID_MODIFICATION_ERR',
40+
\DOM_NAMESPACE_ERR => 'DOM_NAMESPACE_ERR',
41+
\DOM_INVALID_ACCESS_ERR => 'DOM_INVALID_ACCESS_ERR',
42+
\DOM_VALIDATION_ERR => 'DOM_VALIDATION_ERR',
4343
];
4444

4545
private static $nodeTypes = [
46-
XML_ELEMENT_NODE => 'XML_ELEMENT_NODE',
47-
XML_ATTRIBUTE_NODE => 'XML_ATTRIBUTE_NODE',
48-
XML_TEXT_NODE => 'XML_TEXT_NODE',
49-
XML_CDATA_SECTION_NODE => 'XML_CDATA_SECTION_NODE',
50-
XML_ENTITY_REF_NODE => 'XML_ENTITY_REF_NODE',
51-
XML_ENTITY_NODE => 'XML_ENTITY_NODE',
52-
XML_PI_NODE => 'XML_PI_NODE',
53-
XML_COMMENT_NODE => 'XML_COMMENT_NODE',
54-
XML_DOCUMENT_NODE => 'XML_DOCUMENT_NODE',
55-
XML_DOCUMENT_TYPE_NODE => 'XML_DOCUMENT_TYPE_NODE',
56-
XML_DOCUMENT_FRAG_NODE => 'XML_DOCUMENT_FRAG_NODE',
57-
XML_NOTATION_NODE => 'XML_NOTATION_NODE',
58-
XML_HTML_DOCUMENT_NODE => 'XML_HTML_DOCUMENT_NODE',
59-
XML_DTD_NODE => 'XML_DTD_NODE',
60-
XML_ELEMENT_DECL_NODE => 'XML_ELEMENT_DECL_NODE',
61-
XML_ATTRIBUTE_DECL_NODE => 'XML_ATTRIBUTE_DECL_NODE',
62-
XML_ENTITY_DECL_NODE => 'XML_ENTITY_DECL_NODE',
63-
XML_NAMESPACE_DECL_NODE => 'XML_NAMESPACE_DECL_NODE',
46+
\XML_ELEMENT_NODE => 'XML_ELEMENT_NODE',
47+
\XML_ATTRIBUTE_NODE => 'XML_ATTRIBUTE_NODE',
48+
\XML_TEXT_NODE => 'XML_TEXT_NODE',
49+
\XML_CDATA_SECTION_NODE => 'XML_CDATA_SECTION_NODE',
50+
\XML_ENTITY_REF_NODE => 'XML_ENTITY_REF_NODE',
51+
\XML_ENTITY_NODE => 'XML_ENTITY_NODE',
52+
\XML_PI_NODE => 'XML_PI_NODE',
53+
\XML_COMMENT_NODE => 'XML_COMMENT_NODE',
54+
\XML_DOCUMENT_NODE => 'XML_DOCUMENT_NODE',
55+
\XML_DOCUMENT_TYPE_NODE => 'XML_DOCUMENT_TYPE_NODE',
56+
\XML_DOCUMENT_FRAG_NODE => 'XML_DOCUMENT_FRAG_NODE',
57+
\XML_NOTATION_NODE => 'XML_NOTATION_NODE',
58+
\XML_HTML_DOCUMENT_NODE => 'XML_HTML_DOCUMENT_NODE',
59+
\XML_DTD_NODE => 'XML_DTD_NODE',
60+
\XML_ELEMENT_DECL_NODE => 'XML_ELEMENT_DECL_NODE',
61+
\XML_ATTRIBUTE_DECL_NODE => 'XML_ATTRIBUTE_DECL_NODE',
62+
\XML_ENTITY_DECL_NODE => 'XML_ENTITY_DECL_NODE',
63+
\XML_NAMESPACE_DECL_NODE => 'XML_NAMESPACE_DECL_NODE',
6464
];
6565

6666
public static function castException(\DOMException $e, array $a, Stub $stub, $isNested)

‎Caster/ExceptionCaster.php‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@ class ExceptionCaster
2727
public static $srcContext = 1;
2828
public static $traceArgs = true;
2929
public static $errorTypes = [
30-
E_DEPRECATED => 'E_DEPRECATED',
31-
E_USER_DEPRECATED => 'E_USER_DEPRECATED',
32-
E_RECOVERABLE_ERROR => 'E_RECOVERABLE_ERROR',
33-
E_ERROR => 'E_ERROR',
34-
E_WARNING => 'E_WARNING',
35-
E_PARSE => 'E_PARSE',
36-
E_NOTICE => 'E_NOTICE',
37-
E_CORE_ERROR => 'E_CORE_ERROR',
38-
E_CORE_WARNING => 'E_CORE_WARNING',
39-
E_COMPILE_ERROR => 'E_COMPILE_ERROR',
40-
E_COMPILE_WARNING => 'E_COMPILE_WARNING',
41-
E_USER_ERROR => 'E_USER_ERROR',
42-
E_USER_WARNING => 'E_USER_WARNING',
43-
E_USER_NOTICE => 'E_USER_NOTICE',
44-
E_STRICT => 'E_STRICT',
30+
\E_DEPRECATED => 'E_DEPRECATED',
31+
\E_USER_DEPRECATED => 'E_USER_DEPRECATED',
32+
\E_RECOVERABLE_ERROR => 'E_RECOVERABLE_ERROR',
33+
\E_ERROR => 'E_ERROR',
34+
\E_WARNING => 'E_WARNING',
35+
\E_PARSE => 'E_PARSE',
36+
\E_NOTICE => 'E_NOTICE',
37+
\E_CORE_ERROR => 'E_CORE_ERROR',
38+
\E_CORE_WARNING => 'E_CORE_WARNING',
39+
\E_COMPILE_ERROR => 'E_COMPILE_ERROR',
40+
\E_COMPILE_WARNING => 'E_COMPILE_WARNING',
41+
\E_USER_ERROR => 'E_USER_ERROR',
42+
\E_USER_WARNING => 'E_USER_WARNING',
43+
\E_USER_NOTICE => 'E_USER_NOTICE',
44+
\E_STRICT => 'E_STRICT',
4545
];
4646

4747
private static $framesCache = [];

‎Caster/PgSqlCaster.php‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -36,37 +36,37 @@ class PgSqlCaster
3636
];
3737

3838
private static $transactionStatus = [
39-
PGSQL_TRANSACTION_IDLE => 'PGSQL_TRANSACTION_IDLE',
40-
PGSQL_TRANSACTION_ACTIVE => 'PGSQL_TRANSACTION_ACTIVE',
41-
PGSQL_TRANSACTION_INTRANS => 'PGSQL_TRANSACTION_INTRANS',
42-
PGSQL_TRANSACTION_INERROR => 'PGSQL_TRANSACTION_INERROR',
43-
PGSQL_TRANSACTION_UNKNOWN => 'PGSQL_TRANSACTION_UNKNOWN',
39+
\PGSQL_TRANSACTION_IDLE => 'PGSQL_TRANSACTION_IDLE',
40+
\PGSQL_TRANSACTION_ACTIVE => 'PGSQL_TRANSACTION_ACTIVE',
41+
\PGSQL_TRANSACTION_INTRANS => 'PGSQL_TRANSACTION_INTRANS',
42+
\PGSQL_TRANSACTION_INERROR => 'PGSQL_TRANSACTION_INERROR',
43+
\PGSQL_TRANSACTION_UNKNOWN => 'PGSQL_TRANSACTION_UNKNOWN',
4444
];
4545

4646
private static $resultStatus = [
47-
PGSQL_EMPTY_QUERY => 'PGSQL_EMPTY_QUERY',
48-
PGSQL_COMMAND_OK => 'PGSQL_COMMAND_OK',
49-
PGSQL_TUPLES_OK => 'PGSQL_TUPLES_OK',
50-
PGSQL_COPY_OUT => 'PGSQL_COPY_OUT',
51-
PGSQL_COPY_IN => 'PGSQL_COPY_IN',
52-
PGSQL_BAD_RESPONSE => 'PGSQL_BAD_RESPONSE',
53-
PGSQL_NONFATAL_ERROR => 'PGSQL_NONFATAL_ERROR',
54-
PGSQL_FATAL_ERROR => 'PGSQL_FATAL_ERROR',
47+
\PGSQL_EMPTY_QUERY => 'PGSQL_EMPTY_QUERY',
48+
\PGSQL_COMMAND_OK => 'PGSQL_COMMAND_OK',
49+
\PGSQL_TUPLES_OK => 'PGSQL_TUPLES_OK',
50+
\PGSQL_COPY_OUT => 'PGSQL_COPY_OUT',
51+
\PGSQL_COPY_IN => 'PGSQL_COPY_IN',
52+
\PGSQL_BAD_RESPONSE => 'PGSQL_BAD_RESPONSE',
53+
\PGSQL_NONFATAL_ERROR => 'PGSQL_NONFATAL_ERROR',
54+
\PGSQL_FATAL_ERROR => 'PGSQL_FATAL_ERROR',
5555
];
5656

5757
private static $diagCodes = [
58-
'severity' => PGSQL_DIAG_SEVERITY,
59-
'sqlstate' => PGSQL_DIAG_SQLSTATE,
60-
'message' => PGSQL_DIAG_MESSAGE_PRIMARY,
61-
'detail' => PGSQL_DIAG_MESSAGE_DETAIL,
62-
'hint' => PGSQL_DIAG_MESSAGE_HINT,
63-
'statement position' => PGSQL_DIAG_STATEMENT_POSITION,
64-
'internal position' => PGSQL_DIAG_INTERNAL_POSITION,
65-
'internal query' => PGSQL_DIAG_INTERNAL_QUERY,
66-
'context' => PGSQL_DIAG_CONTEXT,
67-
'file' => PGSQL_DIAG_SOURCE_FILE,
68-
'line' => PGSQL_DIAG_SOURCE_LINE,
69-
'function' => PGSQL_DIAG_SOURCE_FUNCTION,
58+
'severity' => \PGSQL_DIAG_SEVERITY,
59+
'sqlstate' => \PGSQL_DIAG_SQLSTATE,
60+
'message' => \PGSQL_DIAG_MESSAGE_PRIMARY,
61+
'detail' => \PGSQL_DIAG_MESSAGE_DETAIL,
62+
'hint' => \PGSQL_DIAG_MESSAGE_HINT,
63+
'statement position' => \PGSQL_DIAG_STATEMENT_POSITION,
64+
'internal position' => \PGSQL_DIAG_INTERNAL_POSITION,
65+
'internal query' => \PGSQL_DIAG_INTERNAL_QUERY,
66+
'context' => \PGSQL_DIAG_CONTEXT,
67+
'file' => \PGSQL_DIAG_SOURCE_FILE,
68+
'line' => \PGSQL_DIAG_SOURCE_LINE,
69+
'function' => \PGSQL_DIAG_SOURCE_FUNCTION,
7070
];
7171

7272
public static function castLargeObject($lo, array $a, Stub $stub, $isNested)
@@ -79,7 +79,7 @@ public static function castLargeObject($lo, array $a, Stub $stub, $isNested)
7979
public static function castLink($link, array $a, Stub $stub, $isNested)
8080
{
8181
$a['status'] = pg_connection_status($link);
82-
$a['status'] = new ConstStub(PGSQL_CONNECTION_OK === $a['status'] ? 'PGSQL_CONNECTION_OK' : 'PGSQL_CONNECTION_BAD', $a['status']);
82+
$a['status'] = new ConstStub(\PGSQL_CONNECTION_OK === $a['status'] ? 'PGSQL_CONNECTION_OK' : 'PGSQL_CONNECTION_BAD', $a['status']);
8383
$a['busy'] = pg_connection_busy($link);
8484

8585
$a['transaction'] = pg_transaction_status($link);
@@ -115,7 +115,7 @@ public static function castResult($result, array $a, Stub $stub, $isNested)
115115
if (isset(self::$resultStatus[$a['status']])) {
116116
$a['status'] = new ConstStub(self::$resultStatus[$a['status']], $a['status']);
117117
}
118-
$a['command-completion tag'] = pg_result_status($result, PGSQL_STATUS_STRING);
118+
$a['command-completion tag'] = pg_result_status($result, \PGSQL_STATUS_STRING);
119119

120120
if (-1 === $a['num rows']) {
121121
foreach (self::$diagCodes as $k => $v) {

‎Caster/ReflectionCaster.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public static function castReflectionGenerator(\ReflectionGenerator $c, array $a
120120
'file' => $c->getExecutingFile(),
121121
'line' => $c->getExecutingLine(),
122122
];
123-
if ($trace = $c->getTrace(DEBUG_BACKTRACE_IGNORE_ARGS)) {
123+
if ($trace = $c->getTrace(\DEBUG_BACKTRACE_IGNORE_ARGS)) {
124124
$function = new \ReflectionGenerator($c->getExecutingGenerator());
125125
array_unshift($trace, [
126126
'function' => 'yield',

‎Caster/XmlResourceCaster.php‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,28 @@
2323
class XmlResourceCaster
2424
{
2525
private static $xmlErrors = [
26-
XML_ERROR_NONE => 'XML_ERROR_NONE',
27-
XML_ERROR_NO_MEMORY => 'XML_ERROR_NO_MEMORY',
28-
XML_ERROR_SYNTAX => 'XML_ERROR_SYNTAX',
29-
XML_ERROR_NO_ELEMENTS => 'XML_ERROR_NO_ELEMENTS',
30-
XML_ERROR_INVALID_TOKEN => 'XML_ERROR_INVALID_TOKEN',
31-
XML_ERROR_UNCLOSED_TOKEN => 'XML_ERROR_UNCLOSED_TOKEN',
32-
XML_ERROR_PARTIAL_CHAR => 'XML_ERROR_PARTIAL_CHAR',
33-
XML_ERROR_TAG_MISMATCH => 'XML_ERROR_TAG_MISMATCH',
34-
XML_ERROR_DUPLICATE_ATTRIBUTE => 'XML_ERROR_DUPLICATE_ATTRIBUTE',
35-
XML_ERROR_JUNK_AFTER_DOC_ELEMENT => 'XML_ERROR_JUNK_AFTER_DOC_ELEMENT',
36-
XML_ERROR_PARAM_ENTITY_REF => 'XML_ERROR_PARAM_ENTITY_REF',
37-
XML_ERROR_UNDEFINED_ENTITY => 'XML_ERROR_UNDEFINED_ENTITY',
38-
XML_ERROR_RECURSIVE_ENTITY_REF => 'XML_ERROR_RECURSIVE_ENTITY_REF',
39-
XML_ERROR_ASYNC_ENTITY => 'XML_ERROR_ASYNC_ENTITY',
40-
XML_ERROR_BAD_CHAR_REF => 'XML_ERROR_BAD_CHAR_REF',
41-
XML_ERROR_BINARY_ENTITY_REF => 'XML_ERROR_BINARY_ENTITY_REF',
42-
XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF => 'XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF',
43-
XML_ERROR_MISPLACED_XML_PI => 'XML_ERROR_MISPLACED_XML_PI',
44-
XML_ERROR_UNKNOWN_ENCODING => 'XML_ERROR_UNKNOWN_ENCODING',
45-
XML_ERROR_INCORRECT_ENCODING => 'XML_ERROR_INCORRECT_ENCODING',
46-
XML_ERROR_UNCLOSED_CDATA_SECTION => 'XML_ERROR_UNCLOSED_CDATA_SECTION',
47-
XML_ERROR_EXTERNAL_ENTITY_HANDLING => 'XML_ERROR_EXTERNAL_ENTITY_HANDLING',
26+
\XML_ERROR_NONE => 'XML_ERROR_NONE',
27+
\XML_ERROR_NO_MEMORY => 'XML_ERROR_NO_MEMORY',
28+
\XML_ERROR_SYNTAX => 'XML_ERROR_SYNTAX',
29+
\XML_ERROR_NO_ELEMENTS => 'XML_ERROR_NO_ELEMENTS',
30+
\XML_ERROR_INVALID_TOKEN => 'XML_ERROR_INVALID_TOKEN',
31+
\XML_ERROR_UNCLOSED_TOKEN => 'XML_ERROR_UNCLOSED_TOKEN',
32+
\XML_ERROR_PARTIAL_CHAR => 'XML_ERROR_PARTIAL_CHAR',
33+
\XML_ERROR_TAG_MISMATCH => 'XML_ERROR_TAG_MISMATCH',
34+
\XML_ERROR_DUPLICATE_ATTRIBUTE => 'XML_ERROR_DUPLICATE_ATTRIBUTE',
35+
\XML_ERROR_JUNK_AFTER_DOC_ELEMENT => 'XML_ERROR_JUNK_AFTER_DOC_ELEMENT',
36+
\XML_ERROR_PARAM_ENTITY_REF => 'XML_ERROR_PARAM_ENTITY_REF',
37+
\XML_ERROR_UNDEFINED_ENTITY => 'XML_ERROR_UNDEFINED_ENTITY',
38+
\XML_ERROR_RECURSIVE_ENTITY_REF => 'XML_ERROR_RECURSIVE_ENTITY_REF',
39+
\XML_ERROR_ASYNC_ENTITY => 'XML_ERROR_ASYNC_ENTITY',
40+
\XML_ERROR_BAD_CHAR_REF => 'XML_ERROR_BAD_CHAR_REF',
41+
\XML_ERROR_BINARY_ENTITY_REF => 'XML_ERROR_BINARY_ENTITY_REF',
42+
\XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF => 'XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF',
43+
\XML_ERROR_MISPLACED_XML_PI => 'XML_ERROR_MISPLACED_XML_PI',
44+
\XML_ERROR_UNKNOWN_ENCODING => 'XML_ERROR_UNKNOWN_ENCODING',
45+
\XML_ERROR_INCORRECT_ENCODING => 'XML_ERROR_INCORRECT_ENCODING',
46+
\XML_ERROR_UNCLOSED_CDATA_SECTION => 'XML_ERROR_UNCLOSED_CDATA_SECTION',
47+
\XML_ERROR_EXTERNAL_ENTITY_HANDLING => 'XML_ERROR_EXTERNAL_ENTITY_HANDLING',
4848
];
4949

5050
public static function castXml($h, array $a, Stub $stub, $isNested)

‎Cloner/AbstractCloner.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ public function setMinDepth($minDepth)
244244
public function cloneVar($var, $filter = 0)
245245
{
246246
$this->prevErrorHandler = set_error_handler(function ($type, $msg, $file, $line, $context = []) {
247-
if (E_RECOVERABLE_ERROR === $type || E_USER_ERROR === $type) {
247+
if (\E_RECOVERABLE_ERROR === $type || \E_USER_ERROR === $type) {
248248
// Cloner never dies
249249
throw new \ErrorException($msg, 0, $type, $file, $line);
250250
}

‎Cloner/Data.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ private function dumpItem(DumperInterface $dumper, Cursor $cursor, array &$refs,
328328
}
329329
} elseif (Stub::TYPE_REF === $item->type) {
330330
if ($item->handle) {
331-
if (!isset($refs[$r = $item->handle - (PHP_INT_MAX >> 1)])) {
331+
if (!isset($refs[$r = $item->handle - (\PHP_INT_MAX >> 1)])) {
332332
$cursor->refIndex = $refs[$r] = $cursor->refIndex ?: ++$refs[0];
333333
} else {
334334
$firstSeen = false;

‎Dumper/AbstractDumper.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ public function dump(Data $data, $output = null)
125125
$this->decimalPoint = localeconv();
126126
$this->decimalPoint = $this->decimalPoint['decimal_point'];
127127

128-
if ($locale = $this->flags & (self::DUMP_COMMA_SEPARATOR | self::DUMP_TRAILING_COMMA) ? setlocale(LC_NUMERIC, 0) : null) {
129-
setlocale(LC_NUMERIC, 'C');
128+
if ($locale = $this->flags & (self::DUMP_COMMA_SEPARATOR | self::DUMP_TRAILING_COMMA) ? setlocale(\LC_NUMERIC, 0) : null) {
129+
setlocale(\LC_NUMERIC, 'C');
130130
}
131131

132132
if ($returnDump = true === $output) {
@@ -150,7 +150,7 @@ public function dump(Data $data, $output = null)
150150
$this->setOutput($prevOutput);
151151
}
152152
if ($locale) {
153-
setlocale(LC_NUMERIC, $locale);
153+
setlocale(\LC_NUMERIC, $locale);
154154
}
155155
}
156156

‎Dumper/CliDumper.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ public function dumpScalar(Cursor $cursor, $type, $value)
149149
$style = 'num';
150150

151151
switch (true) {
152-
case INF === $value: $value = 'INF'; break;
153-
case -INF === $value: $value = '-INF'; break;
152+
case \INF === $value: $value = 'INF'; break;
153+
case -\INF === $value: $value = '-INF'; break;
154154
case is_nan($value): $value = 'NAN'; break;
155155
default:
156156
$value = (string) $value;

0 commit comments

Comments
 (0)