Skip to content

Commit

Permalink
Reference global funcs and consts via use statement
Browse files Browse the repository at this point in the history
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
  • Loading branch information
MauricioFauth committed Jan 23, 2020
1 parent fc7f3f1 commit 6b7af13
Show file tree
Hide file tree
Showing 49 changed files with 816 additions and 25 deletions.
18 changes: 18 additions & 0 deletions libraries/classes/Advisor.php
Expand Up @@ -10,7 +10,25 @@
use Exception;
use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
use Throwable;
use function array_merge;
use function array_merge_recursive;
use function count;
use function file;
use function htmlspecialchars;
use function implode;
use function mb_substr;
use function pow;
use function preg_match;
use function preg_replace;
use function preg_replace_callback;
use function preg_split;
use function round;
use function rtrim;
use function sprintf;
use function strpos;
use function substr;
use function vsprintf;
use const FILE_IGNORE_NEW_LINES;

/**
* Advisor class
Expand Down
3 changes: 2 additions & 1 deletion libraries/classes/CentralColumns.php
Expand Up @@ -10,15 +10,16 @@
use PhpMyAdmin\Charsets\Collation;
use PhpMyAdmin\Html\Generator;
use function array_unique;
use function ceil;
use function count;
use function explode;
use function htmlspecialchars;
use function implode;
use function in_array;
use function is_bool;
use function mb_strtoupper;
use function sprintf;
use function trim;
use function explode;

/**
* PhpMyAdmin\CentralColumns class
Expand Down
62 changes: 62 additions & 0 deletions libraries/classes/Config.php
Expand Up @@ -8,18 +8,80 @@

use DirectoryIterator;
use PhpMyAdmin\Utils\HttpRequest;
use function array_filter;
use function array_flip;
use function array_intersect_key;
use function array_key_exists;
use function array_keys;
use function array_merge;
use function array_replace_recursive;
use function array_shift;
use function array_slice;
use function basename;
use function bin2hex;
use function count;
use function date;
use function define;
use function defined;
use function error_get_last;
use function error_reporting;
use function explode;
use function fclose;
use function file_exists;
use function file_get_contents;
use function filemtime;
use function fileperms;
use function fopen;
use function fread;
use function fseek;
use function function_exists;
use function gd_info;
use function gzuncompress;
use function implode;
use function in_array;
use function ini_get;
use function intval;
use function is_dir;
use function is_file;
use function is_int;
use function is_numeric;
use function is_readable;
use function is_string;
use function is_writable;
use function json_decode;
use function max;
use function mb_strstr;
use function mb_strtolower;
use function md5;
use function min;
use function mkdir;
use function ob_end_clean;
use function ob_get_clean;
use function ob_start;
use function ord;
use function parse_url;
use function preg_match;
use function realpath;
use function rtrim;
use function setcookie;
use function sprintf;
use function str_replace;
use function stripos;
use function strlen;
use function strpos;
use function strtolower;
use function substr;
use function sys_get_temp_dir;
use function time;
use function trigger_error;
use function trim;
use function unpack;
use const DIRECTORY_SEPARATOR;
use const E_USER_ERROR;
use const PHP_EOL;
use const PHP_OS;
use const PHP_URL_PATH;
use const PHP_URL_SCHEME;

/**
* Configuration class
Expand Down
3 changes: 2 additions & 1 deletion libraries/classes/Config/Form.php
Expand Up @@ -10,15 +10,16 @@
use function array_shift;
use function array_walk;
use function count;
use function gettype;
use function is_array;
use function is_bool;
use function is_int;
use function ltrim;
use function mb_strpos;
use function mb_strrpos;
use function mb_substr;
use function trigger_error;
use const E_USER_ERROR;
use function mb_strpos;

/**
* Base class for forms, loads default configuration options, checks allowed
Expand Down
19 changes: 19 additions & 0 deletions libraries/classes/Config/FormDisplay.php
Expand Up @@ -17,6 +17,25 @@
use PhpMyAdmin\Html\MySQLDocumentation;
use PhpMyAdmin\Sanitize;
use PhpMyAdmin\Util;
use function array_flip;
use function array_keys;
use function array_search;
use function count;
use function explode;
use function function_exists;
use function gettype;
use function implode;
use function is_array;
use function is_bool;
use function is_numeric;
use function mb_substr;
use function preg_match;
use function settype;
use function sprintf;
use function str_replace;
use function trigger_error;
use function trim;
use const E_USER_WARNING;

/**
* Form management class, displays and processes forms
Expand Down
15 changes: 14 additions & 1 deletion libraries/classes/Config/Validator.php
Expand Up @@ -14,16 +14,29 @@
use function array_shift;
use function call_user_func_array;
use function count;
use function error_clear_last;
use function error_get_last;
use function explode;
use function filter_var;
use function htmlspecialchars;
use function intval;
use function is_array;
use function is_object;
use function mb_strpos;
use function mb_substr;
use function mysql_close;
use function mysql_connect;
use function mysqli_close;
use function mysqli_connect;
use function preg_match;
use function preg_replace;
use function sprintf;
use function str_replace;
use function error_clear_last;
use function trim;
use const FILTER_FLAG_IPV4;
use const FILTER_FLAG_IPV6;
use const FILTER_VALIDATE_IP;
use const PHP_INT_MAX;

/**
* Validation class for various validation functions
Expand Down
Expand Up @@ -24,21 +24,26 @@
use PhpMyAdmin\Tracker;
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use function array_search;
use function ceil;
use function count;
use function htmlspecialchars;
use function implode;
use function in_array;
use function is_string;
use function json_decode;
use function json_encode;
use function max;
use function mb_substr;
use function md5;
use function preg_match;
use function preg_quote;
use function sha1;
use function sprintf;
use function str_replace;
use function strlen;
use function strtotime;
use function urlencode;
use function array_search;

/**
* Handles database structure logic
Expand Down
20 changes: 20 additions & 0 deletions libraries/classes/Controllers/ImportController.php
Expand Up @@ -21,6 +21,26 @@
use PhpMyAdmin\Url;
use PhpMyAdmin\Util;
use Throwable;
use function define;
use function htmlspecialchars;
use function in_array;
use function ini_get;
use function ini_set;
use function intval;
use function is_array;
use function is_link;
use function is_uploaded_file;
use function mb_strlen;
use function mb_strtolower;
use function preg_match;
use function preg_quote;
use function preg_replace;
use function sprintf;
use function strlen;
use function substr;
use function time;
use function trim;
use function unlink;

final class ImportController extends AbstractController
{
Expand Down
Expand Up @@ -18,18 +18,21 @@
use PhpMyAdmin\UserPreferencesHeader;
use PhpMyAdmin\Util;
use function array_merge;
use function define;
use function file_exists;
use function is_array;
use function is_uploaded_file;
use function json_decode;
use function json_encode;
use function mb_strpos;
use function mb_substr;
use function parse_url;
use function str_replace;
use function urlencode;
use function var_export;
use const JSON_PRETTY_PRINT;
use const PHP_URL_PATH;
use const UPLOAD_ERR_OK;
use function mb_strpos;

/**
* User preferences management page.
Expand Down
6 changes: 5 additions & 1 deletion libraries/classes/Controllers/Table/StructureController.php
Expand Up @@ -39,11 +39,15 @@
use function implode;
use function in_array;
use function is_array;
use function mb_strpos;
use function mb_strtoupper;
use function sprintf;
use function str_replace;
use function trim;
use function strlen;
use function strpos;
use function strrpos;
use function substr;
use function trim;

/**
* Displays table structure infos like columns, indexes, size, rows
Expand Down
5 changes: 4 additions & 1 deletion libraries/classes/Controllers/Table/ZoomSearchController.php
Expand Up @@ -12,16 +12,19 @@
use PhpMyAdmin\Template;
use PhpMyAdmin\Util;
use function array_search;
use function count;
use function htmlspecialchars;
use function in_array;
use function intval;
use function is_numeric;
use function json_encode;
use function mb_strtolower;
use function md5;
use function preg_match;
use function preg_replace;
use function str_ireplace;
use function str_replace;
use function strncasecmp;
use function count;

/**
* Handles table zoom search tab.
Expand Down
44 changes: 43 additions & 1 deletion libraries/classes/Core.php
Expand Up @@ -10,19 +10,61 @@

use PhpMyAdmin\Di\Migration;
use PhpMyAdmin\Display\Error as DisplayError;
use function array_keys;
use function array_pop;
use function array_walk_recursive;
use function chr;
use function count;
use function date_default_timezone_get;
use function date_default_timezone_set;
use function defined;
use function explode;
use function extension_loaded;
use function filter_var;
use function function_exists;
use function getenv;
use function gettype;
use function gmdate;
use function hash_equals;
use function hash_hmac;
use function header;
use function htmlspecialchars;
use function http_build_query;
use function implode;
use function in_array;
use function ini_get;
use function ini_set;
use function intval;
use function is_array;
use function is_numeric;
use function is_scalar;
use function is_string;
use function json_encode;
use function mb_internal_encoding;
use function mb_strlen;
use function mb_strpos;
use function mb_strrpos;
use function mb_substr;
use function parse_str;
use function parse_url;
use function preg_match;
use function preg_replace;
use function session_write_close;
use function sprintf;
use function str_replace;
use function strlen;
use function strpos;
use function strtolower;
use function vsprintf;
use function strtr;
use function substr;
use function trigger_error;
use function unserialize;
use function urldecode;
use function vsprintf;
use const DATE_RFC1123;
use const E_USER_ERROR;
use const E_USER_WARNING;
use const FILTER_VALIDATE_IP;

/**
* Core class
Expand Down

0 comments on commit 6b7af13

Please sign in to comment.