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

1 files changed, 1 insertions, 1 deletions

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];
 	}