php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-13 22:06:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplified regular expressions

Browse Source
This commit is contained in:
Alexander Makarov
2015-10-10 00:40:25 +03:00
parent ffa3a59591
commit b65bfad44d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
framework/console/Controller.php
View File

@ -363,7 +363,7 @@ class Controller extends \yii\base\Controller
foreach ($method->getParameters() as $i => $reflection) { foreach ($method->getParameters() as $i => $reflection) {
$name = $reflection->getName(); $name = $reflection->getName();
$tag = isset($params[$i]) ? $params[$i] : ''; $tag = isset($params[$i]) ? $params[$i] : '';
if (preg_match('/^([^\s]+)\s+(\$\w+\s+)?(.*)/s', $tag, $matches)) { if (preg_match('/^(\S+)\s+(\$\w+\s+)?(.*)/s', $tag, $matches)) {
$type = $matches[1]; $type = $matches[1];
$comment = $matches[3]; $comment = $matches[3];
} else { } else {
@ -425,7 +425,7 @@ class Controller extends \yii\base\Controller
if (is_array($doc)) { if (is_array($doc)) {
$doc = reset($doc); $doc = reset($doc);
} }
if (preg_match('/^([^\s]+)(.*)/s', $doc, $matches)) { if (preg_match('/^(\S+)(.*)/s', $doc, $matches)) {
$type = $matches[1]; $type = $matches[1];
$comment = $matches[2]; $comment = $matches[2];
} else { } else {

4
framework/console/controllers/AssetController.php
View File

@ -617,7 +617,7 @@ EOD;
$fullMatch = $matches[0]; $fullMatch = $matches[0];
$inputUrl = $matches[1]; $inputUrl = $matches[1];
if (strpos($inputUrl, '/') === 0 || preg_match('/^https?:\/\//is', $inputUrl) || preg_match('/^data:/is', $inputUrl)) { if (strpos($inputUrl, '/') === 0 || preg_match('/^https?:\/\//i', $inputUrl) || preg_match('/^data:/i', $inputUrl)) {
return $fullMatch; return $fullMatch;
} }
if ($inputFileRelativePathParts === $outputFileRelativePathParts) { if ($inputFileRelativePathParts === $outputFileRelativePathParts) {
@ -648,7 +648,7 @@ EOD;
return str_replace($inputUrl, $outputUrl, $fullMatch); return str_replace($inputUrl, $outputUrl, $fullMatch);
}; };
$cssContent = preg_replace_callback('/url\(["\']?([^)^"^\']*)["\']?\)/is', $callback, $cssContent); $cssContent = preg_replace_callback('/url\(["\']?([^)^"^\']*)["\']?\)/i', $callback, $cssContent);
return $cssContent; return $cssContent;
} }

2
framework/helpers/BaseConsole.php
View File

@ -613,7 +613,7 @@ class BaseConsole
$output = []; $output = [];
exec('mode con', $output); exec('mode con', $output);
if (isset($output, $output[1]) && strpos($output[1], 'CON') !== false) { if (isset($output, $output[1]) && strpos($output[1], 'CON') !== false) {
return $size = [(int) preg_replace('~[^0-9]~', '', $output[3]), (int) preg_replace('~[^0-9]~', '', $output[4])]; return $size = [(int) preg_replace('~\D~', '', $output[3]), (int) preg_replace('~\D~', '', $output[4])];
} }
} else { } else {
// try stty if available // try stty if available