diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:
Nicolas Grekas 2018-08-08 09:59:30 +02:00
parent bf5704559d 9fae8f4609
commit e0a8a7f631
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Symfony/Component/Config/Definition/BaseNode.php
View File

@ -499,7 +499,7 @@ abstract class BaseNode implements NodeInterface
return self::$placeholders[$value];
}
if (0 === strpos($value, self::$placeholderUniquePrefix)) {
if (self::$placeholderUniquePrefix && 0 === strpos($value, self::$placeholderUniquePrefix)) {
return array();
}
}

8
src/Symfony/Component/Translation/Command/XliffLintCommand.php
View File

@ -134,10 +134,10 @@ EOF
foreach (XliffUtils::validateSchema($document) as $xmlError) {
$errors[] = array(
'line' => $xmlError['line'],
'column' => $xmlError['column'],
'message' => $xmlError['message'],
);
'line' => $xmlError['line'],
'column' => $xmlError['column'],
'message' => $xmlError['message'],
);
}
return array('file' => $file, 'valid' => 0 === \count($errors), 'messages' => $errors);