Fix deprecated usage of null on string params of internal functions#5371

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
kenjis merged 1 commit into from
Nov 25, 2021
Merged

Fix deprecated usage of null on string params of internal functions #5371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion app/Config/Mimes.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -509,7 +509,7 @@ public static function guessExtensionFromType(string $type, ?string $proposedExt
{
$type = trim(strtolower($type), '. ');

$proposedExtension = trim(strtolower($proposedExtension));
$proposedExtension = trim(strtolower($proposedExtension ?? ''));

if ($proposedExtension !== '') {
if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true)) {
Expand Down
8 changes: 5 additions & 3 deletions system/CLI/CLI.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -865,10 +865,12 @@ public static function getOptionString(bool $useLongOpts = false, bool $trim = f
$out .= "-{$name} ";
}

// If there's a space, we need to group
// so it will pass correctly.
if ($value === null) {
continue;
}

if (mb_strpos($value, ' ') !== false) {
$out .= '"' . $value . '" ';
$out .= "\"{$value}\" ";
} elseif ($value !== null) {
$out .= "{$value} ";
}
Expand Down
4 changes: 2 additions & 2 deletions system/Database/BaseUtils.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ public function repairTable(string $tableName)
public function getCSVFromResult(ResultInterface $query, string $delim = ',', string $newline = "\n", string $enclosure = '"')
{
$out = '';
// First generate the headings from the table column names

foreach ($query->getFieldNames() as $name) {
$out .= $enclosure . str_replace($enclosure, $enclosure . $enclosure, $name) . $enclosure . $delim;
}
Expand All@@ -212,7 +212,7 @@ public function getCSVFromResult(ResultInterface $query, string $delim = ',', st
$line = [];

foreach ($row as $item) {
$line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item) . $enclosure;
$line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item ?? '') . $enclosure;
}

$out .= implode($delim, $line) . $newline;
Expand Down
2 changes: 1 addition & 1 deletion system/Database/Forge.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -462,7 +462,7 @@ public function dropKey(string $table, string $keyName)
public function dropForeignKey(string $table, string $foreignName)
{
$sql = sprintf(
$this->dropConstraintStr,
(string) $this->dropConstraintStr,
$this->db->escapeIdentifiers($this->db->DBPrefix . $table),
$this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName)
);
Expand Down
7 changes: 5 additions & 2 deletions system/Database/Postgre/Connection.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -433,8 +433,11 @@ protected function buildDSN()
$this->DSN = "host={$this->hostname} ";
}

if (! empty($this->port) && ctype_digit($this->port)) {
$this->DSN .= "port={$this->port} ";
// ctype_digit only accepts strings
$port = (string) $this->port;

if ($port !== '' && ctype_digit($port)) {
$this->DSN .= "port={$port} ";
}

if ($this->username !== '') {
Expand Down
7 changes: 2 additions & 5 deletions system/Filters/Filters.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -397,13 +397,10 @@ protected function processGlobals(?string $uri = null)
return;
}

$uri = strtolower(trim($uri, '/ '));
$uri = strtolower(trim($uri ?? '', '/ '));

// Add any global filters, unless they are excluded for this URI
$sets = [
'before',
'after',
];
$sets = ['before', 'after'];

foreach ($sets as $set) {
if (isset($this->config->globals[$set])) {
Expand Down
8 changes: 5 additions & 3 deletions system/HTTP/CLIRequest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -139,11 +139,13 @@ public function getOptionString(bool $useLongOpts = false): string
$out .= "-{$name} ";
}

// If there's a space, we need to group
// so it will pass correctly.
if ($value === null) {
continue;
}

if (mb_strpos($value, ' ') !== false) {
$out .= '"' . $value . '" ';
} elseif ($value !== null) {
} else {
$out .= "{$value} ";
}
}
Expand Down
2 changes: 1 addition & 1 deletion system/HTTP/CURLRequest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -424,7 +424,7 @@ protected function applyMethod(string $method, array $curlOptions): array
$this->method = $method;
$curlOptions[CURLOPT_CUSTOMREQUEST] = $method;

$size = strlen($this->body);
$size = strlen($this->body ?? '');

// Have content?
if ($size > 0) {
Expand Down
2 changes: 1 addition & 1 deletion system/HTTP/ResponseTrait.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -435,7 +435,7 @@ public function send()
if ($this->CSPEnabled === true) {
$this->CSP->finalize($this);
} else {
$this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body);
$this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body ?? '');
}

$this->sendHeaders();
Expand Down
18 changes: 8 additions & 10 deletions system/I18n/Time.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -75,25 +75,23 @@ class Time extends DateTime
*/
public function __construct(?string $time = null, $timezone = null, ?string $locale = null)
{
// If no locale was provided, grab it from Locale (set by IncomingRequest for web requests)
$this->locale = ! empty($locale) ? $locale : Locale::getDefault();
$this->locale = $locale ?: Locale::getDefault();

// If a test instance has been provided, use it instead.
if ($time === null && static::$testNow instanceof self) {
if (empty($timezone)) {
$timezone = static::$testNow->getTimezone();
}
$time = $time ?? '';

$time = static::$testNow->toDateTimeString();
// If a test instance has been provided, use it instead.
if ($time === '' && static::$testNow instanceof self) {
$timezone = $timezone ?: static::$testNow->getTimezone();
$time = (string) static::$testNow->toDateTimeString();
}

$timezone = ! empty($timezone) ? $timezone : date_default_timezone_get();
$timezone = $timezone ?: date_default_timezone_get();
$this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);

// If the time string was a relative string (i.e. 'next Tuesday')
// then we need to adjust the time going in so that we have a current
// timezone to work with.
if (! empty($time) && (is_string($time) && static::hasRelativeKeywords($time))) {
if ($time !== '' && static::hasRelativeKeywords($time)) {
$instance = new DateTime('now', $this->timezone);
$instance->modify($time);
$time = $instance->format('Y-m-d H:i:s');
Expand Down
7 changes: 4 additions & 3 deletions system/Security/Security.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ public function verify(RequestInterface $request)
throw SecurityException::forDisallowedAction();
}

$json = json_decode($request->getBody());
$json = json_decode($request->getBody() ?? '');

if (isset($_POST[$this->tokenName])) {
// We kill this since we're done and we don't want to pollute the POST array.
Expand DownExpand Up@@ -323,9 +323,10 @@ private function getPostedToken(RequestInterface $request): ?string
if ($request->hasHeader($this->headerName) && ! empty($request->header($this->headerName)->getValue())) {
$tokenName = $request->header($this->headerName)->getValue();
} else {
$json = json_decode($request->getBody());
$body = (string) $request->getBody();
$json = json_decode($body);

if (! empty($request->getBody()) && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
if ($body !== '' && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
$tokenName = $json->{$this->tokenName} ?? null;
} else {
$tokenName = null;
Expand Down
56 changes: 28 additions & 28 deletions system/Validation/FormatRules.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class FormatRules
*/
public function alpha(?string $str = null): bool
{
return ctype_alpha($str);
return ctype_alpha($str ?? '');
}

/**
Expand DownExpand Up@@ -74,7 +74,7 @@ public function alpha_numeric_punct($str)
*/
public function alpha_numeric(?string $str = null): bool
{
return ctype_alnum($str);
return ctype_alnum($str ?? '');
}

/**
Expand All@@ -83,7 +83,7 @@ public function alpha_numeric(?string $str = null): bool
public function alpha_numeric_space(?string $str = null): bool
{
// @see https://regex101.com/r/0AZDME/1
return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str);
return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str ?? '');
}

/**
Expand All@@ -105,39 +105,39 @@ public function string($str = null): bool
public function decimal(?string $str = null): bool
{
// @see https://regex101.com/r/HULifl/2/
return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str);
return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str ?? '');
}

/**
* String of hexidecimal characters
*/
public function hex(?string $str = null): bool
{
return ctype_xdigit($str);
return ctype_xdigit($str ?? '');
}

/**
* Integer
*/
public function integer(?string $str = null): bool
{
return (bool) preg_match('/\A[\-+]?\d+\z/', $str);
return (bool) preg_match('/\A[\-+]?\d+\z/', $str ?? '');
}

/**
* Is a Natural number (0,1,2,3, etc.)
*/
public function is_natural(?string $str = null): bool
{
return ctype_digit($str);
return ctype_digit($str ?? '');
}

/**
* Is a Natural number, but not a zero (1,2,3, etc.)
*/
public function is_natural_no_zero(?string $str = null): bool
{
return $str !== '0' && ctype_digit($str);
return $str !== '0' && ctype_digit($str ?? '');
}

/**
Expand All@@ -146,7 +146,7 @@ public function is_natural_no_zero(?string $str = null): bool
public function numeric(?string $str = null): bool
{
// @see https://regex101.com/r/bb9wtr/2
return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str);
return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str ?? '');
}

/**
Expand All@@ -158,7 +158,7 @@ public function regex_match(?string $str, string $pattern): bool
$pattern = "/{$pattern}/";
}

return (bool) preg_match($pattern, $str);
return (bool) preg_match($pattern, $str ?? '');
}

/**
Expand All@@ -171,7 +171,7 @@ public function regex_match(?string $str, string $pattern): bool
*/
public function timezone(?string $str = null): bool
{
return in_array($str, timezone_identifiers_list(), true);
return in_array($str ?? '', timezone_identifiers_list(), true);
}

/**
Expand All@@ -184,6 +184,10 @@ public function timezone(?string $str = null): bool
*/
public function valid_base64(?string $str = null): bool
{
if ($str === null) {
return false;
}

return base64_encode(base64_decode($str, true)) === $str;
}

Expand All@@ -194,7 +198,7 @@ public function valid_base64(?string $str = null): bool
*/
public function valid_json(?string $str = null): bool
{
json_decode($str);
json_decode($str ?? '');

return json_last_error() === JSON_ERROR_NONE;
}
Expand All@@ -207,7 +211,7 @@ public function valid_json(?string $str = null): bool
public function valid_email(?string $str = null): bool
{
// @see https://regex101.com/r/wlJG1t/1/
if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches)) {
if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str ?? '', $matches)) {
$str = $matches[1] . '@' . idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46);
}

Expand All@@ -224,8 +228,9 @@ public function valid_email(?string $str = null): bool
*/
public function valid_emails(?string $str = null): bool
{
foreach (explode(',', $str) as $email) {
foreach (explode(',', $str ?? '') as $email) {
$email = trim($email);

if ($email === '') {
return false;
}
Expand All@@ -241,16 +246,15 @@ public function valid_emails(?string $str = null): bool
/**
* Validate an IP address (human readable format or binary string - inet_pton)
*
* @param string $ip IP Address
* @param string $which IP protocol: 'ipv4' or 'ipv6'
Comment thread
paulbalandan marked this conversation as resolved.
* @param string|null $which IP protocol: 'ipv4' or 'ipv6'
*/
public function valid_ip(?string $ip = null, ?string $which = null): bool
{
if (empty($ip)) {
return false;
}

switch (strtolower($which)) {
switch (strtolower($which ?? '')) {
case 'ipv4':
$which = FILTER_FLAG_IPV4;
break;
Expand All@@ -260,20 +264,18 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
break;

default:
$which = null;
break;
$which = 0;
}

return (bool) filter_var($ip, FILTER_VALIDATE_IP, $which) || (! ctype_print($ip) && (bool) filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which));
return filter_var($ip, FILTER_VALIDATE_IP, $which) !== false
|| (! ctype_print($ip) && filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which) !== false);
}

/**
* Checks a string to ensure it is (loosely) a URL.
*
* Warning: this rule will pass basic strings like
* "banana"; use valid_url_strict for a stricter rule.
*
* @param string $str
*/
public function valid_url(?string $str = null): bool
{
Expand DownExpand Up@@ -317,18 +319,16 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu

/**
* Checks for a valid date and matches a given date format
*
* @param string $str
* @param string $format
*/
public function valid_date(?string $str = null, ?string $format = null): bool
{
if (empty($format)) {
return (bool) strtotime($str);
return strtotime($str) !== false;
}

$date = DateTime::createFromFormat($format, $str);
$date = DateTime::createFromFormat($format, $str);
$errors = DateTime::getLastErrors();

return (bool) $date && DateTime::getLastErrors()['warning_count'] === 0 && DateTime::getLastErrors()['error_count'] === 0;
return $date !== false && $errors !== false && $errors['warning_count'] === 0 && $errors['error_count'] === 0;
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Fix deprecated usage of null on string params of internal functions#5371

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

kenjis
merged 1 commit into

from

Nov 25, 2021
 Merged


Fix deprecated usage of null on string params of internal functions
#5371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
app/Config/Mimes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -509,7 +509,7 @@ public static function guessExtensionFromType(string $type, ?string $proposedExt
 {
 $type = trim(strtolower($type), '. ');

 $proposedExtension = trim(strtolower($proposedExtension));
 $proposedExtension = trim(strtolower($proposedExtension ?? ''));

 if ($proposedExtension !== '') {
 if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true)) {
Expand Down

8 changes: 5 additions & 3 deletions
system/CLI/CLI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -865,10 +865,12 @@ public static function getOptionString(bool $useLongOpts = false, bool $trim = f
 $out .= "-{$name} ";
 }

 // If there's a space, we need to group
 // so it will pass correctly.
 if ($value === null) {
 continue;
 }

 if (mb_strpos($value, ' ') !== false) {
 $out .= '"' . $value . '" ';
 $out .= "\"{$value}\" ";
 } elseif ($value !== null) {
 $out .= "{$value} ";
 }
Expand Down

4 changes: 2 additions & 2 deletions
system/Database/BaseUtils.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ public function repairTable(string $tableName)
 public function getCSVFromResult(ResultInterface $query, string $delim = ',', string $newline = "\n", string $enclosure = '"')
 {
 $out = '';
 // First generate the headings from the table column names

 foreach ($query->getFieldNames() as $name) {
 $out .= $enclosure . str_replace($enclosure, $enclosure . $enclosure, $name) . $enclosure . $delim;
 }
Expand All@@ -212,7 +212,7 @@ public function getCSVFromResult(ResultInterface $query, string $delim = ',', st
 $line = [];

 foreach ($row as $item) {
 $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item) . $enclosure;
 $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item ?? '') . $enclosure;
 }

 $out .= implode($delim, $line) . $newline;
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -462,7 +462,7 @@ public function dropKey(string $table, string $keyName)
 public function dropForeignKey(string $table, string $foreignName)
 {
 $sql = sprintf(
 $this->dropConstraintStr,
(string) $this->dropConstraintStr,
 $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
 $this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName)
 );
Expand Down

7 changes: 5 additions & 2 deletions
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,8 +433,11 @@ protected function buildDSN()
 $this->DSN = "host={$this->hostname} ";
 }

 if (! empty($this->port) && ctype_digit($this->port)) {
 $this->DSN .= "port={$this->port} ";
 // ctype_digit only accepts strings
 $port = (string) $this->port;

 if ($port !== '' && ctype_digit($port)) {
 $this->DSN .= "port={$port} ";
 }

 if ($this->username !== '') {
Expand Down

7 changes: 2 additions & 5 deletions
system/Filters/Filters.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -397,13 +397,10 @@ protected function processGlobals(?string $uri = null)
 return;
 }

 $uri = strtolower(trim($uri, '/ '));
 $uri = strtolower(trim($uri ?? '', '/ '));

 // Add any global filters, unless they are excluded for this URI
 $sets = [
 'before',
 'after',
 ];
 $sets = ['before', 'after'];

 foreach ($sets as $set) {
 if (isset($this->config->globals[$set])) {
Expand Down

8 changes: 5 additions & 3 deletions
system/HTTP/CLIRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,11 +139,13 @@ public function getOptionString(bool $useLongOpts = false): string
 $out .= "-{$name} ";
 }

 // If there's a space, we need to group
 // so it will pass correctly.
 if ($value === null) {
 continue;
 }

 if (mb_strpos($value, ' ') !== false) {
 $out .= '"' . $value . '" ';
 } elseif ($value !== null) {
 } else {
 $out .= "{$value} ";
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/CURLRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -424,7 +424,7 @@ protected function applyMethod(string $method, array $curlOptions): array
 $this->method = $method;
 $curlOptions[CURLOPT_CUSTOMREQUEST] = $method;

 $size = strlen($this->body);
 $size = strlen($this->body ?? '');

 // Have content?
 if ($size > 0) {
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -435,7 +435,7 @@ public function send()
 if ($this->CSPEnabled === true) {
 $this->CSP->finalize($this);
 } else {
 $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body);
 $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body ?? '');
 }

 $this->sendHeaders();
Expand Down

18 changes: 8 additions & 10 deletions
system/I18n/Time.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,25 +75,23 @@ class Time extends DateTime
 */
 public function __construct(?string $time = null, $timezone = null, ?string $locale = null)
 {
 // If no locale was provided, grab it from Locale (set by IncomingRequest for web requests)
 $this->locale = ! empty($locale) ? $locale : Locale::getDefault();
 $this->locale = $locale ?: Locale::getDefault();

 // If a test instance has been provided, use it instead.
 if ($time === null && static::$testNow instanceof self) {
 if (empty($timezone)) {
 $timezone = static::$testNow->getTimezone();
 }
 $time = $time ?? '';

 $time = static::$testNow->toDateTimeString();
 // If a test instance has been provided, use it instead.
 if ($time === '' && static::$testNow instanceof self) {
 $timezone = $timezone ?: static::$testNow->getTimezone();
 $time = (string) static::$testNow->toDateTimeString();
 }

 $timezone = ! empty($timezone) ? $timezone : date_default_timezone_get();
 $timezone = $timezone ?: date_default_timezone_get();
 $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);

 // If the time string was a relative string (i.e. 'next Tuesday')
 // then we need to adjust the time going in so that we have a current
 // timezone to work with.
 if (! empty($time) && (is_string($time) && static::hasRelativeKeywords($time))) {
 if ($time !== '' && static::hasRelativeKeywords($time)) {
 $instance = new DateTime('now', $this->timezone);
 $instance->modify($time);
 $time = $instance->format('Y-m-d H:i:s');
Expand Down

7 changes: 4 additions & 3 deletions
system/Security/Security.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ public function verify(RequestInterface $request)
 throw SecurityException::forDisallowedAction();
 }

 $json = json_decode($request->getBody());
 $json = json_decode($request->getBody() ?? '');

 if (isset($_POST[$this->tokenName])) {
 // We kill this since we're done and we don't want to pollute the POST array.
Expand DownExpand Up@@ -323,9 +323,10 @@ private function getPostedToken(RequestInterface $request): ?string
 if ($request->hasHeader($this->headerName) && ! empty($request->header($this->headerName)->getValue())) {
 $tokenName = $request->header($this->headerName)->getValue();
 } else {
 $json = json_decode($request->getBody());
 $body = (string) $request->getBody();
 $json = json_decode($body);

 if (! empty($request->getBody()) && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
 if ($body !== '' && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
 $tokenName = $json->{$this->tokenName} ?? null;
 } else {
 $tokenName = null;
Expand Down

56 changes: 28 additions & 28 deletions
system/Validation/FormatRules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class FormatRules
 */
 public function alpha(?string $str = null): bool
 {
 return ctype_alpha($str);
 return ctype_alpha($str ?? '');
 }

 /**
Expand DownExpand Up@@ -74,7 +74,7 @@ public function alpha_numeric_punct($str)
 */
 public function alpha_numeric(?string $str = null): bool
 {
 return ctype_alnum($str);
 return ctype_alnum($str ?? '');
 }

 /**
Expand All@@ -83,7 +83,7 @@ public function alpha_numeric(?string $str = null): bool
 public function alpha_numeric_space(?string $str = null): bool
 {
 // @see https://regex101.com/r/0AZDME/1
 return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str);
 return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str ?? '');
 }

 /**
Expand All@@ -105,39 +105,39 @@ public function string($str = null): bool
 public function decimal(?string $str = null): bool
 {
 // @see https://regex101.com/r/HULifl/2/
 return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str);
 return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str ?? '');
 }

 /**
 * String of hexidecimal characters
 */
 public function hex(?string $str = null): bool
 {
 return ctype_xdigit($str);
 return ctype_xdigit($str ?? '');
 }

 /**
 * Integer
 */
 public function integer(?string $str = null): bool
 {
 return (bool) preg_match('/\A[\-+]?\d+\z/', $str);
 return (bool) preg_match('/\A[\-+]?\d+\z/', $str ?? '');
 }

 /**
 * Is a Natural number (0,1,2,3, etc.)
 */
 public function is_natural(?string $str = null): bool
 {
 return ctype_digit($str);
 return ctype_digit($str ?? '');
 }

 /**
 * Is a Natural number, but not a zero (1,2,3, etc.)
 */
 public function is_natural_no_zero(?string $str = null): bool
 {
 return $str !== '0' && ctype_digit($str);
 return $str !== '0' && ctype_digit($str ?? '');
 }

 /**
Expand All@@ -146,7 +146,7 @@ public function is_natural_no_zero(?string $str = null): bool
 public function numeric(?string $str = null): bool
 {
 // @see https://regex101.com/r/bb9wtr/2
 return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str);
 return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str ?? '');
 }

 /**
Expand All@@ -158,7 +158,7 @@ public function regex_match(?string $str, string $pattern): bool
 $pattern = "/{$pattern}/";
 }

 return (bool) preg_match($pattern, $str);
 return (bool) preg_match($pattern, $str ?? '');
 }

 /**
Expand All@@ -171,7 +171,7 @@ public function regex_match(?string $str, string $pattern): bool
 */
 public function timezone(?string $str = null): bool
 {
 return in_array($str, timezone_identifiers_list(), true);
 return in_array($str ?? '', timezone_identifiers_list(), true);
 }

 /**
Expand All@@ -184,6 +184,10 @@ public function timezone(?string $str = null): bool
 */
 public function valid_base64(?string $str = null): bool
 {
 if ($str === null) {
 return false;
 }

 return base64_encode(base64_decode($str, true)) === $str;
 }

Expand All@@ -194,7 +198,7 @@ public function valid_base64(?string $str = null): bool
 */
 public function valid_json(?string $str = null): bool
 {
 json_decode($str);
 json_decode($str ?? '');

 return json_last_error() === JSON_ERROR_NONE;
 }
Expand All@@ -207,7 +211,7 @@ public function valid_json(?string $str = null): bool
 public function valid_email(?string $str = null): bool
 {
 // @see https://regex101.com/r/wlJG1t/1/
 if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches)) {
 if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str ?? '', $matches)) {
 $str = $matches[1] . '@' . idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46);
 }

Expand All@@ -224,8 +228,9 @@ public function valid_email(?string $str = null): bool
 */
 public function valid_emails(?string $str = null): bool
 {
 foreach (explode(',', $str) as $email) {
 foreach (explode(',', $str ?? '') as $email) {
 $email = trim($email);

 if ($email === '') {
 return false;
 }
Expand All@@ -241,16 +246,15 @@ public function valid_emails(?string $str = null): bool
 /**
 * Validate an IP address (human readable format or binary string - inet_pton)
 *
 * @param string $ip IP Address
 * @param string $which IP protocol: 'ipv4' or 'ipv6'
Comment thread
paulbalandan marked this conversation as resolved.

 * @param string|null $which IP protocol: 'ipv4' or 'ipv6'
 */
 public function valid_ip(?string $ip = null, ?string $which = null): bool
 {
 if (empty($ip)) {
 return false;
 }

 switch (strtolower($which)) {
 switch (strtolower($which ?? '')) {
 case 'ipv4':
 $which = FILTER_FLAG_IPV4;
 break;
Expand All@@ -260,20 +264,18 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
 break;

 default:
 $which = null;
 break;
 $which = 0;
 }

 return (bool) filter_var($ip, FILTER_VALIDATE_IP, $which) || (! ctype_print($ip) && (bool) filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which));
 return filter_var($ip, FILTER_VALIDATE_IP, $which) !== false
 || (! ctype_print($ip) && filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which) !== false);
 }

 /**
 * Checks a string to ensure it is (loosely) a URL.
 *
 * Warning: this rule will pass basic strings like
 * "banana"; use valid_url_strict for a stricter rule.
 *
 * @param string $str
 */
 public function valid_url(?string $str = null): bool
 {
Expand DownExpand Up@@ -317,18 +319,16 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu

 /**
 * Checks for a valid date and matches a given date format
 *
 * @param string $str
 * @param string $format
 */
 public function valid_date(?string $str = null, ?string $format = null): bool
 {
 if (empty($format)) {
 return (bool) strtotime($str);
 return strtotime($str) !== false;
 }

 $date = DateTime::createFromFormat($format, $str);
 $date = DateTime::createFromFormat($format, $str);
 $errors = DateTime::getLastErrors();

 return (bool) $date && DateTime::getLastErrors()['warning_count'] === 0 && DateTime::getLastErrors()['error_count'] === 0;
 return $date !== false && $errors !== false && $errors['warning_count'] === 0 && $errors['error_count'] === 0;
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix deprecated usage of null on string params of internal functions#5371

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

kenjis
merged 1 commit into

from

Nov 25, 2021
 Merged


Fix deprecated usage of null on string params of internal functions
#5371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
app/Config/Mimes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -509,7 +509,7 @@ public static function guessExtensionFromType(string $type, ?string $proposedExt
 {
 $type = trim(strtolower($type), '. ');

 $proposedExtension = trim(strtolower($proposedExtension));
 $proposedExtension = trim(strtolower($proposedExtension ?? ''));

 if ($proposedExtension !== '') {
 if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true)) {
Expand Down

8 changes: 5 additions & 3 deletions
system/CLI/CLI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -865,10 +865,12 @@ public static function getOptionString(bool $useLongOpts = false, bool $trim = f
 $out .= "-{$name} ";
 }

 // If there's a space, we need to group
 // so it will pass correctly.
 if ($value === null) {
 continue;
 }

 if (mb_strpos($value, ' ') !== false) {
 $out .= '"' . $value . '" ';
 $out .= "\"{$value}\" ";
 } elseif ($value !== null) {
 $out .= "{$value} ";
 }
Expand Down

4 changes: 2 additions & 2 deletions
system/Database/BaseUtils.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ public function repairTable(string $tableName)
 public function getCSVFromResult(ResultInterface $query, string $delim = ',', string $newline = "\n", string $enclosure = '"')
 {
 $out = '';
 // First generate the headings from the table column names

 foreach ($query->getFieldNames() as $name) {
 $out .= $enclosure . str_replace($enclosure, $enclosure . $enclosure, $name) . $enclosure . $delim;
 }
Expand All@@ -212,7 +212,7 @@ public function getCSVFromResult(ResultInterface $query, string $delim = ',', st
 $line = [];

 foreach ($row as $item) {
 $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item) . $enclosure;
 $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item ?? '') . $enclosure;
 }

 $out .= implode($delim, $line) . $newline;
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -462,7 +462,7 @@ public function dropKey(string $table, string $keyName)
 public function dropForeignKey(string $table, string $foreignName)
 {
 $sql = sprintf(
 $this->dropConstraintStr,
(string) $this->dropConstraintStr,
 $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
 $this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName)
 );
Expand Down

7 changes: 5 additions & 2 deletions
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,8 +433,11 @@ protected function buildDSN()
 $this->DSN = "host={$this->hostname} ";
 }

 if (! empty($this->port) && ctype_digit($this->port)) {
 $this->DSN .= "port={$this->port} ";
 // ctype_digit only accepts strings
 $port = (string) $this->port;

 if ($port !== '' && ctype_digit($port)) {
 $this->DSN .= "port={$port} ";
 }

 if ($this->username !== '') {
Expand Down

7 changes: 2 additions & 5 deletions
system/Filters/Filters.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -397,13 +397,10 @@ protected function processGlobals(?string $uri = null)
 return;
 }

 $uri = strtolower(trim($uri, '/ '));
 $uri = strtolower(trim($uri ?? '', '/ '));

 // Add any global filters, unless they are excluded for this URI
 $sets = [
 'before',
 'after',
 ];
 $sets = ['before', 'after'];

 foreach ($sets as $set) {
 if (isset($this->config->globals[$set])) {
Expand Down

8 changes: 5 additions & 3 deletions
system/HTTP/CLIRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,11 +139,13 @@ public function getOptionString(bool $useLongOpts = false): string
 $out .= "-{$name} ";
 }

 // If there's a space, we need to group
 // so it will pass correctly.
 if ($value === null) {
 continue;
 }

 if (mb_strpos($value, ' ') !== false) {
 $out .= '"' . $value . '" ';
 } elseif ($value !== null) {
 } else {
 $out .= "{$value} ";
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/CURLRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -424,7 +424,7 @@ protected function applyMethod(string $method, array $curlOptions): array
 $this->method = $method;
 $curlOptions[CURLOPT_CUSTOMREQUEST] = $method;

 $size = strlen($this->body);
 $size = strlen($this->body ?? '');

 // Have content?
 if ($size > 0) {
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -435,7 +435,7 @@ public function send()
 if ($this->CSPEnabled === true) {
 $this->CSP->finalize($this);
 } else {
 $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body);
 $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body ?? '');
 }

 $this->sendHeaders();
Expand Down

18 changes: 8 additions & 10 deletions
system/I18n/Time.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,25 +75,23 @@ class Time extends DateTime
 */
 public function __construct(?string $time = null, $timezone = null, ?string $locale = null)
 {
 // If no locale was provided, grab it from Locale (set by IncomingRequest for web requests)
 $this->locale = ! empty($locale) ? $locale : Locale::getDefault();
 $this->locale = $locale ?: Locale::getDefault();

 // If a test instance has been provided, use it instead.
 if ($time === null && static::$testNow instanceof self) {
 if (empty($timezone)) {
 $timezone = static::$testNow->getTimezone();
 }
 $time = $time ?? '';

 $time = static::$testNow->toDateTimeString();
 // If a test instance has been provided, use it instead.
 if ($time === '' && static::$testNow instanceof self) {
 $timezone = $timezone ?: static::$testNow->getTimezone();
 $time = (string) static::$testNow->toDateTimeString();
 }

 $timezone = ! empty($timezone) ? $timezone : date_default_timezone_get();
 $timezone = $timezone ?: date_default_timezone_get();
 $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);

 // If the time string was a relative string (i.e. 'next Tuesday')
 // then we need to adjust the time going in so that we have a current
 // timezone to work with.
 if (! empty($time) && (is_string($time) && static::hasRelativeKeywords($time))) {
 if ($time !== '' && static::hasRelativeKeywords($time)) {
 $instance = new DateTime('now', $this->timezone);
 $instance->modify($time);
 $time = $instance->format('Y-m-d H:i:s');
Expand Down

7 changes: 4 additions & 3 deletions
system/Security/Security.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ public function verify(RequestInterface $request)
 throw SecurityException::forDisallowedAction();
 }

 $json = json_decode($request->getBody());
 $json = json_decode($request->getBody() ?? '');

 if (isset($_POST[$this->tokenName])) {
 // We kill this since we're done and we don't want to pollute the POST array.
Expand DownExpand Up@@ -323,9 +323,10 @@ private function getPostedToken(RequestInterface $request): ?string
 if ($request->hasHeader($this->headerName) && ! empty($request->header($this->headerName)->getValue())) {
 $tokenName = $request->header($this->headerName)->getValue();
 } else {
 $json = json_decode($request->getBody());
 $body = (string) $request->getBody();
 $json = json_decode($body);

 if (! empty($request->getBody()) && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
 if ($body !== '' && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
 $tokenName = $json->{$this->tokenName} ?? null;
 } else {
 $tokenName = null;
Expand Down

56 changes: 28 additions & 28 deletions
system/Validation/FormatRules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class FormatRules
 */
 public function alpha(?string $str = null): bool
 {
 return ctype_alpha($str);
 return ctype_alpha($str ?? '');
 }

 /**
Expand DownExpand Up@@ -74,7 +74,7 @@ public function alpha_numeric_punct($str)
 */
 public function alpha_numeric(?string $str = null): bool
 {
 return ctype_alnum($str);
 return ctype_alnum($str ?? '');
 }

 /**
Expand All@@ -83,7 +83,7 @@ public function alpha_numeric(?string $str = null): bool
 public function alpha_numeric_space(?string $str = null): bool
 {
 // @see https://regex101.com/r/0AZDME/1
 return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str);
 return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str ?? '');
 }

 /**
Expand All@@ -105,39 +105,39 @@ public function string($str = null): bool
 public function decimal(?string $str = null): bool
 {
 // @see https://regex101.com/r/HULifl/2/
 return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str);
 return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str ?? '');
 }

 /**
 * String of hexidecimal characters
 */
 public function hex(?string $str = null): bool
 {
 return ctype_xdigit($str);
 return ctype_xdigit($str ?? '');
 }

 /**
 * Integer
 */
 public function integer(?string $str = null): bool
 {
 return (bool) preg_match('/\A[\-+]?\d+\z/', $str);
 return (bool) preg_match('/\A[\-+]?\d+\z/', $str ?? '');
 }

 /**
 * Is a Natural number (0,1,2,3, etc.)
 */
 public function is_natural(?string $str = null): bool
 {
 return ctype_digit($str);
 return ctype_digit($str ?? '');
 }

 /**
 * Is a Natural number, but not a zero (1,2,3, etc.)
 */
 public function is_natural_no_zero(?string $str = null): bool
 {
 return $str !== '0' && ctype_digit($str);
 return $str !== '0' && ctype_digit($str ?? '');
 }

 /**
Expand All@@ -146,7 +146,7 @@ public function is_natural_no_zero(?string $str = null): bool
 public function numeric(?string $str = null): bool
 {
 // @see https://regex101.com/r/bb9wtr/2
 return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str);
 return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str ?? '');
 }

 /**
Expand All@@ -158,7 +158,7 @@ public function regex_match(?string $str, string $pattern): bool
 $pattern = "/{$pattern}/";
 }

 return (bool) preg_match($pattern, $str);
 return (bool) preg_match($pattern, $str ?? '');
 }

 /**
Expand All@@ -171,7 +171,7 @@ public function regex_match(?string $str, string $pattern): bool
 */
 public function timezone(?string $str = null): bool
 {
 return in_array($str, timezone_identifiers_list(), true);
 return in_array($str ?? '', timezone_identifiers_list(), true);
 }

 /**
Expand All@@ -184,6 +184,10 @@ public function timezone(?string $str = null): bool
 */
 public function valid_base64(?string $str = null): bool
 {
 if ($str === null) {
 return false;
 }

 return base64_encode(base64_decode($str, true)) === $str;
 }

Expand All@@ -194,7 +198,7 @@ public function valid_base64(?string $str = null): bool
 */
 public function valid_json(?string $str = null): bool
 {
 json_decode($str);
 json_decode($str ?? '');

 return json_last_error() === JSON_ERROR_NONE;
 }
Expand All@@ -207,7 +211,7 @@ public function valid_json(?string $str = null): bool
 public function valid_email(?string $str = null): bool
 {
 // @see https://regex101.com/r/wlJG1t/1/
 if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches)) {
 if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str ?? '', $matches)) {
 $str = $matches[1] . '@' . idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46);
 }

Expand All@@ -224,8 +228,9 @@ public function valid_email(?string $str = null): bool
 */
 public function valid_emails(?string $str = null): bool
 {
 foreach (explode(',', $str) as $email) {
 foreach (explode(',', $str ?? '') as $email) {
 $email = trim($email);

 if ($email === '') {
 return false;
 }
Expand All@@ -241,16 +246,15 @@ public function valid_emails(?string $str = null): bool
 /**
 * Validate an IP address (human readable format or binary string - inet_pton)
 *
 * @param string $ip IP Address
 * @param string $which IP protocol: 'ipv4' or 'ipv6'
Comment thread
paulbalandan marked this conversation as resolved.

 * @param string|null $which IP protocol: 'ipv4' or 'ipv6'
 */
 public function valid_ip(?string $ip = null, ?string $which = null): bool
 {
 if (empty($ip)) {
 return false;
 }

 switch (strtolower($which)) {
 switch (strtolower($which ?? '')) {
 case 'ipv4':
 $which = FILTER_FLAG_IPV4;
 break;
Expand All@@ -260,20 +264,18 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
 break;

 default:
 $which = null;
 break;
 $which = 0;
 }

 return (bool) filter_var($ip, FILTER_VALIDATE_IP, $which) || (! ctype_print($ip) && (bool) filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which));
 return filter_var($ip, FILTER_VALIDATE_IP, $which) !== false
 || (! ctype_print($ip) && filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which) !== false);
 }

 /**
 * Checks a string to ensure it is (loosely) a URL.
 *
 * Warning: this rule will pass basic strings like
 * "banana"; use valid_url_strict for a stricter rule.
 *
 * @param string $str
 */
 public function valid_url(?string $str = null): bool
 {
Expand DownExpand Up@@ -317,18 +319,16 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu

 /**
 * Checks for a valid date and matches a given date format
 *
 * @param string $str
 * @param string $format
 */
 public function valid_date(?string $str = null, ?string $format = null): bool
 {
 if (empty($format)) {
 return (bool) strtotime($str);
 return strtotime($str) !== false;
 }

 $date = DateTime::createFromFormat($format, $str);
 $date = DateTime::createFromFormat($format, $str);
 $errors = DateTime::getLastErrors();

 return (bool) $date && DateTime::getLastErrors()['warning_count'] === 0 && DateTime::getLastErrors()['error_count'] === 0;
 return $date !== false && $errors !== false && $errors['warning_count'] === 0 && $errors['error_count'] === 0;
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix deprecated usage of null on string params of internal functions#5371

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

kenjis
merged 1 commit into

from

Nov 25, 2021
 Merged


Fix deprecated usage of null on string params of internal functions
#5371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
app/Config/Mimes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -509,7 +509,7 @@ public static function guessExtensionFromType(string $type, ?string $proposedExt
 {
 $type = trim(strtolower($type), '. ');

 $proposedExtension = trim(strtolower($proposedExtension));
 $proposedExtension = trim(strtolower($proposedExtension ?? ''));

 if ($proposedExtension !== '') {
 if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true)) {
Expand Down

8 changes: 5 additions & 3 deletions
system/CLI/CLI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -865,10 +865,12 @@ public static function getOptionString(bool $useLongOpts = false, bool $trim = f
 $out .= "-{$name} ";
 }

 // If there's a space, we need to group
 // so it will pass correctly.
 if ($value === null) {
 continue;
 }

 if (mb_strpos($value, ' ') !== false) {
 $out .= '"' . $value . '" ';
 $out .= "\"{$value}\" ";
 } elseif ($value !== null) {
 $out .= "{$value} ";
 }
Expand Down

4 changes: 2 additions & 2 deletions
system/Database/BaseUtils.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ public function repairTable(string $tableName)
 public function getCSVFromResult(ResultInterface $query, string $delim = ',', string $newline = "\n", string $enclosure = '"')
 {
 $out = '';
 // First generate the headings from the table column names

 foreach ($query->getFieldNames() as $name) {
 $out .= $enclosure . str_replace($enclosure, $enclosure . $enclosure, $name) . $enclosure . $delim;
 }
Expand All@@ -212,7 +212,7 @@ public function getCSVFromResult(ResultInterface $query, string $delim = ',', st
 $line = [];

 foreach ($row as $item) {
 $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item) . $enclosure;
 $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item ?? '') . $enclosure;
 }

 $out .= implode($delim, $line) . $newline;
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -462,7 +462,7 @@ public function dropKey(string $table, string $keyName)
 public function dropForeignKey(string $table, string $foreignName)
 {
 $sql = sprintf(
 $this->dropConstraintStr,
(string) $this->dropConstraintStr,
 $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
 $this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName)
 );
Expand Down

7 changes: 5 additions & 2 deletions
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,8 +433,11 @@ protected function buildDSN()
 $this->DSN = "host={$this->hostname} ";
 }

 if (! empty($this->port) && ctype_digit($this->port)) {
 $this->DSN .= "port={$this->port} ";
 // ctype_digit only accepts strings
 $port = (string) $this->port;

 if ($port !== '' && ctype_digit($port)) {
 $this->DSN .= "port={$port} ";
 }

 if ($this->username !== '') {
Expand Down

7 changes: 2 additions & 5 deletions
system/Filters/Filters.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -397,13 +397,10 @@ protected function processGlobals(?string $uri = null)
 return;
 }

 $uri = strtolower(trim($uri, '/ '));
 $uri = strtolower(trim($uri ?? '', '/ '));

 // Add any global filters, unless they are excluded for this URI
 $sets = [
 'before',
 'after',
 ];
 $sets = ['before', 'after'];

 foreach ($sets as $set) {
 if (isset($this->config->globals[$set])) {
Expand Down

8 changes: 5 additions & 3 deletions
system/HTTP/CLIRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,11 +139,13 @@ public function getOptionString(bool $useLongOpts = false): string
 $out .= "-{$name} ";
 }

 // If there's a space, we need to group
 // so it will pass correctly.
 if ($value === null) {
 continue;
 }

 if (mb_strpos($value, ' ') !== false) {
 $out .= '"' . $value . '" ';
 } elseif ($value !== null) {
 } else {
 $out .= "{$value} ";
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/CURLRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -424,7 +424,7 @@ protected function applyMethod(string $method, array $curlOptions): array
 $this->method = $method;
 $curlOptions[CURLOPT_CUSTOMREQUEST] = $method;

 $size = strlen($this->body);
 $size = strlen($this->body ?? '');

 // Have content?
 if ($size > 0) {
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -435,7 +435,7 @@ public function send()
 if ($this->CSPEnabled === true) {
 $this->CSP->finalize($this);
 } else {
 $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body);
 $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body ?? '');
 }

 $this->sendHeaders();
Expand Down

18 changes: 8 additions & 10 deletions
system/I18n/Time.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,25 +75,23 @@ class Time extends DateTime
 */
 public function __construct(?string $time = null, $timezone = null, ?string $locale = null)
 {
 // If no locale was provided, grab it from Locale (set by IncomingRequest for web requests)
 $this->locale = ! empty($locale) ? $locale : Locale::getDefault();
 $this->locale = $locale ?: Locale::getDefault();

 // If a test instance has been provided, use it instead.
 if ($time === null && static::$testNow instanceof self) {
 if (empty($timezone)) {
 $timezone = static::$testNow->getTimezone();
 }
 $time = $time ?? '';

 $time = static::$testNow->toDateTimeString();
 // If a test instance has been provided, use it instead.
 if ($time === '' && static::$testNow instanceof self) {
 $timezone = $timezone ?: static::$testNow->getTimezone();
 $time = (string) static::$testNow->toDateTimeString();
 }

 $timezone = ! empty($timezone) ? $timezone : date_default_timezone_get();
 $timezone = $timezone ?: date_default_timezone_get();
 $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);

 // If the time string was a relative string (i.e. 'next Tuesday')
 // then we need to adjust the time going in so that we have a current
 // timezone to work with.
 if (! empty($time) && (is_string($time) && static::hasRelativeKeywords($time))) {
 if ($time !== '' && static::hasRelativeKeywords($time)) {
 $instance = new DateTime('now', $this->timezone);
 $instance->modify($time);
 $time = $instance->format('Y-m-d H:i:s');
Expand Down

7 changes: 4 additions & 3 deletions
system/Security/Security.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ public function verify(RequestInterface $request)
 throw SecurityException::forDisallowedAction();
 }

 $json = json_decode($request->getBody());
 $json = json_decode($request->getBody() ?? '');

 if (isset($_POST[$this->tokenName])) {
 // We kill this since we're done and we don't want to pollute the POST array.
Expand DownExpand Up@@ -323,9 +323,10 @@ private function getPostedToken(RequestInterface $request): ?string
 if ($request->hasHeader($this->headerName) && ! empty($request->header($this->headerName)->getValue())) {
 $tokenName = $request->header($this->headerName)->getValue();
 } else {
 $json = json_decode($request->getBody());
 $body = (string) $request->getBody();
 $json = json_decode($body);

 if (! empty($request->getBody()) && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
 if ($body !== '' && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
 $tokenName = $json->{$this->tokenName} ?? null;
 } else {
 $tokenName = null;
Expand Down

56 changes: 28 additions & 28 deletions
system/Validation/FormatRules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class FormatRules
 */
 public function alpha(?string $str = null): bool
 {
 return ctype_alpha($str);
 return ctype_alpha($str ?? '');
 }

 /**
Expand DownExpand Up@@ -74,7 +74,7 @@ public function alpha_numeric_punct($str)
 */
 public function alpha_numeric(?string $str = null): bool
 {
 return ctype_alnum($str);
 return ctype_alnum($str ?? '');
 }

 /**
Expand All@@ -83,7 +83,7 @@ public function alpha_numeric(?string $str = null): bool
 public function alpha_numeric_space(?string $str = null): bool
 {
 // @see https://regex101.com/r/0AZDME/1
 return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str);
 return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str ?? '');
 }

 /**
Expand All@@ -105,39 +105,39 @@ public function string($str = null): bool
 public function decimal(?string $str = null): bool
 {
 // @see https://regex101.com/r/HULifl/2/
 return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str);
 return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str ?? '');
 }

 /**
 * String of hexidecimal characters
 */
 public function hex(?string $str = null): bool
 {
 return ctype_xdigit($str);
 return ctype_xdigit($str ?? '');
 }

 /**
 * Integer
 */
 public function integer(?string $str = null): bool
 {
 return (bool) preg_match('/\A[\-+]?\d+\z/', $str);
 return (bool) preg_match('/\A[\-+]?\d+\z/', $str ?? '');
 }

 /**
 * Is a Natural number (0,1,2,3, etc.)
 */
 public function is_natural(?string $str = null): bool
 {
 return ctype_digit($str);
 return ctype_digit($str ?? '');
 }

 /**
 * Is a Natural number, but not a zero (1,2,3, etc.)
 */
 public function is_natural_no_zero(?string $str = null): bool
 {
 return $str !== '0' && ctype_digit($str);
 return $str !== '0' && ctype_digit($str ?? '');
 }

 /**
Expand All@@ -146,7 +146,7 @@ public function is_natural_no_zero(?string $str = null): bool
 public function numeric(?string $str = null): bool
 {
 // @see https://regex101.com/r/bb9wtr/2
 return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str);
 return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str ?? '');
 }

 /**
Expand All@@ -158,7 +158,7 @@ public function regex_match(?string $str, string $pattern): bool
 $pattern = "/{$pattern}/";
 }

 return (bool) preg_match($pattern, $str);
 return (bool) preg_match($pattern, $str ?? '');
 }

 /**
Expand All@@ -171,7 +171,7 @@ public function regex_match(?string $str, string $pattern): bool
 */
 public function timezone(?string $str = null): bool
 {
 return in_array($str, timezone_identifiers_list(), true);
 return in_array($str ?? '', timezone_identifiers_list(), true);
 }

 /**
Expand All@@ -184,6 +184,10 @@ public function timezone(?string $str = null): bool
 */
 public function valid_base64(?string $str = null): bool
 {
 if ($str === null) {
 return false;
 }

 return base64_encode(base64_decode($str, true)) === $str;
 }

Expand All@@ -194,7 +198,7 @@ public function valid_base64(?string $str = null): bool
 */
 public function valid_json(?string $str = null): bool
 {
 json_decode($str);
 json_decode($str ?? '');

 return json_last_error() === JSON_ERROR_NONE;
 }
Expand All@@ -207,7 +211,7 @@ public function valid_json(?string $str = null): bool
 public function valid_email(?string $str = null): bool
 {
 // @see https://regex101.com/r/wlJG1t/1/
 if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches)) {
 if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str ?? '', $matches)) {
 $str = $matches[1] . '@' . idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46);
 }

Expand All@@ -224,8 +228,9 @@ public function valid_email(?string $str = null): bool
 */
 public function valid_emails(?string $str = null): bool
 {
 foreach (explode(',', $str) as $email) {
 foreach (explode(',', $str ?? '') as $email) {
 $email = trim($email);

 if ($email === '') {
 return false;
 }
Expand All@@ -241,16 +246,15 @@ public function valid_emails(?string $str = null): bool
 /**
 * Validate an IP address (human readable format or binary string - inet_pton)
 *
 * @param string $ip IP Address
 * @param string $which IP protocol: 'ipv4' or 'ipv6'
Comment thread
paulbalandan marked this conversation as resolved.

 * @param string|null $which IP protocol: 'ipv4' or 'ipv6'
 */
 public function valid_ip(?string $ip = null, ?string $which = null): bool
 {
 if (empty($ip)) {
 return false;
 }

 switch (strtolower($which)) {
 switch (strtolower($which ?? '')) {
 case 'ipv4':
 $which = FILTER_FLAG_IPV4;
 break;
Expand All@@ -260,20 +264,18 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
 break;

 default:
 $which = null;
 break;
 $which = 0;
 }

 return (bool) filter_var($ip, FILTER_VALIDATE_IP, $which) || (! ctype_print($ip) && (bool) filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which));
 return filter_var($ip, FILTER_VALIDATE_IP, $which) !== false
 || (! ctype_print($ip) && filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which) !== false);
 }

 /**
 * Checks a string to ensure it is (loosely) a URL.
 *
 * Warning: this rule will pass basic strings like
 * "banana"; use valid_url_strict for a stricter rule.
 *
 * @param string $str
 */
 public function valid_url(?string $str = null): bool
 {
Expand DownExpand Up@@ -317,18 +319,16 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu

 /**
 * Checks for a valid date and matches a given date format
 *
 * @param string $str
 * @param string $format
 */
 public function valid_date(?string $str = null, ?string $format = null): bool
 {
 if (empty($format)) {
 return (bool) strtotime($str);
 return strtotime($str) !== false;
 }

 $date = DateTime::createFromFormat($format, $str);
 $date = DateTime::createFromFormat($format, $str);
 $errors = DateTime::getLastErrors();

 return (bool) $date && DateTime::getLastErrors()['warning_count'] === 0 && DateTime::getLastErrors()['error_count'] === 0;
 return $date !== false && $errors !== false && $errors['warning_count'] === 0 && $errors['error_count'] === 0;
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Fix deprecated usage of null on string params of internal functions#5371

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

kenjis
merged 1 commit into

from

Nov 25, 2021
 Merged


Fix deprecated usage of null on string params of internal functions
#5371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
app/Config/Mimes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -509,7 +509,7 @@ public static function guessExtensionFromType(string $type, ?string $proposedExt
 {
 $type = trim(strtolower($type), '. ');

 $proposedExtension = trim(strtolower($proposedExtension));
 $proposedExtension = trim(strtolower($proposedExtension ?? ''));

 if ($proposedExtension !== '') {
 if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true)) {
Expand Down

8 changes: 5 additions & 3 deletions
system/CLI/CLI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -865,10 +865,12 @@ public static function getOptionString(bool $useLongOpts = false, bool $trim = f
 $out .= "-{$name} ";
 }

 // If there's a space, we need to group
 // so it will pass correctly.
 if ($value === null) {
 continue;
 }

 if (mb_strpos($value, ' ') !== false) {
 $out .= '"' . $value . '" ';
 $out .= "\"{$value}\" ";
 } elseif ($value !== null) {
 $out .= "{$value} ";
 }
Expand Down

4 changes: 2 additions & 2 deletions
system/Database/BaseUtils.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ public function repairTable(string $tableName)
 public function getCSVFromResult(ResultInterface $query, string $delim = ',', string $newline = "\n", string $enclosure = '"')
 {
 $out = '';
 // First generate the headings from the table column names

 foreach ($query->getFieldNames() as $name) {
 $out .= $enclosure . str_replace($enclosure, $enclosure . $enclosure, $name) . $enclosure . $delim;
 }
Expand All@@ -212,7 +212,7 @@ public function getCSVFromResult(ResultInterface $query, string $delim = ',', st
 $line = [];

 foreach ($row as $item) {
 $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item) . $enclosure;
 $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item ?? '') . $enclosure;
 }

 $out .= implode($delim, $line) . $newline;
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -462,7 +462,7 @@ public function dropKey(string $table, string $keyName)
 public function dropForeignKey(string $table, string $foreignName)
 {
 $sql = sprintf(
 $this->dropConstraintStr,
(string) $this->dropConstraintStr,
 $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
 $this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName)
 );
Expand Down

7 changes: 5 additions & 2 deletions
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,8 +433,11 @@ protected function buildDSN()
 $this->DSN = "host={$this->hostname} ";
 }

 if (! empty($this->port) && ctype_digit($this->port)) {
 $this->DSN .= "port={$this->port} ";
 // ctype_digit only accepts strings
 $port = (string) $this->port;

 if ($port !== '' && ctype_digit($port)) {
 $this->DSN .= "port={$port} ";
 }

 if ($this->username !== '') {
Expand Down

7 changes: 2 additions & 5 deletions
system/Filters/Filters.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -397,13 +397,10 @@ protected function processGlobals(?string $uri = null)
 return;
 }

 $uri = strtolower(trim($uri, '/ '));
 $uri = strtolower(trim($uri ?? '', '/ '));

 // Add any global filters, unless they are excluded for this URI
 $sets = [
 'before',
 'after',
 ];
 $sets = ['before', 'after'];

 foreach ($sets as $set) {
 if (isset($this->config->globals[$set])) {
Expand Down

8 changes: 5 additions & 3 deletions
system/HTTP/CLIRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,11 +139,13 @@ public function getOptionString(bool $useLongOpts = false): string
 $out .= "-{$name} ";
 }

 // If there's a space, we need to group
 // so it will pass correctly.
 if ($value === null) {
 continue;
 }

 if (mb_strpos($value, ' ') !== false) {
 $out .= '"' . $value . '" ';
 } elseif ($value !== null) {
 } else {
 $out .= "{$value} ";
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/CURLRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -424,7 +424,7 @@ protected function applyMethod(string $method, array $curlOptions): array
 $this->method = $method;
 $curlOptions[CURLOPT_CUSTOMREQUEST] = $method;

 $size = strlen($this->body);
 $size = strlen($this->body ?? '');

 // Have content?
 if ($size > 0) {
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -435,7 +435,7 @@ public function send()
 if ($this->CSPEnabled === true) {
 $this->CSP->finalize($this);
 } else {
 $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body);
 $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body ?? '');
 }

 $this->sendHeaders();
Expand Down

18 changes: 8 additions & 10 deletions
system/I18n/Time.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,25 +75,23 @@ class Time extends DateTime
 */
 public function __construct(?string $time = null, $timezone = null, ?string $locale = null)
 {
 // If no locale was provided, grab it from Locale (set by IncomingRequest for web requests)
 $this->locale = ! empty($locale) ? $locale : Locale::getDefault();
 $this->locale = $locale ?: Locale::getDefault();

 // If a test instance has been provided, use it instead.
 if ($time === null && static::$testNow instanceof self) {
 if (empty($timezone)) {
 $timezone = static::$testNow->getTimezone();
 }
 $time = $time ?? '';

 $time = static::$testNow->toDateTimeString();
 // If a test instance has been provided, use it instead.
 if ($time === '' && static::$testNow instanceof self) {
 $timezone = $timezone ?: static::$testNow->getTimezone();
 $time = (string) static::$testNow->toDateTimeString();
 }

 $timezone = ! empty($timezone) ? $timezone : date_default_timezone_get();
 $timezone = $timezone ?: date_default_timezone_get();
 $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);

 // If the time string was a relative string (i.e. 'next Tuesday')
 // then we need to adjust the time going in so that we have a current
 // timezone to work with.
 if (! empty($time) && (is_string($time) && static::hasRelativeKeywords($time))) {
 if ($time !== '' && static::hasRelativeKeywords($time)) {
 $instance = new DateTime('now', $this->timezone);
 $instance->modify($time);
 $time = $instance->format('Y-m-d H:i:s');
Expand Down

7 changes: 4 additions & 3 deletions
system/Security/Security.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ public function verify(RequestInterface $request)
 throw SecurityException::forDisallowedAction();
 }

 $json = json_decode($request->getBody());
 $json = json_decode($request->getBody() ?? '');

 if (isset($_POST[$this->tokenName])) {
 // We kill this since we're done and we don't want to pollute the POST array.
Expand DownExpand Up@@ -323,9 +323,10 @@ private function getPostedToken(RequestInterface $request): ?string
 if ($request->hasHeader($this->headerName) && ! empty($request->header($this->headerName)->getValue())) {
 $tokenName = $request->header($this->headerName)->getValue();
 } else {
 $json = json_decode($request->getBody());
 $body = (string) $request->getBody();
 $json = json_decode($body);

 if (! empty($request->getBody()) && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
 if ($body !== '' && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
 $tokenName = $json->{$this->tokenName} ?? null;
 } else {
 $tokenName = null;
Expand Down

56 changes: 28 additions & 28 deletions
system/Validation/FormatRules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class FormatRules
 */
 public function alpha(?string $str = null): bool
 {
 return ctype_alpha($str);
 return ctype_alpha($str ?? '');
 }

 /**
Expand DownExpand Up@@ -74,7 +74,7 @@ public function alpha_numeric_punct($str)
 */
 public function alpha_numeric(?string $str = null): bool
 {
 return ctype_alnum($str);
 return ctype_alnum($str ?? '');
 }

 /**
Expand All@@ -83,7 +83,7 @@ public function alpha_numeric(?string $str = null): bool
 public function alpha_numeric_space(?string $str = null): bool
 {
 // @see https://regex101.com/r/0AZDME/1
 return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str);
 return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str ?? '');
 }

 /**
Expand All@@ -105,39 +105,39 @@ public function string($str = null): bool
 public function decimal(?string $str = null): bool
 {
 // @see https://regex101.com/r/HULifl/2/
 return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str);
 return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str ?? '');
 }

 /**
 * String of hexidecimal characters
 */
 public function hex(?string $str = null): bool
 {
 return ctype_xdigit($str);
 return ctype_xdigit($str ?? '');
 }

 /**
 * Integer
 */
 public function integer(?string $str = null): bool
 {
 return (bool) preg_match('/\A[\-+]?\d+\z/', $str);
 return (bool) preg_match('/\A[\-+]?\d+\z/', $str ?? '');
 }

 /**
 * Is a Natural number (0,1,2,3, etc.)
 */
 public function is_natural(?string $str = null): bool
 {
 return ctype_digit($str);
 return ctype_digit($str ?? '');
 }

 /**
 * Is a Natural number, but not a zero (1,2,3, etc.)
 */
 public function is_natural_no_zero(?string $str = null): bool
 {
 return $str !== '0' && ctype_digit($str);
 return $str !== '0' && ctype_digit($str ?? '');
 }

 /**
Expand All@@ -146,7 +146,7 @@ public function is_natural_no_zero(?string $str = null): bool
 public function numeric(?string $str = null): bool
 {
 // @see https://regex101.com/r/bb9wtr/2
 return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str);
 return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str ?? '');
 }

 /**
Expand All@@ -158,7 +158,7 @@ public function regex_match(?string $str, string $pattern): bool
 $pattern = "/{$pattern}/";
 }

 return (bool) preg_match($pattern, $str);
 return (bool) preg_match($pattern, $str ?? '');
 }

 /**
Expand All@@ -171,7 +171,7 @@ public function regex_match(?string $str, string $pattern): bool
 */
 public function timezone(?string $str = null): bool
 {
 return in_array($str, timezone_identifiers_list(), true);
 return in_array($str ?? '', timezone_identifiers_list(), true);
 }

 /**
Expand All@@ -184,6 +184,10 @@ public function timezone(?string $str = null): bool
 */
 public function valid_base64(?string $str = null): bool
 {
 if ($str === null) {
 return false;
 }

 return base64_encode(base64_decode($str, true)) === $str;
 }

Expand All@@ -194,7 +198,7 @@ public function valid_base64(?string $str = null): bool
 */
 public function valid_json(?string $str = null): bool
 {
 json_decode($str);
 json_decode($str ?? '');

 return json_last_error() === JSON_ERROR_NONE;
 }
Expand All@@ -207,7 +211,7 @@ public function valid_json(?string $str = null): bool
 public function valid_email(?string $str = null): bool
 {
 // @see https://regex101.com/r/wlJG1t/1/
 if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches)) {
 if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str ?? '', $matches)) {
 $str = $matches[1] . '@' . idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46);
 }

Expand All@@ -224,8 +228,9 @@ public function valid_email(?string $str = null): bool
 */
 public function valid_emails(?string $str = null): bool
 {
 foreach (explode(',', $str) as $email) {
 foreach (explode(',', $str ?? '') as $email) {
 $email = trim($email);

 if ($email === '') {
 return false;
 }
Expand All@@ -241,16 +246,15 @@ public function valid_emails(?string $str = null): bool
 /**
 * Validate an IP address (human readable format or binary string - inet_pton)
 *
 * @param string $ip IP Address
 * @param string $which IP protocol: 'ipv4' or 'ipv6'
Comment thread
paulbalandan marked this conversation as resolved.

 * @param string|null $which IP protocol: 'ipv4' or 'ipv6'
 */
 public function valid_ip(?string $ip = null, ?string $which = null): bool
 {
 if (empty($ip)) {
 return false;
 }

 switch (strtolower($which)) {
 switch (strtolower($which ?? '')) {
 case 'ipv4':
 $which = FILTER_FLAG_IPV4;
 break;
Expand All@@ -260,20 +264,18 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
 break;

 default:
 $which = null;
 break;
 $which = 0;
 }

 return (bool) filter_var($ip, FILTER_VALIDATE_IP, $which) || (! ctype_print($ip) && (bool) filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which));
 return filter_var($ip, FILTER_VALIDATE_IP, $which) !== false
 || (! ctype_print($ip) && filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which) !== false);
 }

 /**
 * Checks a string to ensure it is (loosely) a URL.
 *
 * Warning: this rule will pass basic strings like
 * "banana"; use valid_url_strict for a stricter rule.
 *
 * @param string $str
 */
 public function valid_url(?string $str = null): bool
 {
Expand DownExpand Up@@ -317,18 +319,16 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu

 /**
 * Checks for a valid date and matches a given date format
 *
 * @param string $str
 * @param string $format
 */
 public function valid_date(?string $str = null, ?string $format = null): bool
 {
 if (empty($format)) {
 return (bool) strtotime($str);
 return strtotime($str) !== false;
 }

 $date = DateTime::createFromFormat($format, $str);
 $date = DateTime::createFromFormat($format, $str);
 $errors = DateTime::getLastErrors();

 return (bool) $date && DateTime::getLastErrors()['warning_count'] === 0 && DateTime::getLastErrors()['error_count'] === 0;
 return $date !== false && $errors !== false && $errors['warning_count'] === 0 && $errors['error_count'] === 0;
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix deprecated usage of null on string params of internal functions#5371

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

kenjis
merged 1 commit into

from

Nov 25, 2021
 Merged


Fix deprecated usage of null on string params of internal functions
#5371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
app/Config/Mimes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -509,7 +509,7 @@ public static function guessExtensionFromType(string $type, ?string $proposedExt
 {
 $type = trim(strtolower($type), '. ');

 $proposedExtension = trim(strtolower($proposedExtension));
 $proposedExtension = trim(strtolower($proposedExtension ?? ''));

 if ($proposedExtension !== '') {
 if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true)) {
Expand Down

8 changes: 5 additions & 3 deletions
system/CLI/CLI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -865,10 +865,12 @@ public static function getOptionString(bool $useLongOpts = false, bool $trim = f
 $out .= "-{$name} ";
 }

 // If there's a space, we need to group
 // so it will pass correctly.
 if ($value === null) {
 continue;
 }

 if (mb_strpos($value, ' ') !== false) {
 $out .= '"' . $value . '" ';
 $out .= "\"{$value}\" ";
 } elseif ($value !== null) {
 $out .= "{$value} ";
 }
Expand Down

4 changes: 2 additions & 2 deletions
system/Database/BaseUtils.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ public function repairTable(string $tableName)
 public function getCSVFromResult(ResultInterface $query, string $delim = ',', string $newline = "\n", string $enclosure = '"')
 {
 $out = '';
 // First generate the headings from the table column names

 foreach ($query->getFieldNames() as $name) {
 $out .= $enclosure . str_replace($enclosure, $enclosure . $enclosure, $name) . $enclosure . $delim;
 }
Expand All@@ -212,7 +212,7 @@ public function getCSVFromResult(ResultInterface $query, string $delim = ',', st
 $line = [];

 foreach ($row as $item) {
 $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item) . $enclosure;
 $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item ?? '') . $enclosure;
 }

 $out .= implode($delim, $line) . $newline;
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -462,7 +462,7 @@ public function dropKey(string $table, string $keyName)
 public function dropForeignKey(string $table, string $foreignName)
 {
 $sql = sprintf(
 $this->dropConstraintStr,
(string) $this->dropConstraintStr,
 $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
 $this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName)
 );
Expand Down

7 changes: 5 additions & 2 deletions
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,8 +433,11 @@ protected function buildDSN()
 $this->DSN = "host={$this->hostname} ";
 }

 if (! empty($this->port) && ctype_digit($this->port)) {
 $this->DSN .= "port={$this->port} ";
 // ctype_digit only accepts strings
 $port = (string) $this->port;

 if ($port !== '' && ctype_digit($port)) {
 $this->DSN .= "port={$port} ";
 }

 if ($this->username !== '') {
Expand Down

7 changes: 2 additions & 5 deletions
system/Filters/Filters.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -397,13 +397,10 @@ protected function processGlobals(?string $uri = null)
 return;
 }

 $uri = strtolower(trim($uri, '/ '));
 $uri = strtolower(trim($uri ?? '', '/ '));

 // Add any global filters, unless they are excluded for this URI
 $sets = [
 'before',
 'after',
 ];
 $sets = ['before', 'after'];

 foreach ($sets as $set) {
 if (isset($this->config->globals[$set])) {
Expand Down

8 changes: 5 additions & 3 deletions
system/HTTP/CLIRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,11 +139,13 @@ public function getOptionString(bool $useLongOpts = false): string
 $out .= "-{$name} ";
 }

 // If there's a space, we need to group
 // so it will pass correctly.
 if ($value === null) {
 continue;
 }

 if (mb_strpos($value, ' ') !== false) {
 $out .= '"' . $value . '" ';
 } elseif ($value !== null) {
 } else {
 $out .= "{$value} ";
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/CURLRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -424,7 +424,7 @@ protected function applyMethod(string $method, array $curlOptions): array
 $this->method = $method;
 $curlOptions[CURLOPT_CUSTOMREQUEST] = $method;

 $size = strlen($this->body);
 $size = strlen($this->body ?? '');

 // Have content?
 if ($size > 0) {
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -435,7 +435,7 @@ public function send()
 if ($this->CSPEnabled === true) {
 $this->CSP->finalize($this);
 } else {
 $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body);
 $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body ?? '');
 }

 $this->sendHeaders();
Expand Down

18 changes: 8 additions & 10 deletions
system/I18n/Time.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,25 +75,23 @@ class Time extends DateTime
 */
 public function __construct(?string $time = null, $timezone = null, ?string $locale = null)
 {
 // If no locale was provided, grab it from Locale (set by IncomingRequest for web requests)
 $this->locale = ! empty($locale) ? $locale : Locale::getDefault();
 $this->locale = $locale ?: Locale::getDefault();

 // If a test instance has been provided, use it instead.
 if ($time === null && static::$testNow instanceof self) {
 if (empty($timezone)) {
 $timezone = static::$testNow->getTimezone();
 }
 $time = $time ?? '';

 $time = static::$testNow->toDateTimeString();
 // If a test instance has been provided, use it instead.
 if ($time === '' && static::$testNow instanceof self) {
 $timezone = $timezone ?: static::$testNow->getTimezone();
 $time = (string) static::$testNow->toDateTimeString();
 }

 $timezone = ! empty($timezone) ? $timezone : date_default_timezone_get();
 $timezone = $timezone ?: date_default_timezone_get();
 $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);

 // If the time string was a relative string (i.e. 'next Tuesday')
 // then we need to adjust the time going in so that we have a current
 // timezone to work with.
 if (! empty($time) && (is_string($time) && static::hasRelativeKeywords($time))) {
 if ($time !== '' && static::hasRelativeKeywords($time)) {
 $instance = new DateTime('now', $this->timezone);
 $instance->modify($time);
 $time = $instance->format('Y-m-d H:i:s');
Expand Down

7 changes: 4 additions & 3 deletions
system/Security/Security.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ public function verify(RequestInterface $request)
 throw SecurityException::forDisallowedAction();
 }

 $json = json_decode($request->getBody());
 $json = json_decode($request->getBody() ?? '');

 if (isset($_POST[$this->tokenName])) {
 // We kill this since we're done and we don't want to pollute the POST array.
Expand DownExpand Up@@ -323,9 +323,10 @@ private function getPostedToken(RequestInterface $request): ?string
 if ($request->hasHeader($this->headerName) && ! empty($request->header($this->headerName)->getValue())) {
 $tokenName = $request->header($this->headerName)->getValue();
 } else {
 $json = json_decode($request->getBody());
 $body = (string) $request->getBody();
 $json = json_decode($body);

 if (! empty($request->getBody()) && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
 if ($body !== '' && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
 $tokenName = $json->{$this->tokenName} ?? null;
 } else {
 $tokenName = null;
Expand Down

56 changes: 28 additions & 28 deletions
system/Validation/FormatRules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class FormatRules
 */
 public function alpha(?string $str = null): bool
 {
 return ctype_alpha($str);
 return ctype_alpha($str ?? '');
 }

 /**
Expand DownExpand Up@@ -74,7 +74,7 @@ public function alpha_numeric_punct($str)
 */
 public function alpha_numeric(?string $str = null): bool
 {
 return ctype_alnum($str);
 return ctype_alnum($str ?? '');
 }

 /**
Expand All@@ -83,7 +83,7 @@ public function alpha_numeric(?string $str = null): bool
 public function alpha_numeric_space(?string $str = null): bool
 {
 // @see https://regex101.com/r/0AZDME/1
 return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str);
 return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str ?? '');
 }

 /**
Expand All@@ -105,39 +105,39 @@ public function string($str = null): bool
 public function decimal(?string $str = null): bool
 {
 // @see https://regex101.com/r/HULifl/2/
 return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str);
 return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str ?? '');
 }

 /**
 * String of hexidecimal characters
 */
 public function hex(?string $str = null): bool
 {
 return ctype_xdigit($str);
 return ctype_xdigit($str ?? '');
 }

 /**
 * Integer
 */
 public function integer(?string $str = null): bool
 {
 return (bool) preg_match('/\A[\-+]?\d+\z/', $str);
 return (bool) preg_match('/\A[\-+]?\d+\z/', $str ?? '');
 }

 /**
 * Is a Natural number (0,1,2,3, etc.)
 */
 public function is_natural(?string $str = null): bool
 {
 return ctype_digit($str);
 return ctype_digit($str ?? '');
 }

 /**
 * Is a Natural number, but not a zero (1,2,3, etc.)
 */
 public function is_natural_no_zero(?string $str = null): bool
 {
 return $str !== '0' && ctype_digit($str);
 return $str !== '0' && ctype_digit($str ?? '');
 }

 /**
Expand All@@ -146,7 +146,7 @@ public function is_natural_no_zero(?string $str = null): bool
 public function numeric(?string $str = null): bool
 {
 // @see https://regex101.com/r/bb9wtr/2
 return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str);
 return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str ?? '');
 }

 /**
Expand All@@ -158,7 +158,7 @@ public function regex_match(?string $str, string $pattern): bool
 $pattern = "/{$pattern}/";
 }

 return (bool) preg_match($pattern, $str);
 return (bool) preg_match($pattern, $str ?? '');
 }

 /**
Expand All@@ -171,7 +171,7 @@ public function regex_match(?string $str, string $pattern): bool
 */
 public function timezone(?string $str = null): bool
 {
 return in_array($str, timezone_identifiers_list(), true);
 return in_array($str ?? '', timezone_identifiers_list(), true);
 }

 /**
Expand All@@ -184,6 +184,10 @@ public function timezone(?string $str = null): bool
 */
 public function valid_base64(?string $str = null): bool
 {
 if ($str === null) {
 return false;
 }

 return base64_encode(base64_decode($str, true)) === $str;
 }

Expand All@@ -194,7 +198,7 @@ public function valid_base64(?string $str = null): bool
 */
 public function valid_json(?string $str = null): bool
 {
 json_decode($str);
 json_decode($str ?? '');

 return json_last_error() === JSON_ERROR_NONE;
 }
Expand All@@ -207,7 +211,7 @@ public function valid_json(?string $str = null): bool
 public function valid_email(?string $str = null): bool
 {
 // @see https://regex101.com/r/wlJG1t/1/
 if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches)) {
 if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str ?? '', $matches)) {
 $str = $matches[1] . '@' . idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46);
 }

Expand All@@ -224,8 +228,9 @@ public function valid_email(?string $str = null): bool
 */
 public function valid_emails(?string $str = null): bool
 {
 foreach (explode(',', $str) as $email) {
 foreach (explode(',', $str ?? '') as $email) {
 $email = trim($email);

 if ($email === '') {
 return false;
 }
Expand All@@ -241,16 +246,15 @@ public function valid_emails(?string $str = null): bool
 /**
 * Validate an IP address (human readable format or binary string - inet_pton)
 *
 * @param string $ip IP Address
 * @param string $which IP protocol: 'ipv4' or 'ipv6'
Comment thread
paulbalandan marked this conversation as resolved.

 * @param string|null $which IP protocol: 'ipv4' or 'ipv6'
 */
 public function valid_ip(?string $ip = null, ?string $which = null): bool
 {
 if (empty($ip)) {
 return false;
 }

 switch (strtolower($which)) {
 switch (strtolower($which ?? '')) {
 case 'ipv4':
 $which = FILTER_FLAG_IPV4;
 break;
Expand All@@ -260,20 +264,18 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
 break;

 default:
 $which = null;
 break;
 $which = 0;
 }

 return (bool) filter_var($ip, FILTER_VALIDATE_IP, $which) || (! ctype_print($ip) && (bool) filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which));
 return filter_var($ip, FILTER_VALIDATE_IP, $which) !== false
 || (! ctype_print($ip) && filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which) !== false);
 }

 /**
 * Checks a string to ensure it is (loosely) a URL.
 *
 * Warning: this rule will pass basic strings like
 * "banana"; use valid_url_strict for a stricter rule.
 *
 * @param string $str
 */
 public function valid_url(?string $str = null): bool
 {
Expand DownExpand Up@@ -317,18 +319,16 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu

 /**
 * Checks for a valid date and matches a given date format
 *
 * @param string $str
 * @param string $format
 */
 public function valid_date(?string $str = null, ?string $format = null): bool
 {
 if (empty($format)) {
 return (bool) strtotime($str);
 return strtotime($str) !== false;
 }

 $date = DateTime::createFromFormat($format, $str);
 $date = DateTime::createFromFormat($format, $str);
 $errors = DateTime::getLastErrors();

 return (bool) $date && DateTime::getLastErrors()['warning_count'] === 0 && DateTime::getLastErrors()['error_count'] === 0;
 return $date !== false && $errors !== false && $errors['warning_count'] === 0 && $errors['error_count'] === 0;
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Fix deprecated usage of null on string params of internal functions#5371

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

kenjis
merged 1 commit into

from

Nov 25, 2021
 Merged


Fix deprecated usage of null on string params of internal functions
#5371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
app/Config/Mimes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -509,7 +509,7 @@ public static function guessExtensionFromType(string $type, ?string $proposedExt
 {
 $type = trim(strtolower($type), '. ');

 $proposedExtension = trim(strtolower($proposedExtension));
 $proposedExtension = trim(strtolower($proposedExtension ?? ''));

 if ($proposedExtension !== '') {
 if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true)) {
Expand Down

8 changes: 5 additions & 3 deletions
system/CLI/CLI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -865,10 +865,12 @@ public static function getOptionString(bool $useLongOpts = false, bool $trim = f
 $out .= "-{$name} ";
 }

 // If there's a space, we need to group
 // so it will pass correctly.
 if ($value === null) {
 continue;
 }

 if (mb_strpos($value, ' ') !== false) {
 $out .= '"' . $value . '" ';
 $out .= "\"{$value}\" ";
 } elseif ($value !== null) {
 $out .= "{$value} ";
 }
Expand Down

4 changes: 2 additions & 2 deletions
system/Database/BaseUtils.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ public function repairTable(string $tableName)
 public function getCSVFromResult(ResultInterface $query, string $delim = ',', string $newline = "\n", string $enclosure = '"')
 {
 $out = '';
 // First generate the headings from the table column names

 foreach ($query->getFieldNames() as $name) {
 $out .= $enclosure . str_replace($enclosure, $enclosure . $enclosure, $name) . $enclosure . $delim;
 }
Expand All@@ -212,7 +212,7 @@ public function getCSVFromResult(ResultInterface $query, string $delim = ',', st
 $line = [];

 foreach ($row as $item) {
 $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item) . $enclosure;
 $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item ?? '') . $enclosure;
 }

 $out .= implode($delim, $line) . $newline;
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -462,7 +462,7 @@ public function dropKey(string $table, string $keyName)
 public function dropForeignKey(string $table, string $foreignName)
 {
 $sql = sprintf(
 $this->dropConstraintStr,
(string) $this->dropConstraintStr,
 $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
 $this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName)
 );
Expand Down

7 changes: 5 additions & 2 deletions
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,8 +433,11 @@ protected function buildDSN()
 $this->DSN = "host={$this->hostname} ";
 }

 if (! empty($this->port) && ctype_digit($this->port)) {
 $this->DSN .= "port={$this->port} ";
 // ctype_digit only accepts strings
 $port = (string) $this->port;

 if ($port !== '' && ctype_digit($port)) {
 $this->DSN .= "port={$port} ";
 }

 if ($this->username !== '') {
Expand Down

7 changes: 2 additions & 5 deletions
system/Filters/Filters.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -397,13 +397,10 @@ protected function processGlobals(?string $uri = null)
 return;
 }

 $uri = strtolower(trim($uri, '/ '));
 $uri = strtolower(trim($uri ?? '', '/ '));

 // Add any global filters, unless they are excluded for this URI
 $sets = [
 'before',
 'after',
 ];
 $sets = ['before', 'after'];

 foreach ($sets as $set) {
 if (isset($this->config->globals[$set])) {
Expand Down

8 changes: 5 additions & 3 deletions
system/HTTP/CLIRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,11 +139,13 @@ public function getOptionString(bool $useLongOpts = false): string
 $out .= "-{$name} ";
 }

 // If there's a space, we need to group
 // so it will pass correctly.
 if ($value === null) {
 continue;
 }

 if (mb_strpos($value, ' ') !== false) {
 $out .= '"' . $value . '" ';
 } elseif ($value !== null) {
 } else {
 $out .= "{$value} ";
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/CURLRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -424,7 +424,7 @@ protected function applyMethod(string $method, array $curlOptions): array
 $this->method = $method;
 $curlOptions[CURLOPT_CUSTOMREQUEST] = $method;

 $size = strlen($this->body);
 $size = strlen($this->body ?? '');

 // Have content?
 if ($size > 0) {
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -435,7 +435,7 @@ public function send()
 if ($this->CSPEnabled === true) {
 $this->CSP->finalize($this);
 } else {
 $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body);
 $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body ?? '');
 }

 $this->sendHeaders();
Expand Down

18 changes: 8 additions & 10 deletions
system/I18n/Time.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,25 +75,23 @@ class Time extends DateTime
 */
 public function __construct(?string $time = null, $timezone = null, ?string $locale = null)
 {
 // If no locale was provided, grab it from Locale (set by IncomingRequest for web requests)
 $this->locale = ! empty($locale) ? $locale : Locale::getDefault();
 $this->locale = $locale ?: Locale::getDefault();

 // If a test instance has been provided, use it instead.
 if ($time === null && static::$testNow instanceof self) {
 if (empty($timezone)) {
 $timezone = static::$testNow->getTimezone();
 }
 $time = $time ?? '';

 $time = static::$testNow->toDateTimeString();
 // If a test instance has been provided, use it instead.
 if ($time === '' && static::$testNow instanceof self) {
 $timezone = $timezone ?: static::$testNow->getTimezone();
 $time = (string) static::$testNow->toDateTimeString();
 }

 $timezone = ! empty($timezone) ? $timezone : date_default_timezone_get();
 $timezone = $timezone ?: date_default_timezone_get();
 $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);

 // If the time string was a relative string (i.e. 'next Tuesday')
 // then we need to adjust the time going in so that we have a current
 // timezone to work with.
 if (! empty($time) && (is_string($time) && static::hasRelativeKeywords($time))) {
 if ($time !== '' && static::hasRelativeKeywords($time)) {
 $instance = new DateTime('now', $this->timezone);
 $instance->modify($time);
 $time = $instance->format('Y-m-d H:i:s');
Expand Down

7 changes: 4 additions & 3 deletions
system/Security/Security.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ public function verify(RequestInterface $request)
 throw SecurityException::forDisallowedAction();
 }

 $json = json_decode($request->getBody());
 $json = json_decode($request->getBody() ?? '');

 if (isset($_POST[$this->tokenName])) {
 // We kill this since we're done and we don't want to pollute the POST array.
Expand DownExpand Up@@ -323,9 +323,10 @@ private function getPostedToken(RequestInterface $request): ?string
 if ($request->hasHeader($this->headerName) && ! empty($request->header($this->headerName)->getValue())) {
 $tokenName = $request->header($this->headerName)->getValue();
 } else {
 $json = json_decode($request->getBody());
 $body = (string) $request->getBody();
 $json = json_decode($body);

 if (! empty($request->getBody()) && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
 if ($body !== '' && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
 $tokenName = $json->{$this->tokenName} ?? null;
 } else {
 $tokenName = null;
Expand Down

56 changes: 28 additions & 28 deletions
system/Validation/FormatRules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class FormatRules
 */
 public function alpha(?string $str = null): bool
 {
 return ctype_alpha($str);
 return ctype_alpha($str ?? '');
 }

 /**
Expand DownExpand Up@@ -74,7 +74,7 @@ public function alpha_numeric_punct($str)
 */
 public function alpha_numeric(?string $str = null): bool
 {
 return ctype_alnum($str);
 return ctype_alnum($str ?? '');
 }

 /**
Expand All@@ -83,7 +83,7 @@ public function alpha_numeric(?string $str = null): bool
 public function alpha_numeric_space(?string $str = null): bool
 {
 // @see https://regex101.com/r/0AZDME/1
 return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str);
 return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str ?? '');
 }

 /**
Expand All@@ -105,39 +105,39 @@ public function string($str = null): bool
 public function decimal(?string $str = null): bool
 {
 // @see https://regex101.com/r/HULifl/2/
 return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str);
 return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str ?? '');
 }

 /**
 * String of hexidecimal characters
 */
 public function hex(?string $str = null): bool
 {
 return ctype_xdigit($str);
 return ctype_xdigit($str ?? '');
 }

 /**
 * Integer
 */
 public function integer(?string $str = null): bool
 {
 return (bool) preg_match('/\A[\-+]?\d+\z/', $str);
 return (bool) preg_match('/\A[\-+]?\d+\z/', $str ?? '');
 }

 /**
 * Is a Natural number (0,1,2,3, etc.)
 */
 public function is_natural(?string $str = null): bool
 {
 return ctype_digit($str);
 return ctype_digit($str ?? '');
 }

 /**
 * Is a Natural number, but not a zero (1,2,3, etc.)
 */
 public function is_natural_no_zero(?string $str = null): bool
 {
 return $str !== '0' && ctype_digit($str);
 return $str !== '0' && ctype_digit($str ?? '');
 }

 /**
Expand All@@ -146,7 +146,7 @@ public function is_natural_no_zero(?string $str = null): bool
 public function numeric(?string $str = null): bool
 {
 // @see https://regex101.com/r/bb9wtr/2
 return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str);
 return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str ?? '');
 }

 /**
Expand All@@ -158,7 +158,7 @@ public function regex_match(?string $str, string $pattern): bool
 $pattern = "/{$pattern}/";
 }

 return (bool) preg_match($pattern, $str);
 return (bool) preg_match($pattern, $str ?? '');
 }

 /**
Expand All@@ -171,7 +171,7 @@ public function regex_match(?string $str, string $pattern): bool
 */
 public function timezone(?string $str = null): bool
 {
 return in_array($str, timezone_identifiers_list(), true);
 return in_array($str ?? '', timezone_identifiers_list(), true);
 }

 /**
Expand All@@ -184,6 +184,10 @@ public function timezone(?string $str = null): bool
 */
 public function valid_base64(?string $str = null): bool
 {
 if ($str === null) {
 return false;
 }

 return base64_encode(base64_decode($str, true)) === $str;
 }

Expand All@@ -194,7 +198,7 @@ public function valid_base64(?string $str = null): bool
 */
 public function valid_json(?string $str = null): bool
 {
 json_decode($str);
 json_decode($str ?? '');

 return json_last_error() === JSON_ERROR_NONE;
 }
Expand All@@ -207,7 +211,7 @@ public function valid_json(?string $str = null): bool
 public function valid_email(?string $str = null): bool
 {
 // @see https://regex101.com/r/wlJG1t/1/
 if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches)) {
 if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str ?? '', $matches)) {
 $str = $matches[1] . '@' . idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46);
 }

Expand All@@ -224,8 +228,9 @@ public function valid_email(?string $str = null): bool
 */
 public function valid_emails(?string $str = null): bool
 {
 foreach (explode(',', $str) as $email) {
 foreach (explode(',', $str ?? '') as $email) {
 $email = trim($email);

 if ($email === '') {
 return false;
 }
Expand All@@ -241,16 +246,15 @@ public function valid_emails(?string $str = null): bool
 /**
 * Validate an IP address (human readable format or binary string - inet_pton)
 *
 * @param string $ip IP Address
 * @param string $which IP protocol: 'ipv4' or 'ipv6'
Comment thread
paulbalandan marked this conversation as resolved.

 * @param string|null $which IP protocol: 'ipv4' or 'ipv6'
 */
 public function valid_ip(?string $ip = null, ?string $which = null): bool
 {
 if (empty($ip)) {
 return false;
 }

 switch (strtolower($which)) {
 switch (strtolower($which ?? '')) {
 case 'ipv4':
 $which = FILTER_FLAG_IPV4;
 break;
Expand All@@ -260,20 +264,18 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
 break;

 default:
 $which = null;
 break;
 $which = 0;
 }

 return (bool) filter_var($ip, FILTER_VALIDATE_IP, $which) || (! ctype_print($ip) && (bool) filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which));
 return filter_var($ip, FILTER_VALIDATE_IP, $which) !== false
 || (! ctype_print($ip) && filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which) !== false);
 }

 /**
 * Checks a string to ensure it is (loosely) a URL.
 *
 * Warning: this rule will pass basic strings like
 * "banana"; use valid_url_strict for a stricter rule.
 *
 * @param string $str
 */
 public function valid_url(?string $str = null): bool
 {
Expand DownExpand Up@@ -317,18 +319,16 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu

 /**
 * Checks for a valid date and matches a given date format
 *
 * @param string $str
 * @param string $format
 */
 public function valid_date(?string $str = null, ?string $format = null): bool
 {
 if (empty($format)) {
 return (bool) strtotime($str);
 return strtotime($str) !== false;
 }

 $date = DateTime::createFromFormat($format, $str);
 $date = DateTime::createFromFormat($format, $str);
 $errors = DateTime::getLastErrors();

 return (bool) $date && DateTime::getLastErrors()['warning_count'] === 0 && DateTime::getLastErrors()['error_count'] === 0;
 return $date !== false && $errors !== false && $errors['warning_count'] === 0 && $errors['error_count'] === 0;
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Fix deprecated usage of null on string params of internal functions#5371

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

kenjis
merged 1 commit into

from

Nov 25, 2021
 Merged


Fix deprecated usage of null on string params of internal functions
#5371
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 1 addition & 1 deletion
app/Config/Mimes.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -509,7 +509,7 @@ public static function guessExtensionFromType(string $type, ?string $proposedExt
 {
 $type = trim(strtolower($type), '. ');

 $proposedExtension = trim(strtolower($proposedExtension));
 $proposedExtension = trim(strtolower($proposedExtension ?? ''));

 if ($proposedExtension !== '') {
 if (array_key_exists($proposedExtension, static::$mimes) && in_array($type, is_string(static::$mimes[$proposedExtension]) ? [static::$mimes[$proposedExtension]] : static::$mimes[$proposedExtension], true)) {
Expand Down

8 changes: 5 additions & 3 deletions
system/CLI/CLI.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -865,10 +865,12 @@ public static function getOptionString(bool $useLongOpts = false, bool $trim = f
 $out .= "-{$name} ";
 }

 // If there's a space, we need to group
 // so it will pass correctly.
 if ($value === null) {
 continue;
 }

 if (mb_strpos($value, ' ') !== false) {
 $out .= '"' . $value . '" ';
 $out .= "\"{$value}\" ";
 } elseif ($value !== null) {
 $out .= "{$value} ";
 }
Expand Down

4 changes: 2 additions & 2 deletions
system/Database/BaseUtils.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -200,7 +200,7 @@ public function repairTable(string $tableName)
 public function getCSVFromResult(ResultInterface $query, string $delim = ',', string $newline = "\n", string $enclosure = '"')
 {
 $out = '';
 // First generate the headings from the table column names

 foreach ($query->getFieldNames() as $name) {
 $out .= $enclosure . str_replace($enclosure, $enclosure . $enclosure, $name) . $enclosure . $delim;
 }
Expand All@@ -212,7 +212,7 @@ public function getCSVFromResult(ResultInterface $query, string $delim = ',', st
 $line = [];

 foreach ($row as $item) {
 $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item) . $enclosure;
 $line[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $item ?? '') . $enclosure;
 }

 $out .= implode($delim, $line) . $newline;
Expand Down

2 changes: 1 addition & 1 deletion
system/Database/Forge.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -462,7 +462,7 @@ public function dropKey(string $table, string $keyName)
 public function dropForeignKey(string $table, string $foreignName)
 {
 $sql = sprintf(
 $this->dropConstraintStr,
(string) $this->dropConstraintStr,
 $this->db->escapeIdentifiers($this->db->DBPrefix . $table),
 $this->db->escapeIdentifiers($this->db->DBPrefix . $foreignName)
 );
Expand Down

7 changes: 5 additions & 2 deletions
system/Database/Postgre/Connection.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -433,8 +433,11 @@ protected function buildDSN()
 $this->DSN = "host={$this->hostname} ";
 }

 if (! empty($this->port) && ctype_digit($this->port)) {
 $this->DSN .= "port={$this->port} ";
 // ctype_digit only accepts strings
 $port = (string) $this->port;

 if ($port !== '' && ctype_digit($port)) {
 $this->DSN .= "port={$port} ";
 }

 if ($this->username !== '') {
Expand Down

7 changes: 2 additions & 5 deletions
system/Filters/Filters.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -397,13 +397,10 @@ protected function processGlobals(?string $uri = null)
 return;
 }

 $uri = strtolower(trim($uri, '/ '));
 $uri = strtolower(trim($uri ?? '', '/ '));

 // Add any global filters, unless they are excluded for this URI
 $sets = [
 'before',
 'after',
 ];
 $sets = ['before', 'after'];

 foreach ($sets as $set) {
 if (isset($this->config->globals[$set])) {
Expand Down

8 changes: 5 additions & 3 deletions
system/HTTP/CLIRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -139,11 +139,13 @@ public function getOptionString(bool $useLongOpts = false): string
 $out .= "-{$name} ";
 }

 // If there's a space, we need to group
 // so it will pass correctly.
 if ($value === null) {
 continue;
 }

 if (mb_strpos($value, ' ') !== false) {
 $out .= '"' . $value . '" ';
 } elseif ($value !== null) {
 } else {
 $out .= "{$value} ";
 }
 }
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/CURLRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -424,7 +424,7 @@ protected function applyMethod(string $method, array $curlOptions): array
 $this->method = $method;
 $curlOptions[CURLOPT_CUSTOMREQUEST] = $method;

 $size = strlen($this->body);
 $size = strlen($this->body ?? '');

 // Have content?
 if ($size > 0) {
Expand Down

2 changes: 1 addition & 1 deletion
system/HTTP/ResponseTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -435,7 +435,7 @@ public function send()
 if ($this->CSPEnabled === true) {
 $this->CSP->finalize($this);
 } else {
 $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body);
 $this->body = str_replace(['{csp-style-nonce}', '{csp-script-nonce}'], '', $this->body ?? '');
 }

 $this->sendHeaders();
Expand Down

18 changes: 8 additions & 10 deletions
system/I18n/Time.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -75,25 +75,23 @@ class Time extends DateTime
 */
 public function __construct(?string $time = null, $timezone = null, ?string $locale = null)
 {
 // If no locale was provided, grab it from Locale (set by IncomingRequest for web requests)
 $this->locale = ! empty($locale) ? $locale : Locale::getDefault();
 $this->locale = $locale ?: Locale::getDefault();

 // If a test instance has been provided, use it instead.
 if ($time === null && static::$testNow instanceof self) {
 if (empty($timezone)) {
 $timezone = static::$testNow->getTimezone();
 }
 $time = $time ?? '';

 $time = static::$testNow->toDateTimeString();
 // If a test instance has been provided, use it instead.
 if ($time === '' && static::$testNow instanceof self) {
 $timezone = $timezone ?: static::$testNow->getTimezone();
 $time = (string) static::$testNow->toDateTimeString();
 }

 $timezone = ! empty($timezone) ? $timezone : date_default_timezone_get();
 $timezone = $timezone ?: date_default_timezone_get();
 $this->timezone = $timezone instanceof DateTimeZone ? $timezone : new DateTimeZone($timezone);

 // If the time string was a relative string (i.e. 'next Tuesday')
 // then we need to adjust the time going in so that we have a current
 // timezone to work with.
 if (! empty($time) && (is_string($time) && static::hasRelativeKeywords($time))) {
 if ($time !== '' && static::hasRelativeKeywords($time)) {
 $instance = new DateTime('now', $this->timezone);
 $instance->modify($time);
 $time = $instance->format('Y-m-d H:i:s');
Expand Down

7 changes: 4 additions & 3 deletions
system/Security/Security.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -288,7 +288,7 @@ public function verify(RequestInterface $request)
 throw SecurityException::forDisallowedAction();
 }

 $json = json_decode($request->getBody());
 $json = json_decode($request->getBody() ?? '');

 if (isset($_POST[$this->tokenName])) {
 // We kill this since we're done and we don't want to pollute the POST array.
Expand DownExpand Up@@ -323,9 +323,10 @@ private function getPostedToken(RequestInterface $request): ?string
 if ($request->hasHeader($this->headerName) && ! empty($request->header($this->headerName)->getValue())) {
 $tokenName = $request->header($this->headerName)->getValue();
 } else {
 $json = json_decode($request->getBody());
 $body = (string) $request->getBody();
 $json = json_decode($body);

 if (! empty($request->getBody()) && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
 if ($body !== '' && ! empty($json) && json_last_error() === JSON_ERROR_NONE) {
 $tokenName = $json->{$this->tokenName} ?? null;
 } else {
 $tokenName = null;
Expand Down

56 changes: 28 additions & 28 deletions
system/Validation/FormatRules.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ class FormatRules
 */
 public function alpha(?string $str = null): bool
 {
 return ctype_alpha($str);
 return ctype_alpha($str ?? '');
 }

 /**
Expand DownExpand Up@@ -74,7 +74,7 @@ public function alpha_numeric_punct($str)
 */
 public function alpha_numeric(?string $str = null): bool
 {
 return ctype_alnum($str);
 return ctype_alnum($str ?? '');
 }

 /**
Expand All@@ -83,7 +83,7 @@ public function alpha_numeric(?string $str = null): bool
 public function alpha_numeric_space(?string $str = null): bool
 {
 // @see https://regex101.com/r/0AZDME/1
 return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str);
 return (bool) preg_match('/\A[A-Z0-9 ]+\z/i', $str ?? '');
 }

 /**
Expand All@@ -105,39 +105,39 @@ public function string($str = null): bool
 public function decimal(?string $str = null): bool
 {
 // @see https://regex101.com/r/HULifl/2/
 return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str);
 return (bool) preg_match('/\A[-+]?\d{0,}\.?\d+\z/', $str ?? '');
 }

 /**
 * String of hexidecimal characters
 */
 public function hex(?string $str = null): bool
 {
 return ctype_xdigit($str);
 return ctype_xdigit($str ?? '');
 }

 /**
 * Integer
 */
 public function integer(?string $str = null): bool
 {
 return (bool) preg_match('/\A[\-+]?\d+\z/', $str);
 return (bool) preg_match('/\A[\-+]?\d+\z/', $str ?? '');
 }

 /**
 * Is a Natural number (0,1,2,3, etc.)
 */
 public function is_natural(?string $str = null): bool
 {
 return ctype_digit($str);
 return ctype_digit($str ?? '');
 }

 /**
 * Is a Natural number, but not a zero (1,2,3, etc.)
 */
 public function is_natural_no_zero(?string $str = null): bool
 {
 return $str !== '0' && ctype_digit($str);
 return $str !== '0' && ctype_digit($str ?? '');
 }

 /**
Expand All@@ -146,7 +146,7 @@ public function is_natural_no_zero(?string $str = null): bool
 public function numeric(?string $str = null): bool
 {
 // @see https://regex101.com/r/bb9wtr/2
 return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str);
 return (bool) preg_match('/\A[\-+]?\d*\.?\d+\z/', $str ?? '');
 }

 /**
Expand All@@ -158,7 +158,7 @@ public function regex_match(?string $str, string $pattern): bool
 $pattern = "/{$pattern}/";
 }

 return (bool) preg_match($pattern, $str);
 return (bool) preg_match($pattern, $str ?? '');
 }

 /**
Expand All@@ -171,7 +171,7 @@ public function regex_match(?string $str, string $pattern): bool
 */
 public function timezone(?string $str = null): bool
 {
 return in_array($str, timezone_identifiers_list(), true);
 return in_array($str ?? '', timezone_identifiers_list(), true);
 }

 /**
Expand All@@ -184,6 +184,10 @@ public function timezone(?string $str = null): bool
 */
 public function valid_base64(?string $str = null): bool
 {
 if ($str === null) {
 return false;
 }

 return base64_encode(base64_decode($str, true)) === $str;
 }

Expand All@@ -194,7 +198,7 @@ public function valid_base64(?string $str = null): bool
 */
 public function valid_json(?string $str = null): bool
 {
 json_decode($str);
 json_decode($str ?? '');

 return json_last_error() === JSON_ERROR_NONE;
 }
Expand All@@ -207,7 +211,7 @@ public function valid_json(?string $str = null): bool
 public function valid_email(?string $str = null): bool
 {
 // @see https://regex101.com/r/wlJG1t/1/
 if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str, $matches)) {
 if (function_exists('idn_to_ascii') && defined('INTL_IDNA_VARIANT_UTS46') && preg_match('#\A([^@]+)@(.+)\z#', $str ?? '', $matches)) {
 $str = $matches[1] . '@' . idn_to_ascii($matches[2], 0, INTL_IDNA_VARIANT_UTS46);
 }

Expand All@@ -224,8 +228,9 @@ public function valid_email(?string $str = null): bool
 */
 public function valid_emails(?string $str = null): bool
 {
 foreach (explode(',', $str) as $email) {
 foreach (explode(',', $str ?? '') as $email) {
 $email = trim($email);

 if ($email === '') {
 return false;
 }
Expand All@@ -241,16 +246,15 @@ public function valid_emails(?string $str = null): bool
 /**
 * Validate an IP address (human readable format or binary string - inet_pton)
 *
 * @param string $ip IP Address
 * @param string $which IP protocol: 'ipv4' or 'ipv6'
Comment thread
paulbalandan marked this conversation as resolved.

 * @param string|null $which IP protocol: 'ipv4' or 'ipv6'
 */
 public function valid_ip(?string $ip = null, ?string $which = null): bool
 {
 if (empty($ip)) {
 return false;
 }

 switch (strtolower($which)) {
 switch (strtolower($which ?? '')) {
 case 'ipv4':
 $which = FILTER_FLAG_IPV4;
 break;
Expand All@@ -260,20 +264,18 @@ public function valid_ip(?string $ip = null, ?string $which = null): bool
 break;

 default:
 $which = null;
 break;
 $which = 0;
 }

 return (bool) filter_var($ip, FILTER_VALIDATE_IP, $which) || (! ctype_print($ip) && (bool) filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which));
 return filter_var($ip, FILTER_VALIDATE_IP, $which) !== false
 || (! ctype_print($ip) && filter_var(inet_ntop($ip), FILTER_VALIDATE_IP, $which) !== false);
 }

 /**
 * Checks a string to ensure it is (loosely) a URL.
 *
 * Warning: this rule will pass basic strings like
 * "banana"; use valid_url_strict for a stricter rule.
 *
 * @param string $str
 */
 public function valid_url(?string $str = null): bool
 {
Expand DownExpand Up@@ -317,18 +319,16 @@ public function valid_url_strict(?string $str = null, ?string $validSchemes = nu

 /**
 * Checks for a valid date and matches a given date format
 *
 * @param string $str
 * @param string $format
 */
 public function valid_date(?string $str = null, ?string $format = null): bool
 {
 if (empty($format)) {
 return (bool) strtotime($str);
 return strtotime($str) !== false;
 }

 $date = DateTime::createFromFormat($format, $str);
 $date = DateTime::createFromFormat($format, $str);
 $errors = DateTime::getLastErrors();

 return (bool) $date && DateTime::getLastErrors()['warning_count'] === 0 && DateTime::getLastErrors()['error_count'] === 0;
 return $date !== false && $errors !== false && $errors['warning_count'] === 0 && $errors['error_count'] === 0;
 }
}
Loading