diff --git a/src/Symfony/Component/Config/Definition/BaseNode.php b/src/Symfony/Component/Config/Definition/BaseNode.php index f9cf829e4e..61e75eb589 100644 --- a/src/Symfony/Component/Config/Definition/BaseNode.php +++ b/src/Symfony/Component/Config/Definition/BaseNode.php @@ -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(); } } diff --git a/src/Symfony/Component/Translation/Command/XliffLintCommand.php b/src/Symfony/Component/Translation/Command/XliffLintCommand.php index bf48e775d3..e7d6f3cf0f 100644 --- a/src/Symfony/Component/Translation/Command/XliffLintCommand.php +++ b/src/Symfony/Component/Translation/Command/XliffLintCommand.php @@ -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);