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

Improved strtr calls

Browse Source
This commit is contained in:
Alexander Makarov
2014-07-23 16:19:28 +04:00
parent 81d5dd0163
commit 92c64994cd
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/gii/CodeFile.php
View File

@ -61,7 +61,7 @@ class CodeFile extends Object
*/
public function __construct($path, $content)
{
$this->path = strtr($path, ['/' => DIRECTORY_SEPARATOR, '\\' => DIRECTORY_SEPARATOR]);
$this->path = strtr($path, '/\\', DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR);
$this->content = $content;
$this->id = md5($this->path);
if (is_file($path)) {

2
framework/helpers/BaseFileHelper.php
View File

@ -42,7 +42,7 @@ class BaseFileHelper
*/
public static function normalizePath($path, $ds = DIRECTORY_SEPARATOR)
{
$path = rtrim(strtr($path, ['/' => $ds, '\\' => $ds]), $ds);
$path = rtrim(strtr($path, '/\\', $ds . $ds), $ds);
if (strpos($ds . $path, "{$ds}.") === false && strpos($path, "{$ds}{$ds}") === false) {
return $path;
}

2
framework/helpers/BaseVarDumper.php
View File

@ -114,7 +114,7 @@ class BaseVarDumper
$spaces = str_repeat(' ', $level * 4);
self::$_output .= "$className#$id\n" . $spaces . '(';
foreach ((array) $var as $key => $value) {
$keyDisplay = strtr(trim($key), ["\0" => ':']);
$keyDisplay = strtr(trim($key), "\0", ':');
self::$_output .= "\n" . $spaces . " [$keyDisplay] => ";
self::dumpInternal($value, $level + 1);
}