diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-20 15:11:23 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-20 15:11:23 +0200 |
| commit | bc1ab3dc79b63091c82a29f5c5175558423ac8cd (patch) | |
| tree | cd78491859da26541176f8da61a1879f9ae68bfa /phpBB/phpbb/event/php_exporter.php | |
| parent | 08cce5fba548374c8c067ee8bed8aa6d388367e5 (diff) | |
| download | forums-bc1ab3dc79b63091c82a29f5c5175558423ac8cd.tar forums-bc1ab3dc79b63091c82a29f5c5175558423ac8cd.tar.gz forums-bc1ab3dc79b63091c82a29f5c5175558423ac8cd.tar.bz2 forums-bc1ab3dc79b63091c82a29f5c5175558423ac8cd.tar.xz forums-bc1ab3dc79b63091c82a29f5c5175558423ac8cd.zip | |
[ticket/12273] Fix missing space in some Exceptions
PHPBB3-12273
Diffstat (limited to 'phpBB/phpbb/event/php_exporter.php')
| -rw-r--r-- | phpBB/phpbb/event/php_exporter.php | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/phpbb/event/php_exporter.php b/phpBB/phpbb/event/php_exporter.php index c076d7567d..3956be600b 100644 --- a/phpBB/phpbb/event/php_exporter.php +++ b/phpBB/phpbb/event/php_exporter.php @@ -218,8 +218,9 @@ class php_exporter if (isset($this->events[$this->current_event])) { - throw new \LogicException('The event "' . $this->current_event . '" from file "' . $this->current_file - . '" already exists in file "'. $this->events[$this->current_event]['file'] . '"', 10); + throw new \LogicException("The event '{$this->current_event}' from file " + . "'{$this->current_file}:{$event_line_num}' already exists in file " + . "'{$this->events[$this->current_event]['file']}'", 10); } $this->events[$this->current_event] = array( @@ -308,7 +309,7 @@ class php_exporter $found_vars_array = true; if (strlen($match[1]) > 90) { - throw new \LogicException('Should use multiple lines for $vars definition' + throw new \LogicException('Should use multiple lines for $vars definition ' . "for event '{$this->current_event}' in file '{$this->current_file}:{$this->current_event_line}'", 3); } $vars_array = array_merge($vars_array, explode("', '", $match[1])); @@ -365,7 +366,7 @@ class php_exporter $doc_line = explode(' ', $var_line, 5); if (sizeof($doc_line) !== 5) { - throw new \LogicException("Found invalid line '{$this->file_lines[$this->current_event_line - $current_doc_line]}'" + throw new \LogicException("Found invalid line '{$this->file_lines[$this->current_event_line - $current_doc_line]}' " . "for event '{$this->current_event}' in file '{$this->current_file}:{$this->current_event_line}'", 1); } $doc_vars[] = $doc_line[3]; @@ -550,7 +551,7 @@ class php_exporter if ($event !== $event_name) { - throw new \LogicException("Event name does not match '@event' tag for event" + throw new \LogicException("Event name does not match '@event' tag for event " . "'{$this->current_event}' in file '{$this->current_file}:{$this->current_event_line}'", 2); } @@ -573,7 +574,7 @@ class php_exporter if ($sizeof_vars_array !== sizeof($vars_docblock) || $sizeof_vars_array !== sizeof(array_intersect($vars_array, $vars_docblock))) { - throw new \LogicException("\$vars array does not match the list of '@var' tags for event" + throw new \LogicException("\$vars array does not match the list of '@var' tags for event " . "'{$this->current_event}' in file '{$this->current_file}:{$this->current_event_line}'"); } } |