Skip to content

Commit ecd8172

Browse files
author
Mikhail Trusov
committed
Defined conditions in the while loops in a more strict manner.
1 parent 3cdc236 commit ecd8172

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

src/errors.php

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,18 @@ public function add($severity, $content, $filename, $line)
119119
*/
120120
public function tally()
121121
{
122-
while (list($severity, $message, $file, $line) = $this->extract()) {
123-
$severity = $this->getSeverityAsString($severity);
124-
$this->test->error($severity, $message, $file, $line);
122+
while ($error = $this->extract()) {
123+
if (is_array($error)) {
124+
list($severity, $message, $file, $line) = $error;
125+
$severity = $this->getSeverityAsString($severity);
126+
$this->test->error($severity, $message, $file, $line);
127+
}
125128
}
126-
while (list($expected, $message) = $this->extractExpectation()) {
127-
$this->test->assert($expected, false, '%s -> Expected error not caught');
129+
while ($expectation = $this->extractExpectation()) {
130+
if (is_array($expectation)) {
131+
list($expected, $message) = $expectation;
132+
$this->test->assert($expected, false, '%s -> Expected error not caught');
133+
}
128134
}
129135
}
130136

0 commit comments

Comments
 (0)