diff --git a/framework/CHANGELOG.md b/framework/CHANGELOG.md index 0e6c97ffe1..e814f0bafb 100644 --- a/framework/CHANGELOG.md +++ b/framework/CHANGELOG.md @@ -90,6 +90,7 @@ Yii Framework 2 Change Log - Enh: Added `yii\di\Instance::__set_state()` method to restore object after serialization using `var_export()` function (silvefire) - Bug #14072: Fixed a bug where `\yii\db\Command::createTable()`, `addForeignKey()`, `dropForeignKey()`, `addCommentOnColumn()`, and `dropCommentFromColumn()` weren't refreshing the table cache on `yii\db\Schema` (brandonkelly) - Bug #10305: Oracle SQL queries with `IN` condition and more than 1000 parameters are working now (silverfire) +- Enh #14098: `yii\helpers\BaseFileHelper::normalizeOptions()` is now protected (brandonkelly) 2.0.11.2 February 08, 2017 -------------------------- diff --git a/framework/helpers/BaseFileHelper.php b/framework/helpers/BaseFileHelper.php index 583655ab45..51a38f3001 100644 --- a/framework/helpers/BaseFileHelper.php +++ b/framework/helpers/BaseFileHelper.php @@ -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;