tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
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"

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

31
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,20 +28,24 @@ class Csv
public function __toString() public function __toString()
{ {
$first = true; try {
$csv = ''; $first = true;
foreach ($this->query->getQuery()->fetchAll() as $row) { $csv = '';
if ($first) { foreach ($this->query->getQuery()->fetchAll() as $row) {
$csv .= implode(',', array_keys((array) $row)) . "\r\n"; if ($first) {
$first = false; $csv .= implode(',', array_keys((array) $row)) . "\r\n";
$first = false;
}
$out = array();
foreach ($row as & $val) {
$out[] = '"' . $val . '"';
}
$csv .= implode(',', $out) . "\r\n";
} }
$out = array();
foreach ($row as & $val) {
$out[] = '"' . $val . '"';
}
$csv .= implode(',', $out) . "\r\n";
}
return $csv; return $csv;
} catch (Exception $e) {
return (string) $e;
}
} }
} }