mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 13:35:13 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-phpbb/develop-olympus' into HEAD

Browse Source 
* github-phpbb/develop-olympus:
  [ticket/11159] static public is the currently approved order.

Conflicts:
	tests/dbal/select_test.php
	tests/dbal/write_test.php
	tests/request/request_var_test.php
	tests/security/extract_current_page_test.php
	tests/security/redirect_test.php
	tests/template/template_test.php
	tests/text_processing/make_clickable_test.php
	tests/utf/utf8_clean_string_test.php
This commit is contained in:
Nils Adermann 2012-11-06 20:02:40 +01:00
commit 1d388d98ab
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/dbal/select_test.php
View File

@ -125,7 +125,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
$this->assertEquals($expected, $ary);
}
public static function fetchfield_seek_data()
static public function fetchfield_seek_data()
{
return array(
array(1, 'foobar'),
@ -151,7 +151,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
$this->assertEquals($expected, $field);
}
public static function query_limit_data()
static public function query_limit_data()
{
return array(
array(0, 0, array(array('username_clean' => 'barfoo'),

2
tests/privmsgs/delete_user_pms_test.php
View File

@ -16,7 +16,7 @@ class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/delete_user_pms.xml');
}
public static function delete_user_pms_data()
static public function delete_user_pms_data()
{
return array(
// array(

2
tests/test_framework/phpbb_database_test_case.php
View File

@ -137,7 +137,7 @@ abstract class phpbb_database_test_case extends PHPUnit_Extensions_Database_Test
*
* @return string The string with the specified match converted to uppercase
*/
public static function to_upper($matches)
static public function to_upper($matches)
{
return $matches[1] . strtoupper($matches[2]) . $matches[3];
}