Merge branch '4.1'
* 4.1: [Config] minor fix that removes a PHP 7.3 deprecation [Translation] fix perf of lint:xliff command
This commit is contained in:
commit
e0a8a7f631
@ -499,7 +499,7 @@ abstract class BaseNode implements NodeInterface
|
|||||||
return self::$placeholders[$value];
|
return self::$placeholders[$value];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (0 === strpos($value, self::$placeholderUniquePrefix)) {
|
if (self::$placeholderUniquePrefix && 0 === strpos($value, self::$placeholderUniquePrefix)) {
|
||||||
return array();
|
return array();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -134,10 +134,10 @@ EOF
|
|||||||
|
|
||||||
foreach (XliffUtils::validateSchema($document) as $xmlError) {
|
foreach (XliffUtils::validateSchema($document) as $xmlError) {
|
||||||
$errors[] = array(
|
$errors[] = array(
|
||||||
'line' => $xmlError['line'],
|
'line' => $xmlError['line'],
|
||||||
'column' => $xmlError['column'],
|
'column' => $xmlError['column'],
|
||||||
'message' => $xmlError['message'],
|
'message' => $xmlError['message'],
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return array('file' => $file, 'valid' => 0 === \count($errors), 'messages' => $errors);
|
return array('file' => $file, 'valid' => 0 === \count($errors), 'messages' => $errors);
|
||||||
|
Reference in New Issue
Block a user