Merge branch 'master' of /home/rdb/DEV/PhpstormProjects/sysPass with conflicts.

inc/SP/Storage/DBStorageInterface.class.php

@@ -1,48 +1,64 @@
-<?php
-/**
- * sysPass
- *
- * @author nuxsmin
- * @link http://syspass.org
- * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org
- *
- * This file is part of sysPass.
- *
- * sysPass is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * sysPass is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-namespace SP\Storage;
-
-/**
- * Interface DBStorageInterface
- *
- * @package SP\Storage
- */
-interface DBStorageInterface
-{
-    /**
-     * @return \PDO
-     */
-    public function getConnection();
-
-    /**
-     * @return mixed
-     */
-    public function setConnectionData();
-
-    /**
-     * @return int
-     */
-    public function getDbStatus();
+<?php
+/**
+ * sysPass
+ *
+ * @author    nuxsmin
+ * @link      https://syspass.org
+ * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org
+ *
+ * This file is part of sysPass.
+ *
+ * sysPass is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * sysPass is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ *  along with sysPass.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+namespace SP\Storage\Database;
+
+/**
+ * Interface DBStorageInterface
+ *
+ * @package SP\Storage
+ */
+interface DBStorageInterface
+{
+    /**
+     * Obtener una conexión PDO
+     *
+     * @return \PDO
+     */
+    public function getConnection();
+
+    /**
+     * Obtener una conexión PDO sin seleccionar la BD
+     *
+     * @return \PDO
+     */
+    public function getConnectionSimple();
+
+    /**
+     * Devolcer el estado de la BD
+     *
+     * @return int
+     */
+    public function getDbStatus();
+
+    /**
+     * @return mixed
+     */
+    public function getConnectionUri();
+
+    /**
+     * @return string
+     */
+    public function getDatabaseName();
 }