From 8669fcc4be52c007f6471283cd57c77aad50a3cb Mon Sep 17 00:00:00 2001
From: "Timothy J. Warren" <tim@timshomepage.net>
Date: Thu, 30 Jul 2015 13:13:12 -0400
Subject: [PATCH] Some scrutinizer fixes

---
 phpunit.xml                               | 9 ++++-----
 src/Query/Abstract_Driver.php             | 2 +-
 src/Query/Abstract_Query_Builder.php      | 2 +-
 src/Query/Driver_Interface.php            | 8 ++++----
 src/Query/Drivers/Firebird/Driver.php     | 1 -
 src/Query/Drivers/Firebird/Result.php     | 3 +--
 src/Query/Drivers/Pdo_firebird/Driver.php | 2 +-
 7 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/phpunit.xml b/phpunit.xml
index 55da055..dee5698 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -4,11 +4,10 @@
 	stopOnFailure="false"
 	bootstrap="tests/bootstrap.php">
 	<filter>
-		<blacklist>
-			<directory suffix=".php">coverage</directory>
-			<directory suffix=".php">docs</directory>
-			<directory suffix=".php">tests</directory>
-		</blacklist>
+		<whitelist>
+			<directory suffix=".php">src/*</directory>
+			<file>autoload.php</file>
+		</whitelist>
 	</filter>
 	<testsuites>
 		<testsuite name="CoreTests">
diff --git a/src/Query/Abstract_Driver.php b/src/Query/Abstract_Driver.php
index 0057380..6cfd3a0 100644
--- a/src/Query/Abstract_Driver.php
+++ b/src/Query/Abstract_Driver.php
@@ -533,7 +533,7 @@ abstract class Abstract_Driver extends \PDO implements Driver_Interface {
 	 *
 	 * @param string $table
 	 * @param array $data
-	 * @return array
+	 * @return null|array<string|array|null>
 	 */
 	public function insert_batch($table, $data=array())
 	{
diff --git a/src/Query/Abstract_Query_Builder.php b/src/Query/Abstract_Query_Builder.php
index 88863d1..63bfea4 100644
--- a/src/Query/Abstract_Query_Builder.php
+++ b/src/Query/Abstract_Query_Builder.php
@@ -571,7 +571,7 @@ abstract class Abstract_Query_Builder {
 	 *
 	 * @param string $type
 	 * @param string $table
-	 * @return $string
+	 * @return string
 	 */
 	protected function _compile($type='', $table='')
 	{
diff --git a/src/Query/Driver_Interface.php b/src/Query/Driver_Interface.php
index a12c05a..06b9d17 100644
--- a/src/Query/Driver_Interface.php
+++ b/src/Query/Driver_Interface.php
@@ -194,16 +194,16 @@ interface Driver_Interface {
 	/**
 	 * Surrounds the string with the databases identifier escape characters
 	 *
-	 * @param mixed $ident
-	 * @return string
+	 * @param string|array $ident
+	 * @return string|array
 	 */
 	public function quote_ident($ident);
 
 	/**
 	 * Quote database table name, and set prefix
 	 *
-	 * @param string $table
-	 * @return string
+	 * @param string|array $table
+	 * @return string|array
 	 */
 	public function quote_table($table);
 
diff --git a/src/Query/Drivers/Firebird/Driver.php b/src/Query/Drivers/Firebird/Driver.php
index 6167a1d..73cd7cf 100644
--- a/src/Query/Drivers/Firebird/Driver.php
+++ b/src/Query/Drivers/Firebird/Driver.php
@@ -76,7 +76,6 @@ class Driver extends \Query\Abstract_Driver {
 	 * @param string $pass
 	 * @param array $options
 	 * @throws \PDOException
-	 * @return void
 	 */
 	public function __construct($dbpath, $user='SYSDBA', $pass='masterkey', array $options = array())
 	{
diff --git a/src/Query/Drivers/Firebird/Result.php b/src/Query/Drivers/Firebird/Result.php
index 22a3a5b..48f260c 100644
--- a/src/Query/Drivers/Firebird/Result.php
+++ b/src/Query/Drivers/Firebird/Result.php
@@ -48,7 +48,7 @@ class Result extends \PDOStatement {
 	/**
 	 * Reference to the db drive to de-duplicate error functions
 	 *
-	 * @var \Query\Driver\Firebird
+	 * @var \Query\Drivers\Firebird\Driver
 	 */
 	private $db;
 
@@ -58,7 +58,6 @@ class Result extends \PDOStatement {
 	 *
 	 * @param resource $link
 	 * @param Driver|null $db
-	 * @return void
 	 */
 	public function __construct($link, Driver $db = NULL)
 	{
diff --git a/src/Query/Drivers/Pdo_firebird/Driver.php b/src/Query/Drivers/Pdo_firebird/Driver.php
index d8e2d14..17b6edb 100644
--- a/src/Query/Drivers/Pdo_firebird/Driver.php
+++ b/src/Query/Drivers/Pdo_firebird/Driver.php
@@ -43,7 +43,7 @@ class Driver extends \Query\Abstract_Driver {
 		parent::__construct($dsn, $username, $password, $options);
 	}
 
-		// --------------------------------------------------------------------------
+	// --------------------------------------------------------------------------
 
 	/**
 	 * Create sql for batch insert