Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #262 from marc1706/ticket/261

Browse Source 
[ticket/261] Fix tests on sqlite3 and use correct phpBB branch
This commit is contained in:
Marc Alexander
2014-06-11 18:58:00 +02:00
parent 2665a07237 9423032df7
commit b29a49e0f0
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.travis.yml
View File

@@ -24,15 +24,14 @@ matrix:
env: DB=mysqli env: DB=mysqli
allow_failures: allow_failures:
- php: hhvm - php: hhvm
- env: DB=sqlite3
fast_finish: true fast_finish: true
env: env:
global: global:
- EXTNAME="board3/portal" - EXTNAME="board3/portal"
- SNIFF="0" # Should we run code sniffer on your code? - SNIFF="1" # Should we run code sniffer on your code?
- IMAGE_ICC="0" # Should we run icc profile sniffer on your images? - IMAGE_ICC="1" # Should we run icc profile sniffer on your images?
- PHPBB_BRANCH="ticket/12483" # - PHPBB_BRANCH="develop-ascraeus" - PHPBB_BRANCH="develop-ascraeus"
branches: branches:
except: except:

22
modules/birthday_list.php
View File

@@ -103,14 +103,22 @@ class birthday_list extends module_base
break; break;
} }
$sql = 'SELECT u.user_id, u.username, u.user_colour, u.user_birthday $sql_array = array(
FROM ' . USERS_TABLE . ' u 'SELECT' => 'u.user_id, u.username, u.user_colour, u.user_birthday',
LEFT JOIN ' . BANLIST_TABLE . " b ON (u.user_id = b.ban_userid) 'FROM' => array(USERS_TABLE => 'u'),
WHERE (b.ban_id IS NULL 'LEFT_JOIN' => array(
array(
'FROM' => array(BANLIST_TABLE => 'b'),
'ON' => 'u.user_id = b.ban_userid',
),
),
'WHERE' => "(b.ban_id IS NULL
OR b.ban_exclude = 1) OR b.ban_exclude = 1)
AND (u.user_birthday LIKE '" . $this->db->sql_escape(sprintf('%2d-%2d-', $now['mday'], $now['mon'])) . "%' {$sql_days}) AND (u.user_birthday " . $this->db->sql_like_expression($this->db->any_char . sprintf('%2d-%2d-', $now['mday'], $now['mon']) . $this->db->any_char) . " {$sql_days})
AND u.user_type IN (" . USER_NORMAL . ', ' . USER_FOUNDER . ') AND " . $this->db->sql_in_set('u.user_type', array(USER_NORMAL , USER_FOUNDER)),
ORDER BY ' . $order_by; 'ORDER BY' => $order_by,
);
$sql = $this->db->sql_build_query('SELECT', $sql_array);
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$today = sprintf('%2d-%2d-', $now['mday'], $now['mon']); $today = sprintf('%2d-%2d-', $now['mday'], $now['mon']);

1
tests/unit/functions/check_file_src_test.php
View File

@@ -9,6 +9,7 @@
require_once(dirname(__FILE__) . '/../../../includes/functions.php'); require_once(dirname(__FILE__) . '/../../../includes/functions.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/functions_acp.php'); require_once(dirname(__FILE__) . '/../../../../../../includes/functions_acp.php');
require_once(dirname(__FILE__) . '/../../../../../../includes/functions.php');
class phpbb_functions_check_file_src_test extends \board3\portal\tests\testframework\database_test_case class phpbb_functions_check_file_src_test extends \board3\portal\tests\testframework\database_test_case
{ {

2
travis/prepare-phpbb.sh
View File

@@ -21,4 +21,4 @@ cp -R . ../../tmp
cd ../../ cd ../../
# Clone phpBB # Clone phpBB
git clone --depth=1 "git://github.com/nickvergessen/phpbb.git" "phpBB3" --branch=$BRANCH git clone --depth=1 "git://github.com/phpbb/phpbb.git" "phpBB3" --branch=$BRANCH