mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-21 16:01:40 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse Source 
* develop-ascraeus:
  [ticket/12317] Cast string to int to refix DBMSes not using int for integers.
  [ticket/12317] Fix notification tests for DBMSes returning integers as int.
  [ticket/12317] Do not repeat SQL query in notification_submit_post_base.
  [ticket/12314] Workaround HHVM SPL autoloader sometimes using leading backslash
This commit is contained in:
Nils Adermann
2014-03-28 22:28:13 -04:00
parent cff5c8ac38 b7909ba71b
commit 1c6b3fe073
9 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/class_loader.php
View File

@@ -141,8 +141,14 @@ class class_loader
* @param string $class The class name which is being loaded.
*/
public function load_class($class)
{
// In general $class is not supposed to contain a leading backslash,
// but sometimes it does. See tickets PHP-50731 and HHVM-1840.
if ($class[0] !== '\\')
{
$class = '\\' . $class;
}
if (substr($class, 0, strlen($this->namespace)) === $this->namespace)
{
$path = $this->resolve_path($class);

2
phpBB/phpbb/notification/type/bookmark.php
View File

@@ -75,7 +75,7 @@ class bookmark extends \phpbb\notification\type\post
$result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result))
{
$users[] = $row['user_id'];
$users[] = (int) $row['user_id'];
}
$this->db->sql_freeresult($result);

4
phpBB/phpbb/notification/type/post.php
View File

@@ -103,7 +103,7 @@ class post extends \phpbb\notification\type\base
$result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result))
{
$users[] = $row['user_id'];
$users[] = (int) $row['user_id'];
}
$this->db->sql_freeresult($result);
@@ -115,7 +115,7 @@ class post extends \phpbb\notification\type\base
$result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result))
{
$users[] = $row['user_id'];
$users[] = (int) $row['user_id'];
}
$this->db->sql_freeresult($result);

2
phpBB/phpbb/notification/type/quote.php
View File

@@ -94,7 +94,7 @@ class quote extends \phpbb\notification\type\post
$result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result))
{
$users[] = $row['user_id'];
$users[] = (int) $row['user_id'];
}
$this->db->sql_freeresult($result);

2
phpBB/phpbb/notification/type/topic.php
View File

@@ -103,7 +103,7 @@ class topic extends \phpbb\notification\type\base
$result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result))
{
$users[] = $row['user_id'];
$users[] = (int) $row['user_id'];
}
$this->db->sql_freeresult($result);

7
tests/notification/submit_post_base.php
View File

@@ -133,7 +133,7 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATION_TYPES_TABLE . " nt
WHERE nt.notification_type_name = '" . $this->item_type . "'
AND n.notification_type_id = nt.notification_type_id
ORDER BY user_id, item_id ASC";
ORDER BY user_id ASC, item_id ASC";
$result = $this->db->sql_query($sql);
$this->assertEquals($expected_before, $this->db->sql_fetchrowset($result));
$this->db->sql_freeresult($result);
@@ -142,11 +142,6 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
$post_data = array_merge($this->post_data, $additional_post_data);
submit_post('reply', '', 'poster-name', POST_NORMAL, $poll_data, $post_data, false, false);
$sql = 'SELECT user_id, item_id, item_parent_id
FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATION_TYPES_TABLE . " nt
WHERE nt.notification_type_name = '" . $this->item_type . "'
AND n.notification_type_id = nt.notification_type_id
ORDER BY user_id ASC, item_id ASC";
$result = $this->db->sql_query($sql);
$this->assertEquals($expected_after, $this->db->sql_fetchrowset($result));
$this->db->sql_freeresult($result);

2
tests/notification/submit_post_type_bookmark_test.php
View File

@@ -27,7 +27,7 @@ class phpbb_notification_submit_post_type_bookmark_test extends phpbb_notificati
$this->greaterThan(0))
->will($this->returnValueMap(array(
array(
array('3', '4', '5', '6', '7'),
array(3, 4, 5, 6, 7),
'f_read',
1,
array(

2
tests/notification/submit_post_type_post_test.php
View File

@@ -27,7 +27,7 @@ class phpbb_notification_submit_post_type_post_test extends phpbb_notification_s
$this->greaterThan(0))
->will($this->returnValueMap(array(
array(
array('3', '4', '5', '6', '7', '8'),
array(3, 4, 5, 6, 7, 8),
'f_read',
1,
array(

2
tests/notification/submit_post_type_quote_test.php
View File

@@ -27,7 +27,7 @@ class phpbb_notification_submit_post_type_quote_test extends phpbb_notification_
$this->greaterThan(0))
->will($this->returnValueMap(array(
array(
array('3', '4', '5', '6', '7'),
array(3, 4, 5, 6, 7),
'f_read',
1,
array(