Merge remote-tracking branch 'origin/master'

turbopixel · turbopixel · commit c90e067f3807 · 2018-07-08T21:36:44.000+02:00
# Conflicts:
#	lib/PHPDO.php
diff --git a/lib/PHPDO.php b/lib/PHPDO.php
@@ -158,7 +158,7 @@ public function prepare(string $query, array $mapping = []) : PDOStatement {
       $execute  = $pdoStmnt->execute($mapping);
     }
     catch (PDOException $e) {
-      die("error on line " . __LINE__ . ": " . $e->getCode());
+      die(__CLASS__ . "->" . __FUNCTION__ . "() " . $e->getCode() . ": " . $e->getMessage());
     }
 
     $this->addLog($pdoStmnt->queryString, $execute);

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public function prepare(string $query, array $mapping = []) : PDOStatement {`
`158`	`158`	`$execute = $pdoStmnt->execute($mapping);`
`159`	`159`	`}`
`160`	`160`	`catch (PDOException $e) {`
`161`		`- die("error on line " . __LINE__ . ": " . $e->getCode());`
	`161`	`+ die(__CLASS__ . "->" . __FUNCTION__ . "() " . $e->getCode() . ": " . $e->getMessage());`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`$this->addLog($pdoStmnt->queryString, $execute);`