Skip to content

Remove static variables for PHP 8.1 #5262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 31, 2021
Merged

Remove static variables for PHP 8.1 #5262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
916a7b0
refactor: remove static variable and add a proptery for it
kenjis Oct 31, 2021
601d295
refactor: break long lines
kenjis Oct 31, 2021
c36ce02
refactor: remove static variables and add properties
kenjis Oct 31, 2021
dbfacc0
refactor: break long lines
kenjis Oct 31, 2021
833ca56
Apply suggestions from code review
paulbalandan Oct 31, 2021
8d5dc08
Change empty to is identical check
paulbalandan Oct 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 31 additions & 12 deletions system/Database/BaseBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,20 @@ class BaseBuilder
'RIGHT OUTER',
];

/**
* Strings that determine if a string represents a literal value or a field name
*
* @var string[]
*/
protected $isLiteralStr = [];

/**
* RegExp used to get operators
*
* @var string[]
*/
protected $pregOperators = [];

/**
* Constructor
*
Expand Down Expand Up @@ -2515,13 +2529,11 @@ protected function isLiteral(string $str): bool
return true;
}

static $_str;

if (empty($_str)) {
$_str = ($this->db->escapeChar !== '"') ? ['"', "'"] : ["'"];
if ($this->isLiteralStr === []) {
$this->isLiteralStr = $this->db->escapeChar !== '"' ? ['"', "'"] : ["'"];
}

return in_array($str[0], $_str, true);
return in_array($str[0], $this->isLiteralStr, true);
}

/**
Expand Down Expand Up @@ -2600,7 +2612,10 @@ protected function resetWrite()
*/
protected function hasOperator(string $str): bool
{
return (bool) preg_match('/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i', trim($str));
return preg_match(
'/(<|>|!|=|\sIS NULL|\sIS NOT NULL|\sEXISTS|\sBETWEEN|\sLIKE|\sIN\s*\(|\s)/i',
trim($str)
) === 1;
}

/**
Expand All @@ -2610,11 +2625,11 @@ protected function hasOperator(string $str): bool
*/
protected function getOperator(string $str, bool $list = false)
{
static $_operators;

if (empty($_operators)) {
$_les = ($this->db->likeEscapeStr !== '') ? '\s+' . preg_quote(trim(sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar)), '/') : '';
$_operators = [
if ($this->pregOperators === []) {
$_les = $this->db->likeEscapeStr !== ''
? '\s+' . preg_quote(trim(sprintf($this->db->likeEscapeStr, $this->db->likeEscapeChar)), '/')
: '';
$this->pregOperators = [
'\s*(?:<|>|!)?=\s*', // =, <=, >=, !=
'\s*<>?\s*', // <, <>
'\s*>\s*', // >
Expand All @@ -2630,7 +2645,11 @@ protected function getOperator(string $str, bool $list = false)
];
}

return preg_match_all('/' . implode('|', $_operators) . '/i', $str, $match) ? ($list ? $match[0] : $match[0][0]) : false;
return preg_match_all(
'/' . implode('|', $this->pregOperators) . '/i',
$str,
$match
) ? ($list ? $match[0] : $match[0][0]) : false;
}

/**
Expand Down
29 changes: 21 additions & 8 deletions system/Database/BaseConnection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,13 @@ abstract class BaseConnection implements ConnectionInterface
*/
public $likeEscapeChar = '!';

/**
* RegExp used to escape identifiers
*
* @var array
*/
protected $pregEscapeChar = [];

/**
* Holds previously looked up data
* for performance reasons.
Expand Down Expand Up @@ -1119,29 +1126,35 @@ public function escapeIdentifiers($item)
return $item;
}

static $pregEc = [];

if (empty($pregEc)) {
if ($this->pregEscapeChar === []) {
if (is_array($this->escapeChar)) {
$pregEc = [
$this->pregEscapeChar = [
preg_quote($this->escapeChar[0], '/'),
preg_quote($this->escapeChar[1], '/'),
$this->escapeChar[0],
$this->escapeChar[1],
];
} else {
$pregEc[0] = $pregEc[1] = preg_quote($this->escapeChar, '/');
$pregEc[2] = $pregEc[3] = $this->escapeChar;
$this->pregEscapeChar[0] = $this->pregEscapeChar[1] = preg_quote($this->escapeChar, '/');
$this->pregEscapeChar[2] = $this->pregEscapeChar[3] = $this->escapeChar;
}
}

foreach ($this->reservedIdentifiers as $id) {
if (strpos($item, '.' . $id) !== false) {
return preg_replace('/' . $pregEc[0] . '?([^' . $pregEc[1] . '\.]+)' . $pregEc[1] . '?\./i', $pregEc[2] . '$1' . $pregEc[3] . '.', $item);
return preg_replace(
'/' . $this->pregEscapeChar[0] . '?([^' . $this->pregEscapeChar[1] . '\.]+)' . $this->pregEscapeChar[1] . '?\./i',
$this->pregEscapeChar[2] . '$1' . $this->pregEscapeChar[3] . '.',
$item
);
}
}

return preg_replace('/' . $pregEc[0] . '?([^' . $pregEc[1] . '\.]+)' . $pregEc[1] . '?(\.)?/i', $pregEc[2] . '$1' . $pregEc[3] . '$2', $item);
return preg_replace(
'/' . $this->pregEscapeChar[0] . '?([^' . $this->pregEscapeChar[1] . '\.]+)' . $this->pregEscapeChar[1] . '?(\.)?/i',
$this->pregEscapeChar[2] . '$1' . $this->pregEscapeChar[3] . '$2',
$item
);
}

/**
Expand Down