Mirrors/yii2
2
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2026-03-10 01:07:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #14098: yii\helpers\BaseFileHelper::normalizeOptions() is now protected

Browse Source
This commit is contained in:
Brandon Kelly
2017-05-02 15:53:21 -07:00
committed by Alexander Makarov
parent f8b3d68817
commit debe85fa34
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
framework/helpers/BaseFileHelper.php
View File

@@ -270,7 +270,7 @@ class BaseFileHelper
if (!isset($options['basePath'])) {
// this should be done only once
$options['basePath'] = realpath($src);
$options = self::normalizeOptions($options);
$options = static::normalizeOptions($options);
}
while (($file = readdir($handle)) !== false) {
if ($file === '.' || $file === '..') {
@@ -396,7 +396,7 @@ class BaseFileHelper
if (!isset($options['basePath'])) {
// this should be done only once
$options['basePath'] = realpath($dir);
$options = self::normalizeOptions($options);
$options = static::normalizeOptions($options);
}
$list = [];
$handle = opendir($dir);
@@ -696,8 +696,9 @@ class BaseFileHelper
/**
* @param array $options raw options
* @return array normalized options
* @since 2.0.12
*/
private static function normalizeOptions(array $options)
protected static function normalizeOptions(array $options)
{
if (!array_key_exists('caseSensitive', $options)) {
$options['caseSensitive'] = true;