diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php --- a/src/__phutil_library_map__.php +++ b/src/__phutil_library_map__.php @@ -363,8 +363,6 @@ 'XsprintfUnknownConversionException' => 'xsprintf/exception/XsprintfUnknownConversionException.php', ), 'function' => array( - '_qsprintf_check_scalar_type' => 'xsprintf/qsprintf.php', - '_qsprintf_check_type' => 'xsprintf/qsprintf.php', 'array_fuse' => 'utils/utils.php', 'array_interleave' => 'utils/utils.php', 'array_mergev' => 'utils/utils.php', @@ -460,6 +458,8 @@ 'phutil_var_export' => 'utils/utils.php', 'ppull' => 'utils/utils.php', 'qsprintf' => 'xsprintf/qsprintf.php', + 'qsprintf_check_scalar_type' => 'xsprintf/qsprintf.php', + 'qsprintf_check_type' => 'xsprintf/qsprintf.php', 'queryfx' => 'xsprintf/queryfx.php', 'queryfx_all' => 'xsprintf/queryfx.php', 'queryfx_one' => 'xsprintf/queryfx.php', diff --git a/src/xsprintf/qsprintf.php b/src/xsprintf/qsprintf.php --- a/src/xsprintf/qsprintf.php +++ b/src/xsprintf/qsprintf.php @@ -126,7 +126,7 @@ break; case 'L': // List of.. - _qsprintf_check_type($value, "L{$next}", $pattern); + qsprintf_check_type($value, "L{$next}", $pattern); $pattern = substr_replace($pattern, '', $pos, 1); $length = strlen($pattern); $type = 's'; @@ -164,7 +164,7 @@ } if (!$done) { - _qsprintf_check_type($value, $type, $pattern); + qsprintf_check_type($value, $type, $pattern); switch ($type) { case 's': // String if ($nullable && $value === null) { @@ -240,7 +240,7 @@ $pattern[$pos] = $type; } -function _qsprintf_check_type($value, $type, $query) { +function qsprintf_check_type($value, $type, $query) { switch ($type) { case 'Ld': case 'Ls': @@ -259,16 +259,16 @@ } foreach ($value as $scalar) { - _qsprintf_check_scalar_type($scalar, $type, $query); + qsprintf_check_scalar_type($scalar, $type, $query); } break; default: - _qsprintf_check_scalar_type($value, $type, $query); + qsprintf_check_scalar_type($value, $type, $query); break; } } -function _qsprintf_check_scalar_type($value, $type, $query) { +function qsprintf_check_scalar_type($value, $type, $query) { switch ($type) { case 'Q': case 'LC':