Modernize PHP syntax

PHP 7 adopts a short array syntax as well as prefers single quoted
string were possible.
This commit is contained in:
Laravel Shift 2021-02-14 19:45:36 +00:00
parent e030bf2591
commit b8fa6cb1f7
2 changed files with 6 additions and 6 deletions

View file

@ -557,7 +557,7 @@ class ZipStream
*/ */
public static function getRelativePath($path) public static function getRelativePath($path)
{ {
$path = preg_replace("#/+\.?/+#", '/', str_replace('\\', '/', $path)); $path = preg_replace('#/+\\.?/+#', '/', str_replace('\\', '/', $path));
$dirs = explode('/', rtrim(preg_replace('#^(?:\./)+#', '', $path), '/')); $dirs = explode('/', rtrim(preg_replace('#^(?:\./)+#', '', $path), '/'));
$offset = 0; $offset = 0;

View file

@ -1427,15 +1427,15 @@ if (! function_exists('IsValidURL')) {
if ($parts = safe_parse_url($url)) { if ($parts = safe_parse_url($url)) {
if (($parts['scheme'] != 'http') && ($parts['scheme'] != 'https') && ($parts['scheme'] != 'ftp') && ($parts['scheme'] != 'gopher')) { if (($parts['scheme'] != 'http') && ($parts['scheme'] != 'https') && ($parts['scheme'] != 'ftp') && ($parts['scheme'] != 'gopher')) {
return false; return false;
} elseif (! preg_match("#^[[:alnum:]]([-.]?[0-9a-z])*\.[a-z]{2,3}#i$", $parts['host'], $regs) && ! preg_match('#^[0-9]{1,3}(\.[0-9]{1,3}){3}$#', $parts['host'])) { } elseif (! preg_match('#^[[:alnum:]]([-.]?[0-9a-z])*\\.[a-z]{2,3}#i$', $parts['host'], $regs) && ! preg_match('#^[0-9]{1,3}(\.[0-9]{1,3}){3}$#', $parts['host'])) {
return false; return false;
} elseif (! preg_match("#^([[:alnum:]-]|[\_])*$#i", $parts['user'], $regs)) { } elseif (! preg_match('#^([[:alnum:]-]|[\\_])*$#i', $parts['user'], $regs)) {
return false; return false;
} elseif (! preg_match("#^([[:alnum:]-]|[\_])*$#i", $parts['pass'], $regs)) { } elseif (! preg_match('#^([[:alnum:]-]|[\\_])*$#i', $parts['pass'], $regs)) {
return false; return false;
} elseif (! preg_match("#^[[:alnum:]/_\.@~-]*$#i", $parts['path'], $regs)) { } elseif (! preg_match('#^[[:alnum:]/_\\.@~-]*$#i', $parts['path'], $regs)) {
return false; return false;
} elseif (! preg_match("#^[[:alnum:]?&=+:;_()%#/,\.-]*$#i", $parts['query'], $regs)) { } elseif (! preg_match('#^[[:alnum:]?&=+:;_()%#/,\\.-]*$#i', $parts['query'], $regs)) {
return false; return false;
} else { } else {
return true; return true;