1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-06 06:25:04 +02:00

[ticket/11159] static public is the currently approved order.

PHPBB3-11159
This commit is contained in:
Oleg Pudeyev 2012-11-06 10:41:06 -05:00
parent fea118cf0d
commit a7babc211c
10 changed files with 19 additions and 19 deletions

@ -17,7 +17,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/three_users.xml'); return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/three_users.xml');
} }
public static function return_on_error_select_data() static public function return_on_error_select_data()
{ {
return array( return array(
array('phpbb_users', "username_clean = 'bertie'", array(array('username_clean' => 'bertie'))), array('phpbb_users', "username_clean = 'bertie'", array(array('username_clean' => 'bertie'))),
@ -44,7 +44,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
$this->assertEquals($expected, $db->sql_fetchrowset($result)); $this->assertEquals($expected, $db->sql_fetchrowset($result));
} }
public static function fetchrow_data() static public function fetchrow_data()
{ {
return array( return array(
array('', array(array('username_clean' => 'barfoo'), array('', array(array('username_clean' => 'barfoo'),
@ -95,7 +95,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
public static function fetchfield_data() static public function fetchfield_data()
{ {
return array( return array(
array('', array('barfoo', 'foobar', 'bertie')), array('', array('barfoo', 'foobar', 'bertie')),
@ -125,7 +125,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
$this->assertEquals($expected, $ary); $this->assertEquals($expected, $ary);
} }
public static function fetchfield_seek_data() static public function fetchfield_seek_data()
{ {
return array( return array(
array(1, 'foobar'), array(1, 'foobar'),
@ -151,7 +151,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
$this->assertEquals($expected, $field); $this->assertEquals($expected, $field);
} }
public static function query_limit_data() static public function query_limit_data()
{ {
return array( return array(
array(0, 0, array(array('username_clean' => 'barfoo'), array(0, 0, array(array('username_clean' => 'barfoo'),
@ -192,7 +192,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
$this->assertEquals($expected, $ary); $this->assertEquals($expected, $ary);
} }
public static function like_expression_data() static public function like_expression_data()
{ {
// * = any_char; # = one_char // * = any_char; # = one_char
return array( return array(
@ -229,7 +229,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
public static function in_set_data() static public function in_set_data()
{ {
return array( return array(
array('user_id', 3, false, false, array(array('username_clean' => 'bertie'))), array('user_id', 3, false, false, array(array('username_clean' => 'bertie'))),
@ -303,7 +303,7 @@ class phpbb_dbal_select_test extends phpbb_database_test_case
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
public static function build_array_data() static public function build_array_data()
{ {
return array( return array(
array(array('username_clean' => 'barfoo'), array(array('username_clean' => 'barfoo'))), array(array('username_clean' => 'barfoo'), array(array('username_clean' => 'barfoo'))),

@ -16,7 +16,7 @@ class phpbb_dbal_write_test extends phpbb_database_test_case
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml'); return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/config.xml');
} }
public static function build_array_insert_data() static public function build_array_insert_data()
{ {
return array( return array(
array(array( array(array(
@ -104,7 +104,7 @@ class phpbb_dbal_write_test extends phpbb_database_test_case
$db->sql_freeresult($result); $db->sql_freeresult($result);
} }
public static function update_data() static public function update_data()
{ {
return array( return array(
array( array(

@ -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'); 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( return array(
// array( // array(

@ -73,7 +73,7 @@ class phpbb_request_request_var_test extends phpbb_test_case
unset($_GET[$var], $_POST[$var], $_REQUEST[$var], $_COOKIE[$var]); unset($_GET[$var], $_POST[$var], $_REQUEST[$var], $_COOKIE[$var]);
} }
public static function request_variables() static public function request_variables()
{ {
return array( return array(
// strings // strings

@ -14,7 +14,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
class phpbb_security_extract_current_page_test extends phpbb_security_test_base class phpbb_security_extract_current_page_test extends phpbb_security_test_base
{ {
public static function security_variables() static public function security_variables()
{ {
return array( return array(
array('http://localhost/phpBB/index.php', 'mark=forums&x="><script>alert(/XSS/);</script>', 'mark=forums&x=%22%3E%3Cscript%3Ealert(/XSS/);%3C/script%3E'), array('http://localhost/phpBB/index.php', 'mark=forums&x="><script>alert(/XSS/);</script>', 'mark=forums&x=%22%3E%3Cscript%3Ealert(/XSS/);%3C/script%3E'),

@ -14,7 +14,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/session.php';
class phpbb_security_redirect_test extends phpbb_security_test_base class phpbb_security_redirect_test extends phpbb_security_test_base
{ {
public static function provider() static public function provider()
{ {
// array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false)) // array(Input -> redirect(), expected triggered error (else false), expected returned result url (else false))
return array( return array(

@ -94,7 +94,7 @@ class phpbb_template_template_test extends phpbb_test_case
/** /**
* @todo put test data into templates/xyz.test * @todo put test data into templates/xyz.test
*/ */
public static function template_data() static public function template_data()
{ {
return array( return array(
/* /*
@ -419,7 +419,7 @@ class phpbb_template_template_test extends phpbb_test_case
$GLOBALS['config']['tpl_allow_php'] = false; $GLOBALS['config']['tpl_allow_php'] = false;
} }
public static function alter_block_array_data() static public function alter_block_array_data()
{ {
return array( return array(
array( array(

@ -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 * @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]; return $matches[1] . strtoupper($matches[2]) . $matches[3];
} }

@ -12,7 +12,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/functions_content.php';
class phpbb_text_processing_make_clickable_test extends phpbb_test_case class phpbb_text_processing_make_clickable_test extends phpbb_test_case
{ {
public static function make_clickable_data() static public function make_clickable_data()
{ {
// value => whether it should work // value => whether it should work
$prefix_texts = array( $prefix_texts = array(

@ -11,7 +11,7 @@ require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
class phpbb_utf_utf8_clean_string_test extends phpbb_test_case class phpbb_utf_utf8_clean_string_test extends phpbb_test_case
{ {
public static function cleanable_strings() static public function cleanable_strings()
{ {
return array( return array(
array('MiXed CaSe', 'mixed case', 'Checking case folding'), array('MiXed CaSe', 'mixed case', 'Checking case folding'),