tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-02 19:44:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix PHP Fatal error "Method Icinga\File\Csv::__toString() must not throw an exception in /vagrant/test/php/library/Icinga/File/CsvTest.php on line 35"

Browse Source
This commit is contained in:
Alexander Klimov 2014-06-23 12:40:13 +02:00
parent 1532594948
commit 0065cbe998
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/Icinga/File/Csv.php
View File

@ -5,6 +5,7 @@
namespace Icinga\File; namespace Icinga\File;
use Icinga\Data\Browsable; use Icinga\Data\Browsable;
use Exception;
class Csv class Csv
{ {
@ -27,6 +28,7 @@ class Csv
public function __toString() public function __toString()
{ {
try {
$first = true; $first = true;
$csv = ''; $csv = '';
foreach ($this->query->getQuery()->fetchAll() as $row) { foreach ($this->query->getQuery()->fetchAll() as $row) {
@ -42,5 +44,8 @@ class Csv
} }
return $csv; return $csv;
} catch (Exception $e) {
return (string) $e;
}
} }
} }