From 70d36dd1e3000a4934ba44f73420e68b5721d7da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Doursenaud?= <rdoursenaud@gpcsolutions.fr>
Date: Tue, 12 May 2015 19:30:04 +0200
Subject: [PATCH] Better type hinting for the SQLite database driver

---
 htdocs/core/db/sqlite.class.php | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index e8295b9927d..a7852c18333 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -110,7 +110,7 @@ class DoliDBSqlite extends DoliDB
             dol_syslog(get_class($this)."::DoliDBSqlite : Erreur Connect ".$this->error,LOG_ERR);
         }
 
-        return $this->ok;
+        return (int) $this->ok;
     }
 
 
@@ -285,6 +285,7 @@ class DoliDBSqlite extends DoliDB
     function select_db($database)
     {
         dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
+	    // FIXME: sqlite_select_db() does not exist
         return sqlite_select_db($this->db,$database);
     }
 
@@ -297,7 +298,7 @@ class DoliDBSqlite extends DoliDB
 	 *	@param	    string	$passwd		password
 	 *	@param		string	$name		name of database (not used for mysql, used for pgsql)
 	 *	@param		integer	$port		Port of database server
-	 *	@return		resource			Database access handler
+	 *	@return		PDO			Database access handler
 	 *	@see		close
      */
     function connect($host, $login, $passwd, $name, $port=0)
@@ -352,7 +353,7 @@ class DoliDBSqlite extends DoliDB
     /**
      *  Close database connexion
      *
-     *  @return     boolean     True if disconnect successfull, false otherwise
+     *  @return     bool     True if disconnect successfull, false otherwise
      *  @see        connect
      */
     function close()
@@ -374,7 +375,7 @@ class DoliDBSqlite extends DoliDB
      * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollbock to savepoint if error (this allow to have some request with errors inside global transactions).
      * 									Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
      *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-     *	@return	resource    			Resultset of answer
+     *	@return	PDOStatement			Resultset of answer
      */
     function query($query,$usesavepoint=0,$type='auto')
     {
@@ -429,8 +430,8 @@ class DoliDBSqlite extends DoliDB
     /**
      *	Renvoie la ligne courante (comme un objet) pour le curseur resultset
      *
-     *	@param	Resultset	$resultset  Curseur de la requete voulue
-     *	@return	Object					Object result line or false if KO or end of cursor
+     *	@param	PDOStatement    $resultset  Curseur de la requete voulue
+     *	@return	false|object				Object result line or false if KO or end of cursor
      */
     function fetch_object($resultset)
     {
@@ -443,8 +444,8 @@ class DoliDBSqlite extends DoliDB
     /**
      *	Return datas as an array
      *
-     *	@param	Resultset	$resultset  Resultset of request
-     *	@return	array					Array
+     *	@param	PDOStatement	$resultset  Resultset of request
+     *	@return	false|array					Array or false if KO or end of cursor
      */
     function fetch_array($resultset)
     {
@@ -456,8 +457,8 @@ class DoliDBSqlite extends DoliDB
     /**
      *	Return datas as an array
      *
-     *	@param	resource	$resultset  Resultset of request
-     *	@return	array					Array
+     *	@param	PDOStatement	$resultset  Resultset of request
+     *	@return	false|array					Array or false if KO or end of cursor
      */
     function fetch_row($resultset)
     {
@@ -477,7 +478,7 @@ class DoliDBSqlite extends DoliDB
     /**
      *	Return number of lines for result of a SELECT
      *
-     *	@param	Resultset	$resultset  Resulset of requests
+     *	@param	PDOStatement	$resultset  Resulset of requests
      *	@return int		    			Nb of lines
      *	@see    affected_rows
      */
@@ -491,7 +492,7 @@ class DoliDBSqlite extends DoliDB
     /**
      *	Return number of lines for result of a SELECT
      *
-     *	@param	Resultset	$resultset  Resulset of requests
+     *	@param	PDOStatement	$resultset  Resulset of requests
      *	@return int		    			Nb of lines
      *	@see    affected_rows
      */
@@ -508,10 +509,10 @@ class DoliDBSqlite extends DoliDB
 	/**
 	 *	Free last resultset used.
 	 *
-	 *	@param  integer	$resultset   Curseur de la requete voulue
+	 *	@param  PDOStatement	$resultset   Curseur de la requete voulue
 	 *	@return	void
 	 */
-    function free($resultset=0)
+    function free($resultset=null)
     {
         // If resultset not provided, we take the last used by connexion
         if (! is_object($resultset)) { $resultset=$this->_results; }
@@ -709,7 +710,7 @@ class DoliDBSqlite extends DoliDB
 	 * 	@param	string	$charset		Charset used to store data
 	 * 	@param	string	$collation		Charset used to sort data
 	 * 	@param	string	$owner			Username of database owner
-	 * 	@return	resource				resource defined if OK, null if KO
+	 * 	@return	PDOStatement			resource defined if OK, null if KO
      */
     function DDLCreateDb($database,$charset='',$collation='',$owner='')
     {