maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

small fixes for error reporting

Browse Source
This commit is contained in:
envoyr
2022-05-11 16:26:41 +02:00
parent 3adc5dc119
commit 5cab0e46bd
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Froxlor/Install/Install/Core.php
View File

@@ -352,7 +352,7 @@ class Core
$pdo->query($froxlorSQL); $pdo->query($froxlorSQL);
} catch (PDOException $e) { } catch (PDOException $e) {
throw new Exception('failed to import data!', 0, $e); throw new Exception('failed to import data!' . $e->getMessage(), 0, $e);
} }
} }

5
lib/Froxlor/PhpHelper.php
View File

@@ -468,7 +468,7 @@ class PhpHelper
} }
} }
private static function sortListByGivenKey($a, $b) private static function sortListByGivenKey($a, $b): int
{ {
if (self::$sort_type == SORT_NATURAL) { if (self::$sort_type == SORT_NATURAL) {
return strnatcasecmp($a[self::$sort_key], $b[self::$sort_key]); return strnatcasecmp($a[self::$sort_key], $b[self::$sort_key]);
@@ -480,10 +480,11 @@ class PhpHelper
* Generate php file from array. * Generate php file from array.
* *
* @param array $array * @param array $array
* @param string|null $comment
* @param bool $asReturn * @param bool $asReturn
* @return string * @return string
*/ */
public static function parseArrayToPhpFile(array $array, string $comment = null, $asReturn = false): string public static function parseArrayToPhpFile(array $array, string $comment = null, bool $asReturn = false): string
{ {
$str = sprintf("<?php\n// %s\n\n", $comment ?? 'autogenerated froxlor file'); $str = sprintf("<?php\n// %s\n\n", $comment ?? 'autogenerated froxlor file');