makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make a few functions truly static to fix the tests.

Browse source
This commit is contained in:
Nils Adermann 2010-03-06 04:41:49 +01:00
parent 797a9ed28c
commit 9d28bcd308
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/session.php
View file

@ -39,7 +39,7 @@ class session
* *
* @param string $root_path current root path (phpbb_root_path) * @param string $root_path current root path (phpbb_root_path)
*/ */
function extract_current_page($root_path) static function extract_current_page($root_path)
{ {
$page_array = array(); $page_array = array();

14
phpBB/includes/utf/utf_normalizer.php
View file

@ -77,7 +77,7 @@ class utf_normalizer
* @param string &$str The dirty string * @param string &$str The dirty string
* @return string The same string, all shiny and cleaned-up * @return string The same string, all shiny and cleaned-up
*/ */
function cleanup(&$str) static function cleanup(&$str)
{ {
// The string below is the list of all autorized characters, sorted by frequency in latin text // The string below is the list of all autorized characters, sorted by frequency in latin text
$pos = strspn($str, "\x20\x65\x69\x61\x73\x6E\x74\x72\x6F\x6C\x75\x64\x5D\x5B\x63\x6D\x70\x27\x0A\x67\x7C\x68\x76\x2E\x66\x62\x2C\x3A\x3D\x2D\x71\x31\x30\x43\x32\x2A\x79\x78\x29\x28\x4C\x39\x41\x53\x2F\x50\x22\x45\x6A\x4D\x49\x6B\x33\x3E\x35\x54\x3C\x44\x34\x7D\x42\x7B\x38\x46\x77\x52\x36\x37\x55\x47\x4E\x3B\x4A\x7A\x56\x23\x48\x4F\x57\x5F\x26\x21\x4B\x3F\x58\x51\x25\x59\x5C\x09\x5A\x2B\x7E\x5E\x24\x40\x60\x7F\x0D"); $pos = strspn($str, "\x20\x65\x69\x61\x73\x6E\x74\x72\x6F\x6C\x75\x64\x5D\x5B\x63\x6D\x70\x27\x0A\x67\x7C\x68\x76\x2E\x66\x62\x2C\x3A\x3D\x2D\x71\x31\x30\x43\x32\x2A\x79\x78\x29\x28\x4C\x39\x41\x53\x2F\x50\x22\x45\x6A\x4D\x49\x6B\x33\x3E\x35\x54\x3C\x44\x34\x7D\x42\x7B\x38\x46\x77\x52\x36\x37\x55\x47\x4E\x3B\x4A\x7A\x56\x23\x48\x4F\x57\x5F\x26\x21\x4B\x3F\x58\x51\x25\x59\x5C\x09\x5A\x2B\x7E\x5E\x24\x40\x60\x7F\x0D");
@ -119,7 +119,7 @@ class utf_normalizer
* @param string &$str Unchecked UTF string * @param string &$str Unchecked UTF string
* @return string The string, validated and in normal form * @return string The string, validated and in normal form
*/ */
function nfc(&$str) static function nfc(&$str)
{ {
$pos = strspn($str, UTF8_ASCII_RANGE); $pos = strspn($str, UTF8_ASCII_RANGE);
$len = strlen($str); $len = strlen($str);
@ -151,7 +151,7 @@ class utf_normalizer
* @param string &$str Unchecked UTF string * @param string &$str Unchecked UTF string
* @return string The string, validated and in normal form * @return string The string, validated and in normal form
*/ */
function nfkc(&$str) static function nfkc(&$str)
{ {
$pos = strspn($str, UTF8_ASCII_RANGE); $pos = strspn($str, UTF8_ASCII_RANGE);
$len = strlen($str); $len = strlen($str);
@ -183,7 +183,7 @@ class utf_normalizer
* @param string &$str Unchecked UTF string * @param string &$str Unchecked UTF string
* @return string The string, validated and in normal form * @return string The string, validated and in normal form
*/ */
function nfd(&$str) static function nfd(&$str)
{ {
$pos = strspn($str, UTF8_ASCII_RANGE); $pos = strspn($str, UTF8_ASCII_RANGE);
$len = strlen($str); $len = strlen($str);
@ -209,7 +209,7 @@ class utf_normalizer
* @param string &$str Unchecked UTF string * @param string &$str Unchecked UTF string
* @return string The string, validated and in normal form * @return string The string, validated and in normal form
*/ */
function nfkd(&$str) static function nfkd(&$str)
{ {
$pos = strspn($str, UTF8_ASCII_RANGE); $pos = strspn($str, UTF8_ASCII_RANGE);
$len = strlen($str); $len = strlen($str);
@ -242,7 +242,7 @@ class utf_normalizer
* *
* @access private * @access private
*/ */
function recompose($str, $pos, $len, &$qc, &$decomp_map) static function recompose($str, $pos, $len, &$qc, &$decomp_map)
{ {
global $utf_combining_class, $utf_canonical_comp, $utf_jamo_type, $utf_jamo_index; global $utf_combining_class, $utf_canonical_comp, $utf_jamo_type, $utf_jamo_index;
@ -944,7 +944,7 @@ class utf_normalizer
* *
* @access private * @access private
*/ */
function decompose($str, $pos, $len, &$decomp_map) static function decompose($str, $pos, $len, &$decomp_map)
{ {
global $utf_combining_class; global $utf_combining_class;