diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-11-06 20:02:40 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-11-06 20:02:40 +0100 |
| commit | 1d388d98ab25bd6414dc60a5f21620b8397c326c (patch) | |
| tree | 5bac5fc6cce2ca720e334befb48b6047fefaee9d /tests | |
| parent | f941a5cc2dc1df16244c8d9495ee56e0d043468e (diff) | |
| parent | 875adc4247611fd0805d7a684c9f11bc99d7733f (diff) | |
| download | forums-1d388d98ab25bd6414dc60a5f21620b8397c326c.tar forums-1d388d98ab25bd6414dc60a5f21620b8397c326c.tar.gz forums-1d388d98ab25bd6414dc60a5f21620b8397c326c.tar.bz2 forums-1d388d98ab25bd6414dc60a5f21620b8397c326c.tar.xz forums-1d388d98ab25bd6414dc60a5f21620b8397c326c.zip | |
Merge remote-tracking branch 'github-phpbb/develop-olympus' into HEAD
* 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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/dbal/select_test.php | 4 | ||||
| -rw-r--r-- | tests/privmsgs/delete_user_pms_test.php | 2 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_database_test_case.php | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/dbal/select_test.php b/tests/dbal/select_test.php index bd524100a2..c8cfad04e0 100644 --- a/tests/dbal/select_test.php +++ b/tests/dbal/select_test.php @@ -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'), diff --git a/tests/privmsgs/delete_user_pms_test.php b/tests/privmsgs/delete_user_pms_test.php index 265df1596a..f705825262 100644 --- a/tests/privmsgs/delete_user_pms_test.php +++ b/tests/privmsgs/delete_user_pms_test.php @@ -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( diff --git a/tests/test_framework/phpbb_database_test_case.php b/tests/test_framework/phpbb_database_test_case.php index bb86df0ef0..75a3c0944b 100644 --- a/tests/test_framework/phpbb_database_test_case.php +++ b/tests/test_framework/phpbb_database_test_case.php @@ -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]; } |