Skip to content

Commit 0b7724f

Browse files
authored
Merge pull request #94 from kasimi/lang-array-merge
Add message instead of throwing error if array_merge has unexpected argument
2 parents 525b5fc + 67fa647 commit 0b7724f

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

src/Tests/Tests/epv_test_validate_languages.php

+15-13
Original file line numberDiff line numberDiff line change
@@ -128,23 +128,25 @@ protected function load_language_keys($filename)
128128
/** @var Array_ $array */
129129
$array = $expr->args[$i]->value;
130130

131-
if (!($array instanceof Array_))
131+
if ($array instanceof Array_)
132132
{
133-
throw new Error(sprintf('Expected argument %d of array_merge() to be %s, got %s', $i + 1, Array_::class, get_class($array)), $array->getLine());
134-
}
135-
136-
foreach ($array->items as $item)
137-
{
138-
/** @var ArrayItem $item */
139-
if ($item->key instanceof String_)
133+
foreach ($array->items as $item)
140134
{
141-
$keys[] = $item->key->value;
142-
}
143-
else
144-
{
145-
$this->output->addMessage(OutputInterface::NOTICE, 'Language key is not a string value in ' . substr($filename, strlen($this->basedir)) . ' on line ' . $item->key->getLine());
135+
/** @var ArrayItem $item */
136+
if ($item->key instanceof String_)
137+
{
138+
$keys[] = $item->key->value;
139+
}
140+
else
141+
{
142+
$this->output->addMessage(OutputInterface::NOTICE, 'Language key is not a string value in ' . substr($filename, strlen($this->basedir)) . ' on line ' . $item->key->getLine());
143+
}
146144
}
147145
}
146+
else
147+
{
148+
$this->output->addMessage(OutputInterface::ERROR, sprintf('Expected argument %d of array_merge() to be %s, got %s on line %d', $i + 1, Array_::class, get_class($array), $array->getLine()));
149+
}
148150
}
149151
}
150152
}

0 commit comments

Comments
 (0)