summaryrefslogtreecommitdiff
path: root/src/Database
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2017-12-26 10:29:16 +0100
committerGitHub <noreply@github.com>2017-12-26 10:29:16 +0100
commitde61c88d6de67d12d5de5b6dd0ab6b8c82e5a290 (patch)
treeaac6a43cb88e3d803da5809ab37885b41bc811c6 /src/Database
parent879918864a9c6da0fe9be1aca6c443ec8df0afc3 (diff)
parentf8d0a7c5b00a58c646871e355b5876dcc5890be5 (diff)
Merge pull request #388 from MyIgel/master
Formatting, Docstrings, and fixup
Diffstat (limited to 'src/Database')
-rw-r--r--src/Database/DatabaseServiceProvider.php4
-rw-r--r--src/Database/Db.php2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Database/DatabaseServiceProvider.php b/src/Database/DatabaseServiceProvider.php
index 364816cc..49fb4af5 100644
--- a/src/Database/DatabaseServiceProvider.php
+++ b/src/Database/DatabaseServiceProvider.php
@@ -12,7 +12,9 @@ class DatabaseServiceProvider extends ServiceProvider
{
$config = $this->app->get('config');
Db::connect(
- 'mysql:host=' . $config->get('database')['host'] . ';dbname=' . $config->get('database')['db'] . ';charset=utf8',
+ 'mysql:host=' . $config->get('database')['host']
+ . ';dbname=' . $config->get('database')['db']
+ . ';charset=utf8',
$config->get('database')['user'],
$config->get('database')['pw']
) || $this->exitOnError();
diff --git a/src/Database/Db.php b/src/Database/Db.php
index 7042998f..114bd8fc 100644
--- a/src/Database/Db.php
+++ b/src/Database/Db.php
@@ -71,7 +71,7 @@ class Db
*
* @param string $query
* @param array $bindings
- * @return array
+ * @return array[]
*/
public static function select($query, array $bindings = [])
{