From c24249ae55b2ebeb9d39693d4bf7236d20f611c9 Mon Sep 17 00:00:00 2001
From: Nils Adermann <naderman@naderman.de>
Date: Sun, 7 Aug 2011 19:18:52 -0400
Subject: [task/whitelist-code-coverage] Load all of includes/ into code
 coverage report

PHPBB3-10314
---
 phpBB/includes/acp/acp_send_statistics.php |  6 +++---
 phpunit.xml.all                            | 17 +++++++++++++++++
 phpunit.xml.dist                           | 17 +++++++++++++++++
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/phpBB/includes/acp/acp_send_statistics.php b/phpBB/includes/acp/acp_send_statistics.php
index aef67a8b1a..eb7154d114 100644
--- a/phpBB/includes/acp/acp_send_statistics.php
+++ b/phpBB/includes/acp/acp_send_statistics.php
@@ -16,8 +16,6 @@ if (!defined('IN_PHPBB'))
 	exit;
 }
 
-include($phpbb_root_path . 'includes/questionnaire/questionnaire.' . $phpEx);
-
 /**
 * @package acp
 */
@@ -27,7 +25,9 @@ class acp_send_statistics
 
 	function main($id, $mode)
 	{
-		global $config, $template, $phpbb_admin_path, $phpEx;
+		global $config, $template, $phpbb_admin_path, $phpbb_root_path, $phpEx;
+
+		include($phpbb_root_path . 'includes/questionnaire/questionnaire.' . $phpEx);
 
 		$collect_url = "http://www.phpbb.com/stats/receive_stats.php";
 
diff --git a/phpunit.xml.all b/phpunit.xml.all
index 1be2830729..fde3bbb1a7 100644
--- a/phpunit.xml.all
+++ b/phpunit.xml.all
@@ -21,5 +21,22 @@
         <blacklist>
             <directory>./tests/</directory>
         </blacklist>
+        <whitelist>
+            <directory suffix=".php">./phpBB/includes/</directory>
+            <exclude>
+                <file>./phpBB/includes/db/firebird.php</file>
+                <file>./phpBB/includes/db/mysql.php</file>
+                <file>./phpBB/includes/db/mysqli.php</file>
+                <file>./phpBB/includes/db/mssql.php</file>
+                <file>./phpBB/includes/db/mssql_odbc.php</file>
+                <file>./phpBB/includes/db/mssqlnative.php</file>
+                <file>./phpBB/includes/db/oracle.php</file>
+                <file>./phpBB/includes/db/postgres.php</file>
+                <file>./phpBB/includes/db/sqlite.php</file>
+                <file>./phpBB/includes/search/fulltext_native.php</file>
+                <file>./phpBB/includes/search/fulltext_mysql.php</file>
+                <directory suffix=".php">./phpBB/includes/captcha/</directory>
+            </exclude>
+        </whitelist>
     </filter>
 </phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index de8134da8e..a2bf2288cc 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -27,5 +27,22 @@
         <blacklist>
             <directory>./tests/</directory>
         </blacklist>
+        <whitelist>
+            <directory suffix=".php">./phpBB/includes/</directory>
+            <exclude>
+                <file>./phpBB/includes/db/firebird.php</file>
+                <file>./phpBB/includes/db/mysql.php</file>
+                <file>./phpBB/includes/db/mysqli.php</file>
+                <file>./phpBB/includes/db/mssql.php</file>
+                <file>./phpBB/includes/db/mssql_odbc.php</file>
+                <file>./phpBB/includes/db/mssqlnative.php</file>
+                <file>./phpBB/includes/db/oracle.php</file>
+                <file>./phpBB/includes/db/postgres.php</file>
+                <file>./phpBB/includes/db/sqlite.php</file>
+                <file>./phpBB/includes/search/fulltext_native.php</file>
+                <file>./phpBB/includes/search/fulltext_mysql.php</file>
+                <directory suffix=".php">./phpBB/includes/captcha/</directory>
+            </exclude>
+        </whitelist>
     </filter>
 </phpunit>
-- 
cgit v1.2.1